From 15f3a3799c1cc96f7dc7a5a6cbce39e1a1d1bea7 Mon Sep 17 00:00:00 2001 From: Rajan Maurya Date: Fri, 27 Oct 2023 15:41:34 +0530 Subject: [PATCH 1/2] Rename .java to .kt --- .../{SplashScreenActivity.java => SplashScreenActivity.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mifospay/src/main/java/org/mifos/mobilewallet/mifospay/{SplashScreenActivity.java => SplashScreenActivity.kt} (100%) diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.java b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.kt similarity index 100% rename from mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.java rename to mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.kt From 62c4707504ad16db6a7cdddabb4733a9f251dc06 Mon Sep 17 00:00:00 2001 From: Rajan Maurya Date: Fri, 27 Oct 2023 15:41:34 +0530 Subject: [PATCH 2/2] fix: Splash screen using SplashAPI --- build.gradle | 1 + .../core/ExampleInstrumentedTest.java | 7 +-- mifospay/build.gradle | 22 ++++++--- .../mifospay/ExampleInstrumentedTest.java | 2 +- mifospay/src/main/AndroidManifest.xml | 2 +- .../mifospay/SplashScreenActivity.kt | 46 ++++++++++-------- mifospay/src/main/res/drawable/bg_splash.xml | 11 +++++ .../src/main/res/drawable/bg_splash_12.xml | 12 +++++ .../src/main/res/drawable/splash_icon.png | Bin 0 -> 18282 bytes mifospay/src/main/res/values-v31/themes.xml | 11 +++++ mifospay/src/main/res/values/splash.xml | 8 +-- .../res/values/{styles.xml => themes.xml} | 4 ++ 12 files changed, 90 insertions(+), 36 deletions(-) create mode 100644 mifospay/src/main/res/drawable/bg_splash.xml create mode 100644 mifospay/src/main/res/drawable/bg_splash_12.xml create mode 100644 mifospay/src/main/res/drawable/splash_icon.png create mode 100644 mifospay/src/main/res/values-v31/themes.xml rename mifospay/src/main/res/values/{styles.xml => themes.xml} (94%) diff --git a/build.gradle b/build.gradle index 1c6ca03f6..48090e838 100644 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,7 @@ ext { compileSdkVersion = 34 buildToolsVersion = '30.0.3' kotlinVersion = "1.9.10" // 1.9.10 + compose_version = '1.5.4' // App dependencies supportLibraryVersion = '28.0.0' diff --git a/core/src/androidTest/java/org/mifos/mobilewallet/core/ExampleInstrumentedTest.java b/core/src/androidTest/java/org/mifos/mobilewallet/core/ExampleInstrumentedTest.java index 62a26442b..78d818d2b 100644 --- a/core/src/androidTest/java/org/mifos/mobilewallet/core/ExampleInstrumentedTest.java +++ b/core/src/androidTest/java/org/mifos/mobilewallet/core/ExampleInstrumentedTest.java @@ -3,8 +3,9 @@ import static org.junit.Assert.assertEquals; import android.content.Context; + +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,12 +15,12 @@ * * @see Testing documentation */ -@RunWith(AndroidJUnit4.class) +@RunWith(AndroidJUnit4ClassRunner.class) public class ExampleInstrumentedTest { @Test public void useAppContext() throws Exception { // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); + Context appContext = InstrumentationRegistry.getInstrumentation().getContext(); assertEquals("org.mifos.mobilewallet.core.test", appContext.getPackageName()); } diff --git a/mifospay/build.gradle b/mifospay/build.gradle index ee614325c..6cc406c1c 100644 --- a/mifospay/build.gradle +++ b/mifospay/build.gradle @@ -45,11 +45,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - + implementation project(':core') implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { - exclude group: 'com.android.support', module: 'support-annotations' - }) implementation 'androidx.appcompat:appcompat:1.6.1' implementation "androidx.core:core-ktx:1.12.0" @@ -60,11 +57,19 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.3.2' api 'com.google.android.material:material:1.0.0' // update require alot of UI changes + // Compose + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion" kapt "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion" // Splash API - implementation 'androidx.core:core-splashscreen:1.0.1' + implementation("androidx.core:core-splashscreen:1.0.1") implementation "com.google.dagger:dagger:$rootProject.daggerVersion" kapt "com.google.dagger:dagger-compiler:$rootProject.daggerVersion" @@ -97,9 +102,12 @@ dependencies { implementation 'com.alimuzaffar.lib:pinentryedittext:1.3.1' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'com.github.yalantis:ucrop:2.2.2' - testImplementation "junit:junit:$rootProject.junitVersion" - implementation project(':core') + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation "junit:junit:$rootProject.junitVersion" } kapt { diff --git a/mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.java b/mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.java index e8375d4d1..2df2b252f 100644 --- a/mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.java +++ b/mifospay/src/androidTest/java/org/mifos/mobilewallet/mifospay/ExampleInstrumentedTest.java @@ -19,7 +19,7 @@ public class ExampleInstrumentedTest { @Test public void useAppContext() throws Exception { // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); + Context appContext = InstrumentationRegistry.getInstrumentation().getContext(); assertEquals("org.mifos.mobilewallet.mifospay", appContext.getPackageName()); } diff --git a/mifospay/src/main/AndroidManifest.xml b/mifospay/src/main/AndroidManifest.xml index 76ceb7bae..d385a0171 100644 --- a/mifospay/src/main/AndroidManifest.xml +++ b/mifospay/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.kt index 39dfd7bb2..fcf1e3aab 100644 --- a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.kt +++ b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/SplashScreenActivity.kt @@ -1,25 +1,31 @@ -package org.mifos.mobilewallet.mifospay; +package org.mifos.mobilewallet.mifospay -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.os.Handler; -import androidx.appcompat.app.AppCompatActivity; -import android.os.Bundle; -import org.mifos.mobilewallet.mifospay.auth.ui.LoginActivity; +import android.annotation.SuppressLint +import android.content.Intent +import android.content.pm.ActivityInfo +import android.os.Build +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen +import androidx.lifecycle.lifecycleScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import org.mifos.mobilewallet.mifospay.auth.ui.LoginActivity -public class SplashScreenActivity extends AppCompatActivity { +@SuppressLint("CustomSplashScreen") +class SplashScreenActivity : ComponentActivity() { - private final int splashScreenDuration = 2000; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - new Handler().postDelayed(new Runnable() { - public void run() { - startActivity(new Intent(SplashScreenActivity.this, LoginActivity.class)); - finish(); - } - }, splashScreenDuration); + override fun onCreate(savedInstanceState: Bundle?) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){ + val splashScreen = installSplashScreen() + splashScreen.setKeepOnScreenCondition { true } + } + super.onCreate(savedInstanceState) + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + lifecycleScope.launch { + delay(2000) + startActivity(Intent(this@SplashScreenActivity, LoginActivity::class.java)) + finish() + } } } diff --git a/mifospay/src/main/res/drawable/bg_splash.xml b/mifospay/src/main/res/drawable/bg_splash.xml new file mode 100644 index 000000000..dfa25dc8a --- /dev/null +++ b/mifospay/src/main/res/drawable/bg_splash.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/mifospay/src/main/res/drawable/bg_splash_12.xml b/mifospay/src/main/res/drawable/bg_splash_12.xml new file mode 100644 index 000000000..56bb0f3fa --- /dev/null +++ b/mifospay/src/main/res/drawable/bg_splash_12.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/mifospay/src/main/res/drawable/splash_icon.png b/mifospay/src/main/res/drawable/splash_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e20ea37d2b667fb69c39c4851241c3d51781be GIT binary patch literal 18282 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

Qr(tL^lsA+Am#=3Q{f7z8;G_oKIq|yqKK$ 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 + + + + + \ No newline at end of file diff --git a/mifospay/src/main/res/values/splash.xml b/mifospay/src/main/res/values/splash.xml index d6f71d144..05cdaefc6 100644 --- a/mifospay/src/main/res/values/splash.xml +++ b/mifospay/src/main/res/values/splash.xml @@ -1,8 +1,8 @@ - - \ No newline at end of file + diff --git a/mifospay/src/main/res/values/styles.xml b/mifospay/src/main/res/values/themes.xml similarity index 94% rename from mifospay/src/main/res/values/styles.xml rename to mifospay/src/main/res/values/themes.xml index 59fe6866f..518a3be57 100644 --- a/mifospay/src/main/res/values/styles.xml +++ b/mifospay/src/main/res/values/themes.xml @@ -6,6 +6,10 @@ @color/colorAccent + +