Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 19, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions common/android/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions feature/create-exam/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion feature/detail/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion feature/exam-result/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion feature/friends/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 3 additions & 2 deletions feature/home/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion feature/notification/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 3 additions & 1 deletion feature/onboard/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions feature/profile/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -16,7 +17,7 @@
android:exported="false" />
<activity
android:name=".ViewAllActivity"
android:exported="false" />
android:exported="false"/>
</application>

</manifest>
3 changes: 2 additions & 1 deletion feature/search/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion feature/setting/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 2 additions & 1 deletion feature/skeleton/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion feature/solve-problem/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion feature/start-exam/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion feature/tag-edit/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
24 changes: 14 additions & 10 deletions presentation/src/main/kotlin/team/duckie/app/android/presentation/IntroActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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?>()

Expand Down
1 change: 1 addition & 0 deletions presentation/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
-->

<resources>
<color name="white">#FFFFFF</color>
<color name="duckie_orange">#FF8300</color>
</resources>