[FIX/#78] Splash 화면 앱 호환성 대응

Keyneez · Mar 9, 2023 · bdc67ed · bdc67ed
1 parent 5855b54
commit bdc67ed
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 88 deletions.
diff --git a/README.md b/README.md
@@ -83,6 +83,6 @@
 ```
 <br>
 
-## DEOMO VIDEO
+## DEMO VIDEO
 - [▶](https://drive.google.com/file/d/1dB0Fh9PADfYUX_6WU70Drmr83e3VjW6n/view?usp=drivesdk)
 <br>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,9 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
     <!-- Add uses-permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
-
     <uses-feature android:name="android.hardware.camera.any" />
-
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application
@@ -23,35 +21,33 @@
         <activity
             android:name="com.keyneez.presentation.splash.SplashActivity"
             android:exported="true"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Keyneez.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
         <activity
             android:name="com.keyneez.presentation.onboarding.OnboardingActivity"
-            android:exported="true"
-            android:screenOrientation="portrait">
-
-        </activity>
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.keyneez.presentation.login.LoginActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.keyneez.presentation.signup.SignupActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.keyneez.presentation.main.MainActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.keyneez.presentation.main.detail.DetailActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.keyneez.presentation.main.search.SearchActivity"
@@ -70,5 +66,4 @@
             android:exported="false"
             android:screenOrientation="portrait" />
     </application>
-
 </manifest>
diff --git a/app/src/main/java/com/keyneez/presentation/splash/SplashActivity.kt b/app/src/main/java/com/keyneez/presentation/splash/SplashActivity.kt
@@ -2,27 +2,19 @@ package com.keyneez.presentation.splash
 
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
+import androidx.appcompat.app.AppCompatActivity
 import com.keyneez.presentation.onboarding.OnboardingActivity
-import com.keyneez.util.binding.BindingActivity
-import com.lab.keyneez.R
-import com.lab.keyneez.databinding.ActivitySplashBinding
 
-class SplashActivity : BindingActivity<ActivitySplashBinding>(R.layout.activity_splash) {
+class SplashActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_splash)
 
-        Handler().postDelayed({
-            val intent = Intent(this, OnboardingActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-            startActivity(intent)
-            finish()
-        }, DURATION)
+        intentToOnboarding()
     }
 
-    companion object {
-        private const val DURATION: Long = 3000
+    private fun intentToOnboarding() {
+        startActivity(Intent(this, OnboardingActivity::class.java))
+        finish()
     }
 }
diff --git a/app/src/main/res/drawable/bg_splash_screen.xml b/app/src/main/res/drawable/bg_splash_screen.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/gray050" />
+        </shape>
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/img_splash_logo" />
+    </item>
+    <item android:bottom="39dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/img_splash_copyright" />
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_splash_bottom.xml b/app/src/main/res/drawable/ic_splash_bottom.xml
diff --git a/app/src/main/res/drawable/img_splash_copyright.png b/app/src/main/res/drawable/img_splash_copyright.png
diff --git a/app/src/main/res/drawable/img_splash_logo.png b/app/src/main/res/drawable/img_splash_logo.png
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.Keyneez" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
@@ -18,5 +18,19 @@
         <!-- Remove title bar -->
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <!-- Bottom sheet dialog -->
+        <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
+    </style>
+
+    <style name="AppBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/AppModalStyle</item>
+    </style>
+
+    <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/shape_gray050_fill_top20_rect</item>
+    </style>
+
+    <style name="Theme.Keyneez.Splash">
+        <item name="android:background">@drawable/bg_splash_screen</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,36 @@
+<resources>
+    <!-- Base application theme. -->
+    <style name="Theme.Keyneez" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/gray900</item>
+        <item name="colorPrimaryVariant">@color/gray900</item>
+        <item name="colorOnPrimary">@color/gray050</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/gray900</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+
+        <!-- Customize your theme here. -->
+        <!-- Remove font padding -->
+        <item name="android:includeFontPadding">false</item>
+        <!-- Remove title bar -->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <!-- Bottom sheet dialog -->
+        <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
+    </style>
+
+    <style name="AppBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/AppModalStyle</item>
+    </style>
+
+    <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/shape_gray050_fill_top20_rect</item>
+    </style>
+
+    <style name="Theme.Keyneez.Splash">
+        <item name="android:windowSplashScreenBackground">@drawable/bg_splash_screen</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.Keyneez" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
@@ -21,12 +21,16 @@
         <!-- Bottom sheet dialog -->
         <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
     </style>
-    <style name="AppBottomSheetDialogTheme"
-        parent="Theme.Design.Light.BottomSheetDialog">
+
+    <style name="AppBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/AppModalStyle</item>
     </style>
-    <style name="AppModalStyle"
-        parent="Widget.Design.BottomSheet.Modal">
+
+    <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
         <item name="android:background">@drawable/shape_gray050_fill_top20_rect</item>
     </style>
+
+    <style name="Theme.Keyneez.Splash">
+        <item name="android:background">@drawable/bg_splash_screen</item>
+    </style>
 </resources>