fix: 저버전 기기에서 상단 padding이 적용되는 문제 (#671)

duckie-team · Nov 19, 2023 · 352063c · 352063c
1 parent 4331d13
commit 352063c
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 27 deletions.
diff --git a/common/android/src/main/res/values/themes.xml b/common/android/src/main/res/values/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Designed and developed by Duckie Team, 2022
+  ~
+  ~ Licensed under the MIT.
+  ~ Please see full license: https://github.com/duckie-team/duckie-android/blob/develop/LICENSE
+  -->
+
+<resources>
+    <style name="Theme.Duckie" parent="android:Theme.Material.Light.NoActionBar"/>
+</resources>
diff --git a/feature/create-exam/src/main/AndroidManifest.xml b/feature/create-exam/src/main/AndroidManifest.xml
@@ -7,11 +7,11 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
 
         <activity
             android:name=".CreateExamActivity"
             android:exported="false" />
-
     </application>
 </manifest>
diff --git a/feature/detail/src/main/AndroidManifest.xml b/feature/detail/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application android:theme="@style/Theme.Duckie">
 
         <activity
             android:name=".DetailActivity"

diff --git a/feature/exam-result/src/main/AndroidManifest.xml b/feature/exam-result/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name="team.duckie.app.android.feature.exam.result.ExamResultActivity"
             android:exported="false"

diff --git a/feature/friends/src/main/AndroidManifest.xml b/feature/friends/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name=".FriendsActivity"
             android:exported="false">

diff --git a/feature/home/src/main/AndroidManifest.xml b/feature/home/src/main/AndroidManifest.xml
@@ -7,11 +7,12 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name=".screen.MainActivity"
             android:exported="true"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize" />
     </application>
 
 </manifest>
diff --git a/feature/notification/src/main/AndroidManifest.xml b/feature/notification/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name="team.duckie.app.android.feature.notification.NotificationActivity"
             android:exported="false" />

diff --git a/feature/onboard/src/main/AndroidManifest.xml b/feature/onboard/src/main/AndroidManifest.xml
@@ -20,7 +20,9 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
-    <application android:usesCleartextTraffic="true">
+    <application
+        android:theme="@style/Theme.Duckie"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".OnboardActivity"
             android:exported="true"

diff --git a/feature/profile/src/main/AndroidManifest.xml b/feature/profile/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name=".ProfileActivity"
             android:exported="false" />
@@ -16,7 +17,7 @@
             android:exported="false" />
         <activity
             android:name=".ViewAllActivity"
-            android:exported="false" />
+            android:exported="false"/>
     </application>
 
 </manifest>
diff --git a/feature/search/src/main/AndroidManifest.xml b/feature/search/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name=".screen.SearchActivity"
             android:exported="true"

diff --git a/feature/setting/src/main/AndroidManifest.xml b/feature/setting/src/main/AndroidManifest.xml
@@ -11,8 +11,8 @@
         <activity
             android:name="team.duckie.app.android.feature.setting.screen.SettingActivity"
             android:exported="true"
+            android:theme="@style/Theme.Duckie"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
             android:theme="@style/Theme.Duckie.AppCompat" />

diff --git a/feature/skeleton/src/main/AndroidManifest.xml b/feature/skeleton/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name="team.duckie.app.android.feature.skeleton.SkeletonActivity"
             android:exported="false">

diff --git a/feature/solve-problem/src/main/AndroidManifest.xml b/feature/solve-problem/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name="team.duckie.app.android.feature.solve.problem.SolveProblemActivity"
             android:exported="true"

diff --git a/feature/start-exam/src/main/AndroidManifest.xml b/feature/start-exam/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name=".screen.StartExamActivity"
             android:exported="false"

diff --git a/feature/tag-edit/src/main/AndroidManifest.xml b/feature/tag-edit/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <application>
+    <application
+        android:theme="@style/Theme.Duckie">
         <activity
             android:name="TagEditActivity"
             android:exported="false"

diff --git a/presentation/src/main/kotlin/team/duckie/app/android/presentation/IntroActivity.kt b/presentation/src/main/kotlin/team/duckie/app/android/presentation/IntroActivity.kt
@@ -63,16 +63,7 @@ class IntroActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         if (enabledDelay) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                splashScreen.setOnExitAnimationListener { splashScreenView ->
-                    ObjectAnimator.ofFloat(splashScreenView, View.ALPHA, 1f, 0f).run {
-                        interpolator = LinearInterpolator()
-                        duration = SplashScreenExitAnimationDurationMillis
-                        doOnEnd { splashScreenView.remove() }
-                        start()
-                    }
-                }
-            }
+            setSplashExitAnimation()
         }
 
         vm.observe(
@@ -94,6 +85,19 @@ class IntroActivity : BaseActivity() {
         }
     }
 
+    private fun setSplashExitAnimation() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            splashScreen.setOnExitAnimationListener { splashScreenView ->
+                ObjectAnimator.ofFloat(splashScreenView, View.ALPHA, 1f, 0f).run {
+                    interpolator = LinearInterpolator()
+                    duration = SplashScreenExitAnimationDurationMillis
+                    doOnEnd { splashScreenView.remove() }
+                    start()
+                }
+            }
+        }
+    }
+
     private fun parseExamIdDeepLink(): Deferred<Int?> {
         val dynamicLink = CompletableDeferred<Int?>()
 

diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
@@ -6,5 +6,6 @@
   -->
 
 <resources>
+    <color name="white">#FFFFFF</color>
     <color name="duckie_orange">#FF8300</color>
 </resources>