Merge branch 'master' of github.com:BananoCoin/kalium_wallet_flutter

BananoCoin · Mar 6, 2024 · ae1205f · ae1205f
2 parents b82e6c5 + d6fdbf1
commit ae1205f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 12 deletions.
diff --git a/fonts/AppIcons2.ttf b/fonts/AppIcons2.ttf
diff --git a/lib/localization.dart b/lib/localization.dart
@@ -1108,7 +1108,7 @@ class AppLocalization {
   }
 
   String get backupSecretPhrase {
-    return Intl.message("Backup Secret Phrase",
+    return Intl.message("Back Up Secret Phrase",
         desc: 'backup seed', name: 'backupSecretPhrase');
   }
 

diff --git a/lib/ui/accounts/accounts_sheet.dart b/lib/ui/accounts/accounts_sheet.dart
@@ -599,6 +599,7 @@ class _AppAccountsWidgetState extends State<AppAccountsWidget> {
                               text: account.balance != null ? "" : "",
                               style: TextStyle(
                                 fontFamily: 'AppIcons',
+                                fontWeight: FontWeight.w400,
                                 color: StateContainer.of(context).curTheme.text,
                                 fontSize: 13.0,
                               ),

diff --git a/lib/ui/accounts/import_external_account_sheet.dart b/lib/ui/accounts/import_external_account_sheet.dart
@@ -192,7 +192,7 @@ class _ImportExternalAccountSheetState
                             : AppLocalization.of(context).secretPhrase,
                         style: TextStyle(
                           color: StateContainer.of(context).curTheme.text,
-                          fontSize: 24.0,
+                          fontSize: 22.0,
                           fontFamily: 'NunitoSans',
                           fontWeight: FontWeight.w700,
                         ),
@@ -534,7 +534,7 @@ class _ImportExternalAccountSheetState
                                   AppLocalization.of(context).accountIndexTitle,
                               style: TextStyle(
                                 color: StateContainer.of(context).curTheme.text,
-                                fontSize: 24.0,
+                                fontSize: 22.0,
                                 fontFamily: 'NunitoSans',
                                 fontWeight: FontWeight.w700,
                               ),

diff --git a/lib/ui/home_page.dart b/lib/ui/home_page.dart
@@ -1694,9 +1694,10 @@ class _AppHomePageState extends State<AppHomePage>
                         children: [
                           // Currency Icon
                           TextSpan(
-                            text: "\u{e80a}",
+                            text: "\u{e817}",
                             style: TextStyle(
-                              fontFamily: 'AppIcons',
+                              fontFamily: 'AppIcons2',
+                              fontWeight: FontWeight.w400,
                               color:
                                   StateContainer.of(context).curTheme.primary,
                               fontSize: 23.0,
@@ -1712,7 +1713,11 @@ class _AppHomePageState extends State<AppHomePage>
                         ],
                       ),
                       maxLines: 1,
-                      style: TextStyle(fontSize: 28.0),
+                      style: TextStyle(
+                        fontSize: 28.0,
+                        fontWeight: FontWeight.w600,
+                        fontFamily: "NunitoSans",
+                      ),
                       stepGranularity: 0.1,
                       minFontSize: 1,
                     ),

diff --git a/lib/ui/receive/share_card.dart b/lib/ui/receive/share_card.dart
@@ -88,13 +88,23 @@ class _AppShareCardState extends State<AppShareCard> {
                         children: [
                           // Currency Icon
                           TextSpan(
-                            text: "\u{e801} ",
+                            text: "\u{e80d}",
                             style: TextStyle(
                               color:
                                   StateContainer.of(context).curTheme.primary,
-                              fontFamily: "AppIcons",
-                              fontWeight: FontWeight.w500,
-                              fontSize: 14.8,
+                              fontFamily: "AppIcons2",
+                              fontWeight: FontWeight.w400,
+                              fontSize: 14.6,
+                            ),
+                          ),
+                          TextSpan(
+                            text: "  ",
+                            style: TextStyle(
+                              fontFamily: 'NunitoSans',
+                              color:
+                                  StateContainer.of(context).curTheme.primary,
+                              fontWeight: FontWeight.w600,
+                              fontSize: 8.5,
                             ),
                           ),
                           TextSpan(
@@ -108,6 +118,12 @@ class _AppShareCardState extends State<AppShareCard> {
                             ),
                           ),
                         ],
+                        style: TextStyle(
+                          fontFamily: 'NeueHansKendrick',
+                          color: StateContainer.of(context).curTheme.primary,
+                          fontWeight: FontWeight.w500,
+                          fontSize: 14.8,
+                        ),
                       ),
                     ),
                   ),

diff --git a/lib/ui/util/ui_util.dart b/lib/ui/util/ui_util.dart
@@ -406,7 +406,7 @@ class UIUtil {
         ),
       ),
       dismissOtherToast: true,
-      duration: Duration(milliseconds: 2500),
+      duration: Duration(milliseconds: 3000),
     );
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,7 +7,7 @@ description: A new Flutter project.
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 2.4.2+1
+version: 2.4.2+3
 
 environment:
   sdk: ">=2.11.99 <3.0.0"
@@ -175,6 +175,11 @@ flutter:
     - family: AppIcons
       fonts:
         - asset: fonts/AppIcons.ttf
+          weight: 400
+    - family: AppIcons2
+      fonts:
+        - asset: fonts/AppIcons2.ttf
+          weight: 400
     - family: NeueHansKendrick
       fonts:
         - asset: fonts/NeueHansKendrick-Medium.ttf