diff --git a/lib/main.dart b/lib/main.dart index cf4f681..703d039 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -23,34 +23,14 @@ Future main() async { Get.put(AppAuthRouteResolver()); Get.put(AuthMiddleware()); - runApp(MyApp()); + //runApp(MyApp()); - // runApp(DevicePreview(builder: (context) => ForDevicePreview(),)); + runApp(DevicePreview(builder: (context) => ForDevicePreview(),)); } -/*class ForDevicePreview extends StatelessWidget { +class ForDevicePreview extends StatelessWidget { const ForDevicePreview({super.key}); - @override - Widget build(BuildContext context) { - return GetMaterialApp( - useInheritedMediaQuery: true, - locale: DevicePreview.locale(context), - builder: DevicePreview.appBuilder, - title: 'رصدیار', - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: AppColor.blueNormal), - ), - initialRoute: AppPages.initRoutes, - initialBinding: BindingsBuilder.put(() => UserService()), - getPages: AppPages.pages, - ); - } -}*/ - -class MyApp extends StatelessWidget { - const MyApp({super.key}); - @override Widget build(BuildContext context) { return ScreenUtilInit( @@ -79,3 +59,35 @@ class MyApp extends StatelessWidget { ); } } + +/*class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return ScreenUtilInit( + designSize: const Size(412, 917), + minTextAdapt: true, + splitScreenMode: true, + child: GetMaterialApp( + title: 'رصدیار', + theme: ThemeData( + fontFamily: 'yekan', + colorScheme: ColorScheme.fromSeed(seedColor: AppColor.blueNormal), + ), + initialRoute: AppPages.initRoutes, + getPages: AppPages.pages, + locale: const Locale("fa", "IR"), + supportedLocales: const [Locale("fa", "IR")], + navigatorObservers: [CustomNavigationObserver()], + localizationsDelegates: [ + PersianMaterialLocalizations.delegate, + PersianCupertinoLocalizations.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + ), + ); + } +}*/ diff --git a/lib/presentation/pages/modules/view.dart b/lib/presentation/pages/modules/view.dart index 3de7873..02dd85d 100644 --- a/lib/presentation/pages/modules/view.dart +++ b/lib/presentation/pages/modules/view.dart @@ -28,11 +28,13 @@ class ModulesPage extends GetView { Positioned.fill( child: Column( children: [ - SizedBox(height: 24.h), + SizedBox(height: 12.h), SliderWidget(widgetTag: "up"), - Expanded( + SizedBox( + height: 244.h, child: GridView.builder( + padding: EdgeInsets.symmetric(horizontal: 25.w, vertical: 24.h), itemBuilder: (context, index) { final module = controller.moduleList[index]; @@ -47,10 +49,10 @@ class ModulesPage extends GetView { }, gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, - mainAxisSpacing: 24.h, + mainAxisSpacing: 22.h, crossAxisSpacing: 16.w, ), - physics: BouncingScrollPhysics(), + physics: NeverScrollableScrollPhysics(), itemCount: controller.moduleList.length, ), ), diff --git a/packages/core/lib/core.dart b/packages/core/lib/core.dart index 4bc7af9..1412fac 100644 --- a/packages/core/lib/core.dart +++ b/packages/core/lib/core.dart @@ -2,32 +2,40 @@ library; export 'package:android_intent_plus/android_intent.dart'; export 'package:android_intent_plus/flag.dart'; + export 'package:cached_network_image/cached_network_image.dart'; export 'package:collection/collection.dart'; export 'package:connectivity_plus/connectivity_plus.dart'; export 'package:device_info_plus/device_info_plus.dart'; export 'package:dio/dio.dart'; export 'package:flutter_localizations/flutter_localizations.dart'; + //map export 'package:flutter_map/flutter_map.dart'; export 'package:flutter_map_animations/flutter_map_animations.dart'; export 'package:flutter_map_marker_cluster/flutter_map_marker_cluster.dart'; export 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart' hide DownloadProgress; export 'package:flutter_rating_bar/flutter_rating_bar.dart'; -export 'package:flutter_screenutil/flutter_screenutil.dart'; +export 'package:device_preview_plus/device_preview_plus.dart'; +export 'package:flutter_screenutil/flutter_screenutil.dart' hide DeviceType; export 'package:flutter_secure_storage/flutter_secure_storage.dart'; export 'package:flutter_slidable/flutter_slidable.dart'; + //freezed export 'package:freezed_annotation/freezed_annotation.dart'; export 'package:geolocator/geolocator.dart'; export 'package:get/get.dart' hide FormData, MultipartFile, Response; + //di export 'package:get_it/get_it.dart'; + //local storage export 'package:hive_ce_flutter/hive_flutter.dart'; export 'package:image_cropper/image_cropper.dart'; + ///image picker export 'package:image_picker/image_picker.dart'; + //encryption //export 'package:encrypt/encrypt.dart' show Encrypted; @@ -45,17 +53,21 @@ export 'package:smooth_page_indicator/smooth_page_indicator.dart'; //models export 'data/model/model.dart'; + //data export 'data/services/services.dart'; + //infrastructure export 'infrastructure/infrastructure.dart'; export 'infrastructure/local/hive_local_storage.dart'; export 'injection/di.dart'; + //routing export 'routing/auth_route_resolver.dart'; export 'utils/extension/date_time_utils.dart'; export 'utils/extension/num_utils.dart'; export 'utils/extension/string_utils.dart'; + //utils export 'utils/logger_utils.dart'; export 'utils/map_utils.dart'; diff --git a/packages/core/lib/injection/di.dart b/packages/core/lib/injection/di.dart index 279afd3..1bc9558 100644 --- a/packages/core/lib/injection/di.dart +++ b/packages/core/lib/injection/di.dart @@ -11,7 +11,7 @@ Future setupAllCoreProvider() async { diCore.registerSingleton(ImagePicker()); //max 500MB Map Cashing - await FMTCObjectBoxBackend().initialise(); +// await FMTCObjectBoxBackend().initialise(); await diCore.allReady(); } diff --git a/packages/core/pubspec.lock b/packages/core/pubspec.lock index 9a55430..a7ff537 100644 --- a/packages/core/pubspec.lock +++ b/packages/core/pubspec.lock @@ -305,6 +305,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.11" + device_frame_plus: + dependency: transitive + description: + name: device_frame_plus + sha256: ccc94abccd4d9f0a9f19ef239001b3a59896e678ad42601371d7065889f2bf78 + url: "https://pub.dev" + source: hosted + version: "1.5.0" device_info_plus: dependency: "direct main" description: @@ -321,6 +329,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.3" + device_preview_plus: + dependency: "direct main" + description: + name: device_preview_plus + sha256: "45f9154c3213e470df1aa54326757ccf3cc6fb1f04396bced6ad1a7bfc9d6400" + url: "https://pub.dev" + source: hosted + version: "2.5.0" dio: dependency: "direct main" description: @@ -1389,6 +1405,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + shared_preferences: + dependency: transitive + description: + name: shared_preferences + sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" + url: "https://pub.dev" + source: hosted + version: "2.5.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74 + url: "https://pub.dev" + source: hosted + version: "2.4.12" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: @@ -1779,5 +1851,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=3.9.0 <4.0.0" - flutter: ">=3.29.0" + dart: ">=3.9.2 <4.0.0" + flutter: ">=3.35.3" diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index 5063a4b..ba7e73f 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -63,6 +63,7 @@ dependencies: persian_datetime_picker: ^3.1.1 encrypt: ^5.0.3 collection: ^1.19.1 + device_preview_plus: ^2.5.0 #L10N tools intl: ^0.20.2 diff --git a/pubspec.lock b/pubspec.lock index 70167a4..e6e5b31 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -305,6 +305,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.11" + device_frame_plus: + dependency: transitive + description: + name: device_frame_plus + sha256: ccc94abccd4d9f0a9f19ef239001b3a59896e678ad42601371d7065889f2bf78 + url: "https://pub.dev" + source: hosted + version: "1.5.0" device_info_plus: dependency: transitive description: @@ -321,6 +329,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.3" + device_preview_plus: + dependency: transitive + description: + name: device_preview_plus + sha256: "45f9154c3213e470df1aa54326757ccf3cc6fb1f04396bced6ad1a7bfc9d6400" + url: "https://pub.dev" + source: hosted + version: "2.5.0" dio: dependency: transitive description: @@ -1417,6 +1433,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + shared_preferences: + dependency: transitive + description: + name: shared_preferences + sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5" + url: "https://pub.dev" + source: hosted + version: "2.5.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74 + url: "https://pub.dev" + source: hosted + version: "2.4.12" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03" + url: "https://pub.dev" + source: hosted + version: "2.5.4" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" shelf: dependency: transitive description: @@ -1751,5 +1823,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=3.9.0 <4.0.0" - flutter: ">=3.29.0" + dart: ">=3.9.2 <4.0.0" + flutter: ">=3.35.3"