Skip to content

Commit 5550b02

Browse files
committed
add long click to options buttons
1 parent 780102b commit 5550b02

10 files changed

Lines changed: 27 additions & 0 deletions

File tree

features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/view/ArchiveFragment.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.recordType.create
2424
import com.example.util.simpletimetracker.feature_views.extension.pxToDp
2525
import com.example.util.simpletimetracker.feature_views.extension.setMargins
2626
import com.example.util.simpletimetracker.feature_views.extension.setOnClick
27+
import com.example.util.simpletimetracker.feature_views.extension.setOnLongClick
2728
import com.example.util.simpletimetracker.navigation.params.screen.ArchiveDialogParams
2829
import com.example.util.simpletimetracker.navigation.params.screen.OptionsListParams
2930
import com.google.android.flexbox.FlexDirection
@@ -78,6 +79,7 @@ class ArchiveFragment :
7879

7980
override fun initUx(): Unit = with(binding) {
8081
btnArchiveOptions.setOnClick(throttle(viewModel::onOptionsClick))
82+
btnArchiveOptions.setOnLongClick(throttle(viewModel::onOptionsLongClick))
8183
etArchiveSearchField.doAfterTextChanged { viewModel.onSearchChange(it.toString()) }
8284
}
8385

features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/viewModel/ArchiveViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ class ArchiveViewModel @Inject constructor(
8383
router.navigate(OptionsListParams(items))
8484
}
8585

86+
fun onOptionsLongClick() = viewModelScope.launch {
87+
onSearchToggled()
88+
}
89+
8690
fun onOptionsItemClick(id: OptionsListParams.Item.Id) = viewModelScope.launch {
8791
if (id !is ArchiveOptionsListItem) return@launch
8892
when (id) {

features/feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/view/CategoriesFragment.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.example.util.simpletimetracker.feature_categories.viewModel.Categorie
2525
import com.example.util.simpletimetracker.feature_views.extension.pxToDp
2626
import com.example.util.simpletimetracker.feature_views.extension.setMargins
2727
import com.example.util.simpletimetracker.feature_views.extension.setOnClick
28+
import com.example.util.simpletimetracker.feature_views.extension.setOnLongClick
2829
import com.example.util.simpletimetracker.navigation.params.screen.OptionsListParams
2930
import com.google.android.flexbox.FlexDirection
3031
import com.google.android.flexbox.FlexWrap
@@ -84,6 +85,7 @@ class CategoriesFragment :
8485

8586
override fun initUx(): Unit = with(binding) {
8687
btnCategoriesOptions.setOnClick(throttle(viewModel::onOptionsClick))
88+
btnCategoriesOptions.setOnLongClick(throttle(viewModel::onOptionsLongClick))
8789
etCategoriesSearchField.doAfterTextChanged { viewModel.onSearchChange(it.toString()) }
8890
}
8991

features/feature_categories/src/main/java/com/example/util/simpletimetracker/feature_categories/viewModel/CategoriesViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ class CategoriesViewModel @Inject constructor(
112112
router.navigate(OptionsListParams(items))
113113
}
114114

115+
fun onOptionsLongClick() {
116+
onFilterClick()
117+
}
118+
115119
fun onOptionsItemClick(id: OptionsListParams.Item.Id) = viewModelScope.launch {
116120
if (id !is CategoriesOptionsListItem) return@launch
117121
when (id) {

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/view/RecordsContainerFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class RecordsContainerFragment :
6666

6767
override fun initUx() = with(binding) {
6868
btnRecordAdd.setOnClick(throttle(viewModel::onOptionsClick))
69+
btnRecordAdd.setOnLongClick(throttle(viewModel::onOptionsLongClick))
6970
btnRecordsContainerPrevious.setOnClick(viewModel::onPreviousClick)
7071
btnRecordsContainerNext.setOnClick(viewModel::onNextClick)
7172
btnRecordsContainerToday.setOnClick(viewModel::onTodayClick)

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsContainerViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ class RecordsContainerViewModel @Inject constructor(
6060
router.navigate(OptionsListParams(items))
6161
}
6262

63+
fun onOptionsLongClick() {
64+
onRecordAddClick()
65+
}
66+
6367
fun onTodayClick() {
6468
viewModelScope.launch {
6569
val useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat()

features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/view/StatisticsContainerFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class StatisticsContainerFragment :
6666

6767
override fun initUx() = with(binding) {
6868
btnStatisticsContainerOptions.setOnClick(throttle(viewModel::onOptionsClick))
69+
btnStatisticsContainerOptions.setOnLongClick(throttle(viewModel::onOptionsLongClick))
6970
spinnerStatisticsContainer.onItemSelected = {
7071
viewModel.onRangeSelected(it)
7172
settingsViewModel.onRangeSelected(it)

features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsContainerViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ class StatisticsContainerViewModel @Inject constructor(
8989
router.navigate(OptionsListParams(items))
9090
}
9191

92+
fun onOptionsLongClick() = viewModelScope.launch {
93+
statisticsUpdateInteractor.sendFilterClicked()
94+
}
95+
9296
fun onRangeSelected(item: CustomSpinner.CustomSpinnerItem) {
9397
when (item) {
9498
is SelectDateViewData -> {

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/view/StatisticsDetailFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ class StatisticsDetailFragment :
109109

110110
override fun initUx() = with(binding) {
111111
btnStatisticsDetailOptions.setOnClick(throttle(viewModel::onOptionsClick))
112+
btnStatisticsDetailOptions.setOnLongClick(throttle(viewModel::onOptionsLongClick))
112113
spinnerStatisticsDetail.onItemSelected = viewModel::onRangeSelected
113114
btnStatisticsDetailPrevious.setOnClick(viewModel::onPreviousClick)
114115
btnStatisticsDetailNext.setOnClick(viewModel::onNextClick)

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ class StatisticsDetailViewModel @Inject constructor(
197197
router.navigate(OptionsListParams(items))
198198
}
199199

200+
fun onOptionsLongClick() {
201+
filterDelegate.onFilterClick()
202+
}
203+
200204
fun onOptionsItemClick(id: OptionsListParams.Item.Id) {
201205
if (id !is StatisticsDetailOptionsListItem) return
202206
when (id) {

0 commit comments

Comments
 (0)