Flutter 3 upgdates

appditto · Aug 30, 2022 · 696c8c8 · 696c8c8
1 parent 241f0a7
commit 696c8c8
Show file tree

Hide file tree

Showing 8 changed files with 598 additions and 13 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     lintOptions {
         disable 'InvalidPackage'
@@ -43,7 +43,7 @@ android {
     defaultConfig {
         applicationId "co.banano.natriumwallet"
         minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 32
         multiDexEnabled true
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -77,6 +77,8 @@ android {
             }            
         }
     }
+
+    ndkVersion 25.1.8937393
 }
 
 flutter {

diff --git a/android/build.gradle b/android/build.gradle
@@ -3,11 +3,11 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.4'
     }
@@ -16,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/lib/ui/widgets/buttons.dart b/lib/ui/widgets/buttons.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:natrium_wallet_flutter/appstate_container.dart';
 import 'package:natrium_wallet_flutter/styles.dart';
 import 'package:natrium_wallet_flutter/ui/util/exceptions.dart';
+import 'package:natrium_wallet_flutter/ui/widgets/outline_button.dart';
 
 enum AppButtonType {
   PRIMARY,

diff --git a/lib/ui/widgets/mnemonic_display.dart b/lib/ui/widgets/mnemonic_display.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:natrium_wallet_flutter/appstate_container.dart';
 import 'package:natrium_wallet_flutter/localization.dart';
 import 'package:natrium_wallet_flutter/styles.dart';
+import 'package:natrium_wallet_flutter/ui/widgets/outline_button.dart';
 import 'package:natrium_wallet_flutter/util/user_data_util.dart';
 
 /// A widget for displaying a mnemonic phrase
@@ -122,8 +123,7 @@ class _MnemonicDisplayState extends State<MnemonicDisplay> {
             ),
             // Tap to reveal or hide
             widget.obscureSeed
-                ?
-                Container(
+                ? Container(
                     margin: EdgeInsetsDirectional.only(top: 8),
                     child: _seedObscured
                         ? AutoSizeText(
@@ -147,7 +147,8 @@ class _MnemonicDisplayState extends State<MnemonicDisplay> {
               padding: EdgeInsets.all(0.0),
               child: OutlineButton(
                 onPressed: () {
-                  UserDataUtil.setSecureClipboardItem(widget.wordList.join(' '));
+                  UserDataUtil.setSecureClipboardItem(
+                      widget.wordList.join(' '));
                   setState(() {
                     _seedCopied = true;
                   });
@@ -178,7 +179,9 @@ class _MnemonicDisplayState extends State<MnemonicDisplay> {
                         : StateContainer.of(context).curTheme.primary,
                     width: 1.0),
                 child: AutoSizeText(
-                  _seedCopied ? AppLocalization.of(context).copied : AppLocalization.of(context).copy,
+                  _seedCopied
+                      ? AppLocalization.of(context).copied
+                      : AppLocalization.of(context).copy,
                   textAlign: TextAlign.center,
                   style: _seedCopied
                       ? AppStyles.textStyleButtonSuccessSmallOutline(context)