Skip to content

[fix] Splash 화면 낮은 API에서 실행시 발생하던 오류 수정(+ 탈퇴하기 버튼 위치 이동) #287

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

Merged
dpcks0509 merged 5 commits into from
Mar 20, 2025
Merged

[fix] Splash 화면 낮은 API에서 실행시 발생하던 오류 수정(+ 탈퇴하기 버튼 위치 이동) #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ada1f1
fix: Splash 화면 낮은 API에서 실행시 발생하던 오류 수정
dpcks0509 Mar 19, 2025
4bcbcc9
refactor: 탈퇴하기 버튼 왼쪽으로 이동
dpcks0509 Mar 19, 2025
b648890
fix: ci 버전 v2 -> v3로 업그레이드
dpcks0509 Mar 19, 2025
a2af39e
refactor: ktlint 적용
dpcks0509 Mar 19, 2025
26cb766
refactor: SplashActivity 삭제해서 SingleActivity Architecture 유지
dpcks0509 Mar 19, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/android_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2

- name: Gradle cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.DATEROAD"
android:theme="@style/Theme.App.Starting"
android:usesCleartextTraffic="true"
tools:targetApi="31">

Expand Down Expand Up @@ -48,8 +48,10 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="oauth"
android:scheme="kakao${KAKAO_NATIVE_APP_KEY_MANIFEST}" />
Expand All @@ -62,7 +64,7 @@
android:exported="true"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/Theme.DATEROAD">
android:theme="@style/Theme.App.Starting">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -75,8 +77,10 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="kakaolink"
android:scheme="kakao${KAKAO_NATIVE_APP_KEY_MANIFEST}" />
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ fun MyPageRoute(
LoadState.Success -> {
navigateToSignIn()
}

else -> Unit
}

Expand Down Expand Up @@ -266,6 +267,7 @@ fun MyPageScreen(
}
Spacer(modifier = Modifier.weight(1f))
DateRoadTextButton(
modifier = Modifier.align(Alignment.Start),
Copy link

@jinuemong jinuemong Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

굿

textContent = stringResource(id = R.string.my_page_menu_withdrawal),
textStyle = DateRoadTheme.typography.bodyMed13,
textColor = DateRoadTheme.colors.gray400,
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.delay
import org.sopt.teamdateroad.presentation.ui.splash.SplashScreen
Expand All @@ -19,9 +18,6 @@ class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

installSplashScreen().setOnExitAnimationListener { splashScreenView ->
splashScreenView.remove()
}
setContent {
val navigator: MainNavigator = rememberMainNavigator()
var showSplash by remember { mutableStateOf(true) }
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ fun MainNavHost(
NavHost(
navController = navigator.navHostController,
startDestination = navigator.startDestination
// startDestination = navigator.startDestination
) {
advertisementGraph(
popBackStack = navigator::popBackStackIfNotHome
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<resources>

<style name="Theme.DATEROAD" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:windowNoTitle">true</item>
</style>

<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsTranslucent">true</item>
<item name="postSplashScreenTheme">@style/Theme.DATEROAD</item>
</style>
</resources>
Binary file added ktlint
View file
Open in desktop
Binary file not shown.