Add ScreenUtils and update theme definitions

sebastianpaz · sebastianpaz · commit 73ffb6358f7b · 2023-01-13T16:45:28.000-03:00
diff --git a/assets/images/svg/logo.svg b/assets/images/svg/logo.svg
@@ -0,0 +1,5 @@
+<svg width="28" height="21" viewBox="0 0 28 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.739 5.56117C15.6828 7.58289 17.0435 8.99809 17.0435 10.0089C17.0435 11.0198 15.6828 12.435 13.739 14.4567C12.6699 15.5687 11.0176 17.2871 9.6569 17.2871C8.19901 17.2871 7.32428 16.2763 7.32428 14.9622C7.32428 13.7491 8.3934 12.7383 8.97655 12.1318C9.94847 11.1209 10.5316 10.6155 10.5316 10.0089C10.5316 9.40243 9.94847 8.89701 8.97655 7.88615C8.3934 7.27963 7.32428 6.26877 7.32428 5.05574C7.32428 3.53946 8.3934 2.73077 9.5597 2.73077C10.5316 2.73077 11.5035 3.2362 13.739 5.56117Z" fill="#2E4FEB"/>
+<path d="M4.21413 7.38071C2.56186 7.38071 0.229248 8.897 0.229248 10.0089C0.229248 11.1209 2.56186 12.6372 4.21413 12.6372C5.67201 12.6372 7.1299 11.4241 7.1299 10.0089C7.1299 8.59374 5.67201 7.38071 4.21413 7.38071Z" fill="#2E4FEB"/>
+<path d="M27.4431 10.0089C27.4431 11.4241 25.402 13.7491 23.4582 15.7708C21.2228 18.0958 19.4733 20.1175 17.7239 20.1175C16.8491 20.1175 15.3912 19.511 15.3912 17.5904C15.3912 16.3773 16.4604 15.1643 17.0435 14.5578C18.0154 13.5469 20.348 11.3231 20.348 10.11C20.348 8.897 18.0154 6.67311 17.0435 5.66226C16.4604 5.05574 15.3912 3.74163 15.3912 2.62968C15.3912 0.607968 16.8491 0.102539 17.7239 0.102539C19.4733 0.102539 21.1256 2.12425 23.361 4.44923C25.402 6.26877 27.4431 8.59374 27.4431 10.0089Z" fill="#2E4FEB"/>
+</svg>
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -29,12 +29,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preferences_ios/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
 COCOAPODS: 1.11.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -340,7 +340,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -418,7 +418,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -467,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/lib/constants/assets.dart b/lib/constants/assets.dart
@@ -0,0 +1,3 @@
+const basePath = 'assets/images';
+
+const logoSvgFilePath = "$basePath/svg/logo.svg";
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_template/constants/l10n/localizations.dart';
 import 'package:flutter_template/data/repositories/user_repository.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -54,16 +55,20 @@ class FlutterTemplateApp extends StatelessWidget {
                 create: (context) =>
                     LoginCubit(repository: context.read<UserRepository>())),
           ],
-          child: MaterialApp(
-            debugShowCheckedModeBanner: false,
-            onGenerateRoute: appRouter.onGenerateRoute,
-            theme: lightTheme,
-            darkTheme: darkTheme,
-            themeMode: ThemeMode.light,
-            localizationsDelegates: localizationDelegates,
-            supportedLocales: supportedLocales,
-            locale: currentLanguage,
-          )),
+          child: ScreenUtilInit(
+              designSize: const Size(360, 690),
+              builder: (BuildContext context, Widget? child) {
+                return MaterialApp(
+                  debugShowCheckedModeBanner: false,
+                  onGenerateRoute: appRouter.onGenerateRoute,
+                  theme: lightTheme,
+                  darkTheme: darkTheme,
+                  themeMode: ThemeMode.light,
+                  localizationsDelegates: localizationDelegates,
+                  supportedLocales: supportedLocales,
+                  locale: currentLanguage,
+                );
+              })),
     );
   }
 }
