fix conflicts

4seer · Feb 15, 2020 · 8cf6608 · 8cf6608
2 parents 4312439 + e3e4e03
commit 8cf6608
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 60 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -5,11 +5,12 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:openflutterecommerce/config/routes.dart';
 import 'package:openflutterecommerce/config/theme.dart';
 import 'package:openflutterecommerce/screens/categories/categories_screen.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_translate/flutter_translate.dart';
 import 'package:openflutterecommerce/screens/home/home_screen.dart';
 import 'package:openflutterecommerce/screens/signin/forget_password.dart';
 import 'package:openflutterecommerce/screens/signin/signup.dart';
 import 'package:openflutterecommerce/screens/splash_screen.dart';
-
 import 'authentication/authentication.dart';
 import 'config/routes.dart';
 import 'screens/home/home_screen.dart';
@@ -37,17 +38,19 @@ class SimpleBlocDelegate extends BlocDelegate {
 }
 
 void main() async {
+  var delegate = await LocalizationDelegate.create(
+    fallbackLocale: 'en_US',
+    supportedLocales: ['en_US', 'de'],
+  );
+
   WidgetsFlutterBinding.ensureInitialized();
   BlocSupervisor.delegate = SimpleBlocDelegate();
-  var delegate = await LocalizationDelegate.create(
-      fallbackLocale: 'en_US', supportedLocales: ['en_US', 'de']);
   runApp(BlocProvider<AuthenticationBloc>(
-    create: (context) => AuthenticationBloc()..add(AppStarted()),
-    child: LocalizedApp(
-      delegate,
-      OpenFlutterEcommerceApp(),
-    ),
-  ));
+      create: (context) => AuthenticationBloc()..add(AppStarted()),
+      child: LocalizedApp(
+        delegate,
+        OpenFlutterEcommerceApp(),
+      )));
 }
 
 class OpenFlutterEcommerceApp extends StatelessWidget {
@@ -71,39 +74,38 @@ class OpenFlutterEcommerceApp extends StatelessWidget {
     var localizationDelegate = LocalizedApp.of(context).delegate;
 
     return LocalizationProvider(
-      state: LocalizationProvider.of(context).state,
-      child: MaterialApp(
-        title: 'Open FLutter E-commerce',
-        localizationsDelegates: [
-          GlobalMaterialLocalizations.delegate,
-          GlobalWidgetsLocalizations.delegate,
-          localizationDelegate
-        ],
-        supportedLocales: localizationDelegate.supportedLocales,
-        locale: localizationDelegate.currentLocale,
-        theme: OpenFlutterEcommerceTheme.of(context),
-        routes: <String, WidgetBuilder>{
-          OpenFlutterEcommerceRoutes.home: (context) => HomeScreen(),
-          OpenFlutterEcommerceRoutes.cart: (context) => HomeScreen(),
-          OpenFlutterEcommerceRoutes.favourites: (context) => HomeScreen(),
-          OpenFlutterEcommerceRoutes.SIGNIN: (context) => _signIn,
-          OpenFlutterEcommerceRoutes.SIGNUP: (context) => _signUp,
-          OpenFlutterEcommerceRoutes.FORGET_PASSWORD: (context) =>
-              _forgetPassword,
-          OpenFlutterEcommerceRoutes.shop: (context) => CategoriesScreen(),
-          OpenFlutterEcommerceRoutes.profile: (context) =>
-              BlocBuilder<AuthenticationBloc, AuthenticationState>(
-                  builder: (context, state) {
-                if (state is Authenticated) {
-                  return HomeScreen(); //TODO profile properties should be here
-                } else if (state is Unauthenticated) {
-                  return _signUp;
-                } else {
-                  return SplashScreen();
-                }
-              }),
-        },
-      ),
-    );
+        state: LocalizationProvider.of(context).state,
+        child: MaterialApp(
+          localizationsDelegates: [
+            GlobalMaterialLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+            localizationDelegate,
+          ],
+          supportedLocales: localizationDelegate.supportedLocales,
+          locale: localizationDelegate.currentLocale,
+          title: 'Open FLutter E-commerce',
+          theme: OpenFlutterEcommerceTheme.of(context),
+          routes: <String, WidgetBuilder>{
+            OpenFlutterEcommerceRoutes.home: (context) => HomeScreen(),
+            OpenFlutterEcommerceRoutes.cart: (context) => HomeScreen(),
+            OpenFlutterEcommerceRoutes.favourites: (context) => HomeScreen(),
+            OpenFlutterEcommerceRoutes.SIGNIN: (context) => _signIn,
+            OpenFlutterEcommerceRoutes.SIGNUP: (context) => _signUp,
+            OpenFlutterEcommerceRoutes.FORGET_PASSWORD: (context) =>
+                _forgetPassword,
+            OpenFlutterEcommerceRoutes.shop: (context) => CategoriesScreen(),
+            OpenFlutterEcommerceRoutes.profile: (context) =>
+                BlocBuilder<AuthenticationBloc, AuthenticationState>(
+                    builder: (context, state) {
+                  if (state is Authenticated) {
+                    return HomeScreen(); //TODO profile properties should be here
+                  } else if (state is Unauthenticated) {
+                    return _signUp;
+                  } else {
+                    return SplashScreen();
+                  }
+                }),
+          },
+        ));
   }
 }
diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart
@@ -21,7 +21,7 @@ class _HomeScreenState extends State<HomeScreen> {
   @override
   Widget build(BuildContext context) {
     return SafeArea(
-        child: OpenFlutterScaffold(
+      child: OpenFlutterScaffold(
       background: null,
       title: null,
       body: BlocProvider<HomeBloc>(
@@ -47,20 +47,22 @@ class _HomeWrapperState extends OpenFlutterWrapperState<HomeWrapper> {
   Widget build(BuildContext context) {
     return BlocBuilder<HomeBloc, HomeState>(
         builder: (BuildContext context, HomeState state) {
-      return getPageView(<Widget>[
-        Main1View(
-            changeView: changePage,
-            products:
-                state is HomeLoadedState ? state.newProducts : List<Product>()),
-        Main2View(
-            changeView: changePage,
-            salesProducts: state is HomeLoadedState
-                ? state.salesProducts
-                : List<Product>(),
-            newProducts:
-                state is HomeLoadedState ? state.newProducts : List<Product>()),
-        Main3View(changeView: changePage)
-      ]);
-    });
+          return getPageView(<Widget>[
+            Main1View(
+                changeView: changePage,
+                products: state is HomeLoadedState
+                    ? state.newProducts
+                    : List<Product>()),
+            Main2View(
+                changeView: changePage,
+                salesProducts: state is HomeLoadedState
+                    ? state.salesProducts
+                    : List<Product>(),
+                newProducts: state is HomeLoadedState
+                    ? state.newProducts
+                    : List<Product>()),
+            Main3View(changeView: changePage)
+          ]);
+        });
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -21,7 +21,6 @@ dependencies:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
-#  flutter_cupertino_localizations: ^1.0.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.