Skip to content

Commit fc0ed85

Browse files
committed
remove show all and hide all buttons from default types dialog
1 parent 0f5a1b1 commit fc0ed85

File tree

3 files changed

+11
-44
lines changed

3 files changed

+11
-44
lines changed

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/view/DefaultTypesSelectionDialogFragment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ class DefaultTypesSelectionDialogFragment :
6262
}
6363

6464
override fun initUx(): Unit = with(binding) {
65-
btnDefaultTypesSelectionShowAll.setOnClick(viewModel::onShowAllClick)
66-
btnDefaultTypesSelectionHideAll.setOnClick(viewModel::onHideAllClick)
6765
btnDefaultTypesSelectionSave.setOnClick(viewModel::onSaveClick)
6866
btnDefaultTypesSelectionHide.setOnClick(viewModel::onHideClick)
6967
}

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ class DefaultTypesSelectionViewModel @Inject constructor(
6060
updateRecordTypesViewData()
6161
}
6262

63-
fun onShowAllClick() {
64-
typeIdsSelected.addAll(recordTypes.map { it.id })
65-
updateSaveButtonEnabled()
66-
updateRecordTypesViewData()
67-
}
68-
69-
fun onHideAllClick() {
70-
typeIdsSelected.clear()
71-
updateSaveButtonEnabled()
72-
updateRecordTypesViewData()
73-
}
74-
7563
fun onSaveClick() {
7664
if (typeIdsSelected.size == 0) return
7765

features/feature_dialogs/src/main/res/layout/default_types_selection_dialog_fragment.xml

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,53 +19,34 @@
1919
style="@style/DialogTitle"
2020
android:layout_width="match_parent"
2121
android:layout_height="wrap_content"
22+
android:layout_marginHorizontal="10dp"
2223
android:text="@string/default_types_selection_title" />
2324

24-
<com.example.util.simpletimetracker.feature_views.DividerView
25+
<com.example.util.simpletimetracker.feature_views.DividerFullView
2526
android:layout_width="match_parent"
2627
android:layout_height="wrap_content" />
2728

2829
<androidx.recyclerview.widget.RecyclerView
2930
android:id="@+id/rvDefaultTypesSelectionContainer"
3031
android:layout_width="match_parent"
3132
android:layout_height="0dp"
32-
android:layout_marginBottom="8dp"
3333
android:layout_weight="1"
34+
android:clipToPadding="false"
3435
android:overScrollMode="never"
36+
android:paddingTop="8dp"
37+
android:paddingBottom="8dp"
3538
tools:listitem="@layout/item_record_type_layout" />
3639

40+
<View
41+
android:layout_width="match_parent"
42+
android:layout_height="2dp"
43+
android:layout_marginBottom="4dp"
44+
android:background="?appDividerColor" />
45+
3746
<androidx.constraintlayout.widget.ConstraintLayout
3847
android:layout_width="match_parent"
3948
android:layout_height="wrap_content">
4049

41-
<com.google.android.material.button.MaterialButton
42-
android:id="@+id/btnDefaultTypesSelectionShowAll"
43-
style="@style/AppButton"
44-
android:layout_width="0dp"
45-
android:layout_marginStart="8dp"
46-
android:layout_marginEnd="4dp"
47-
android:ellipsize="marquee"
48-
android:paddingHorizontal="0dp"
49-
android:singleLine="true"
50-
android:text="@string/select_all"
51-
app:layout_constraintBottom_toTopOf="@id/btnDefaultTypesSelectionSave"
52-
app:layout_constraintEnd_toStartOf="@id/btnDefaultTypesSelectionHideAll"
53-
app:layout_constraintStart_toStartOf="parent" />
54-
55-
<com.google.android.material.button.MaterialButton
56-
android:id="@+id/btnDefaultTypesSelectionHideAll"
57-
style="@style/AppButton"
58-
android:layout_width="0dp"
59-
android:layout_marginStart="4dp"
60-
android:layout_marginEnd="8dp"
61-
android:ellipsize="marquee"
62-
android:paddingHorizontal="0dp"
63-
android:singleLine="true"
64-
android:text="@string/select_nothing"
65-
app:layout_constraintBottom_toTopOf="@id/btnDefaultTypesSelectionSave"
66-
app:layout_constraintEnd_toEndOf="parent"
67-
app:layout_constraintStart_toEndOf="@id/btnDefaultTypesSelectionShowAll" />
68-
6950
<com.google.android.material.button.MaterialButton
7051
android:id="@+id/btnDefaultTypesSelectionSave"
7152
style="@style/AppButtonActive"

0 commit comments

Comments
 (0)