Skip to content

Commit 5017c4c

Browse files
committed
fix: 뒤로가기 시 흰화면 수정
모바일 뒤로가기 후 앱의 뒤로가기 버튼을 누를 경우 흰 화면이 뜨던 현상 수정.
1 parent 4ce6e2f commit 5017c4c

File tree

6 files changed

+19
-10
lines changed

6 files changed

+19
-10
lines changed

app/src/main/java/com/example/notimanager/presentation/ui/screen/DateFormatterScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ fun DateFormatterScreen(
3030
CommonTopAppBar(title) {
3131
if (!isClicked) {
3232
isClicked = true
33-
navController.popBackStack()
33+
if (navController.previousBackStackEntry != null) {
34+
navController.popBackStack()
35+
}
3436
}
3537
}
3638
}

app/src/main/java/com/example/notimanager/presentation/ui/screen/FilteredListScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ fun FilteredListScreen(
3333
CommonTopAppBar(title = title, onBackClick = {
3434
if (!isClicked){
3535
isClicked = true
36-
37-
navController.popBackStack()
36+
if (navController.previousBackStackEntry != null) {
37+
navController.popBackStack()
38+
}
3839
}
3940

4041
})

app/src/main/java/com/example/notimanager/presentation/ui/screen/NotificationScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ fun NotificationScreen(navController: NavController, appName: String = "", title
5151
CommonTopAppBar(title = title, onBackClick = {
5252
if(!isClicked){
5353
isClicked = true
54-
navController.popBackStack()
54+
if (navController.previousBackStackEntry != null) {
55+
navController.popBackStack()
56+
}
5557
} }
5658
)
5759
}

app/src/main/java/com/example/notimanager/presentation/ui/screen/NotificationSubScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ fun NotificationSubScreen(navController: NavController, appName: String = "", su
5050
CommonTopAppBar(title = subText, onBackClick = {
5151
if(!isClicked){
5252
isClicked = true
53-
navController.popBackStack()
53+
if (navController.previousBackStackEntry != null) {
54+
navController.popBackStack()
55+
}
5456
}
55-
5657
})
5758
}
5859
) { innerPadding ->

app/src/main/java/com/example/notimanager/presentation/ui/screen/SettingScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ fun SettingScreen(
3030
CommonTopAppBar(title){
3131
if (!isClicked){
3232
isClicked = true
33-
navController.popBackStack()
33+
if (navController.previousBackStackEntry != null) {
34+
navController.popBackStack()
35+
}
3436
}
3537
}
3638
}

app/src/main/java/com/example/notimanager/presentation/ui/screen/TitleScreen.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.example.notimanager.presentation.ui.screen
22

3+
import android.util.Log
34
import androidx.compose.foundation.layout.padding
45
import androidx.compose.material3.ExperimentalMaterial3Api
56
import androidx.compose.material3.HorizontalDivider
@@ -60,9 +61,9 @@ fun TitleScreen(navController: NavController, appName: String = ""){
6061
CommonTopAppBar(title = appName, onBackClick = {
6162
if (!isClicked) {
6263
isClicked = true
63-
64-
navController.popBackStack()
65-
64+
if (navController.previousBackStackEntry != null) {
65+
navController.popBackStack()
66+
}
6667
}
6768
})
6869
}

0 commit comments

Comments
 (0)