Browse Source

Removed unused imports & Refactored

Sean RIley Hawkins 3 years ago
parent
commit
2ae4762de8

+ 1 - 2
frontend/app_flowy/lib/workspace/presentation/widgets/menu/widget/top_bar.dart

@@ -4,7 +4,6 @@ import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:provider/provider.dart';
 import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra/theme.dart';
 
 
 class MenuTopBar extends StatelessWidget {
 class MenuTopBar extends StatelessWidget {
@@ -26,7 +25,7 @@ class MenuTopBar extends StatelessWidget {
                 width: 28,
                 width: 28,
                 onPressed: () => context.read<MenuBloc>().add(const MenuEvent.collapse()),
                 onPressed: () => context.read<MenuBloc>().add(const MenuEvent.collapse()),
                 iconPadding: const EdgeInsets.fromLTRB(4, 4, 4, 4),
                 iconPadding: const EdgeInsets.fromLTRB(4, 4, 4, 4),
-                icon: svg("home/hide_menu", color: theme.textColor),
+                icon: svg("home/hide_menu", color: theme.iconColor),
               )
               )
             ],
             ],
           ),
           ),

+ 3 - 1
frontend/app_flowy/packages/flowy_infra/lib/theme.dart

@@ -10,7 +10,6 @@ enum ThemeType {
 const _black = Color(0xff000000);
 const _black = Color(0xff000000);
 const _grey = Color(0xff808080);
 const _grey = Color(0xff808080);
 const _white = Color(0xFFFFFFFF);
 const _white = Color(0xFFFFFFFF);
-const _main2 = Color(0xff00b7ea);
 
 
 class AppTheme {
 class AppTheme {
   static ThemeType defaultTheme = ThemeType.light;
   static ThemeType defaultTheme = ThemeType.light;
@@ -46,6 +45,7 @@ class AppTheme {
   late Color tint8;
   late Color tint8;
   late Color tint9;
   late Color tint9;
   late Color textColor;
   late Color textColor;
+  late Color iconColor;
 
 
   late Color main1;
   late Color main1;
   late Color main2;
   late Color main2;
@@ -89,6 +89,7 @@ class AppTheme {
           ..main1 = const Color(0xff00bcf0)
           ..main1 = const Color(0xff00bcf0)
           ..main2 = const Color(0xff00b7ea)
           ..main2 = const Color(0xff00b7ea)
           ..textColor = _black
           ..textColor = _black
+          ..iconColor = _black
           ..shadowColor = _black;
           ..shadowColor = _black;
 
 
       case ThemeType.dark:
       case ThemeType.dark:
@@ -122,6 +123,7 @@ class AppTheme {
           ..main1 = const Color(0xff00bcf0)
           ..main1 = const Color(0xff00bcf0)
           ..main2 = const Color(0xff009cc7)
           ..main2 = const Color(0xff009cc7)
           ..textColor = _white
           ..textColor = _white
+          ..iconColor = _white
           ..shadowColor = _white;
           ..shadowColor = _white;
     }
     }
   }
   }