تصميم عالمي جديد، وإصلاح الخرائط ومراقب السيرفرات

siro_admin/lib/main.dart

@@ -9,12 +9,11 @@ import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'constant/box_name.dart';
+import 'constant/theme.dart';
 import 'controller/firebase/firbase_messge.dart';
 import 'controller/functions/encrypt_decrypt.dart';
 import 'firebase_options.dart';
 import 'models/db_sql.dart';
-import 'package:google_fonts/google_fonts.dart';
-import 'constant/colors.dart';
 import 'routes.dart';
 import 'binding/initial_binding.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
@@ -27,7 +26,7 @@ Future<void> backgroundMessageHandler(RemoteMessage message) async {
   if (message.data.isNotEmpty && message.notification != null) {
     FirebaseMessagesController().fireBaseTitles(message);
   }
-} //
+}
 
 DbSql sql = DbSql.instance;
 
@@ -40,7 +39,6 @@ void main() async {
     await Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,
     );
-    // await FirebaseMessagesController().requestFirebaseMessagingPermission();
 
     FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
 
@@ -54,8 +52,7 @@ void main() async {
       DeviceOrientation.portraitUp,
       DeviceOrientation.portraitDown,
     ]);
-  } // Enable Crashlytics collection
-  // FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
+  }
 
   runApp(const MainApp());
 }
@@ -70,30 +67,9 @@ class MainApp extends StatelessWidget {
       title: 'Siro Admin',
       locale: const Locale('ar'),
       fallbackLocale: const Locale('en'),
-      themeMode: ThemeMode.dark,
-      darkTheme: ThemeData(
-        fontFamily: GoogleFonts.tajawal().fontFamily,
-        brightness: Brightness.dark,
-        scaffoldBackgroundColor: AppColor.bg,
-        primaryColor: AppColor.accent,
-        colorScheme: const ColorScheme.dark(
-          primary: AppColor.accent,
-          secondary: AppColor.accent,
-          surface: AppColor.surface,
-          error: AppColor.danger,
-        ),
-        dividerColor: AppColor.divider,
-        appBarTheme: AppBarTheme(
-          backgroundColor: AppColor.bg,
-          elevation: 0,
-          centerTitle: true,
-          titleTextStyle: GoogleFonts.tajawal(
-            color: AppColor.textPrimary,
-            fontSize: 18,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-      ),
+      themeMode: ThemeMode.system,
+      theme: AppTheme.lightTheme,
+      darkTheme: AppTheme.darkTheme,
       initialBinding: InitialBinding(),
       initialRoute: box.read(BoxName.phoneVerified) == true ? "/" : "/login",
       getPages: routes,