Merge pull request #46 from mediocre9/development

development

.gitignore

@@ -50,3 +50,6 @@ linux/
 macos/
 web/
 ios/
+
+# remove firebase options
+firebase_options.dart

README.md

@@ -13,7 +13,8 @@
 ## Channels
 |  Release |  Beta |
 |---|---|
-| [0.4.2](https://github.com/mediocre9/smart-link/releases/tag/v0.4.2)  | [0.3.3-beta](https://github.com/mediocre9/smart-link/releases/tag/v0.3.3-beta)
+| [0.4.2](https://github.com/mediocre9/smart-link/releases/tag/v0.4.2)  | [0.5.2-beta](https://github.com/mediocre9/smart-link/releases/tag/v0.5.2)
+
 
 ## Development Branches:
 - **<a href="https://github.com/mediocre9/remo-tooth/tree/development">Development</a>**

lib/config/colors/app_colors.dart

@@ -4,26 +4,25 @@ class AppColors {
   AppColors._();
 
   /// Widget colors....
-  static const Color kPrimary = Color(0xFFD4C5F6);
-  static const Color kScaffold = Color(0xFF1C1B1F);
-  static const Color kProgressIndicator = Color(0xFFD0BCFF);
-  static const Color kAppBar = Color(0xFF2A2831);
-  static const Color kElevatedButton = Color(0xFFBEA9EE);
-  static const Color kSnackbar = Color(0xFF313033);
-  static const Color kFloatingActionButton = Color(0xFF313034);
-  static const Color kBottomSheet = Color(0xFF1C1B1F);
-  static const Color kCard = Color(0xFF25232A);
-  static const Color kCardBorder = Color(0xFF49454F);
-  static const Color kListTile = Color(0xFF25232A);
+  static const Color primary = Color(0xFFD4C5F6);
+  static const Color scaffold = Color(0xFF1C1B1F);
+  static const Color progressIndicator = Color(0xFFD0BCFF);
+  static const Color appBar = Color(0xFF2A2831);
+  static const Color elevatedButton = Color(0xFFBEA9EE);
+  static const Color snackBar = Color(0xFF313033);
+  static const Color floatingActionButton = Color(0xFF313034);
+  static const Color card = Color(0xFF25232A);
+  static const Color cardBorder = Color(0xFF49454F);
+  static const Color listTile = Color(0xFF25232A);
 
   /// Text Colors....
-  static const Color kAppBarText = Color(0xFFE2D9F8);
-  static const Color kMediumDisplay = Color(0xFFAC8EF0);
-  static const Color kSmallTitle = Color(0xFFE6E1E5);
-  static const Color kMediumTitle = Color(0xFFE2D9F8);
-  static const Color kSmallLabel = Color(0xFF7A7A7A);
-  static const Color kMediumLabel = Color(0xFFB7B7B7);
-  static const Color kLargeLabel = Color(0xFFE6E1E5);
-  static const Color kElevatedButtonText = Color(0xFF381E72);
-  static const Color kSnackbarText = Color(0xFFF4EFF4);
+  static const Color appBarContent = Color(0xFFE2D9F8);
+  static const Color mediumDisplay = Color(0xFFAC8EF0);
+  static const Color smallTitle = Color(0xFFE6E1E5);
+  static const Color mediumTitle = Color(0xFFE2D9F8);
+  static const Color smallLabel = Color(0xFF7A7A7A);
+  static const Color mediumLabel = Color(0xFFB7B7B7);
+  static const Color largeLabel = Color(0xFFE6E1E5);
+  static const Color elevatedButtonContent = Color(0xFF381E72);
+  static const Color snackBarContent = Color(0xFFF4EFF4);
 }

lib/config/index.dart

@@ -1,4 +1,4 @@
 export 'colors/app_colors.dart';
-export 'router/app_routes.dart';
-export 'strings/app_strings.dart';
+export 'router/routes.dart';
+export 'strings/strings.dart';
 export 'theme/app_theme.dart';

lib/config/router/index.dart

@@ -7,4 +7,4 @@ export '../../screens/wifi_home_screen/wifi_home_screen.dart';
 export '../../screens/wifi_remote_screen/cubit/wifi_remote_cubit.dart';
 export '../../screens/wifi_remote_screen/wifi_remote_screen.dart';
 export '../../screens/biometric_screen/fingerprint_screen.dart';
-export 'app_routes.dart';
+export 'routes.dart';

lib/config/router/route_generator.dart

@@ -4,7 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart';
 import 'package:remo_tooth/config/router/index.dart';
 import 'package:remo_tooth/screens/authentication_screen/cubit/authentication_screen_cubit.dart';
-import '../../screens/splash_screen/splash_screen.dart';
+import 'package:remo_tooth/services/auth_service.dart';
 import '../../screens/wifi_home_screen/cubit/wifi_home_cubit.dart';
 
 class RouteGenerator {
@@ -14,18 +14,17 @@ class RouteGenerator {
     var arg = routeSettings.arguments;
 
     switch (routeSettings.name) {
-      case Routes.kSplash:
-        return _pageTransition(const SplashScreen());
-
-      case Routes.kAuth:
+      case Routes.auth:
         return _pageTransition(
           BlocProvider(
-            create: (_) => AuthenticationScreenCubit(),
+            create: (_) => AuthenticationScreenCubit(
+              authService: AuthenticationService(),
+            ),
             child: const AuthenticationScreen(),
           ),
         );
 
-      case Routes.kBluetooth:
+      case Routes.bluetoothHome:
         return _pageTransition(
           BlocProvider(
             lazy: false,
@@ -34,7 +33,7 @@ class RouteGenerator {
           ),
         );
 
-      case Routes.kBluetoothRemote:
+      case Routes.bluetoothRemote:
         return _pageTransition(
           BlocProvider(
             lazy: false,
@@ -43,7 +42,7 @@ class RouteGenerator {
           ),
         );
 
-      case Routes.kWifi:
+      case Routes.wifiHome:
         return _pageTransition(
           BlocProvider(
             lazy: false,
@@ -52,7 +51,7 @@ class RouteGenerator {
           ),
         );
 
-      case Routes.kWifiRemote:
+      case Routes.wifiRemote:
         return _pageTransition(
           BlocProvider(
             lazy: false,
@@ -61,7 +60,7 @@ class RouteGenerator {
           ),
         );
 
-      case Routes.kBiometric:
+      case Routes.biometric:
         return _pageTransition(const BiometricScreen());
 
       default:

lib/config/router/routes.dart

@@ -0,0 +1,9 @@
+class Routes {
+  Routes._();
+  static const String auth = '/';
+  static const String bluetoothHome = '/bluetoothHome';
+  static const String bluetoothRemote = '/bluetoothRemote';
+  static const String wifiHome = '/wifiHome';
+  static const String wifiRemote = '/wifiRemote';
+  static const String biometric = '/biometric';
+}

lib/config/strings/strings.dart

@@ -0,0 +1,31 @@
+class Strings {
+  Strings._();
+
+  static const String appName = 'Smart Link';
+  static const String appVersion = 'v0.5.2';
+  static const String appDescription = 'IoT Remote Control';
+  static const String appLogo = 'assets/images/logo.png';
+  static const String bluetoothOnHomeDescription = 'Scan for bluetooth devices';
+  static const String bluetoothDiscoveryDescription =
+      'This may take a few moments to discover nearby devices. Please be patient!';
+  static const String noInternet = 'No Internet Connection!';
+  static const String bluetoothOff = 'Bluetooth service is off.';
+  static const String devicesNotInRange =
+      'No nearby device(s) available. Try Again!';
+  static const String copyright =
+      '(c) Copyright 2023 CUSIT IT & Robotics Engineering Society. All rights reserved.';
+
+  static const String biometricLock = "Locked out due to too many attempts!";
+  static const String biometricPermanent =
+      "Locked out permanently due to too many attempts!";
+  static const String biometricEnrollment =
+      "Please register your fingerprint from your device settings!";
+  static const String biometricNotSupported =
+      "Your device does not have fingerprint support!";
+  static const String microControllerIp = "192.168.4.1";
+
+  static const String userBlocked = 'Your account has been blocked.';
+  static const String googleLogoPath = 'assets/images/google_logo.png';
+  static const String radarAnimationPath = 'assets/animations/radar.json';
+  static const String signinButtonText = 'Sign in with Google';
+}

lib/config/theme/app_theme.dart

@@ -7,7 +7,7 @@ class AppTheme {
 
   static ThemeData darkTheme() {
     return ThemeData.dark(useMaterial3: true).copyWith(
-      primaryColor: AppColors.kPrimary,
+      primaryColor: AppColors.primary,
       useMaterial3: true,
       inputDecorationTheme: const InputDecorationTheme(
         border: OutlineInputBorder(),
@@ -17,31 +17,31 @@ class AppTheme {
         color: Color(0xFFE2D9F8),
       ),
       floatingActionButtonTheme: const FloatingActionButtonThemeData(
-        backgroundColor: AppColors.kElevatedButton,
-        foregroundColor: AppColors.kElevatedButtonText,
+        backgroundColor: AppColors.elevatedButton,
+        foregroundColor: AppColors.elevatedButtonContent,
         shape: CircleBorder(),
       ),
       bottomSheetTheme: const BottomSheetThemeData(
         shape: BeveledRectangleBorder(),
-        backgroundColor: AppColors.kScaffold,
+        backgroundColor: AppColors.scaffold,
       ),
       progressIndicatorTheme: const ProgressIndicatorThemeData(
-        color: AppColors.kProgressIndicator,
+        color: AppColors.progressIndicator,
       ),
       cardTheme: CardTheme(
-        color: AppColors.kCard,
+        color: AppColors.card,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(4),
           side: const BorderSide(
-            color: AppColors.kCardBorder,
+            color: AppColors.cardBorder,
             style: BorderStyle.solid,
             width: 0.5,
           ),
         ),
       ),
       listTileTheme: const ListTileThemeData(
         dense: true,
-        tileColor: AppColors.kListTile,
+        tileColor: AppColors.listTile,
       ),
       elevatedButtonTheme: ElevatedButtonThemeData(
         style: ButtonStyle(
@@ -51,48 +51,48 @@ class AppTheme {
             ),
           ),
           backgroundColor: MaterialStateProperty.all(
-            AppColors.kElevatedButton,
+            AppColors.elevatedButton,
           ),
           foregroundColor: MaterialStateProperty.all(
-            AppColors.kElevatedButtonText,
+            AppColors.elevatedButtonContent,
           ),
         ),
       ),
       snackBarTheme: SnackBarThemeData(
-        backgroundColor: AppColors.kSnackbar,
+        backgroundColor: AppColors.snackBar,
         contentTextStyle: const TextStyle(
-          color: AppColors.kSnackbarText,
+          color: AppColors.snackBarContent,
         ),
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(4),
         ),
       ),
       textTheme: const TextTheme(
         displayLarge: TextStyle(
-          color: AppColors.kMediumDisplay,
+          color: AppColors.mediumDisplay,
           fontWeight: FontWeight.bold,
         ),
         displaySmall: TextStyle(
-          color: AppColors.kMediumDisplay,
+          color: AppColors.mediumDisplay,
           fontWeight: FontWeight.bold,
         ),
         titleSmall: TextStyle(
-          color: AppColors.kSmallTitle,
+          color: AppColors.smallTitle,
           fontWeight: FontWeight.w300,
         ),
         titleMedium: TextStyle(
-          color: AppColors.kMediumTitle,
+          color: AppColors.mediumTitle,
           fontWeight: FontWeight.w600,
           fontSize: 16,
         ),
         labelSmall: TextStyle(
-          color: AppColors.kSmallLabel,
+          color: AppColors.smallLabel,
         ),
         labelMedium: TextStyle(
-          color: AppColors.kMediumLabel,
+          color: AppColors.mediumLabel,
         ),
         labelLarge: TextStyle(
-          color: AppColors.kLargeLabel,
+          color: AppColors.largeLabel,
           fontWeight: FontWeight.w500,
         ),
       ),