A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
add clear text icon on input fields
+25
-9
+1
-1
core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt
+1
-1
core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt
···
165
165
// TODO multitask filters.
166
166
167
167
fun RecordBase.selectedByActivity(): Boolean {
168
-
return typeIds.isEmpty() || typeIds.firstOrNull().orZero() in typeIds
168
+
return typeIds.isEmpty() || this.typeIds.firstOrNull().orZero() in typeIds
169
169
}
170
170
171
171
fun RecordBase.selectedByComment(): Boolean {
+1
-1
features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
+1
-1
features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
···
356
356
android:visibility="gone"
357
357
app:layout_constraintBottom_toTopOf="@id/btnChangeRecordSave"
358
358
app:layout_constraintTop_toBottomOf="@id/barrierChangeRecord"
359
-
tools:visibility="visible">
359
+
tools:visibility="gone">
360
360
361
361
<androidx.appcompat.widget.LinearLayoutCompat
362
362
android:layout_width="match_parent"
+7
-7
features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
+7
-7
features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
···
102
102
103
103
<com.google.android.material.textfield.TextInputLayout
104
104
android:id="@+id/inputColorSelectionHex"
105
-
style="@style/ChangeItemInputFieldDialog"
105
+
style="@style/ChangeItemInputFieldColorDialog"
106
106
android:layout_width="match_parent"
107
107
android:layout_height="wrap_content"
108
108
android:layout_marginHorizontal="16dp"
···
124
124
125
125
<com.google.android.material.textfield.TextInputLayout
126
126
android:id="@+id/inputColorSelectionRed"
127
-
style="@style/ChangeItemInputFieldDialog"
127
+
style="@style/ChangeItemInputFieldColorDialog"
128
128
android:layout_width="0dp"
129
129
android:layout_height="wrap_content"
130
130
android:layout_marginStart="16dp"
···
146
146
147
147
<com.google.android.material.textfield.TextInputLayout
148
148
android:id="@+id/inputColorSelectionGreen"
149
-
style="@style/ChangeItemInputFieldDialog"
149
+
style="@style/ChangeItemInputFieldColorDialog"
150
150
android:layout_width="0dp"
151
151
android:layout_height="wrap_content"
152
152
android:layout_marginBottom="10dp"
···
166
166
167
167
<com.google.android.material.textfield.TextInputLayout
168
168
android:id="@+id/inputColorSelectionBlue"
169
-
style="@style/ChangeItemInputFieldDialog"
169
+
style="@style/ChangeItemInputFieldColorDialog"
170
170
android:layout_width="0dp"
171
171
android:layout_height="wrap_content"
172
172
android:layout_marginBottom="10dp"
···
186
186
187
187
<com.google.android.material.textfield.TextInputLayout
188
188
android:id="@+id/inputColorSelectionHue"
189
-
style="@style/ChangeItemInputFieldDialog"
189
+
style="@style/ChangeItemInputFieldColorDialog"
190
190
android:layout_width="0dp"
191
191
android:layout_height="wrap_content"
192
192
android:layout_marginStart="16dp"
···
207
207
208
208
<com.google.android.material.textfield.TextInputLayout
209
209
android:id="@+id/inputColorSelectionSaturation"
210
-
style="@style/ChangeItemInputFieldDialog"
210
+
style="@style/ChangeItemInputFieldColorDialog"
211
211
android:layout_width="0dp"
212
212
android:layout_height="wrap_content"
213
213
android:layout_marginBottom="10dp"
···
227
227
228
228
<com.google.android.material.textfield.TextInputLayout
229
229
android:id="@+id/inputColorSelectionValue"
230
-
style="@style/ChangeItemInputFieldDialog"
230
+
style="@style/ChangeItemInputFieldColorDialog"
231
231
android:layout_width="0dp"
232
232
android:layout_height="wrap_content"
233
233
android:layout_marginEnd="16dp"
+9
features/feature_views/src/main/res/drawable/clear.xml
+9
features/feature_views/src/main/res/drawable/clear.xml
···
1
+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
+
android:width="24dp"
3
+
android:height="24dp"
4
+
android:viewportWidth="24"
5
+
android:viewportHeight="24">
6
+
<path
7
+
android:fillColor="#FF000000"
8
+
android:pathData="M14.59,8L12,10.59 9.41,8 8,9.41 10.59,12 8,14.59 9.41,16 12,13.41 14.59,16 16,14.59 13.41,12 16,9.41 14.59,8zM12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
9
+
</vector>
+7
features/feature_views/src/main/res/values/styles.xml
+7
features/feature_views/src/main/res/values/styles.xml
···
174
174
<item name="errorTextAppearance">@style/ChangeItemErrorStyle</item>
175
175
<item name="hintTextAppearance">@style/ChangeItemHintStyle</item>
176
176
<item name="hintTextColor">@color/blue_grey_300</item>
177
+
<item name="endIconDrawable">@drawable/clear</item>
178
+
<item name="endIconMode">clear_text</item>
177
179
</style>
178
180
179
181
<style name="ChangeItemInputFieldDialog" parent="ChangeItemInputField">
180
182
<item name="boxStrokeColor">@color/states_input_field_border_dialog_color</item>
183
+
</style>
184
+
185
+
<style name="ChangeItemInputFieldColorDialog" parent="ChangeItemInputFieldDialog">
186
+
<item name="endIconDrawable">@null</item>
187
+
<item name="endIconMode">none</item>
181
188
</style>
182
189
183
190
<style name="ChangeItemInputFieldTimeDialog" parent="ChangeItemInputField">