update styles

@@ -9,7 +9,6 @@ import 'package:one_poem/tiktok/widgets/tiktok_top_info.dart';
 import 'package:one_poem/tiktok/widgets/tiktok_video.dart';
 import 'package:one_poem/tiktok/widgets/tiktok_video.dart';
 import 'package:one_poem/tiktok/widgets/tiktok_video_button_column.dart';
 import 'package:one_poem/tiktok/widgets/tiktok_video_button_column.dart';
 import 'package:one_poem/tiktok/widgets/tiktok_video_poem.dart';
 import 'package:one_poem/tiktok/widgets/tiktok_video_poem.dart';
-import 'package:one_poem/util/toast_utils.dart';
 import 'package:one_poem/widgets/bars/home_action_bar.dart';
 import 'package:one_poem/widgets/bars/home_action_bar.dart';
 import 'package:one_poem/widgets/my_app_bar.dart';
 import 'package:one_poem/widgets/my_app_bar.dart';
 import 'package:video_player/video_player.dart';
 import 'package:video_player/video_player.dart';

@@ -66,6 +66,7 @@ class TikTokVidePoem extends StatelessWidget {
                           fontSize: 20.px),
                           fontSize: 20.px),
                     ),
                     ),
                     Container(
                     Container(
+                      padding: EdgeInsets.only(right: 5.px),
                       alignment: Alignment.centerRight,
                       alignment: Alignment.centerRight,
                       width: double.infinity,
                       width: double.infinity,
                       child: Text(
                       child: Text(

@@ -5,7 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/services.dart';
 import 'package:one_poem/timeline/models/friend_entity.dart';
 import 'package:one_poem/timeline/models/friend_entity.dart';
 import 'package:one_poem/timeline/widgets/friend_cell.dart';
 import 'package:one_poem/timeline/widgets/friend_cell.dart';
-import 'package:one_poem/timeline/widgets/header_view.dart';
+import 'package:one_poem/widgets/bars/timeline_menu_bar.dart';
+import 'package:one_poem/widgets/my_app_bar.dart';
 
 
 class TimelinesPage extends StatefulWidget {
 class TimelinesPage extends StatefulWidget {
   const TimelinesPage({Key? key}) : super(key: key);
   const TimelinesPage({Key? key}) : super(key: key);
@@ -14,11 +15,11 @@ class TimelinesPage extends StatefulWidget {
   _TimelinesPageState createState() => _TimelinesPageState();
   _TimelinesPageState createState() => _TimelinesPageState();
 }
 }
 
 
-class _TimelinesPageState extends State<TimelinesPage>{
+class _TimelinesPageState extends State<TimelinesPage> {
   final ScrollController _scrollController = ScrollController();
   final ScrollController _scrollController = ScrollController();
   double _opacity = 0;
   double _opacity = 0;
 
 
-  FriendEntity _friendmodelEntity = FriendEntity();
+  FriendEntity _friendModelEntity = FriendEntity();
 
 
   Future<String> loadAsset() async {
   Future<String> loadAsset() async {
     return await rootBundle.loadString('assets/data/Data.json');
     return await rootBundle.loadString('assets/data/Data.json');
@@ -28,59 +29,51 @@ class _TimelinesPageState extends State<TimelinesPage>{
   void initState() {
   void initState() {
     super.initState();
     super.initState();
 
 
-    loadAsset().then((value){
+    loadAsset().then((value) {
       var json = jsonDecode(value);
       var json = jsonDecode(value);
-      _friendmodelEntity = FriendEntity.fromJson(json);
+      _friendModelEntity = FriendEntity.fromJson(json);
       setState(() {});
       setState(() {});
     });
     });
 
 
-
     _scrollController.addListener(() {
     _scrollController.addListener(() {
-
-      double alph = _scrollController.offset/200;
-      if (alph < 0) {
-        alph = 0;
-      } else if (alph > 1) {
-        alph = 1;
+      double alpha = _scrollController.offset / 200;
+      if (alpha < 0) {
+        alpha = 0;
+      } else if (alpha > 1) {
+        alpha = 1;
       }
       }
       setState(() {
       setState(() {
-        _opacity = alph;
+        _opacity = alpha;
       });
       });
-
-
     });
     });
-
   }
   }
 
 
-  Widget _mainListViewBuidler(BuildContext context , int index) {
-    return FriendCell(model: _friendmodelEntity.data[index],);
+  Widget _mainListViewBuilder(BuildContext context, int index) {
+    return FriendCell(
+      model: _friendModelEntity.data[index],
+    );
   }
   }
 
 
-
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
-
     return Scaffold(
     return Scaffold(
-      body: Stack(
+      appBar: const MyAppBar(
+        isBack: false,
+        isTransparent: true,
+        homeMenuHeader: TimelineMenuHeader(),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.only(top: 0),
+        controller: _scrollController,
         children: <Widget>[
         children: <Widget>[
-          ListView(
+          ListView.builder(
             padding: const EdgeInsets.only(top: 0),
             padding: const EdgeInsets.only(top: 0),
-            controller: _scrollController,
-            children: <Widget>[
-              const HeaderView(),
-              ListView.builder(padding: const EdgeInsets.only(top: 0), itemBuilder: _mainListViewBuidler , itemCount: _friendmodelEntity.data.length, shrinkWrap: true, physics:NeverScrollableScrollPhysics(),)
-            ],
-          ),
-          Opacity(
-            opacity: _opacity,
-            child: const CupertinoNavigationBar(
-              middle: Text("临境|附近|新鲜"),
-
-            ),
+            itemBuilder: _mainListViewBuilder,
+            itemCount: _friendModelEntity.data.length,
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
           )
           )
-
         ],
         ],
-
       ),
       ),
     );
     );
   }
   }

+import 'package:flutter/material.dart';
+
+class TimelineMenuHeader extends StatelessWidget {
+  const TimelineMenuHeader({
+    Key? key,
+    this.funcLeft,
+    this.funcCenter,
+    this.funcRight,
+  }) : super(key: key);
+
+  final Function? funcLeft;
+  final Function? funcCenter;
+  final Function? funcRight;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+        alignment: Alignment.center,
+        margin: const EdgeInsets.symmetric(horizontal: 5.0),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisSize: MainAxisSize.min,
+          //交叉轴的布局方式，对于column来说就是水平方向的布局方式
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: <Widget>[
+            SizedBox(
+              width: 60.0,
+              child: TextButton(
+                onPressed: () => funcLeft!(),
+                child: const Text(
+                  "临境",
+                  style: TextStyle(color: Colors.black54),
+                ),
+              ),
+            ),
+            const VerticalDivider(
+              color: Colors.black54,
+              width: 1.0,
+              thickness: 1.0,
+              indent: 16.0,
+              endIndent: 16.0,
+            ),
+            TextButton(
+              onPressed: () => funcCenter!(),
+              child: const Text(
+                "附近",
+                style: TextStyle(color: Colors.black54),
+              ),
+            ),
+            const VerticalDivider(
+              color: Colors.black54,
+              width: 1.0,
+              thickness: 1.0,
+              indent: 15.0,
+              endIndent: 15.0,
+            ),
+            TextButton(
+              onPressed: () => funcRight!(),
+              child: const Text(
+                "新鲜",
+                style: TextStyle(color: Colors.black54),
+              ),
+            ),
+          ],
+        ));
+  }
+}