diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 00000000..bbc1648a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,66 @@ +name: Bug Report + +description: Create a bug report + +title: "Brief Description of the Issue" + +labels: + - bug + +body: + - type: markdown + attributes: + value: | + #### Please fill the fields to help us solving your bug! Don't forget to add the right label. + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered. + options: + - label: I have searched the existing issues + required: true + + - type: textarea + id: what-happened + attributes: + label: What happened? + description: Also tell us, what did you expect to happen? + placeholder: Describe your bug! + validations: + required: true + + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + placeholder: | + 1. In this environment... + 2. With this config... + 3. Run '...' + 4. See error... + validations: + required: false + + - type: textarea + id: screenshots + attributes: + label: Relevant screenshots/screen records + description: | + Please provide any relevant screenshots/screen records, this is very important for UI issues. + Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. + validations: + required: true + + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + render: console + validations: + required: true + + - type: markdown + attributes: + value: | + ### Thanks for taking the time to fill out this bug report! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 00000000..c61671d7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,28 @@ +name: Feature request +description: Suggest an idea for this project +labels: ["type_feature"] +body: + - type: markdown + attributes: + value: | + Don't forget to add the right label + + - type: textarea + id: describe + attributes: + label: Is your feature request related to a problem? Please describe + placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when \[...] + validations: + required: true + + - type: textarea + id: solution + attributes: + label: Describe the solution you'd like + placeholder: A clear and concise description of what you want to happen. If you've a specific approach to discuss, describe it here clearly. + validations: + required: true + - type: markdown + attributes: + value: | + ### Thanks for taking the time to fill out this bug report! \ No newline at end of file diff --git a/.github/PULL_REQUEST.md b/.github/PULL_REQUEST.md new file mode 100644 index 00000000..d6734373 --- /dev/null +++ b/.github/PULL_REQUEST.md @@ -0,0 +1,11 @@ +### Changes + +List of changes this PR includes + +### Related Issues + +List of related issues + +### Tested Scenarios + +A list of scenarios tried to match the deliverables diff --git a/.github/workflows/format_analyze.yml b/.github/workflows/format_analyze.yml new file mode 100644 index 00000000..71dbbe80 --- /dev/null +++ b/.github/workflows/format_analyze.yml @@ -0,0 +1,27 @@ +name: Format and Analyze + +on: + pull_request: + branches: + - development + push: + branches: + - development + + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Set up Repository + uses: actions/checkout@v4 + - uses: subosito/flutter-action@v2 + with: + channel: 'stable' + flutter-version: '3.19.0' + + - run: cd app && dart pub get + + - run: dart format app/lib + + - run: dart analyze app/lib \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 88dba5e0..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,39 +0,0 @@ -# name: build -# on: push -# jobs: -# build: -# # This job will run on ubuntu virtual machine -# runs-on: ubuntu-latest -# steps: - -# # Setup Java environment in order to build the Android app. -# - uses: actions/checkout@v1 -# - uses: actions/setup-java@v1 -# with: -# java-version: '12.x' - -# # Setup the flutter environment. -# - uses: subosito/flutter-action@v1 -# with: -# # channel: 'stable' # 'dev', 'alpha', default to: 'stable' -# flutter-version: '2.0.x' # you can also specify exact version of flutter - -# # Get flutter dependencies. -# - run: flutter pub get -# working-directory: app - -# # Check for any formatting issues in the code. -# - run: flutter format --set-exit-if-changed . -# working-directory: app - -# # Statically analyze the Dart code for any errors. -# - run: flutter analyze . -# working-directory: app - -# # Run widget tests for our flutter project. -# - run: flutter test -# working-directory: app - -# # Build apk. -# - run: flutter build apk -# working-directory: app \ No newline at end of file diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/.gitignore b/.gitignore index 76f5983b..8b7172f8 100644 --- a/.gitignore +++ b/.gitignore @@ -347,4 +347,10 @@ backend/services/__pycache__/productkeys.cpython-39.pyc backend/services/__pycache__/socket.cpython-39.pyc *.pyc -.vscode \ No newline at end of file +.vscode + +# reflected files +app/lib/main.reflectable.dart + +# pubSpec override +app/pubspec_overrides.yaml diff --git a/README.md b/README.md index 6f9e5903..fd019c53 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Wallet v3: Farmer: -Support: +Support: ## Frontend diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml index ccdc696f..6af5073e 100644 --- a/app/analysis_options.yaml +++ b/app/analysis_options.yaml @@ -1,3 +1,13 @@ +analyzer: + errors: + constant_identifier_names: ignore + deprecated_member_use: ignore + library_prefixes: ignore + library_private_types_in_public_api: ignore + non_constant_identifier_names: ignore + prefer_interpolation_to_compose_strings: ignore + prefer_typing_uninitialized_variables: ignore + use_build_context_synchronously: ignore include: package:flutter_lints/flutter.yaml linter: diff --git a/app/android/app/build_local b/app/android/app/build_local index fa51847d..f06e5ef7 100644 --- a/app/android/app/build_local +++ b/app/android/app/build_local @@ -34,21 +34,24 @@ android { } lintOptions { - disable 'InvalidPackage' - } + disable 'InvalidPackage' + disable "Instantiatable" + checkReleaseBuilds false + abortOnError false + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } defaultConfig { - applicationId "org.jimber.threebotlogin.local" - minSdkVersion 23 + applicationId "org.jimber.threebotlogin" + minSdkVersion 24 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -66,7 +69,6 @@ android { } } - buildTypes { release { signingConfig signingConfigs.release @@ -75,6 +77,15 @@ android { signingConfig signingConfigs.debug } } + buildscript { + ext { + stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump + } + } + + dataBinding { + enabled = true + } } flutter { @@ -89,6 +100,7 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + } diff --git a/app/android/app/build_production b/app/android/app/build_production index fbcde236..61d842a2 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -34,21 +34,24 @@ android { } lintOptions { - disable 'InvalidPackage' - } + disable 'InvalidPackage' + disable "Instantiatable" + checkReleaseBuilds false + abortOnError false + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } defaultConfig { applicationId "org.jimber.threebotlogin" - minSdkVersion 23 + minSdkVersion 24 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -74,6 +77,15 @@ android { signingConfig signingConfigs.debug } } + buildscript { + ext { + stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump + } + } + + dataBinding { + enabled = true + } } flutter { @@ -88,6 +100,7 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + } diff --git a/app/android/app/build_staging b/app/android/app/build_staging index 786d8861..f06e5ef7 100644 --- a/app/android/app/build_staging +++ b/app/android/app/build_staging @@ -34,21 +34,24 @@ android { } lintOptions { - disable 'InvalidPackage' - } + disable 'InvalidPackage' + disable "Instantiatable" + checkReleaseBuilds false + abortOnError false + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } defaultConfig { - applicationId "org.jimber.threebotlogin.staging" - minSdkVersion 23 + applicationId "org.jimber.threebotlogin" + minSdkVersion 24 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -74,6 +77,15 @@ android { signingConfig signingConfigs.debug } } + buildscript { + ext { + stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump + } + } + + dataBinding { + enabled = true + } } flutter { @@ -88,6 +100,7 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + } diff --git a/app/android/app/build_testing b/app/android/app/build_testing index ff4c55c6..61d842a2 100644 --- a/app/android/app/build_testing +++ b/app/android/app/build_testing @@ -34,21 +34,24 @@ android { } lintOptions { - disable 'InvalidPackage' - } + disable 'InvalidPackage' + disable "Instantiatable" + checkReleaseBuilds false + abortOnError false + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } defaultConfig { - applicationId "org.jimber.threebotlogin.testing" - minSdkVersion 23 + applicationId "org.jimber.threebotlogin" + minSdkVersion 24 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -57,10 +60,10 @@ android { signingConfigs { release { - // keyAlias localProperties.getProperty('keyAlias') - // keyPassword localProperties.getProperty('keyPassword') - // storeFile file(localProperties.getProperty('storeFile')) - // storePassword localProperties.getProperty('storePassword') + keyAlias localProperties.getProperty('keyAlias') + keyPassword localProperties.getProperty('keyPassword') + storeFile file(localProperties.getProperty('storeFile')) + storePassword localProperties.getProperty('storePassword') } debug { @@ -74,6 +77,15 @@ android { signingConfig signingConfigs.debug } } + buildscript { + ext { + stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump + } + } + + dataBinding { + enabled = true + } } flutter { @@ -88,6 +100,7 @@ dependencies { implementation 'com.hbb20:ccp:2.4.0' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" - implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + } diff --git a/app/android/app/src/main/AndroidManifest_local b/app/android/app/src/main/AndroidManifest_local index ee4786bc..ce9dba7a 100644 --- a/app/android/app/src/main/AndroidManifest_local +++ b/app/android/app/src/main/AndroidManifest_local @@ -1,7 +1,7 @@ + android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false"> diff --git a/app/android/app/src/main/AndroidManifest_production b/app/android/app/src/main/AndroidManifest_production index 936dedac..5ddec470 100644 --- a/app/android/app/src/main/AndroidManifest_production +++ b/app/android/app/src/main/AndroidManifest_production @@ -1,7 +1,7 @@ - + + android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false"> diff --git a/app/android/app/src/main/AndroidManifest_staging b/app/android/app/src/main/AndroidManifest_staging index cea04629..47c590d8 100644 --- a/app/android/app/src/main/AndroidManifest_staging +++ b/app/android/app/src/main/AndroidManifest_staging @@ -1,7 +1,7 @@ + android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false"> diff --git a/app/android/app/src/main/AndroidManifest_testing b/app/android/app/src/main/AndroidManifest_testing index 5e3d3efa..5baaf0b4 100644 --- a/app/android/app/src/main/AndroidManifest_testing +++ b/app/android/app/src/main/AndroidManifest_testing @@ -1,7 +1,7 @@ + android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false"> diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt index d621fae4..35f37c04 100644 --- a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt +++ b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt @@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine) } -} \ No newline at end of file +} diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local index ece5499c..78f68439 100644 --- a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local +++ b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local @@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine) } -} \ No newline at end of file +} diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production index d621fae4..35f37c04 100644 --- a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production +++ b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production @@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine) } -} \ No newline at end of file +} diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging index c64d56e8..435c13df 100644 --- a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging +++ b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging @@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine) } -} \ No newline at end of file +} diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing index 61b8a58c..369e8b9d 100644 --- a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing +++ b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing @@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() { override fun configureFlutterEngine(flutterEngine: FlutterEngine) { GeneratedPluginRegistrant.registerWith(flutterEngine) } -} \ No newline at end of file +} diff --git a/app/android/app/src/main/res/drawable-hdpi/splash.png b/app/android/app/src/main/res/drawable-hdpi/splash.png deleted file mode 100644 index 2826abe8..00000000 Binary files a/app/android/app/src/main/res/drawable-hdpi/splash.png and /dev/null differ diff --git a/app/android/app/src/main/res/drawable-mdpi/splash.png b/app/android/app/src/main/res/drawable-mdpi/splash.png deleted file mode 100644 index 4482d6a6..00000000 Binary files a/app/android/app/src/main/res/drawable-mdpi/splash.png and /dev/null differ diff --git a/app/android/app/src/main/res/drawable-night-v21/background.png b/app/android/app/src/main/res/drawable-night-v21/background.png new file mode 100644 index 00000000..71e9c817 Binary files /dev/null and b/app/android/app/src/main/res/drawable-night-v21/background.png differ diff --git a/app/android/app/src/main/res/drawable-night-v21/launch_background.xml b/app/android/app/src/main/res/drawable-night-v21/launch_background.xml new file mode 100644 index 00000000..f88598cf --- /dev/null +++ b/app/android/app/src/main/res/drawable-night-v21/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/android/app/src/main/res/drawable-night/background.png b/app/android/app/src/main/res/drawable-night/background.png new file mode 100644 index 00000000..71e9c817 Binary files /dev/null and b/app/android/app/src/main/res/drawable-night/background.png differ diff --git a/app/android/app/src/main/res/drawable-night/launch_background.xml b/app/android/app/src/main/res/drawable-night/launch_background.xml new file mode 100644 index 00000000..f88598cf --- /dev/null +++ b/app/android/app/src/main/res/drawable-night/launch_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/android/app/src/main/res/drawable-v21/background.png b/app/android/app/src/main/res/drawable-v21/background.png index e29b3b59..3107d37f 100644 Binary files a/app/android/app/src/main/res/drawable-v21/background.png and b/app/android/app/src/main/res/drawable-v21/background.png differ diff --git a/app/android/app/src/main/res/drawable-v21/launch_background.xml b/app/android/app/src/main/res/drawable-v21/launch_background.xml index 3fe6b2e8..f88598cf 100644 --- a/app/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -3,7 +3,4 @@ - - - - \ No newline at end of file + diff --git a/app/android/app/src/main/res/drawable-xhdpi/splash.png b/app/android/app/src/main/res/drawable-xhdpi/splash.png deleted file mode 100644 index b1aa9453..00000000 Binary files a/app/android/app/src/main/res/drawable-xhdpi/splash.png and /dev/null differ diff --git a/app/android/app/src/main/res/drawable-xxhdpi/splash.png b/app/android/app/src/main/res/drawable-xxhdpi/splash.png deleted file mode 100644 index 4cda529c..00000000 Binary files a/app/android/app/src/main/res/drawable-xxhdpi/splash.png and /dev/null differ diff --git a/app/android/app/src/main/res/drawable-xxxhdpi/splash.png b/app/android/app/src/main/res/drawable-xxxhdpi/splash.png deleted file mode 100644 index 1fc54b83..00000000 Binary files a/app/android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ diff --git a/app/android/app/src/main/res/drawable/background.png b/app/android/app/src/main/res/drawable/background.png index e29b3b59..3107d37f 100644 Binary files a/app/android/app/src/main/res/drawable/background.png and b/app/android/app/src/main/res/drawable/background.png differ diff --git a/app/android/app/src/main/res/drawable/launch_background.xml b/app/android/app/src/main/res/drawable/launch_background.xml index 3fe6b2e8..f88598cf 100644 --- a/app/android/app/src/main/res/drawable/launch_background.xml +++ b/app/android/app/src/main/res/drawable/launch_background.xml @@ -3,7 +3,4 @@ - - - - \ No newline at end of file + diff --git a/app/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml b/app/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml new file mode 100644 index 00000000..55aebf98 --- /dev/null +++ b/app/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png index 7ca2eea0..c889b807 100644 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png differ diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_production.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_production.png index f823d754..c889b807 100755 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_production.png and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_production.png differ diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_staging.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_staging.png index 689ebfc3..c889b807 100644 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_staging.png and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_staging.png differ diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_testing.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_testing.png index 7ad795dc..c889b807 100644 Binary files a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_testing.png and b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_testing.png differ diff --git a/app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png new file mode 100644 index 00000000..c889b807 Binary files /dev/null and b/app/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png index 8c185ec7..0d9069f5 100644 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_local.png differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_production.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_production.png index 5282e60a..0d9069f5 100755 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_production.png and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_production.png differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_staging.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_staging.png index a73b7bdd..0d9069f5 100644 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_staging.png and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_staging.png differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_testing.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_testing.png index 72d10249..0d9069f5 100644 Binary files a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_testing.png and b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_testing.png differ diff --git a/app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png new file mode 100644 index 00000000..0d9069f5 Binary files /dev/null and b/app/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png index 84925353..dbb8c3ce 100644 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_local.png differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_production.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_production.png index 5eff8480..dbb8c3ce 100755 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_production.png and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_production.png differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_staging.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_staging.png index a94af6d8..dbb8c3ce 100644 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_staging.png and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_staging.png differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_testing.png b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_testing.png index cbbafec4..dbb8c3ce 100644 Binary files a/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_testing.png and b/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_testing.png differ diff --git a/app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png new file mode 100644 index 00000000..dbb8c3ce Binary files /dev/null and b/app/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png index 47ef5731..9b5d869b 100644 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_local.png differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_production.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_production.png index 30609785..9b5d869b 100755 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_production.png and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_production.png differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_staging.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_staging.png index 880c0be5..9b5d869b 100644 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_staging.png and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_staging.png differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_testing.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_testing.png index 90609207..9b5d869b 100644 Binary files a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_testing.png and b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_testing.png differ diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png new file mode 100644 index 00000000..9b5d869b Binary files /dev/null and b/app/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png index dd407666..2003c37b 100644 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_local.png differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_production.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_production.png index 65486d85..2003c37b 100755 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_production.png and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_production.png differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_staging.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_staging.png index 886e172c..2003c37b 100644 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_staging.png and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_staging.png differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_testing.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_testing.png index 390b4da2..2003c37b 100644 Binary files a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_testing.png and b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_testing.png differ diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png new file mode 100644 index 00000000..2003c37b Binary files /dev/null and b/app/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/app/android/app/src/main/res/values-night-v31/styles.xml b/app/android/app/src/main/res/values-night-v31/styles.xml new file mode 100644 index 00000000..a3653cb1 --- /dev/null +++ b/app/android/app/src/main/res/values-night-v31/styles.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/app/android/app/src/main/res/values-night/styles.xml b/app/android/app/src/main/res/values-night/styles.xml index 449a9f93..7b20e158 100644 --- a/app/android/app/src/main/res/values-night/styles.xml +++ b/app/android/app/src/main/res/values-night/styles.xml @@ -5,6 +5,10 @@ @drawable/launch_background + false + false + false + shortEdges @drawable/launch_background + false false + false + shortEdges