Skip to content

Commit c07ae17

Browse files
committed
refactor :: 봉사신청 인자 제거
1 parent bda5f5d commit c07ae17

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

feature/src/main/java/team/aliens/dms/android/feature/main/application/ApplicationScreen.kt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ import team.aliens.dms.android.core.designsystem.DmsTopAppBar
3737
import team.aliens.dms.android.core.designsystem.RoundedButton
3838
import team.aliens.dms.android.core.designsystem.Scaffold
3939
import team.aliens.dms.android.core.designsystem.shadow
40-
import team.aliens.dms.android.core.jwt.AccessToken
41-
import team.aliens.dms.android.core.jwt.RefreshToken
42-
import team.aliens.dms.android.core.jwt.Tokens
4340
import team.aliens.dms.android.core.ui.DefaultVerticalSpace
4441
import team.aliens.dms.android.core.ui.PaddingDefaults
4542
import team.aliens.dms.android.core.ui.bottomPadding
@@ -56,7 +53,7 @@ internal fun ApplicationScreen(
5653
onNavigateToStudyRoomList: () -> Unit,
5754
onNavigateToRemains: () -> Unit,
5855
onNavigateToOuting: () -> Unit,
59-
onNavigateToVolunteers: (String, String, String) -> Unit,
56+
onNavigateToVolunteers: () -> Unit,
6057
) {
6158
val viewModel: ApplicationViewModel = hiltViewModel()
6259
val uiState by viewModel.stateFlow.collectAsStateWithLifecycle()
@@ -74,22 +71,6 @@ internal fun ApplicationScreen(
7471
.fillMaxSize()
7572
.padding(padValues),
7673
) {
77-
ApplicationCard(
78-
modifier = Modifier
79-
.fillMaxWidth()
80-
.topPadding(),
81-
title = stringResource(id = R.string.study_room_application),
82-
appliedTitle = uiState.appliedStudyRoom?.let { studyRoom ->
83-
stringResource(
84-
id = R.string.format_study_room_applied_text,
85-
studyRoom.floor,
86-
studyRoom.name,
87-
)
88-
},
89-
description = stringResource(id = R.string.study_room_description),
90-
buttonText = stringResource(id = R.string.study_room_do_application),
91-
onButtonClick = { onNavigateToVolunteers("", "", "") },
92-
)
9374
ApplicationCard(
9475
modifier = Modifier.fillMaxWidth(),
9576
title = stringResource(id = R.string.remains_application),
@@ -105,6 +86,15 @@ internal fun ApplicationScreen(
10586
buttonText = stringResource(id = R.string.outing_do_application),
10687
onButtonClick = onNavigateToOuting,
10788
)
89+
ApplicationCard(
90+
modifier = Modifier
91+
.fillMaxWidth()
92+
.topPadding(),
93+
title = stringResource(id = R.string.volunteers_application),
94+
description = stringResource(id = R.string.volunteers_description),
95+
buttonText = stringResource(id = R.string.volunteers_do_description),
96+
onButtonClick = onNavigateToVolunteers,
97+
)
10898
}
10999
}
110100
}

feature/src/main/java/team/aliens/dms/android/feature/main/navigation/MainNavigator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ interface MainNavigator {
2626

2727
fun openOutingNav()
2828

29-
fun openVolunteer(webViewUrl: String, accessToken: String, refreshToken: String,)
29+
fun openVolunteer()
3030
}

0 commit comments

Comments
 (0)