add samecity page

lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:douyin_demo/pages/RecommendPage/BottomSheet.dart';
 import 'package:douyin_demo/providers/RecommendProvider.dart';
-import 'package:douyin_demo/widgets/FavAnimation.dart' as prefix0;
+import 'package:douyin_demo/widgets/BottomBar.dart';
+// import 'package:douyin_demo/widgets/FavAnimation.dart' as prefix0;
 import 'package:flutter/material.dart';
 // import 'package:marquee/marquee.dart';
 import 'package:marquee_flutter/marquee_flutter.dart';
@@ -20,6 +21,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: "某音",
+      theme: ThemeData(primaryColor: Color(0xff121319)),
       home: MultiProvider(
           providers: [
             ChangeNotifierProvider(
@@ -57,7 +59,7 @@ class BottomSafeBar extends StatelessWidget {
           decoration: BoxDecoration(color: Colors.black),
           height: 60,
           // decoration: BoxDecoration(color: Colors.black),
-          child: BtmBar(),
+          child: BtmBar(selectIndex: 0,),
         ),
       )),
     );
@@ -137,7 +139,7 @@ class Home extends StatelessWidget {
     double rpx = screenWidth / 750;
     return Stack(children: [
       Positioned(
-        top: 0,
+        top: 20*rpx,
         // height: 120,
         width: screenWidth,
         child: SafeArea(
@@ -236,85 +238,7 @@ class _TopTabState extends State<TopTab> with SingleTickerProviderStateMixin {
   }
 }
 
-class BtmBar extends StatelessWidget {
-  const BtmBar({Key key}) : super(key: key);
 
-  @override
-  Widget build(BuildContext context) {
-    RecommendProvider provider = Provider.of<RecommendProvider>(context);
-    return Container(
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceAround,
-        children: <Widget>[
-          getBtmTextWidget("首页", true),
-          getBtmTextWidget("同城", false),
-          AddIcon(),
-          getBtmTextWidget("消息", false),
-          getBtmTextWidget("我", false),
-        ],
-      ),
-    );
-  }
-}
-
-getBtmTextWidget(String content, bool ifSelected) {
-  return Text("$content",
-      style: ifSelected
-          ? TextStyle(
-              fontSize: 16, color: Colors.white, fontWeight: FontWeight.bold)
-          : TextStyle(
-              fontSize: 16,
-              color: Colors.grey[600],
-              fontWeight: FontWeight.bold));
-}
-
-class AddIcon extends StatelessWidget {
-  const AddIcon({Key key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    double iconHeight = 30;
-    double totalWidth = 50;
-    double eachSide = 3;
-    return Container(
-      // decoration: BoxDecoration(),
-      height: iconHeight,
-      width: 50,
-      child: Stack(
-        children: <Widget>[
-          Positioned(
-            height: iconHeight,
-            width: totalWidth - eachSide,
-            child: Container(
-              decoration: BoxDecoration(
-                  color: Colors.cyan, borderRadius: BorderRadius.circular(10)),
-            ),
-          ),
-          Positioned(
-            height: iconHeight,
-            width: totalWidth - eachSide,
-            right: 0,
-            child: Container(
-              decoration: BoxDecoration(
-                  color: Colors.redAccent,
-                  borderRadius: BorderRadius.circular(10)),
-            ),
-          ),
-          Positioned(
-            height: iconHeight,
-            width: totalWidth - eachSide * 2,
-            right: eachSide,
-            child: Container(
-              decoration: BoxDecoration(
-                  color: Colors.white, borderRadius: BorderRadius.circular(10)),
-              child: Icon(Icons.add),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
 
 class BtnContent extends StatelessWidget {
   const BtnContent({Key key}) : super(key: key);
@@ -396,7 +320,7 @@ class _RotateAlbumState extends State<RotateAlbum>
       turns: Tween(begin: 0.0, end: 1.0).animate(_controller)
         ..addStatusListener((status) {
           if (status == AnimationStatus.completed) {
-            // _controller.forward(from: 0.0);
+            _controller.forward(from: 0.0);
           }
         }),
       child: Container(
@@ -480,6 +404,7 @@ class _ButtonListState extends State<ButtonList> {
               child: Stack(
                 children: <Widget>[
                   Container(
+                    // decoration: BoxDecoration(c),
                       width: 90 * rpx,
                       height: 90 * rpx,
                       child: CircleAvatar(

lib/pages/RecommendPage/FriendList.dart

@@ -31,8 +31,8 @@ class AtFriendPage extends StatelessWidget {
                 bottom: PreferredSize(
                   preferredSize: Size.fromHeight(80 * rpx),
                   child: Container(
-                    margin: EdgeInsets.symmetric(horizontal: 20 * rpx),
-                    decoration: BoxDecoration(color: Colors.grey[700]),
+                    margin: EdgeInsets.symmetric(horizontal: 30 * rpx),
+                    decoration: BoxDecoration(color: Color(0xff2a2b33)),
                     padding: EdgeInsets.symmetric(horizontal: 20 * rpx),
                     child: TextField(
                       decoration: InputDecoration(

lib/pages/sameCity/SameCityPage.dart

@@ -0,0 +1,46 @@
+import 'package:douyin_demo/widgets/BottomBar.dart';
+import 'package:flutter/material.dart';
+
+class SameCityMain extends StatelessWidget {
+  const SameCityMain({Key key,this.selIndex}) : super(key: key);
+  final int selIndex;
+  @override
+  Widget build(BuildContext context) {
+    double rpx=MediaQuery.of(context).size.width/750;
+    return Scaffold(
+      backgroundColor: Theme.of(context).primaryColor,
+      appBar: AppBar(
+        title: Text("同城"),
+      ),
+      bottomNavigationBar: Container(
+        decoration: BoxDecoration(color: Colors.black),
+        child: SafeArea(
+          child: BtmBar(selectIndex:selIndex)
+        )
+      ),
+      body: Column(
+        children: <Widget>[
+          Container(
+            height: 120*rpx,
+            padding: EdgeInsets.all(20*rpx),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                Row(
+                  children: <Widget>[
+                    Icon(Icons.near_me,color: Colors.grey[400],),
+                    Text("自动定位 ：上海",style: TextStyle(color: Colors.grey[400]),),
+                  ],
+                ),
+                Row(
+                  children: <Widget>[Text("切换",style: TextStyle(color: Colors.grey[400])), Icon(Icons.arrow_right,color: Colors.grey[400])],
+                ),
+              ],
+            )
+          ),
+
+        ],
+      ),
+    );
+  }
+}

lib/widgets/BottomBar.dart

@@ -0,0 +1,154 @@
+import 'package:douyin_demo/pages/sameCity/SameCityPage.dart';
+import 'package:flutter/material.dart';
+
+// class BtmBar extends StatelessWidget {
+//   const BtmBar({Key key}) : super(key: key);
+
+//   @override
+//   Widget build(BuildContext context) {
+//     // RecommendProvider provider = Provider.of<RecommendProvider>(context);
+//     return Container(
+//       child: Row(
+//         mainAxisAlignment: MainAxisAlignment.spaceAround,
+//         children: <Widget>[
+//           getBtmTextWidget("首页", true),
+//           getBtmTextWidget("同城", false),
+//           AddIcon(),
+//           getBtmTextWidget("消息", false),
+//           getBtmTextWidget("我", false),
+//         ],
+//       ),
+//     );
+//   }
+// }
+
+class BtmBar extends StatefulWidget {
+  BtmBar({Key key, this.selectIndex}) : super(key: key);
+  final int selectIndex;
+
+  _BtmBarState createState() => _BtmBarState();
+}
+
+class _BtmBarState extends State<BtmBar> {
+  List<bool> selected = List<bool>();
+  List<String> selectItems = List<String>();
+  @override
+  void initState() {
+    super.initState();
+    for (var i = 0; i < 4; i++) {
+      selected.add(false);
+    }
+    selected[widget.selectIndex] = true;
+  }
+
+  tapItem(index) {
+    // selected=List<bool>();
+    // for (var i = 0; i < 4; i++) {
+    //   selected.add(false);
+    // }
+    // selected[index]=true;
+    // setState(() {
+      
+    //   selected=selected;
+    // });
+    Navigator.push(context, MaterialPageRoute(builder: (context)=>SameCityMain(selIndex: index,)));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // RecommendProvider provider = Provider.of<RecommendProvider>(context);
+    double rpx=MediaQuery.of(context).size.width/750;
+    return Container(
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: <Widget>[
+          Expanded(
+            flex: 1,
+            child: getBtmTextWidget("首页", selected[0],(){tapItem(0);},rpx)
+          ),
+          Expanded(
+            flex: 1,
+            child: getBtmTextWidget("同城", selected[1],(){tapItem(1);},rpx)
+          ),
+          Expanded(
+            flex: 1,
+            child: AddIcon()
+          ),
+          Expanded(
+            flex: 1,
+            child: getBtmTextWidget("消息", selected[2],(){tapItem(2);},rpx)
+          ),
+          Expanded(
+            flex: 1,
+            child: getBtmTextWidget("我", selected[3],(){tapItem(3);},rpx)
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+getBtmTextWidget(String content, bool ifSelected,tapFunc,double rpx) {
+  return FlatButton(
+      onPressed: () {tapFunc();},
+      child: Text("$content",
+          style: ifSelected
+              ? TextStyle(
+                  fontSize: 30*rpx,
+                  color: Colors.white,
+                  fontWeight: FontWeight.w900)
+              : TextStyle(
+                  fontSize: 30*rpx,
+                  color: Colors.grey[600],
+                  fontWeight: FontWeight.w900)));
+}
+
+class AddIcon extends StatelessWidget {
+  const AddIcon({Key key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    double rpx=MediaQuery.of(context).size.width/750;
+    double iconHeight = 55*rpx;
+    double totalWidth = 90*rpx;
+    double eachSide = 5*rpx;
+    return Container(
+      // decoration: BoxDecoration(),
+      padding: EdgeInsets.symmetric(horizontal: 30*rpx),
+      height: iconHeight,
+      width: 150*rpx,
+      child: Stack(
+        children: <Widget>[
+          Positioned(
+            height: iconHeight,
+            width: totalWidth - eachSide,
+            child: Container(
+              decoration: BoxDecoration(
+                  color: Colors.cyan, borderRadius: BorderRadius.circular(10)),
+            ),
+          ),
+          Positioned(
+            height: iconHeight,
+            width: totalWidth - eachSide,
+            right: 0,
+            child: Container(
+              decoration: BoxDecoration(
+                  color: Colors.redAccent,
+                  borderRadius: BorderRadius.circular(10)),
+            ),
+          ),
+          Positioned(
+            height: iconHeight,
+            width: totalWidth - eachSide * 2,
+            right: eachSide,
+            child: Container(
+              decoration: BoxDecoration(
+                  color: Colors.white, borderRadius: BorderRadius.circular(10)),
+              child: Icon(Icons.add),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}