From 373683bbf020bc1027fcaf188098fbe83bc9645b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sat, 2 Mar 2024 00:26:47 +0100 Subject: [PATCH] flutter android build --- android/.idea/deploymentTargetDropDown.xml | 10 +++++ flutter/.gitignore | 11 +++++ flutter/android/app/build.gradle | 24 +++++++---- flutter/lib/pages/account/login.dart | 13 ++---- flutter/pubspec.lock | 48 ++++++++++++++++++---- flutter/pubspec.yaml | 2 +- 6 files changed, 82 insertions(+), 26 deletions(-) create mode 100644 android/.idea/deploymentTargetDropDown.xml diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/android/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/flutter/.gitignore b/flutter/.gitignore index 29a3a50..2977ce2 100644 --- a/flutter/.gitignore +++ b/flutter/.gitignore @@ -1,3 +1,14 @@ + + +*.keystore + + + +####################################################################################################################### + + + + # Miscellaneous *.class *.log diff --git a/flutter/android/app/build.gradle b/flutter/android/app/build.gradle index 502b4dc..cf6141c 100644 --- a/flutter/android/app/build.gradle +++ b/flutter/android/app/build.gradle @@ -22,6 +22,12 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + android { namespace "com.example.simplecloudnotifier" compileSdkVersion flutter.compileSdkVersion @@ -41,21 +47,25 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.simplecloudnotifier" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + applicationId "com.blackforestbytes.simplecloudnotifier" minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } } } diff --git a/flutter/lib/pages/account/login.dart b/flutter/lib/pages/account/login.dart index 621c69f..fc6ce0c 100644 --- a/flutter/lib/pages/account/login.dart +++ b/flutter/lib/pages/account/login.dart @@ -14,15 +14,8 @@ class AccountLoginPage extends StatefulWidget { } class _AccountLoginPageState extends State { - late TextEditingController _ctrlUserID; - late TextEditingController _ctrlToken; - - @override - void initState() { - super.initState(); - _ctrlUserID = TextEditingController(); - _ctrlToken = TextEditingController(); - } + final TextEditingController _ctrlUserID = TextEditingController(); + final TextEditingController _ctrlToken = TextEditingController(); @override void dispose() { @@ -78,7 +71,7 @@ class _AccountLoginPageState extends State { final uid = _ctrlUserID.text; final tok = _ctrlToken.text; - final verified = await APIClient.verifyToken(uid, tok); + final verified = await APIClient.verifyToken(uid, tok); //TODO verify that this is an perm=ADMIN key if (verified) { msgr.showSnackBar( const SnackBar( diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index ce09b52..b6b596b 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -135,6 +135,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -147,26 +171,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" nested: dependency: transitive description: @@ -179,10 +203,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_provider_linux: dependency: transitive description: @@ -444,6 +468,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" web: dependency: transitive description: diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 0b17b04..332adc0 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+1 +version: 2.0.0+100 environment: sdk: '>=3.2.6 <4.0.0'