Add splashing screen

jchodev · jchodev · commit edc278740c06 · 2023-11-28T14:20:09.000Z
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,8 @@ android {
     defaultConfig {
         applicationId "com.jerry.blescanner"
 
-        versionCode 5
-        versionName "1.0.0"
+        versionCode 7
+        versionName "1.0.2"
 
         buildConfigField "String", "BASE_URL", "\"https://api-proxy.ofcom.org.uk/\""
         buildConfigField "String", "KEY", "\"\""
@@ -94,6 +94,7 @@ android {
 dependencies {
     implementation project(":base-modiule")
     implementation project(":jetpack-design-lib")
+    implementation project(":features:splash")
     implementation project(":features:bluetooth")
 
     // LeakCanary //app only
@@ -104,7 +105,6 @@ dependencies {
     implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
 
-
 }
 
 // Allow references to generated code {https://developer.android.com/training/dependency-injection/hilt-android}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,19 +28,26 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.BleScanner"
+        android:theme="@style/Theme.App.Starting"
         tools:targetApi="31">
+
         <activity
-            android:name="com.jerry.blescanner.features.bluetooth.presentation.BluetoothActivity"
+            android:name="com.jerry.blescanner.features.splash.presentation.SplashActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.BleScanner">
+            android:theme="@style/Theme.App.Starting">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name="com.jerry.blescanner.features.bluetooth.presentation.BluetoothActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.BleScanner"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/res/animator/logo_animator.xml b/app/src/main/res/animator/logo_animator.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="1000">
+
+    <propertyValuesHolder
+        android:propertyName="rotation"
+        android:valueType="floatType"
+        android:valueFrom="0.0"
+        android:valueTo="360.0"/>
+
+    <propertyValuesHolder
+        android:propertyName="scaleX"
+        android:valueType="floatType"
+        android:valueFrom="0.0"
+        android:valueTo="0.4"/>
+
+    <propertyValuesHolder
+        android:propertyName="scaleY"
+        android:valueType="floatType"
+        android:valueFrom="0.0"
+        android:valueTo="0.4"/>
+
+</objectAnimator>
diff --git a/app/src/main/res/drawable/animated_logo.xml b/app/src/main/res/drawable/animated_logo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/logo">
+
+    <target
+        android:animation="@animator/logo_animator"
+        android:name="animationGroup"/>
+
+</animated-vector>
diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml
@@ -0,0 +1,11 @@
+<vector android:height="24dp" android:tint="#2334A2"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--animation-->
+    <group
+        android:name="animationGroup"
+        android:pivotX="12"
+        android:pivotY="12">
+        <path android:fillColor="@android:color/white" android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,4 +2,10 @@
 <resources>
 
     <style name="Theme.BleScanner" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/black</item>
+        <item name="postSplashScreenTheme">@style/Theme.BleScanner</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/animated_logo</item>
+    </style>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -69,6 +69,8 @@ buildscript {
         lifecycle_runtime_compose_version = "2.6.2"
 
         jetpack_navigation_compose_version = "2.5.3"
+
+        core_splachscreen_version = '1.0.1'
     }
 
     repositories {
diff --git a/common-library.gradle b/common-library.gradle
@@ -47,4 +47,7 @@ dependencies {
 
     //permission
     implementation "com.google.accompanist:accompanist-permissions:$permission_verion"
+
+    //splashscreen
+    implementation "androidx.core:core-splashscreen:$core_splachscreen_version"
 }
diff --git a/features/splash/.gitignore b/features/splash/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/features/splash/build.gradle b/features/splash/build.gradle
@@ -0,0 +1,26 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'com.google.dagger.hilt.android'
+}
+
+apply from: "$project.rootDir/common-android-version.gradle"
+apply from: "$project.rootDir/common-library.gradle"
+apply from: "$project.rootDir/jacoco.gradle"
+apply from: "$project.rootDir/jetpack-compose.gradle"
+
+
+android {
+    namespace 'com.jerry.blescanner.features.splash'
+}
+
+
+dependencies {
+    implementation project(":base-modiule")
+    implementation project(":jetpack-design-lib")
+    implementation project(":features:bluetooth")
+
+    //   testImplementation project(":shared-test")
+    //   androidTestImplementation project(":shared-test")
+
+}
diff --git a/features/splash/consumer-rules.pro b/features/splash/consumer-rules.pro
diff --git a/features/splash/proguard-rules.pro b/features/splash/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/features/splash/src/androidTest/java/com/jerry/blescanner/features/splash/ExampleInstrumentedTest.kt b/features/splash/src/androidTest/java/com/jerry/blescanner/features/splash/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.jerry.blescanner.features.splash
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.jerry.blescanner.features.splash.test", appContext.packageName)
+    }
+}
diff --git a/features/splash/src/main/AndroidManifest.xml b/features/splash/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/features/splash/src/main/java/com/jerry/blescanner/features/splash/presentation/SplashActivity.kt b/features/splash/src/main/java/com/jerry/blescanner/features/splash/presentation/SplashActivity.kt
@@ -0,0 +1,45 @@
+package com.jerry.blescanner.features.splash.presentation
+
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.viewModels
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.jerry.blescanner.features.bluetooth.presentation.BluetoothActivity
+import com.jerry.blescanner.features.splash.presentation.viewmodel.SplashViewModel
+
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class SplashActivity : ComponentActivity() {
+
+    private val viewModel by viewModels<SplashViewModel>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        installSplashScreen().apply {
+            setKeepOnScreenCondition {
+                viewModel.isReady != null
+            }
+        }
+
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.isReady.collectLatest {
+                    it?.let {
+                        startActivity(Intent(this@SplashActivity, BluetoothActivity::class.java))
+                        this@SplashActivity.finish()
+                    }
+
+                }
+            }
+        }
+    }
+}
diff --git a/features/splash/src/main/java/com/jerry/blescanner/features/splash/presentation/viewmodel/SplashViewModel.kt b/features/splash/src/main/java/com/jerry/blescanner/features/splash/presentation/viewmodel/SplashViewModel.kt
@@ -0,0 +1,28 @@
+package com.jerry.blescanner.features.splash.presentation.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class SplashViewModel @Inject constructor(
+
+): ViewModel() {
+
+    private val _isReady = MutableStateFlow<Boolean?>( null)
+    val isReady = _isReady.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            delay(1000)
+            _isReady.value = true
+        }
+    }
+
+}
diff --git a/features/splash/src/test/java/com/jerry/blescanner/features/splash/ExampleUnitTest.kt b/features/splash/src/test/java/com/jerry/blescanner/features/splash/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.jerry.blescanner.features.splash
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/settings.gradle b/settings.gradle
@@ -20,3 +20,4 @@ include ':app'
 include ':base-modiule'
 include ':jetpack-design-lib'
 include ':features:bluetooth'
+include ':features:splash'

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ buildscript {`
`69`	`69`	`lifecycle_runtime_compose_version = "2.6.2"`
`70`	`70`
`71`	`71`	`jetpack_navigation_compose_version = "2.5.3"`
	`72`	`+`
	`73`	`+ core_splachscreen_version = '1.0.1'`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,7 @@ dependencies {`
`47`	`47`
`48`	`48`	`//permission`
`49`	`49`	`implementation "com.google.accompanist:accompanist-permissions:$permission_verion"`
	`50`	`+`
	`51`	`+ //splashscreen`
	`52`	`+ implementation "androidx.core:core-splashscreen:$core_splachscreen_version"`
`50`	`53`	`}`