Skip to content

Commit 72c35ca

Browse files
committed
collapse settings on tab reselected
1 parent c7e931c commit 72c35ca

File tree

7 files changed

+30
-0
lines changed

7 files changed

+30
-0
lines changed

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/view/SettingsFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class SettingsFragment :
6363
viewModel.content.observe(contentAdapter::replaceAsNew)
6464
viewModel.resetScreen.observe {
6565
rvSettingsContent.smoothScrollToPosition(0)
66+
viewModel.onResetScreen()
6667
mainTabsViewModel.onHandled()
6768
}
6869
viewModel.themeChanged.observe(::changeTheme)

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/SettingsViewModel.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,15 @@ class SettingsViewModel @Inject constructor(
143143
}
144144
}
145145

146+
fun onResetScreen() = viewModelScope.launch {
147+
notificationsDelegate.collapse()
148+
displayDelegate.collapse()
149+
additionalDelegate.collapse()
150+
backupDelegate.collapse()
151+
exportDelegate.collapse()
152+
updateContent()
153+
}
154+
146155
fun onThemeChanged() = viewModelScope.launch {
147156
themeChangedInteractor.send()
148157
}

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsAdditionalViewModelDelegate.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ class SettingsAdditionalViewModelDelegate @Inject constructor(
108108
onTypesSelectedDelegate(typeIds, tag)
109109
}
110110

111+
fun collapse() {
112+
isCollapsed = true
113+
}
114+
111115
private fun onCollapseClick() = delegateScope.launch {
112116
isCollapsed = isCollapsed.flip()
113117
parent?.updateContent()

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsBackupViewModelDelegate.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ class SettingsBackupViewModelDelegate @Inject constructor(
8383
}
8484
}
8585

86+
fun collapse() {
87+
isCollapsed = true
88+
}
89+
8690
private fun onCustomizeClick() {
8791
router.navigate(BackupOptionsParams)
8892
}

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsDisplayViewModelDelegate.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ class SettingsDisplayViewModelDelegate @Inject constructor(
110110
onTypesSelectedDelegate(typeIds, tag)
111111
}
112112

113+
fun collapse() {
114+
isCollapsed = true
115+
}
116+
113117
private fun onCollapseClick() = delegateScope.launch {
114118
isCollapsed = isCollapsed.flip()
115119
parent?.updateContent()

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsExportViewModelDelegate.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ class SettingsExportViewModelDelegate @Inject constructor(
3434
}
3535
}
3636

37+
fun collapse() {
38+
isCollapsed = true
39+
}
40+
3741
private fun onCollapseClick() = delegateScope.launch {
3842
isCollapsed = isCollapsed.flip()
3943
parent?.updateContent()

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/viewModel/delegate/SettingsNotificationsViewModelDelegate.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ class SettingsNotificationsViewModelDelegate @Inject constructor(
7777
onDateTimeSetDelegate(timestamp, tag)
7878
}
7979

80+
fun collapse() {
81+
isCollapsed = true
82+
}
83+
8084
private fun onCollapseClick() = delegateScope.launch {
8185
isCollapsed = isCollapsed.flip()
8286
parent?.updateContent()

0 commit comments

Comments
 (0)