diff --git a/.github/workflows/make_site.yaml b/.github/workflows/make_site.yaml index 199c27fdd..c9fc0852f 100644 --- a/.github/workflows/make_site.yaml +++ b/.github/workflows/make_site.yaml @@ -3,8 +3,10 @@ name: Publish Web App on: # Runs on pushes targeting the default branch push: - branches: ["dev"] - + branches: [ "dev" ] + # Trigger on new releases + release: + types: [ published ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/master_dev_ci.yml b/.github/workflows/master_dev_ci.yml index c60533cb0..f4a0e7504 100644 --- a/.github/workflows/master_dev_ci.yml +++ b/.github/workflows/master_dev_ci.yml @@ -65,6 +65,7 @@ jobs: + dependency_guard: needs: setup runs-on: ubuntu-latest @@ -114,11 +115,6 @@ jobs: - name: Build APKs run: ./gradlew :mifospay-android:assembleDemoDebug - - name: Check badging - # This step is allowed to fail, as it's not critical for the build - continue-on-error: true - run: ./gradlew :mifospay-android:checkProdReleaseBadging - - name: Upload APKs uses: actions/upload-artifact@v4 with: diff --git a/config/quality/checkstyle/checkstyle-config.xml b/config/quality/checkstyle/checkstyle-config.xml deleted file mode 100755 index 32776425c..000000000 --- a/config/quality/checkstyle/checkstyle-config.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config/quality/findbugs/android-exclude-filter.xml b/config/quality/findbugs/android-exclude-filter.xml deleted file mode 100755 index 7080dd955..000000000 --- a/config/quality/findbugs/android-exclude-filter.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config/quality/pmd/pmd-ruleset.xml b/config/quality/pmd/pmd-ruleset.xml deleted file mode 100755 index 5a17cb92a..000000000 --- a/config/quality/pmd/pmd-ruleset.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - Custom ruleset for Mifos Pay Android application - - .*/R.java - .*/gen/.* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/quality/quality.gradle b/config/quality/quality.gradle deleted file mode 100755 index 39f0807ff..000000000 --- a/config/quality/quality.gradle +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Set up Checkstyle, Findbugs and PMD to perform extensive code analysis. - * - * Gradle tasks added: - * - checkstyle - * - findbugs - * - pmd - * - * The three tasks above are added as dependencies of the check task so running check will - * run all of them. - */ - -apply plugin: 'checkstyle' -apply plugin: 'pmd' - -dependencies { - checkstyle libs.checkstyle -} - -def qualityConfigDir = "$project.rootDir/config/quality" -def reportsDir = "$project.buildDir/reports" - -check.dependsOn 'checkstyle', 'pmd' - -task checkstyle(type: Checkstyle, group: 'Verification', description: 'Runs code style checks') { - configFile file("$qualityConfigDir/checkstyle/checkstyle-config.xml") - source 'src' - include '**/*.java' - - reports { - //xml.enabled = true - xml { - destination file("$reportsDir/checkstyle/checkstyle.xml") - } - } - - classpath = files( ) -} - -task pmd(type: Pmd, group: 'Verification', description: 'Inspect sourcecode for bugs') { - ruleSetFiles = files("$qualityConfigDir/pmd/pmd-ruleset.xml") - ignoreFailures = false - ruleSets = [] - - source 'src' - include '**/*.java' - exclude '**/gen/**' - - reports { - //xml.enabled = true - //html.enabled = true - xml { - destination file("$reportsDir/pmd/pmd.xml") - } - html { - destination file("$reportsDir/pmd/pmd.html") - } - } -} \ No newline at end of file diff --git a/docs/images/mifospay_logo.svg b/docs/images/mifospay_logo.svg new file mode 100644 index 000000000..650bd751d --- /dev/null +++ b/docs/images/mifospay_logo.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/images/mifospay_logo_160.svg b/docs/images/mifospay_logo_160.svg new file mode 100644 index 000000000..82c422eab --- /dev/null +++ b/docs/images/mifospay_logo_160.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/images/mifospay_logo_192.svg b/docs/images/mifospay_logo_192.svg new file mode 100644 index 000000000..83524bc8e --- /dev/null +++ b/docs/images/mifospay_logo_192.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/images/mifospay_logo_288.svg b/docs/images/mifospay_logo_288.svg new file mode 100644 index 000000000..ea772d87a --- /dev/null +++ b/docs/images/mifospay_logo_288.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/images/mifospay_logo_512.svg b/docs/images/mifospay_logo_512.svg new file mode 100644 index 000000000..9efd63f45 --- /dev/null +++ b/docs/images/mifospay_logo_512.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fastlane/AppFile b/fastlane/AppFile index d85271893..fce8506d0 100644 --- a/fastlane/AppFile +++ b/fastlane/AppFile @@ -1,2 +1,2 @@ -json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name(ENV["STAGING_PACKAGE_NAME"]) # e.g. org.mifospay.demo \ No newline at end of file +json_key_file("mifospay-android/playStorePublishServiceCredentialsFile.json") +package_name("org.mifospay") # e.g. org.mifospay.demo \ No newline at end of file diff --git a/fastlane/FastFile b/fastlane/FastFile index 8d73fc365..4dd5b1c91 100644 --- a/fastlane/FastFile +++ b/fastlane/FastFile @@ -34,27 +34,4 @@ platform :android do ) end - desc "Prep Amazon Appstore submission" - lane :prep_amazon do - amazon_app_submission( - client_id: ENV["AMAZON_APPSTORE_CLIENT_ID"], - client_secret: ENV["AMAZON_APPSTORE_CLIENT_SECRET"], - app_id: ENV["AMAZON_APPSTORE_APP_ID"], - apk_path: "mifospay-android/build/outputs/apk/prod/release/mifospay-android-prod-release.apk", - upload_apk: true, - changelogs_path: "fastlane/metadata/android/en-US/changelogs/", - upload_changelogs: true, - submit_for_review: false - ) - end - - desc "Submit to Amazon Appstore" - lane :submit_amazon do - amazon_app_submission( - client_id: ENV["AMAZON_APPSTORE_CLIENT_ID"], - client_secret: ENV["AMAZON_APPSTORE_CLIENT_SECRET"], - app_id: ENV["AMAZON_APPSTORE_APP_ID"], - submit_for_review: true - ) - end end \ No newline at end of file diff --git a/mifospay-android/build.gradle.kts b/mifospay-android/build.gradle.kts index f7f54b297..d89c9c714 100644 --- a/mifospay-android/build.gradle.kts +++ b/mifospay-android/build.gradle.kts @@ -33,10 +33,10 @@ plugins { } android { - namespace = "org.mifospay.android" + namespace = "org.mifospay" defaultConfig { - applicationId = "org.mifospay.android" + applicationId = "org.mifospay" versionName = project.dynamicVersion versionCode = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1 vectorDrawables.useSupportLibrary = true @@ -147,7 +147,7 @@ dependencyGuard { firebaseAppDistribution { serviceCredentialsFile = "mifospay-android/firebaseAppDistributionServiceCredentialsFile.json" releaseNotesFile = "./mifospay-android/build/outputs/changelogBeta" - groups = "continuous-deployment" + groups = "mifos-wallet-testers" } // Disable to fix memory leak and be compatible with the configuration cache. diff --git a/mifospay-android/google-services.json b/mifospay-android/google-services.json index 0aaf19f25..2f054dffe 100644 --- a/mifospay-android/google-services.json +++ b/mifospay-android/google-services.json @@ -1,86 +1,63 @@ { "project_info": { - "project_number": "581746068392", - "project_id": "mifos-wallet", - "storage_bucket": "mifos-wallet.firebasestorage.app" + "project_number": "project_number", + "firebase_url": "firebase_url", + "project_id": "project_id", + "storage_bucket": "storage_bucket" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:581746068392:android:923dc7e0ae51eab358ab9d", + "mobilesdk_app_id": "mobilesdk_app_id", "android_client_info": { - "package_name": "org.mifospay.android" + "package_name": "org.mifospay" } }, - "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyD-ak7NSId25dSXr4cvgj7YVKh0f_4LhG0" + "current_key": "current_key" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } + ] }, { "client_info": { - "mobilesdk_app_id": "1:581746068392:android:923dc7e0ae51eab358ab9d", + "mobilesdk_app_id": "mobilesdk_app_id", "android_client_info": { - "package_name": "org.mifospay.android.demo.debug" + "package_name": "org.mifospay.demo.debug" } }, - "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyD-ak7NSId25dSXr4cvgj7YVKh0f_4LhG0" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] + "current_key": "current_key" } - } + ] }, { "client_info": { - "mobilesdk_app_id": "1:581746068392:android:923dc7e0ae51eab358ab9d", + "mobilesdk_app_id": "mobilesdk_app_id", "android_client_info": { - "package_name": "org.mifospay.android.debug" + "package_name": "org.mifospay.demo" } }, - "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyD-ak7NSId25dSXr4cvgj7YVKh0f_4LhG0" + "current_key": "current_key" } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } + ] }, { "client_info": { - "mobilesdk_app_id": "1:581746068392:android:923dc7e0ae51eab358ab9d", + "mobilesdk_app_id": "mobilesdk_app_id", "android_client_info": { - "package_name": "org.mifospay.android.demo" + "package_name": "org.mifospay.debug" } }, - "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyD-ak7NSId25dSXr4cvgj7YVKh0f_4LhG0" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] + "current_key": "current_key" } - } + ] } ], "configuration_version": "1" -} \ No newline at end of file +} diff --git a/mifospay-android/prodRelease-badging.txt b/mifospay-android/prodRelease-badging.txt index 6bb39e10d..ece7e9cd2 100644 --- a/mifospay-android/prodRelease-badging.txt +++ b/mifospay-android/prodRelease-badging.txt @@ -1,10 +1,10 @@ -package: name='org.mifospay.android' versionCode='1' versionName='0.0.4-beta.0.62' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' +package: name='org.mifospay' versionCode='1' versionName='0.0.4-beta.0.15' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' sdkVersion:'26' targetSdkVersion:'34' uses-permission: name='android.permission.INTERNET' uses-permission: name='android.permission.CAMERA' -uses-permission: name='android.permission.READ_EXTERNAL_STORAGE' -uses-permission: name='android.permission.WRITE_EXTERNAL_STORAGE' +uses-permission: name='android.permission.READ_EXTERNAL_STORAGE' maxSdkVersion='32' +uses-permission: name='android.permission.WRITE_EXTERNAL_STORAGE' maxSdkVersion='32' uses-permission: name='android.permission.READ_CONTACTS' uses-permission: name='android.permission.VIBRATE' uses-permission: name='android.permission.FLASHLIGHT' @@ -13,7 +13,7 @@ uses-permission: name='android.permission.WAKE_LOCK' uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE' uses-permission: name='android.permission.ACCESS_ADSERVICES_ATTRIBUTION' uses-permission: name='android.permission.ACCESS_ADSERVICES_AD_ID' -uses-permission: name='org.mifospay.android.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION' +uses-permission: name='org.mifospay.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION' application-label:'Mifos Pay' application-label-af:'Mifos Pay' application-label-am:'Mifos Pay' @@ -100,13 +100,14 @@ application-label-zh-CN:'Mifos Pay' application-label-zh-HK:'Mifos Pay' application-label-zh-TW:'Mifos Pay' application-label-zu:'Mifos Pay' -application-icon-160:'res/mipmap/ic_launcher.png' -application-icon-240:'res/mipmap/ic_launcher.png' -application-icon-320:'res/mipmap/ic_launcher.png' -application-icon-480:'res/mipmap/ic_launcher.png' -application-icon-640:'res/mipmap/ic_launcher.png' -application: label='Mifos Pay' icon='res/mipmap/ic_launcher.png' -launchable-activity: name='org.mifospay.android.MainActivity' label='' icon='' +application-icon-160:'res/mipmap-anydpi-v26/ic_launcher.xml' +application-icon-240:'res/mipmap-anydpi-v26/ic_launcher.xml' +application-icon-320:'res/mipmap-anydpi-v26/ic_launcher.xml' +application-icon-480:'res/mipmap-anydpi-v26/ic_launcher.xml' +application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml' +application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml' +application: label='Mifos Pay' icon='res/mipmap-anydpi-v26/ic_launcher.xml' +launchable-activity: name='org.mifospay.MainActivity' label='' icon='' property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar' @@ -125,5 +126,5 @@ other-services supports-screens: 'small' 'normal' 'large' 'xlarge' supports-any-density: 'true' locales: '--_--' 'af' 'am' 'ar' 'as' 'az' 'be' 'bg' 'bn' 'bs' 'ca' 'cs' 'da' 'de' 'el' 'en-AU' 'en-CA' 'en-GB' 'en-IN' 'en-XC' 'es' 'es-US' 'et' 'eu' 'fa' 'fi' 'fr' 'fr-CA' 'gl' 'gu' 'hi' 'hr' 'hu' 'hy' 'in' 'is' 'it' 'iw' 'ja' 'ka' 'kk' 'km' 'kn' 'ko' 'ky' 'lo' 'lt' 'lv' 'mk' 'ml' 'mn' 'mr' 'ms' 'my' 'nb' 'ne' 'nl' 'or' 'pa' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'si' 'sk' 'sl' 'sq' 'sr' 'sr-Latn' 'sv' 'sw' 'ta' 'te' 'th' 'tl' 'tr' 'uk' 'ur' 'uz' 'vi' 'zh-CN' 'zh-HK' 'zh-TW' 'zu' -densities: '160' '240' '320' '480' '640' +densities: '160' '240' '320' '480' '640' '65534' native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64' diff --git a/mifospay-android/src/main/AndroidManifest.xml b/mifospay-android/src/main/AndroidManifest.xml index 14829335c..0227e5e62 100644 --- a/mifospay-android/src/main/AndroidManifest.xml +++ b/mifospay-android/src/main/AndroidManifest.xml @@ -17,8 +17,11 @@ - - + + - - - - - - - - \ No newline at end of file diff --git a/mifospay-android/src/main/res/drawable/feature_accounts_ic_bank.xml b/mifospay-android/src/main/res/drawable/feature_accounts_ic_bank.xml deleted file mode 100644 index a7856762d..000000000 --- a/mifospay-android/src/main/res/drawable/feature_accounts_ic_bank.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mifospay-android/src/main/res/drawable/feature_receipt_mifospay_round_logo.png b/mifospay-android/src/main/res/drawable/feature_receipt_mifospay_round_logo.png deleted file mode 100644 index 38b8ada8c..000000000 Binary files a/mifospay-android/src/main/res/drawable/feature_receipt_mifospay_round_logo.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/ic_finance.xml b/mifospay-android/src/main/res/drawable/ic_finance.xml deleted file mode 100644 index da7207de3..000000000 --- a/mifospay-android/src/main/res/drawable/ic_finance.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/mifospay-android/src/main/res/drawable/ic_home.xml b/mifospay-android/src/main/res/drawable/ic_home.xml deleted file mode 100644 index 9096da0b2..000000000 --- a/mifospay-android/src/main/res/drawable/ic_home.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/mifospay-android/src/main/res/drawable/ic_launcher_foreground.xml b/mifospay-android/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..0775acebe --- /dev/null +++ b/mifospay-android/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mifospay-android/src/main/res/drawable/ic_person.xml b/mifospay-android/src/main/res/drawable/ic_person.xml deleted file mode 100644 index 6447263c8..000000000 --- a/mifospay-android/src/main/res/drawable/ic_person.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/mifospay-android/src/main/res/drawable/logo_axis.png b/mifospay-android/src/main/res/drawable/logo_axis.png deleted file mode 100644 index 2eb0939c7..000000000 Binary files a/mifospay-android/src/main/res/drawable/logo_axis.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/logo_hdfc.png b/mifospay-android/src/main/res/drawable/logo_hdfc.png deleted file mode 100644 index 54d70d16f..000000000 Binary files a/mifospay-android/src/main/res/drawable/logo_hdfc.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/logo_icici.png b/mifospay-android/src/main/res/drawable/logo_icici.png deleted file mode 100644 index abe979ced..000000000 Binary files a/mifospay-android/src/main/res/drawable/logo_icici.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/logo_pnb.png b/mifospay-android/src/main/res/drawable/logo_pnb.png deleted file mode 100644 index d74ed0416..000000000 Binary files a/mifospay-android/src/main/res/drawable/logo_pnb.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/logo_rbl.png b/mifospay-android/src/main/res/drawable/logo_rbl.png deleted file mode 100644 index b98b1daa6..000000000 Binary files a/mifospay-android/src/main/res/drawable/logo_rbl.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/logo_sbi.png b/mifospay-android/src/main/res/drawable/logo_sbi.png deleted file mode 100644 index 522850c3e..000000000 Binary files a/mifospay-android/src/main/res/drawable/logo_sbi.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/mifospay_logo_512.xml b/mifospay-android/src/main/res/drawable/mifospay_logo_512.xml new file mode 100644 index 000000000..f56c3e104 --- /dev/null +++ b/mifospay-android/src/main/res/drawable/mifospay_logo_512.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mifospay-android/src/main/res/drawable/mifospay_logo_filled.xml b/mifospay-android/src/main/res/drawable/mifospay_logo_filled.xml new file mode 100644 index 000000000..ecb0130a3 --- /dev/null +++ b/mifospay-android/src/main/res/drawable/mifospay_logo_filled.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mifospay-android/src/main/res/drawable/mifospay_logo_transparent.xml b/mifospay-android/src/main/res/drawable/mifospay_logo_transparent.xml new file mode 100644 index 000000000..fb4d06e1f --- /dev/null +++ b/mifospay-android/src/main/res/drawable/mifospay_logo_transparent.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mifospay-android/src/main/res/drawable/money_in.png b/mifospay-android/src/main/res/drawable/money_in.png deleted file mode 100644 index 9744fcf09..000000000 Binary files a/mifospay-android/src/main/res/drawable/money_in.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/money_out.png b/mifospay-android/src/main/res/drawable/money_out.png deleted file mode 100644 index 0b96008bb..000000000 Binary files a/mifospay-android/src/main/res/drawable/money_out.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/splash_icon.png b/mifospay-android/src/main/res/drawable/splash_icon.png deleted file mode 100644 index b4e20ea37..000000000 Binary files a/mifospay-android/src/main/res/drawable/splash_icon.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/bg_splash_12.xml b/mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 53% rename from mifospay-android/src/main/res/drawable/bg_splash_12.xml rename to mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index a24f0fefd..3ef44dbc0 100644 --- a/mifospay-android/src/main/res/drawable/bg_splash_12.xml +++ b/mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -8,14 +8,7 @@ See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md --> - - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/mifospay-android/src/main/res/drawable/splash_screen_background.xml b/mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 53% rename from mifospay-android/src/main/res/drawable/splash_screen_background.xml rename to mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 5d8b65cca..3ef44dbc0 100644 --- a/mifospay-android/src/main/res/drawable/splash_screen_background.xml +++ b/mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -8,13 +8,7 @@ See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md --> - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher.webp b/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 000000000..7b98b8c75 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 000000000..dfaf880a8 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher.webp b/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 000000000..6c1612290 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 000000000..1b556594d Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher.webp b/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 000000000..c34ff3083 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..af2c096e6 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 000000000..50509b8cf Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..9a82aa8db Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 000000000..6d9ece212 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..247759879 Binary files /dev/null and b/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/mifospay-android/src/main/res/mipmap/ic_launcher.png b/mifospay-android/src/main/res/mipmap/ic_launcher.png deleted file mode 100644 index 99bd04c6d..000000000 Binary files a/mifospay-android/src/main/res/mipmap/ic_launcher.png and /dev/null differ diff --git a/mifospay-android/src/main/res/mipmap/ic_launcher_round.png b/mifospay-android/src/main/res/mipmap/ic_launcher_round.png deleted file mode 100644 index e93327578..000000000 Binary files a/mifospay-android/src/main/res/mipmap/ic_launcher_round.png and /dev/null differ diff --git a/mifospay-android/src/main/res/drawable/ic_swap_horiz.xml b/mifospay-android/src/main/res/values/ic_launcher_background.xml similarity index 52% rename from mifospay-android/src/main/res/drawable/ic_swap_horiz.xml rename to mifospay-android/src/main/res/values/ic_launcher_background.xml index 791cfcfd1..3ea8e39c2 100644 --- a/mifospay-android/src/main/res/drawable/ic_swap_horiz.xml +++ b/mifospay-android/src/main/res/values/ic_launcher_background.xml @@ -8,12 +8,6 @@ See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md --> - - - + + #05589A + \ No newline at end of file diff --git a/mifospay-android/src/main/res/values/splash.xml b/mifospay-android/src/main/res/values/splash.xml index 9bcf80035..5789b9f79 100644 --- a/mifospay-android/src/main/res/values/splash.xml +++ b/mifospay-android/src/main/res/values/splash.xml @@ -9,9 +9,10 @@ See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md --> +