Merge pull request #274 from AgoraDesk-LocalMonero/iteration_60

Iteration 60

Author: sergdeus

assets/translations/app_ar.arb

@@ -24,9 +24,9 @@ PODS:
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.12)
     - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreInternal (10.21.0):
+  - FirebaseCoreInternal (10.22.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.21.0):
+  - FirebaseInstallations (10.22.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
@@ -58,27 +58,35 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - GoogleDataTransport (9.3.0):
+  - GoogleDataTransport (9.4.1):
     - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.12.0):
+  - GoogleUtilities/AppDelegateSwizzler (7.13.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.12.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (7.13.0):
+    - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.12.0):
+  - GoogleUtilities/Logger (7.13.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.12.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (7.13.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.12.0)"
-  - GoogleUtilities/Reachability (7.12.0):
+  - "GoogleUtilities/NSData+zlib (7.13.0)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (7.13.0)
+  - GoogleUtilities/Reachability (7.13.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.12.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (7.13.0):
     - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - image_picker_ios (0.0.1):
     - Flutter
   - local_auth_ios (0.0.1):
@@ -97,7 +105,7 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.1.1):
     - Flutter
-  - PromisesObjC (2.3.1)
+  - PromisesObjC (2.4.0)
   - ReachabilitySwift (5.0.0)
   - restart_app (0.0.1):
     - Flutter
@@ -229,8 +237,8 @@ SPEC CHECKSUMS:
   firebase_core: a46c312d8bae4defa3d009b2aa7b5b413aeb394e
   firebase_messaging: e7062cef946e12f93b42abea96937004f8d914d6
   FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6
-  FirebaseCoreInternal: 43c1788eaeee9d1b97caaa751af567ce11010d00
-  FirebaseInstallations: 390ea1d10a4d02b20c965cbfd527ee9b3b412acb
+  FirebaseCoreInternal: bca337352024b18424a61e478460547d46c4c753
+  FirebaseInstallations: 763814908793c0da14c18b3dcffdec71e29ed55e
   FirebaseMessaging: 06c414a21b122396a26847c523d5c370f8325df5
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f
@@ -239,8 +247,8 @@ SPEC CHECKSUMS:
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
-  GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
+  GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
   image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
   local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
@@ -249,7 +257,7 @@ SPEC CHECKSUMS:
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
-  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   restart_app: 806659942bf932f6ce51c5372f91ce5e81c8c14a
   Sentry: a8d7b373b9f9868442b02a0c425192f693103cbf

assets/translations/app_bg.arb

@@ -128,6 +128,10 @@ class AppParameters {
       'name': 'French',
       'origName': 'français, langue française',
     },
+    'ha': {
+      'name': 'Hausa',
+      'origName': 'Hausa, هَوُسَ',
+    },
     'hi': {
       'name': 'Hindi',
       'origName': 'हिन्दी',
@@ -196,6 +200,10 @@ class AppParameters {
       'name': 'Slovenian',
       'origName': 'Slovenščina',
     },
+    'so': {
+      'name': 'Somali',
+      'origName': 'Soomaaliga',
+    },
     'sv': {
       'name': 'Swedish',
       'origName': 'Svenska',

assets/translations/app_cs.arb

@@ -48,24 +48,13 @@ final lightTheme = ThemeData(
   colorScheme: _lightColorScheme,
   scaffoldBackgroundColor: ThemeColors.surface1Light,
   textTheme: textTheme,
-  // radioTheme: RadioThemeData(
-  //   fillColor: MaterialStateProperty.all(ThemeColors.neutral80),
-  //   overlayColor: MaterialStateProperty.all(ThemeColors.primary40),
-  // ),
   inputDecorationTheme: const InputDecorationTheme(
     labelStyle: TextStyle(color: Colors.blue),
     border: OutlineInputBorder(),
     focusedBorder: UnderlineInputBorder(
       borderSide: BorderSide(style: BorderStyle.solid, color: Colors.blue),
     ),
   ),
-  // checkboxTheme: const CheckboxThemeData().copyWith(
-  //   shape: const RoundedRectangleBorder(
-  //     borderRadius: BorderRadius.all(
-  //       Radius.circular(4),
-  //     ),
-  //   ),
-  // ),
   fontFamily: 'Roboto',
   unselectedWidgetColor: ThemeColors.neutral60,
   checkboxTheme: const CheckboxThemeData()
@@ -90,6 +79,7 @@ final lightTheme = ThemeData(
   radioTheme: RadioThemeData(
     fillColor: MaterialStateProperty.all(ThemeColors.neutral80),
     overlayColor: MaterialStateProperty.all(ThemeColors.primary40),
+    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
   ).copyWith(
     fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
       if (states.contains(MaterialState.disabled)) {
@@ -98,7 +88,7 @@ final lightTheme = ThemeData(
       if (states.contains(MaterialState.selected)) {
         return ThemeColors.primary80;
       }
-      return null;
+      return ThemeColors.neutral50;
     }),
   ),
   switchTheme: SwitchThemeData(
@@ -129,24 +119,13 @@ final darkTheme = ThemeData(
   scaffoldBackgroundColor: ThemeColors.surface1Dark,
   textSelectionTheme: const TextSelectionThemeData(cursorColor: Colors.white),
   textTheme: textTheme,
-  // radioTheme: RadioThemeData(
-  //   fillColor: MaterialStateProperty.all(ThemeColors.neutral50),
-  //   overlayColor: MaterialStateProperty.all(ThemeColors.primary70),
-  // ),
   inputDecorationTheme: const InputDecorationTheme(
     labelStyle: TextStyle(color: Colors.blue),
     border: OutlineInputBorder(),
     focusedBorder: UnderlineInputBorder(
       borderSide: BorderSide(style: BorderStyle.solid, color: Colors.blue),
     ),
   ),
-  // checkboxTheme: const CheckboxThemeData().copyWith(
-  //   shape: const RoundedRectangleBorder(
-  //     borderRadius: BorderRadius.all(
-  //       Radius.circular(4),
-  //     ),
-  //   ),
-  // ),
   iconTheme: const IconThemeData(color: Colors.white),
   fontFamily: 'Roboto',
   unselectedWidgetColor: ThemeColors.neutral60,
@@ -172,6 +151,7 @@ final darkTheme = ThemeData(
   radioTheme: RadioThemeData(
     fillColor: MaterialStateProperty.all(ThemeColors.neutral50),
     overlayColor: MaterialStateProperty.all(ThemeColors.primary70),
+    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
   ).copyWith(
     fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
       if (states.contains(MaterialState.disabled)) {
@@ -180,7 +160,7 @@ final darkTheme = ThemeData(
       if (states.contains(MaterialState.selected)) {
         return ThemeColors.primary80;
       }
-      return null;
+      return ThemeColors.neutral50;
     }),
   ),
   switchTheme: SwitchThemeData(
@@ -241,8 +221,8 @@ extension ThemeShorcuts on BuildContext {
         color: Theme.of(this).colorScheme.p80P70,
       );
 
-  TextStyle get txtLabelSmallPrimary95 => Theme.of(this).textTheme.agoraLabelSmall.copyWith(
-        color: Theme.of(this).colorScheme.primary95,
+  TextStyle get txtLabelSmallP95P10 => Theme.of(this).textTheme.agoraLabelSmall.copyWith(
+        color: Theme.of(this).colorScheme.p95p10,
       );
 
   TextStyle get txtLabelMediumErr30 => Theme.of(this).textTheme.agoraLabelMedium.copyWith(
@@ -264,6 +244,9 @@ extension ThemeShorcuts on BuildContext {
   TextStyle get txtLabelMediumN90 => Theme.of(this).textTheme.agoraLabelMedium.copyWith(
         color: Theme.of(this).colorScheme.neutral90,
       );
+  TextStyle get txtLabelMediumCustom08Custom07 => Theme.of(this).textTheme.agoraLabelMedium.copyWith(
+        color: Theme.of(this).colorScheme.c08c07,
+      );
 
   TextStyle get txtLabelMediumPrimary10 => Theme.of(this).textTheme.agoraLabelMedium.copyWith(
         color: ThemeColors.primary10,
@@ -282,7 +265,7 @@ extension ThemeShorcuts on BuildContext {
       );
 
   TextStyle get txtLabelMediumPrimary90 => Theme.of(this).textTheme.agoraLabelMedium.copyWith(
-        color: Theme.of(this).colorScheme.primary90,
+        color: Theme.of(this).colorScheme.p90p10,
       );
 
   TextStyle get txtLabelLargeCustom08 => Theme.of(this).textTheme.agoraLabelLarge.copyWith(
@@ -345,7 +328,7 @@ extension ThemeShorcuts on BuildContext {
       );
 
   TextStyle get txtLabelLargePrimary90 => Theme.of(this).textTheme.agoraLabelLarge.copyWith(
-        color: Theme.of(this).colorScheme.primary90,
+        color: Theme.of(this).colorScheme.p90p10,
       );
 
   TextStyle get txtBodyXXSmallNeutral50 => Theme.of(this).textTheme.bodyTextXXSmall.copyWith(
@@ -410,7 +393,7 @@ extension ThemeShorcuts on BuildContext {
       );
 
   TextStyle get txtBodySmallP90 => Theme.of(this).textTheme.bodyTextSmall.copyWith(
-        color: Theme.of(this).colorScheme.primary90,
+        color: Theme.of(this).colorScheme.p90p10,
       );
 
   // bodyMedium == bodyMedium
@@ -443,7 +426,7 @@ extension ThemeShorcuts on BuildContext {
       );
 
   TextStyle get txtBodyMediumP90 => Theme.of(this).textTheme.bodyMedium!.copyWith(
-        color: Theme.of(this).colorScheme.primary90,
+        color: Theme.of(this).colorScheme.p90p10,
       );
 
   TextStyle get txtBodyMediumErr30 => Theme.of(this).textTheme.bodyMedium!.copyWith(
@@ -606,7 +589,7 @@ extension ThemeShorcuts on BuildContext {
 
   Color get colP80 => Theme.of(this).colorScheme.p80P70;
 
-  Color get colP90 => Theme.of(this).colorScheme.primary90;
+  Color get colP90 => Theme.of(this).colorScheme.p90p10;
 
   Color get colP95 => Theme.of(this).colorScheme.primary95;
 
@@ -872,7 +855,8 @@ extension ColorExtension on ColorScheme {
 
   Color get p80P70 => brightness == Brightness.dark ? ThemeColors.primary80 : ThemeColors.primary70;
 
-  Color get primary90 => brightness == Brightness.dark ? ThemeColors.primary90 : ThemeColors.primary10;
+  Color get p90p10 => brightness == Brightness.dark ? ThemeColors.primary90 : ThemeColors.primary10;
+  Color get p95p10 => brightness == Brightness.dark ? ThemeColors.primary95Dark : ThemeColors.primary10;
 
   Color get primary95 => brightness == Brightness.dark ? ThemeColors.primary95Dark : ThemeColors.primary95Light;
 

assets/translations/app_da.arb

@@ -56,7 +56,7 @@ class _AgoraBoxOpenCloseLineS5S3State extends State<AgoraBoxOpenCloseLineS5S3> {
                         AutoSizeText(
                           widget.title,
                           style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                color: Theme.of(context).colorScheme.primary90,
+                                color: Theme.of(context).colorScheme.p90p10,
                               ),
                         ),
                         const SizedBox(width: 10),

assets/translations/app_de.arb

@@ -59,7 +59,7 @@ class _AgoraBoxOpenCloseLineSurface2State extends State<AgoraBoxOpenCloseLineSur
                         AutoSizeText(
                           widget.title,
                           style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                color: Theme.of(context).colorScheme.primary90,
+                                color: Theme.of(context).colorScheme.p90p10,
                               ),
                         ),
                         const SizedBox(width: 10),

assets/translations/app_el.arb

@@ -20,7 +20,7 @@ class CircleWithIcon extends StatelessWidget {
       child: Center(
         child: Icon(
           icon,
-          color: Theme.of(context).colorScheme.primary90,
+          color: Theme.of(context).colorScheme.p90p10,
           size: 14,
         ),
       ),

assets/translations/app_en.arb

@@ -28,7 +28,7 @@ class CircleWithNum extends StatelessWidget {
         style: Theme.of(context)
             .textTheme
             .agoraLabelLarge
-            .copyWith(color: Theme.of(context).colorScheme.primary90.withOpacity(active ? 1 : 0.5)),
+            .copyWith(color: Theme.of(context).colorScheme.p90p10.withOpacity(active ? 1 : 0.5)),
       )),
     );
   }

assets/translations/app_es.arb

@@ -21,7 +21,7 @@ class CircleWithSvg extends StatelessWidget {
       child: Center(
         child: SvgPicture.asset(
           iconPath,
-          color: Theme.of(context).colorScheme.primary90,
+          color: Theme.of(context).colorScheme.p90p10,
         ),
       ),
     );

assets/translations/app_fi.arb

@@ -29,7 +29,7 @@ class LineIconTextPrimary90 extends StatelessWidget {
                   text,
                   maxLines: 1,
                   style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        color: Theme.of(context).colorScheme.primary90.withOpacity(active ? 1 : 0.5),
+                        color: Theme.of(context).colorScheme.p90p10.withOpacity(active ? 1 : 0.5),
                       ),
                   overflow: TextOverflow.ellipsis,
                 ),
@@ -39,7 +39,7 @@ class LineIconTextPrimary90 extends StatelessWidget {
                   text,
                   maxLines: 1,
                   style: Theme.of(context).textTheme.agoraLabelSmall.copyWith(
-                        color: Theme.of(context).colorScheme.primary90.withOpacity(active ? 1 : 0.5),
+                        color: Theme.of(context).colorScheme.p90p10.withOpacity(active ? 1 : 0.5),
                       ),
                   overflow: TextOverflow.ellipsis,
                 ),

assets/translations/app_fr.arb

@@ -20,7 +20,7 @@ class PlusMinusBox extends StatelessWidget {
       ),
       child: Icon(
         isPlus ? CupertinoIcons.plus : CupertinoIcons.minus,
-        color: Theme.of(context).colorScheme.primary90,
+        color: Theme.of(context).colorScheme.p90p10,
         size: 14,
       ),
     );

assets/translations/app_ha.arb

@@ -39,8 +39,7 @@ class RadioListItem extends StatelessWidget {
               ),
             ),
             Radio<bool>(
-              materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-              activeColor: context.colP70,
+              activeColor: context.colP70P40,
               value: isActive,
               groupValue: true,
               onChanged: (bool? val) {

assets/translations/app_hi.arb

@@ -46,21 +46,21 @@ class FormulaThreeTabsBar extends StatelessWidget {
             Tab(
               icon: Text(
                 textLeft,
-                style: context.txtLabelSmallPrimary95,
+                style: context.txtLabelSmallP95P10,
                 textAlign: TextAlign.center,
               ),
             ),
             Tab(
               icon: Text(
                 textCenter,
-                style: context.txtLabelSmallPrimary95,
+                style: context.txtLabelSmallP95P10,
                 textAlign: TextAlign.center,
               ),
             ),
             Tab(
               icon: Text(
                 textRight,
-                style: context.txtLabelSmallPrimary95,
+                style: context.txtLabelSmallP95P10,
                 textAlign: TextAlign.center,
               ),
             ),

assets/translations/app_hu.arb

@@ -124,6 +124,7 @@ class _PostAdStep32OnlineBuyState extends State<PostAdStep32OnlineBuy> with QrSc
                 SizedBox(
                   height: 40,
                   child: Radio<BtcFeesEnum>(
+                    activeColor: context.colP70P40,
                     value: BtcFeesEnum.values[index],
                     groupValue: widget.model.btcFeesEnum,
                     onChanged: (BtcFeesEnum? value) {