diff --git a/lib/ui/screens/login/login.dart b/lib/ui/screens/login/login.dart
@@ -1,10 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:flutter_template/bloc/login/login_cubit.dart';
+import 'package:flutter_template/constants/assets.dart';
 import 'package:flutter_template/ui/components/button.dart';
 import 'package:flutter_template/ui/screens/home/home_navigator.dart';
 import 'package:flutter_template/ui/themes/text_styles.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class LoginWidget extends StatefulWidget {
   const LoginWidget({Key? key}) : super(key: key);
@@ -48,6 +51,7 @@ class _LoginWidgetState extends State<LoginWidget> {
   @override
   Widget build(BuildContext context) {
     final locale = AppLocalizations.of(context)!;
+    final theme = Theme.of(context);
 
     return Scaffold(
         appBar: AppBar(title: Text(locale.loginTitle)),
@@ -57,11 +61,15 @@ class _LoginWidgetState extends State<LoginWidget> {
           }
         }, builder: (context, state) {
           return Container(
-            padding: const EdgeInsets.all(30),
+            padding: EdgeInsets.all(20.h),
             child: Column(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  const SizedBox(height: 0),
+                  Padding(
+                    padding: EdgeInsets.only(top: 40.h),
+                    child: SvgPicture.asset(logoSvgFilePath,
+                        height: 60.h, width: 60.h, color: theme.primaryColor),
+                  ),
                   Column(children: [
                     Form(
                         key: _formKey,
diff --git a/lib/ui/themes/dark_theme.dart b/lib/ui/themes/dark_theme.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/ui/themes/text_styles.dart';
 
+Color brandingPrimaryColor = const Color(0xff0a0a36);
+
 ThemeData darkTheme = ThemeData(
     brightness: Brightness.dark,
-    primaryColor: Colors.blueAccent.shade700,
+    primaryColor: brandingPrimaryColor,
     primaryColorDark: Colors.blueAccent,
     primaryColorLight: Colors.lightBlueAccent,
     disabledColor: Colors.blueGrey,
diff --git a/lib/ui/themes/light_theme.dart b/lib/ui/themes/light_theme.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_template/ui/themes/text_styles.dart';
 
+Color brandingPrimaryColor = const Color(0xff0a0a36);
+
 ThemeData lightTheme = ThemeData(
     brightness: Brightness.light,
-    primaryColor: Colors.blueAccent.shade700,
+    primaryColor: brandingPrimaryColor,
     primaryColorDark: Colors.blueAccent,
     primaryColorLight: Colors.lightBlueAccent,
     disabledColor: Colors.blueGrey,
diff --git a/pubspec.lock b/pubspec.lock
@@ -263,6 +263,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.4"
+  flutter_screenutil:
+    dependency: "direct main"
+    description:
+      name: flutter_screenutil
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.6.0"
   flutter_secure_storage:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -52,6 +52,7 @@ dependencies:
   simple_animations: ^4.2.0
   bloc_test: ^9.1.0
   mocktail: ^0.3.0
+  flutter_screenutil: ^5.6.0
 
 dev_dependencies:
   flutter_test:
diff --git a/test/widgets/mocks/context_mock.dart b/test/widgets/mocks/context_mock.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_template/constants/l10n/localizations.dart';
 import 'package:flutter_template/ui/themes/dark_theme.dart';
 import 'package:flutter_template/ui/themes/light_theme.dart';
@@ -11,13 +12,13 @@ class ContextMock extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      localizationsDelegates: localizationDelegates,
-      supportedLocales: supportedLocales,
-      locale: currentLanguage,
-      theme: lightTheme,
-      darkTheme: darkTheme,
-      themeMode: ThemeMode.light,
-      home: child,
-    );
+        localizationsDelegates: localizationDelegates,
+        supportedLocales: supportedLocales,
+        locale: currentLanguage,
+        theme: lightTheme,
+        darkTheme: darkTheme,
+        themeMode: ThemeMode.light,
+        home: ScreenUtilInit(
+            designSize: const Size(360, 690), builder: (context, _) => child));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const basePath = 'assets/images';`
	`2`	`+`
	`3`	`+const logoSvgFilePath = "$basePath/svg/logo.svg";`