Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge

android/build.gradle

@@ -3,6 +3,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven { url "https://jitpack.io" }
         maven {url 'https://developer.huawei.com/repo/'}
     }
 

android/gradle.properties

@@ -1,4 +1,3 @@
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m
 android.useAndroidX=true
 android.enableJetifier=true
-

lib/controllers/providers/settings/setting_provider.dart

@@ -69,6 +69,9 @@ class SettingProvider extends ChangeNotifier {
     await prefs.setBool(ASettings.rememberMe, rememberMe);
     await prefs.setString(ASettings.userName, username);
     await prefs.setString(ASettings.password, password);
+
+    this.username = username;
+    this.password = password;
   }
 
   void selectAssetGroup(User user) {
@@ -85,7 +88,7 @@ class SettingProvider extends ChangeNotifier {
     setAssetGroup(_assetGroup);
   }
 
-  Future<void> setAssetGroup(AssetGroup? assetGroup) async {
+  void setAssetGroup(AssetGroup? assetGroup) {
     _assetGroup = assetGroup;
     ApiManager.instance.assetGroup = _assetGroup!;
     notifyListeners();

lib/models/user.dart

@@ -297,6 +297,7 @@ class AssetGroup {
     data['id'] = id;
     data['name'] = name;
     data['code'] = code;
+    data['enabledEngineerTimer'] = enabledEngineerTimer;
     return data;
   }
 }

lib/new_views/pages/splash_page.dart

@@ -85,9 +85,7 @@ class _SplashPageState extends State<SplashPage> {
       setState(() {
         loading = false;
       });
-      if (isValid && _settingProvider.isLocalAuthEnable) {
-        handleLocalAuth();
-      } else {
+      if (isValid == false) {
         showDialog(
           context: context,
           builder: (BuildContext cxt) => SingleBtnDialog(
@@ -99,6 +97,12 @@ class _SplashPageState extends State<SplashPage> {
                 Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
               }),
         );
+      } else {
+        if (isValid && _settingProvider.isLocalAuthEnable) {
+          handleLocalAuth();
+          return;
+        }
+        Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
       }
     }
   }

lib/views/widgets/date_and_time/date_picker.dart

@@ -82,6 +82,42 @@ class ADatePicker extends StatelessWidget {
               initialDate: DateTime.now(),
               firstDate: from ?? DateTime.now(),
               lastDate: to ?? DateTime.now(),
+              builder: (BuildContext context, Widget? child) {
+                final ThemeData currentTheme = Theme.of(context);
+                return Theme(
+                  data: currentTheme.copyWith(
+                    datePickerTheme: DatePickerThemeData(
+                      headerBackgroundColor: AppColor.primary10,
+                      headerForegroundColor: Colors.white,
+                      backgroundColor: currentTheme.colorScheme.surface,
+                      dayForegroundColor: MaterialStateColor.resolveWith((states) {
+                        if (states.contains(MaterialState.selected)) return Colors.white;
+                        if (states.contains(MaterialState.disabled)) return Colors.grey.withOpacity(0.6);
+                        return currentTheme.colorScheme.onSurface;
+                      }),
+                      dayBackgroundColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? AppColor.primary10 : Colors.transparent),
+                      yearForegroundColor: MaterialStateColor.resolveWith((states) {
+                        if (states.contains(MaterialState.selected)) return Colors.white;
+                        if (states.contains(MaterialState.disabled)) return Colors.grey.withOpacity(0.6);
+                        return currentTheme.colorScheme.onSurface;
+                      }),
+                      yearBackgroundColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? AppColor.primary10 : Colors.transparent),
+                      // todayForegroundColor: MaterialStateColor.resolveWith((states) => AppColor.primary10),
+                      // todayBorder: BorderSide(color: AppColor.primary10.withOpacity(0.7)),
+                      dividerColor: Colors.grey.withOpacity(0.2),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+                      inputDecorationTheme: const InputDecorationTheme(
+                        focusedBorder: UnderlineInputBorder(borderSide: BorderSide(color: AppColor.primary10, width: 2)),
+                      ),
+                    ),
+                    textButtonTheme: TextButtonThemeData(
+                      style: TextButton.styleFrom(foregroundColor: AppColor.primary10),
+                    ),
+                    iconTheme: IconThemeData(color: AppColor.primary10.withOpacity(0.7)),
+                  ),
+                  child: child!,
+                );
+              },
             );
             if (picked != null && onDatePicker != null) {
               onDatePicker!(picked); // Use null-aware operator

lib/views/widgets/equipment/single_device_picker.dart

@@ -47,10 +47,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
 
   _getDevice(String result, {bool isQr = false}) async {
     _devicesProvider.reset();
-    await _devicesProvider.getAssets(
-      search: DeviceSearch(assetNo: result, assetSerialNumber: ""),
-      isQr: isQr,
-    );
+    await _devicesProvider.getAssets(search: DeviceSearch(assetNo: result, assetSerialNumber: ""), isQr: isQr);
     _searchableList.clear();
     _searchableList.addAll(_devicesProvider.devices);
   }
@@ -144,7 +141,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
       ),
       body: SafeArea(
         child: LoadingManager(
-          isLoading: _devicesProvider.isLoading,
+          isLoading: false,
           stateCode: _devicesProvider.stateCode,
           isFailedLoading: _devicesProvider.devices == null,
           onRefresh: () async {
@@ -155,20 +152,22 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
             children: [
               Expanded(
                   child: _searchableList.isEmpty
-                      ? NoDataFound(message: context.translation.noDeviceFound)
+                      ? NoDataFound(message: context.translation.noDeviceFound).center
                       : LazyLoading(
                           nextPage: _devicesProvider.nextPage,
                           onLazyLoad: () async {
-                            await _devicesProvider.getDevicesList(
-                              user: _userProvider.user!,
-                              host: _settingProvider.host!,
-                              hospitalId: _userProvider.user!.clientId!,
-                              search: _searchAsset?.copyWith(assetSerialNumber: snController.text, assetNo: numberController.text),
+                            await _devicesProvider.getAssets(
+                              // user: _userProvider.user!,
+                              // host: _settingProvider.host!,
+                              // hospitalId: _userProvider.user!.clientId!,
+                              search: _searchAsset,
                               // serialNumber: snController.text,
                               // number: numberController.text,
                             );
                           },
-                          child: AnimatedSwitcher(
+                          child: Stack(
+                            children: [
+                              AnimatedSwitcher(
                                 duration: const Duration(milliseconds: 500),
                                 child: showListView
                                     ? ListView.separated(
@@ -199,6 +198,9 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
                                         },
                                       ),
                               ),
+                              if (_devicesProvider.isLoading) Align(alignment: Alignment.bottomCenter, child: const CircularProgressIndicator().paddingOnly(top: 16, bottom: 16)),
+                            ],
+                          ),
                         )),
             ],
           ),

lib/views/widgets/timer/app_timer.dart

@@ -171,6 +171,24 @@ class _AppTimerState extends State<AppTimer> {
                   showTimePicker(
                     context: context,
                     initialTime: TimeOfDay.now(),
+                    builder: (BuildContext context, Widget? child) {
+                      final ThemeData currentTheme = Theme.of(context);
+                      return Theme(
+                        data: currentTheme.copyWith(
+                          timePickerTheme: TimePickerThemeData(
+                            dialHandColor: AppColor.primary10,
+                            dialBackgroundColor: Colors.grey.withOpacity(0.1),
+                            hourMinuteColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? AppColor.primary10 : Colors.grey.withOpacity(0.1)),
+                            dayPeriodColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? AppColor.primary10 : Colors.transparent),
+                            dayPeriodTextColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? Colors.white : AppColor.primary10),
+                            dayPeriodBorderSide: BorderSide(color: Colors.grey.withOpacity(0.2)),
+                            entryModeIconColor: AppColor.primary10,
+                          ),
+                          textButtonTheme: TextButtonThemeData(style: TextButton.styleFrom(foregroundColor: AppColor.primary10)),
+                        ),
+                        child: child!,
+                      );
+                    },
                   ).then((selectedTime) {
                     if (selectedTime != null) {
                       _pickerStartAt = DateTime(selectedDate.year, selectedDate.month, selectedDate.day, selectedTime.hour, selectedTime.minute);
@@ -205,6 +223,24 @@ class _AppTimerState extends State<AppTimer> {
                   showTimePicker(
                     context: context,
                     initialTime: TimeOfDay.now(),
+                    builder: (BuildContext context, Widget? child) {
+                      final ThemeData currentTheme = Theme.of(context);
+                      return Theme(
+                        data: currentTheme.copyWith(
+                          timePickerTheme: TimePickerThemeData(
+                            dialHandColor: AppColor.primary10,
+                            dialBackgroundColor: Colors.grey.withOpacity(0.1),
+                            hourMinuteColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? AppColor.primary10 : Colors.grey.withOpacity(0.1)),
+                            dayPeriodColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? AppColor.primary10 : Colors.transparent),
+                            dayPeriodTextColor: MaterialStateColor.resolveWith((states) => states.contains(MaterialState.selected) ? Colors.white : AppColor.primary10),
+                            dayPeriodBorderSide: BorderSide(color: Colors.grey.withOpacity(0.2)),
+                            entryModeIconColor: AppColor.primary10,
+                          ),
+                          textButtonTheme: TextButtonThemeData(style: TextButton.styleFrom(foregroundColor: AppColor.primary10)),
+                        ),
+                        child: child!,
+                      );
+                    },
                   ).then((selectedTime) {
                     if (selectedTime != null) {
                       selectedDate = selectedDate.add(Duration(hours: selectedTime.hour, minutes: selectedTime.minute));