diff --git a/.gitignore b/.gitignore index 7bc39e3..62de6ac 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ **/android/gradlew **/android/gradlew.bat **/android/local.properties +**/android/key.properties **/android/**/GeneratedPluginRegistrant.java # iOS/XCode related diff --git a/mobile-app/README.md b/mobile-app/README.md index 604916e..1afb482 100644 --- a/mobile-app/README.md +++ b/mobile-app/README.md @@ -9,3 +9,7 @@ ## App launcher icon $ flutter pub pub run flutter_launcher_icons:main + +## Create App Bundle Release + + $ flutter build appbundle \ No newline at end of file diff --git a/mobile-app/android/app/build.gradle b/mobile-app/android/app/build.gradle index b64058b..1ed3166 100644 --- a/mobile-app/android/app/build.gradle +++ b/mobile-app/android/app/build.gradle @@ -24,6 +24,12 @@ if (flutterVersionName == null) { apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + android { compileSdkVersion 28 @@ -40,13 +46,19 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - 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 - } - } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { + release { + signingConfig signingConfigs.release + } + } } flutter { diff --git a/mobile-app/android/app/src/main/AndroidManifest.xml b/mobile-app/android/app/src/main/AndroidManifest.xml index 38b7b1f..73d4bd5 100644 --- a/mobile-app/android/app/src/main/AndroidManifest.xml +++ b/mobile-app/android/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ FlutterApplication and put your custom class here. --> + + diff --git a/mobile-app/android/app/src/main/res/drawable/launch_background.xml b/mobile-app/android/app/src/main/res/drawable/launch_background.xml index 304732f..fc0e15e 100644 --- a/mobile-app/android/app/src/main/res/drawable/launch_background.xml +++ b/mobile-app/android/app/src/main/res/drawable/launch_background.xml @@ -1,12 +1,11 @@ - + - - + android:src="@mipmap/splashscreen" /> + diff --git a/mobile-app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/mobile-app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png index ab428cb..9b25698 100644 Binary files a/mobile-app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/mobile-app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/mobile-app/android/app/src/main/res/mipmap-hdpi/splashscreen.png b/mobile-app/android/app/src/main/res/mipmap-hdpi/splashscreen.png new file mode 100644 index 0000000..da0f0c5 Binary files /dev/null and b/mobile-app/android/app/src/main/res/mipmap-hdpi/splashscreen.png differ diff --git a/mobile-app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/mobile-app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png index 79b52d2..1e7264d 100644 Binary files a/mobile-app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/mobile-app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/mobile-app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/mobile-app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png index 84d3d31..682492c 100644 Binary files a/mobile-app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/mobile-app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/mobile-app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/mobile-app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png index 3bc56da..541de80 100644 Binary files a/mobile-app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/mobile-app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/mobile-app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/mobile-app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png index 421b0e1..4202a97 100644 Binary files a/mobile-app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/mobile-app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/mobile-app/android/app/src/main/res/values/colors.xml b/mobile-app/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..e261b1a --- /dev/null +++ b/mobile-app/android/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #ffffff + \ No newline at end of file diff --git a/mobile-app/android/app/src/main/res/values/styles.xml b/mobile-app/android/app/src/main/res/values/styles.xml index 00fa441..5691c75 100644 --- a/mobile-app/android/app/src/main/res/values/styles.xml +++ b/mobile-app/android/app/src/main/res/values/styles.xml @@ -1,8 +1,6 @@ diff --git a/mobile-app/android/app/src/profile/AndroidManifest.xml b/mobile-app/android/app/src/profile/AndroidManifest.xml index 3142238..fc4bfc7 100644 --- a/mobile-app/android/app/src/profile/AndroidManifest.xml +++ b/mobile-app/android/app/src/profile/AndroidManifest.xml @@ -1,9 +1,4 @@ - - - diff --git a/mobile-app/assets/images/logo.png b/mobile-app/assets/images/logo.png index bbe55f0..4bfe3c6 100644 Binary files a/mobile-app/assets/images/logo.png and b/mobile-app/assets/images/logo.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 0d56aae..0c27c94 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 125bad4..5f0b0be 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 01bbacc..9256256 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index cb82562..cab4289 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index d7946f0..92a7b5e 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 88b9f75..d47a5b1 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index f78cdd7..397481b 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 01bbacc..9256256 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 780c1e0..6c05f0e 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index edc817f..ccef310 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index edc817f..ccef310 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 1624b2b..ede1ec9 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 5ab4220..653fac9 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 3739865..898c28a 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index a91697c..7bb32c5 100644 Binary files a/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/mobile-app/pubspec.yaml b/mobile-app/pubspec.yaml index 34674c0..7f1ce01 100644 --- a/mobile-app/pubspec.yaml +++ b/mobile-app/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.0+1 +version: 1.0.0+2 environment: sdk: ">=2.2.2 <3.0.0"