Skip to content

Commit 66e9b0c

Browse files
authored
Merge pull request #112 from YAPP-Github/refactor/#98-redesign_write_routine
[Refactor/#98] 루틴 작성/수정 화면 리디자인 적용
2 parents a29f624 + 5ec5940 commit 66e9b0c

85 files changed

Lines changed: 1479 additions & 892 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ fun MainNavHost(
212212
val writeScreenNavArg = if (arg.isRegister) {
213213
WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId)
214214
} else {
215-
WriteRoutineScreenArg.Edit(routineId = arg.routineId!!)
215+
WriteRoutineScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
216216
}
217217

218218
val viewModel = hiltViewModel<WriteRoutineViewModel, WriteRoutineViewModel.Factory> { factory ->
@@ -263,6 +263,18 @@ fun MainNavHost(
263263
navigator.navController.popBackStack()
264264
}
265265
},
266+
navigateToAddRoutine = {
267+
navigator.navController.navigate(Route.WriteRoutine())
268+
},
269+
navigateToEditRoutine = { routineId, updateRoutineFromNowDate ->
270+
navigator.navController.navigate(
271+
Route.WriteRoutine(
272+
routineId = routineId,
273+
isRegister = false,
274+
isUpdateRoutineFromNowDate = updateRoutineFromNowDate,
275+
),
276+
)
277+
},
266278
)
267279
}
268280

app/src/main/java/com/threegap/bitnagil/Route.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ sealed interface Route {
3434
data class WriteRoutine(
3535
val routineId: String? = null,
3636
val isRegister: Boolean = true,
37+
val isUpdateRoutineFromNowDate: Boolean = true,
3738
) : Route
3839

3940
@Serializable

app/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<style name="Base.Theme.Bitnagil" parent="android:Theme.Material.Light.NoActionBar" />
4+
<style name="Base.Theme.Bitnagil" parent="Theme.AppCompat.Light.NoActionBar" />
55

66
<style name="Theme.Bitnagil" parent="Base.Theme.Bitnagil">
77
<item name="android:windowIsTranslucent">true</item>
888 Bytes
1013 Bytes
1.05 KB
1.11 KB
1.28 KB
963 Bytes
1.22 KB

0 commit comments

Comments
 (0)