A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
change buttons style
+53
-94
+3
core/src/main/res/values/dimens.xml
+3
core/src/main/res/values/dimens.xml
···
17
17
<dimen name="color_icon_item_corner_radius">8dp</dimen>
18
18
<dimen name="color_icon_item_elevation">4dp</dimen>
19
19
<dimen name="color_icon_recycler_margin">8dp</dimen>
20
+
21
+
<dimen name="button_height">58dp</dimen>
22
+
<dimen name="button_corner_radius">8dp</dimen>
20
23
</resources>
+16
-5
core/src/main/res/values/styles.xml
+16
-5
core/src/main/res/values/styles.xml
···
242
242
<item name="android:paddingTop">12dp</item>
243
243
</style>
244
244
245
-
<style name="ContainerRangeMainButton">
245
+
<style name="AppButton">
246
+
<item name="android:layout_height">@dimen/button_height</item>
247
+
<item name="android:textColor">?appLightTextColor</item>
248
+
<item name="backgroundTint">?appInactiveColor</item>
249
+
<item name="cornerRadius">@dimen/button_corner_radius</item>
250
+
</style>
251
+
252
+
<style name="AppButtonActive">
253
+
<item name="android:layout_height">@dimen/button_height</item>
254
+
<item name="android:textColor">?appLightTextColor</item>
255
+
<item name="backgroundTint">?appActiveColor</item>
256
+
<item name="cornerRadius">@dimen/button_corner_radius</item>
257
+
</style>
258
+
259
+
<style name="ContainerRangeMainButton" parent="AppButtonActive">
246
260
<item name="android:layout_marginStart">8dp</item>
247
261
<item name="android:layout_marginEnd">8dp</item>
248
262
<item name="android:padding">0dp</item>
249
-
<item name="android:textColor">@color/white</item>
250
-
<item name="backgroundTint">?appActiveColor</item>
251
263
<item name="layout_constraintHorizontal_weight">2.5</item>
252
264
</style>
253
265
···
258
270
<item name="iconTint">@color/white</item>
259
271
</style>
260
272
261
-
<style name="ContainerRangeButton">
273
+
<style name="ContainerRangeButton" parent="AppButton">
262
274
<item name="android:scaleType">fitXY</item>
263
-
<item name="backgroundTint">?appInactiveColor</item>
264
275
<item name="icon">@drawable/arrow_left</item>
265
276
<item name="iconGravity">start</item>
266
277
<item name="iconTint">@color/white</item>
+1
-4
feature_change_category/src/main/res/layout/change_category_fragment.xml
+1
-4
feature_change_category/src/main/res/layout/change_category_fragment.xml
···
171
171
172
172
<com.google.android.material.button.MaterialButton
173
173
android:id="@+id/btnChangeCategorySave"
174
+
style="@style/AppButtonActive"
174
175
android:layout_width="match_parent"
175
-
android:layout_height="wrap_content"
176
176
android:layout_marginStart="8dp"
177
177
android:layout_marginTop="8dp"
178
178
android:layout_marginEnd="8dp"
179
-
android:gravity="center"
180
179
android:text="@string/change_category_save"
181
-
android:textColor="?appLightTextColor"
182
-
app:backgroundTint="?appActiveColor"
183
180
app:layout_constraintBottom_toBottomOf="parent" />
184
181
185
182
</androidx.constraintlayout.widget.ConstraintLayout>
+1
-4
feature_change_record/src/main/res/layout/change_record_fragment.xml
+1
-4
feature_change_record/src/main/res/layout/change_record_fragment.xml
···
232
232
233
233
<com.google.android.material.button.MaterialButton
234
234
android:id="@+id/btnChangeRecordSave"
235
+
style="@style/AppButtonActive"
235
236
android:layout_width="match_parent"
236
-
android:layout_height="wrap_content"
237
237
android:layout_marginStart="8dp"
238
238
android:layout_marginTop="8dp"
239
239
android:layout_marginEnd="8dp"
240
-
android:gravity="center"
241
240
android:text="@string/change_record_save"
242
-
android:textColor="?appLightTextColor"
243
-
app:backgroundTint="?appActiveColor"
244
241
app:layout_constraintBottom_toBottomOf="parent" />
245
242
246
243
</androidx.constraintlayout.widget.ConstraintLayout>
+1
-4
feature_change_record_tag/src/main/res/layout/change_record_tag_fragment.xml
+1
-4
feature_change_record_tag/src/main/res/layout/change_record_tag_fragment.xml
···
112
112
113
113
<com.google.android.material.button.MaterialButton
114
114
android:id="@+id/btnChangeRecordTagSave"
115
+
style="@style/AppButtonActive"
115
116
android:layout_width="match_parent"
116
-
android:layout_height="wrap_content"
117
117
android:layout_marginStart="8dp"
118
118
android:layout_marginTop="8dp"
119
119
android:layout_marginEnd="8dp"
120
-
android:gravity="center"
121
120
android:text="@string/change_category_save"
122
-
android:textColor="?appLightTextColor"
123
-
app:backgroundTint="?appActiveColor"
124
121
app:layout_constraintBottom_toBottomOf="parent" />
125
122
126
123
</androidx.constraintlayout.widget.ConstraintLayout>
+2
-6
feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
+2
-6
feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
···
316
316
317
317
<com.google.android.material.button.MaterialButton
318
318
android:id="@+id/btnChangeRecordTypeSave"
319
+
style="@style/AppButtonActive"
319
320
android:layout_width="match_parent"
320
-
android:layout_height="wrap_content"
321
-
android:layout_marginStart="8dp"
321
+
android:layout_marginHorizontal="8dp"
322
322
android:layout_marginTop="8dp"
323
-
android:layout_marginEnd="8dp"
324
-
android:gravity="center"
325
323
android:text="@string/change_record_type_save"
326
-
android:textColor="?appLightTextColor"
327
-
app:backgroundTint="?appActiveColor"
328
324
app:layout_constraintBottom_toBottomOf="parent" />
329
325
330
326
</androidx.constraintlayout.widget.ConstraintLayout>
+1
-4
feature_change_running_record/src/main/res/layout/change_running_record_fragment.xml
+1
-4
feature_change_running_record/src/main/res/layout/change_running_record_fragment.xml
···
202
202
203
203
<com.google.android.material.button.MaterialButton
204
204
android:id="@+id/btnChangeRunningRecordSave"
205
+
style="@style/AppButtonActive"
205
206
android:layout_width="match_parent"
206
-
android:layout_height="wrap_content"
207
207
android:layout_marginStart="8dp"
208
208
android:layout_marginTop="8dp"
209
209
android:layout_marginEnd="8dp"
210
-
android:gravity="center"
211
210
android:text="@string/change_record_save"
212
-
android:textColor="?appLightTextColor"
213
-
app:backgroundTint="?appActiveColor"
214
211
app:layout_constraintBottom_toBottomOf="parent" />
215
212
216
213
</androidx.constraintlayout.widget.ConstraintLayout>
+1
-1
feature_dialogs/src/main/res/layout/archive_dialog_fragment.xml
+1
-1
feature_dialogs/src/main/res/layout/archive_dialog_fragment.xml
···
19
19
android:id="@+id/rvArchiveDialogContent"
20
20
android:layout_width="match_parent"
21
21
android:layout_height="wrap_content"
22
-
android:layout_marginVertical="16dp"
22
+
android:layout_marginTop="16dp"
23
23
tools:itemCount="1"
24
24
tools:listitem="@layout/item_record_type_layout" />
25
25
+3
-6
feature_dialogs/src/main/res/layout/card_size_dialog_fragment.xml
+3
-6
feature_dialogs/src/main/res/layout/card_size_dialog_fragment.xml
···
39
39
40
40
<com.google.android.material.button.MaterialButton
41
41
android:id="@+id/btnCardSizeDefault"
42
+
style="@style/AppButton"
42
43
android:layout_width="match_parent"
43
-
android:layout_height="wrap_content"
44
-
android:layout_marginStart="8dp"
45
-
android:layout_marginEnd="8dp"
46
-
android:text="@string/card_size_default"
47
-
android:textColor="@color/white"
48
-
app:backgroundTint="?appInactiveColor" />
44
+
android:layout_marginHorizontal="8dp"
45
+
android:text="@string/card_size_default" />
49
46
50
47
</androidx.appcompat.widget.LinearLayoutCompat>
+2
-6
feature_dialogs/src/main/res/layout/chart_filter_dialog_fragment.xml
+2
-6
feature_dialogs/src/main/res/layout/chart_filter_dialog_fragment.xml
···
51
51
52
52
<com.google.android.material.button.MaterialButton
53
53
android:id="@+id/btnChartFilterShowAll"
54
+
style="@style/AppButton"
54
55
android:layout_width="0dp"
55
-
android:layout_height="wrap_content"
56
56
android:layout_marginStart="8dp"
57
57
android:layout_marginEnd="4dp"
58
58
android:ellipsize="marquee"
59
59
android:paddingHorizontal="0dp"
60
60
android:singleLine="true"
61
61
android:text="@string/types_filter_show_all"
62
-
android:textColor="@color/white"
63
-
app:backgroundTint="?appInactiveColor"
64
62
app:layout_constraintBottom_toBottomOf="parent"
65
63
app:layout_constraintEnd_toStartOf="@id/btnChartFilterHideAll"
66
64
app:layout_constraintStart_toStartOf="parent" />
67
65
68
66
<com.google.android.material.button.MaterialButton
69
67
android:id="@+id/btnChartFilterHideAll"
68
+
style="@style/AppButton"
70
69
android:layout_width="0dp"
71
-
android:layout_height="wrap_content"
72
70
android:layout_marginStart="4dp"
73
71
android:layout_marginEnd="8dp"
74
72
android:ellipsize="marquee"
75
73
android:paddingHorizontal="0dp"
76
74
android:singleLine="true"
77
75
android:text="@string/types_filter_hide_all"
78
-
android:textColor="@color/white"
79
-
app:backgroundTint="?appInactiveColor"
80
76
app:layout_constraintBottom_toBottomOf="parent"
81
77
app:layout_constraintEnd_toEndOf="parent"
82
78
app:layout_constraintStart_toEndOf="@id/btnChartFilterShowAll" />
+2
-8
feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml
+2
-8
feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml
···
81
81
82
82
<com.google.android.material.button.MaterialButton
83
83
android:id="@+id/btnCsvExportSettingsRange"
84
+
style="@style/AppButton"
84
85
android:layout_width="0dp"
85
-
android:layout_height="@dimen/input_field_height"
86
86
android:layout_marginStart="10dp"
87
87
android:layout_marginTop="6dp"
88
88
android:layout_marginEnd="6dp"
···
90
90
android:paddingHorizontal="0dp"
91
91
android:singleLine="true"
92
92
android:text="@string/csv_export_settings_range"
93
-
android:textColor="@color/white"
94
-
app:backgroundTint="?appInactiveColor"
95
-
app:cornerRadius="@dimen/input_field_corner_radius"
96
93
app:layout_constraintEnd_toStartOf="@id/btnCsvExportSettingsAll"
97
94
app:layout_constraintStart_toStartOf="parent"
98
95
app:layout_constraintTop_toBottomOf="@id/fieldCsvExportSettingsTimeStarted" />
99
96
100
97
<com.google.android.material.button.MaterialButton
101
98
android:id="@+id/btnCsvExportSettingsAll"
99
+
style="@style/AppButton"
102
100
android:layout_width="0dp"
103
-
android:layout_height="@dimen/input_field_height"
104
101
android:layout_marginStart="6dp"
105
102
android:layout_marginTop="6dp"
106
103
android:layout_marginEnd="10dp"
···
108
105
android:paddingHorizontal="0dp"
109
106
android:singleLine="true"
110
107
android:text="@string/csv_export_settings_all"
111
-
android:textColor="@color/white"
112
-
app:backgroundTint="?appInactiveColor"
113
-
app:cornerRadius="@dimen/input_field_corner_radius"
114
108
app:layout_constraintEnd_toEndOf="parent"
115
109
app:layout_constraintStart_toEndOf="@id/btnCsvExportSettingsRange"
116
110
app:layout_constraintTop_toBottomOf="@id/fieldCsvExportSettingsTimeStarted" />
+4
-9
feature_dialogs/src/main/res/layout/duration_dialog_fragment.xml
+4
-9
feature_dialogs/src/main/res/layout/duration_dialog_fragment.xml
···
22
22
android:layout_marginVertical="8dp"
23
23
android:layout_marginStart="8dp"
24
24
android:layout_marginEnd="16dp"
25
-
app:durationLegendTextSize="32sp"
26
-
app:durationLegendTextColor="?appTextHintColor"
27
25
app:durationLegendPadding="16dp"
26
+
app:durationLegendTextColor="?appTextHintColor"
27
+
app:durationLegendTextSize="32sp"
28
28
app:durationTextColor="?appTextPrimaryColor"
29
29
app:layout_constraintBottom_toTopOf="@id/guidelineDurationPicker"
30
30
app:layout_constraintEnd_toStartOf="@id/ivDurationPickerDelete"
···
74
74
android:id="@+id/containerDurationPickerButtons"
75
75
android:layout_width="match_parent"
76
76
android:layout_height="wrap_content"
77
-
android:layout_marginBottom="16dp"
78
77
android:paddingHorizontal="4dp"
79
78
app:layout_constraintBottom_toBottomOf="parent">
80
79
81
80
<com.google.android.material.button.MaterialButton
82
81
android:id="@+id/btnDurationPickerSave"
82
+
style="@style/AppButtonActive"
83
83
android:layout_width="0dp"
84
-
android:layout_height="wrap_content"
85
84
android:layout_marginStart="4dp"
86
85
android:layout_marginEnd="4dp"
87
86
android:text="@string/duration_dialog_save"
88
-
android:textColor="@color/white"
89
-
app:backgroundTint="?appActiveColor"
90
87
app:layout_constraintBottom_toBottomOf="parent"
91
88
app:layout_constraintEnd_toStartOf="@id/btnDurationPickerDisable"
92
89
app:layout_constraintStart_toStartOf="parent" />
93
90
94
91
<com.google.android.material.button.MaterialButton
95
92
android:id="@+id/btnDurationPickerDisable"
93
+
style="@style/AppButton"
96
94
android:layout_width="0dp"
97
-
android:layout_height="wrap_content"
98
95
android:layout_marginStart="4dp"
99
96
android:layout_marginEnd="4dp"
100
97
android:text="@string/duration_dialog_disable"
101
-
android:textColor="@color/white"
102
-
app:backgroundTint="?appInactiveColor"
103
98
app:layout_constraintBottom_toBottomOf="parent"
104
99
app:layout_constraintEnd_toEndOf="parent"
105
100
app:layout_constraintStart_toEndOf="@id/btnDurationPickerSave" />
+2
-6
feature_dialogs/src/main/res/layout/types_filter_dialog_fragment.xml
+2
-6
feature_dialogs/src/main/res/layout/types_filter_dialog_fragment.xml
···
31
31
32
32
<com.google.android.material.button.MaterialButton
33
33
android:id="@+id/btnTypesFilterShowAll"
34
+
style="@style/AppButton"
34
35
android:layout_width="0dp"
35
-
android:layout_height="wrap_content"
36
36
android:layout_marginStart="8dp"
37
37
android:layout_marginEnd="4dp"
38
38
android:ellipsize="marquee"
39
39
android:paddingHorizontal="0dp"
40
40
android:singleLine="true"
41
41
android:text="@string/types_filter_show_all"
42
-
android:textColor="@color/white"
43
-
app:backgroundTint="?appInactiveColor"
44
42
app:layout_constraintBottom_toBottomOf="parent"
45
43
app:layout_constraintEnd_toStartOf="@id/btnTypesFilterHideAll"
46
44
app:layout_constraintStart_toStartOf="parent" />
47
45
48
46
<com.google.android.material.button.MaterialButton
49
47
android:id="@+id/btnTypesFilterHideAll"
48
+
style="@style/AppButton"
50
49
android:layout_width="0dp"
51
-
android:layout_height="wrap_content"
52
50
android:layout_marginStart="4dp"
53
51
android:layout_marginEnd="8dp"
54
52
android:ellipsize="marquee"
55
53
android:paddingHorizontal="0dp"
56
54
android:singleLine="true"
57
55
android:text="@string/types_filter_hide_all"
58
-
android:textColor="@color/white"
59
-
app:backgroundTint="?appInactiveColor"
60
56
app:layout_constraintBottom_toBottomOf="parent"
61
57
app:layout_constraintEnd_toEndOf="parent"
62
58
app:layout_constraintStart_toEndOf="@id/btnTypesFilterShowAll" />
+2
-7
feature_records/src/main/res/layout/records_container_fragment.xml
+2
-7
feature_records/src/main/res/layout/records_container_fragment.xml
···
33
33
android:id="@+id/btnRecordsContainerPrevious"
34
34
style="@style/ContainerRangeButton"
35
35
android:layout_width="0dp"
36
-
android:layout_height="0dp"
37
36
android:layout_marginStart="8dp"
38
37
app:layout_constraintBottom_toBottomOf="parent"
39
38
app:layout_constraintEnd_toStartOf="@id/btnRecordsContainerToday"
40
-
app:layout_constraintStart_toStartOf="parent"
41
-
app:layout_constraintTop_toTopOf="@id/btnRecordsContainerToday" />
39
+
app:layout_constraintStart_toStartOf="parent" />
42
40
43
41
<com.google.android.material.button.MaterialButton
44
42
android:id="@+id/btnRecordsContainerToday"
45
43
style="@style/ContainerRangeSelectableMainButton"
46
44
android:layout_width="0dp"
47
-
android:layout_height="wrap_content"
48
45
app:layout_constraintBottom_toBottomOf="parent"
49
46
app:layout_constraintEnd_toStartOf="@id/btnRecordsContainerNext"
50
47
app:layout_constraintStart_toEndOf="@id/btnRecordsContainerPrevious"
···
54
51
android:id="@+id/btnRecordsContainerNext"
55
52
style="@style/ContainerRangeButton"
56
53
android:layout_width="0dp"
57
-
android:layout_height="0dp"
58
54
android:layout_marginEnd="8dp"
59
55
app:icon="@drawable/arrow_right"
60
56
app:iconGravity="end"
61
57
app:layout_constraintBottom_toBottomOf="parent"
62
58
app:layout_constraintEnd_toEndOf="parent"
63
-
app:layout_constraintStart_toEndOf="@id/btnRecordsContainerToday"
64
-
app:layout_constraintTop_toTopOf="@id/btnRecordsContainerToday" />
59
+
app:layout_constraintStart_toEndOf="@id/btnRecordsContainerToday" />
65
60
66
61
</androidx.constraintlayout.widget.ConstraintLayout>
67
62
+2
-7
feature_statistics/src/main/res/layout/statistics_container_fragment.xml
+2
-7
feature_statistics/src/main/res/layout/statistics_container_fragment.xml
···
16
16
android:id="@+id/btnStatisticsContainerPrevious"
17
17
style="@style/ContainerRangeButton"
18
18
android:layout_width="0dp"
19
-
android:layout_height="0dp"
20
19
android:layout_marginStart="8dp"
21
20
app:layout_constraintBottom_toBottomOf="parent"
22
21
app:layout_constraintEnd_toStartOf="@id/btnStatisticsContainerToday"
23
-
app:layout_constraintStart_toStartOf="parent"
24
-
app:layout_constraintTop_toTopOf="@id/btnStatisticsContainerToday" />
22
+
app:layout_constraintStart_toStartOf="parent" />
25
23
26
24
<com.example.util.simpletimetracker.core.view.spinner.CustomSpinner
27
25
android:id="@+id/spinnerStatisticsContainer"
···
36
34
android:id="@+id/btnStatisticsContainerToday"
37
35
style="@style/ContainerRangeSelectableMainButton"
38
36
android:layout_width="0dp"
39
-
android:layout_height="wrap_content"
40
37
app:layout_constraintBottom_toBottomOf="parent"
41
38
app:layout_constraintEnd_toStartOf="@id/btnStatisticsContainerNext"
42
39
app:layout_constraintStart_toEndOf="@id/btnStatisticsContainerPrevious"
···
46
43
android:id="@+id/btnStatisticsContainerNext"
47
44
style="@style/ContainerRangeButton"
48
45
android:layout_width="0dp"
49
-
android:layout_height="0dp"
50
46
android:layout_marginEnd="8dp"
51
47
app:icon="@drawable/arrow_right"
52
48
app:iconGravity="end"
53
49
app:layout_constraintBottom_toBottomOf="parent"
54
50
app:layout_constraintEnd_toEndOf="parent"
55
51
app:layout_constraintHorizontal_weight="1"
56
-
app:layout_constraintStart_toEndOf="@id/btnStatisticsContainerToday"
57
-
app:layout_constraintTop_toTopOf="@id/btnStatisticsContainerToday" />
52
+
app:layout_constraintStart_toEndOf="@id/btnStatisticsContainerToday" />
58
53
59
54
</androidx.constraintlayout.widget.ConstraintLayout>
+2
-7
feature_statistics_detail/src/main/res/layout/statistics_detail_fragment.xml
+2
-7
feature_statistics_detail/src/main/res/layout/statistics_detail_fragment.xml
···
195
195
android:id="@+id/btnStatisticsDetailPrevious"
196
196
style="@style/ContainerRangeButton"
197
197
android:layout_width="0dp"
198
-
android:layout_height="0dp"
199
198
android:layout_marginStart="8dp"
200
199
app:layout_constraintBottom_toBottomOf="@id/btnStatisticsDetailToday"
201
200
app:layout_constraintEnd_toStartOf="@id/btnStatisticsDetailToday"
202
-
app:layout_constraintStart_toStartOf="parent"
203
-
app:layout_constraintTop_toTopOf="@id/btnStatisticsDetailToday" />
201
+
app:layout_constraintStart_toStartOf="parent" />
204
202
205
203
<com.example.util.simpletimetracker.core.view.spinner.CustomSpinner
206
204
android:id="@+id/spinnerStatisticsDetail"
···
215
213
android:id="@+id/btnStatisticsDetailToday"
216
214
style="@style/ContainerRangeSelectableMainButton"
217
215
android:layout_width="0dp"
218
-
android:layout_height="wrap_content"
219
216
app:layout_constraintBottom_toBottomOf="parent"
220
217
app:layout_constraintEnd_toStartOf="@id/btnStatisticsDetailNext"
221
218
app:layout_constraintStart_toEndOf="@id/btnStatisticsDetailPrevious"
···
225
222
android:id="@+id/btnStatisticsDetailNext"
226
223
style="@style/ContainerRangeButton"
227
224
android:layout_width="0dp"
228
-
android:layout_height="0dp"
229
225
android:layout_marginEnd="8dp"
230
226
app:icon="@drawable/arrow_right"
231
227
app:iconGravity="end"
232
228
app:layout_constraintBottom_toBottomOf="@id/btnStatisticsDetailToday"
233
229
app:layout_constraintEnd_toEndOf="parent"
234
-
app:layout_constraintStart_toEndOf="@id/btnStatisticsDetailToday"
235
-
app:layout_constraintTop_toTopOf="@id/btnStatisticsDetailToday" />
230
+
app:layout_constraintStart_toEndOf="@id/btnStatisticsDetailToday" />
236
231
237
232
</androidx.constraintlayout.widget.ConstraintLayout>