update styles

@@ -47,15 +47,10 @@ class TikTokVidePoem extends StatelessWidget {
                   children: [
                   children: [
                     Text(
                     Text(
                       title ?? '每日一言',
                       title ?? '每日一言',
-<<<<<<< HEAD
-                      style:
-                          const TextStyle(color: Colors.white, fontSize: 28.0),
-=======
                       style: const TextStyle(
                       style: const TextStyle(
                         fontSize: 28.0,
                         fontSize: 28.0,
                         color: Colors.white,
                         color: Colors.white,
                       ),
                       ),
->>>>>>> 9fecb8a6ef8a0360e7ff66980f084c393cc257ed
                     ),
                     ),
                     Gaps.vGap10,
                     Gaps.vGap10,
                     Text(
                     Text(
@@ -67,15 +62,10 @@ class TikTokVidePoem extends StatelessWidget {
                     ),
                     ),
                     Text(
                     Text(
                       author ?? '诗人',
                       author ?? '诗人',
-<<<<<<< HEAD
-                      style:
-                          const TextStyle(color: Colors.white, fontSize: 16.0),
-=======
                       style: const TextStyle(
                       style: const TextStyle(
                         fontSize: 16.0,
                         fontSize: 16.0,
                         color: Colors.white,
                         color: Colors.white,
                       ),
                       ),
->>>>>>> 9fecb8a6ef8a0360e7ff66980f084c393cc257ed
                     ),
                     ),
                   ],
                   ],
                 ),
                 ),

@@ -33,42 +33,6 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
             ? SystemUiOverlayStyle.light
             ? SystemUiOverlayStyle.light
             : SystemUiOverlayStyle.dark;
             : SystemUiOverlayStyle.dark;
 
 
-<<<<<<< HEAD
-    final Widget action = actionName.isNotEmpty
-        ? Positioned(
-            right: 0.0,
-            child: Theme(
-              data: Theme.of(context).copyWith(
-                buttonTheme: const ButtonThemeData(
-                  padding: EdgeInsets.symmetric(horizontal: 16.0),
-                  minWidth: 60.0,
-                ),
-              ),
-              child: Row(
-                children: [
-                  Icon(
-                    Icons.star,
-                    color: Colors.white.withOpacity(0.66),
-                  ),
-                  Gaps.hGap10,
-                  Icon(
-                    Icons.ios_share,
-                    color: Colors.white.withOpacity(0.66),
-                  ),
-                  Gaps.hGap10,
-                  Icon(
-                    Icons.more_horiz,
-                    color: Colors.white.withOpacity(0.66),
-                  ),
-                  Gaps.hGap10,
-                ],
-              ),
-            ),
-          )
-        : Gaps.empty;
-
-=======
->>>>>>> 9fecb8a6ef8a0360e7ff66980f084c393cc257ed
     final Widget back = isBack
     final Widget back = isBack
         ? IconButton(
         ? IconButton(
             onPressed: () async {
             onPressed: () async {
@@ -84,73 +48,11 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
           )
           )
         : Gaps.empty;
         : Gaps.empty;
 
 
-<<<<<<< HEAD
-    // TODO 复用组件
-    final Widget titleWidget = Semantics(
-      namesRoute: true,
-      header: true,
-      child: isShowButtons
-          ? Container(
-              width: double.infinity,
-              alignment: Alignment.center,
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                mainAxisSize: MainAxisSize.max,
-                //交叉轴的布局方式，对于column来说就是水平方向的布局方式
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: <Widget>[
-                  TextButton(
-                    onPressed: () => funcLeft!(),
-                    child: Text(
-                      buttonLeft ?? "一言",
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                  ),
-                  const Text("|"),
-                  TextButton(
-                    onPressed: () => funcCenter!(),
-                    child: Text(
-                      buttonCenter ?? "译解",
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                  ),
-                  const Text("|"),
-                  TextButton(
-                    onPressed: () => funcRight!(),
-                    child: Text(
-                      buttonRight ?? "临境",
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                  ),
-                ],
-              ),
-            )
-          : Gaps.hGap10,
-    );
-
-=======
->>>>>>> 9fecb8a6ef8a0360e7ff66980f084c393cc257ed
     return AnnotatedRegion<SystemUiOverlayStyle>(
     return AnnotatedRegion<SystemUiOverlayStyle>(
       value: _overlayStyle,
       value: _overlayStyle,
       child: Material(
       child: Material(
         color: isTransparent ? Colors.transparent : Colors.black,
         color: isTransparent ? Colors.transparent : Colors.black,
         child: SafeArea(
         child: SafeArea(
-<<<<<<< HEAD
-          child: Flex(
-            direction: Axis.horizontal,
-            children: [
-              Expanded(
-                child: back,
-                flex: 1,
-              ),
-              Expanded(
-                child: titleWidget,
-                flex: 4,
-              ),
-              Expanded(
-                child: action,
-                flex: 2,
-=======
           child: Stack(
           child: Stack(
             alignment: Alignment.center,
             alignment: Alignment.center,
             children: <Widget>[
             children: <Widget>[
@@ -167,7 +69,6 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
                   alignment: Alignment.centerRight,
                   alignment: Alignment.centerRight,
                   child: homeActionWidgets,
                   child: homeActionWidgets,
                 ),
                 ),
->>>>>>> 9fecb8a6ef8a0360e7ff66980f084c393cc257ed
               ),
               ),
             ],
             ],
           ),
           ),