A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
fix settings layout empty on low api
+68
-57
+5
-4
features/feature_settings/src/main/res/layout/item_settings_checkbox.xml
+5
-4
features/feature_settings/src/main/res/layout/item_settings_checkbox.xml
···
27
27
android:layout_marginStart="4dp"
28
28
android:paddingTop="0dp"
29
29
android:paddingBottom="0dp"
30
-
android:translationZ="4dp"
30
+
android:translationZ="@dimen/settings_card_elevation"
31
31
app:layout_constraintBottom_toTopOf="@id/tvItemSettingsSubtitle"
32
32
app:layout_constraintEnd_toStartOf="@id/checkboxItemSettings"
33
33
app:layout_constraintStart_toStartOf="parent"
···
41
41
android:layout_height="wrap_content"
42
42
android:layout_marginStart="4dp"
43
43
android:paddingBottom="0dp"
44
-
android:translationZ="4dp"
44
+
android:translationZ="@dimen/settings_card_elevation"
45
45
android:visibility="gone"
46
46
app:layout_constraintEnd_toStartOf="@id/checkboxItemSettings"
47
47
app:layout_constraintStart_toStartOf="parent"
···
54
54
android:layout_width="wrap_content"
55
55
android:layout_height="0dp"
56
56
android:layout_marginEnd="4dp"
57
-
android:translationZ="4dp"
57
+
android:translationZ="@dimen/settings_card_elevation"
58
58
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
59
59
app:layout_constraintEnd_toEndOf="parent"
60
60
app:layout_constraintTop_toTopOf="@id/tvItemSettingsTitle" />
···
70
70
style="@style/SettingsDivider"
71
71
android:layout_width="match_parent"
72
72
android:layout_marginHorizontal="12dp"
73
-
android:translationZ="4dp"
73
+
android:outlineProvider="none"
74
+
android:translationZ="@dimen/settings_card_elevation"
74
75
app:layout_constraintTop_toBottomOf="@id/spaceItemSettingsBottom" />
75
76
76
77
</androidx.constraintlayout.widget.ConstraintLayout>
+8
-7
features/feature_settings/src/main/res/layout/item_settings_checkbox_with_range.xml
+8
-7
features/feature_settings/src/main/res/layout/item_settings_checkbox_with_range.xml
···
22
22
android:layout_marginTop="12dp"
23
23
android:paddingTop="0dp"
24
24
android:paddingBottom="0dp"
25
-
android:translationZ="4dp"
25
+
android:translationZ="@dimen/settings_card_elevation"
26
26
app:layout_constraintEnd_toStartOf="@id/barrierItemSettingsCheckboxWithRange"
27
27
app:layout_constraintStart_toStartOf="parent"
28
28
app:layout_constraintTop_toTopOf="parent"
···
34
34
android:layout_width="0dp"
35
35
android:layout_height="wrap_content"
36
36
android:paddingBottom="0dp"
37
-
android:translationZ="4dp"
37
+
android:translationZ="@dimen/settings_card_elevation"
38
38
app:layout_constraintEnd_toEndOf="@id/tvItemSettingsCheckboxWithRangeTitle"
39
39
app:layout_constraintStart_toStartOf="@id/tvItemSettingsCheckboxWithRangeTitle"
40
40
app:layout_constraintTop_toBottomOf="@id/tvItemSettingsCheckboxWithRangeTitle"
···
51
51
style="@style/SettingsDivider"
52
52
android:layout_width="match_parent"
53
53
android:layout_marginHorizontal="12dp"
54
-
android:translationZ="4dp"
54
+
android:outlineProvider="none"
55
+
android:translationZ="@dimen/settings_card_elevation"
55
56
app:layout_constraintTop_toBottomOf="@id/spaceItemSettingsCheckboxWithRangeBottom" />
56
57
57
58
<androidx.constraintlayout.widget.Barrier
···
66
67
android:layout_width="wrap_content"
67
68
android:layout_height="0dp"
68
69
android:layout_marginEnd="4dp"
69
-
android:translationZ="4dp"
70
+
android:translationZ="@dimen/settings_card_elevation"
70
71
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsCheckboxWithRangeTitle"
71
72
app:layout_constraintEnd_toEndOf="parent"
72
73
app:layout_constraintTop_toTopOf="@id/tvItemSettingsCheckboxWithRangeTitle" />
···
81
82
android:paddingHorizontal="8dp"
82
83
android:paddingVertical="4dp"
83
84
android:textColor="?appTextPrimaryColor"
84
-
android:translationZ="4dp"
85
+
android:translationZ="@dimen/settings_card_elevation"
85
86
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsDivider"
86
87
app:layout_constraintTop_toBottomOf="@id/checkboxItemSettings"
87
88
tools:text="01:23" />
···
93
94
android:gravity="end|center_vertical"
94
95
android:text="-"
95
96
android:textColor="?appTextPrimaryColor"
96
-
android:translationZ="4dp"
97
+
android:translationZ="@dimen/settings_card_elevation"
97
98
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsStart"
98
99
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsEnd"
99
100
app:layout_constraintTop_toTopOf="@id/tvItemSettingsStart"
···
109
110
android:paddingHorizontal="8dp"
110
111
android:paddingVertical="4dp"
111
112
android:textColor="?appTextPrimaryColor"
112
-
android:translationZ="4dp"
113
+
android:translationZ="@dimen/settings_card_elevation"
113
114
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsStart"
114
115
app:layout_constraintEnd_toEndOf="parent"
115
116
app:layout_constraintTop_toTopOf="@id/tvItemSettingsStart"
+3
-2
features/feature_settings/src/main/res/layout/item_settings_collapse.xml
+3
-2
features/feature_settings/src/main/res/layout/item_settings_collapse.xml
···
20
20
android:layout_marginStart="4dp"
21
21
android:layout_marginEnd="4dp"
22
22
android:background="?selectableItemBackground"
23
-
android:translationZ="4dp"
23
+
android:translationZ="@dimen/settings_card_elevation"
24
24
app:layout_constraintTop_toTopOf="parent">
25
25
26
26
<androidx.appcompat.widget.AppCompatTextView
···
52
52
style="@style/SettingsDivider"
53
53
android:layout_width="match_parent"
54
54
android:layout_marginHorizontal="12dp"
55
-
android:translationZ="4dp"
55
+
android:outlineProvider="none"
56
+
android:translationZ="@dimen/settings_card_elevation"
56
57
app:layout_constraintTop_toBottomOf="@id/layoutItemSettingsCollapseTitle" />
57
58
58
59
</androidx.constraintlayout.widget.ConstraintLayout>
+3
-2
features/feature_settings/src/main/res/layout/item_settings_hint.xml
+3
-2
features/feature_settings/src/main/res/layout/item_settings_hint.xml
···
26
26
android:layout_height="wrap_content"
27
27
android:layout_marginHorizontal="4dp"
28
28
android:paddingBottom="0dp"
29
-
android:translationZ="4dp"
29
+
android:translationZ="@dimen/settings_card_elevation"
30
30
app:layout_constraintTop_toBottomOf="@id/spaceItemSettingsTop"
31
31
tools:text="Subtitle" />
32
32
···
41
41
style="@style/SettingsDivider"
42
42
android:layout_width="match_parent"
43
43
android:layout_marginHorizontal="12dp"
44
-
android:translationZ="4dp"
44
+
android:outlineProvider="none"
45
+
android:translationZ="@dimen/settings_card_elevation"
45
46
app:layout_constraintTop_toBottomOf="@id/spaceItemSettingsBottom" />
46
47
47
48
</androidx.constraintlayout.widget.ConstraintLayout>
+6
-5
features/feature_settings/src/main/res/layout/item_settings_range.xml
+6
-5
features/feature_settings/src/main/res/layout/item_settings_range.xml
···
19
19
android:layout_width="0dp"
20
20
android:layout_height="wrap_content"
21
21
android:layout_marginStart="4dp"
22
-
android:translationZ="4dp"
22
+
android:translationZ="@dimen/settings_card_elevation"
23
23
app:layout_constraintBottom_toTopOf="@id/tvItemSettingsTitle"
24
24
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsStart"
25
25
app:layout_constraintStart_toStartOf="parent"
···
34
34
android:gravity="center"
35
35
android:paddingHorizontal="8dp"
36
36
android:paddingVertical="4dp"
37
-
android:translationZ="4dp"
38
37
android:textColor="?appTextPrimaryColor"
38
+
android:translationZ="@dimen/settings_card_elevation"
39
39
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
40
40
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsDivider"
41
41
app:layout_constraintTop_toTopOf="@id/tvItemSettingsTitle"
···
47
47
android:layout_height="wrap_content"
48
48
android:gravity="end|center_vertical"
49
49
android:text="-"
50
-
android:translationZ="4dp"
51
50
android:textColor="?appTextPrimaryColor"
51
+
android:translationZ="@dimen/settings_card_elevation"
52
52
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
53
53
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsEnd"
54
54
app:layout_constraintTop_toTopOf="@id/tvItemSettingsTitle" />
···
62
62
android:gravity="center"
63
63
android:paddingHorizontal="8dp"
64
64
android:paddingVertical="4dp"
65
-
android:translationZ="4dp"
66
65
android:textColor="?appTextPrimaryColor"
66
+
android:translationZ="@dimen/settings_card_elevation"
67
67
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
68
68
app:layout_constraintEnd_toEndOf="parent"
69
69
app:layout_constraintTop_toTopOf="@id/tvItemSettingsTitle"
···
74
74
style="@style/SettingsDivider"
75
75
android:layout_width="match_parent"
76
76
android:layout_marginHorizontal="12dp"
77
-
android:translationZ="4dp"
77
+
android:outlineProvider="none"
78
+
android:translationZ="@dimen/settings_card_elevation"
78
79
app:layout_constraintTop_toBottomOf="@id/tvItemSettingsTitle" />
79
80
80
81
</androidx.constraintlayout.widget.ConstraintLayout>
+5
-4
features/feature_settings/src/main/res/layout/item_settings_selector.xml
+5
-4
features/feature_settings/src/main/res/layout/item_settings_selector.xml
···
22
22
android:layout_marginTop="12dp"
23
23
android:paddingTop="0dp"
24
24
android:paddingBottom="0dp"
25
-
android:translationZ="4dp"
25
+
android:translationZ="@dimen/settings_card_elevation"
26
26
app:layout_constraintBottom_toTopOf="@id/tvItemSettingsSubtitle"
27
27
app:layout_constraintEnd_toStartOf="@id/groupItemSettingsSelector"
28
28
app:layout_constraintStart_toStartOf="parent"
···
36
36
android:layout_height="wrap_content"
37
37
android:layout_marginStart="4dp"
38
38
android:paddingBottom="0dp"
39
-
android:translationZ="4dp"
39
+
android:translationZ="@dimen/settings_card_elevation"
40
40
android:visibility="gone"
41
41
app:layout_constraintEnd_toStartOf="@id/groupItemSettingsSelector"
42
42
app:layout_constraintStart_toStartOf="parent"
···
52
52
android:layout_marginTop="12dp"
53
53
android:layout_marginEnd="4dp"
54
54
android:orientation="horizontal"
55
-
android:translationZ="4dp"
55
+
android:translationZ="@dimen/settings_card_elevation"
56
56
app:layout_constraintEnd_toEndOf="parent"
57
57
app:layout_constraintTop_toTopOf="parent">
58
58
···
87
87
style="@style/SettingsDivider"
88
88
android:layout_width="match_parent"
89
89
android:layout_marginHorizontal="12dp"
90
-
android:translationZ="4dp"
90
+
android:outlineProvider="none"
91
+
android:translationZ="@dimen/settings_card_elevation"
91
92
app:layout_constraintTop_toBottomOf="@id/spaceItemSettingsBottom" />
92
93
93
94
</androidx.constraintlayout.widget.ConstraintLayout>
+5
-4
features/feature_settings/src/main/res/layout/item_settings_spinner.xml
+5
-4
features/feature_settings/src/main/res/layout/item_settings_spinner.xml
···
19
19
android:layout_width="0dp"
20
20
android:layout_height="wrap_content"
21
21
android:layout_marginStart="4dp"
22
-
android:translationZ="4dp"
22
+
android:translationZ="@dimen/settings_card_elevation"
23
23
app:layout_constraintEnd_toEndOf="parent"
24
24
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsValue"
25
25
app:layout_constraintStart_toStartOf="parent"
···
35
35
android:paddingStart="8dp"
36
36
android:paddingEnd="8dp"
37
37
android:textColor="?appTextPrimaryColor"
38
-
android:translationZ="4dp"
38
+
android:translationZ="@dimen/settings_card_elevation"
39
39
app:layout_constraintBottom_toBottomOf="@id/spinnerItemSettings"
40
40
app:layout_constraintEnd_toEndOf="@id/spinnerItemSettings"
41
41
app:layout_constraintTop_toTopOf="@id/spinnerItemSettings"
···
46
46
android:layout_width="wrap_content"
47
47
android:layout_height="0dp"
48
48
android:layout_marginEnd="12dp"
49
-
android:translationZ="4dp"
49
+
android:translationZ="@dimen/settings_card_elevation"
50
50
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
51
51
app:layout_constraintEnd_toEndOf="parent"
52
52
app:layout_constraintTop_toTopOf="@id/tvItemSettingsTitle" />
···
56
56
style="@style/SettingsDivider"
57
57
android:layout_width="match_parent"
58
58
android:layout_marginHorizontal="12dp"
59
-
android:translationZ="4dp"
59
+
android:outlineProvider="none"
60
+
android:translationZ="@dimen/settings_card_elevation"
60
61
app:layout_constraintTop_toBottomOf="@id/tvItemSettingsTitle" />
61
62
62
63
</androidx.constraintlayout.widget.ConstraintLayout>
+6
-5
features/feature_settings/src/main/res/layout/item_settings_spinner_even.xml
+6
-5
features/feature_settings/src/main/res/layout/item_settings_spinner_even.xml
···
19
19
android:layout_width="0dp"
20
20
android:layout_height="wrap_content"
21
21
android:layout_marginStart="4dp"
22
-
android:translationZ="4dp"
22
+
android:translationZ="@dimen/settings_card_elevation"
23
23
app:layout_constraintEnd_toEndOf="parent"
24
24
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsValue"
25
25
app:layout_constraintStart_toStartOf="parent"
···
35
35
android:paddingStart="8dp"
36
36
android:paddingEnd="8dp"
37
37
android:textColor="?appTextPrimaryColor"
38
-
android:translationZ="4dp"
39
-
app:layout_constraintStart_toEndOf="@id/tvItemSettingsTitle"
38
+
android:translationZ="@dimen/settings_card_elevation"
40
39
app:layout_constraintBottom_toBottomOf="@id/spinnerItemSettings"
41
40
app:layout_constraintEnd_toEndOf="@id/spinnerItemSettings"
41
+
app:layout_constraintStart_toEndOf="@id/tvItemSettingsTitle"
42
42
app:layout_constraintTop_toTopOf="@id/spinnerItemSettings"
43
43
tools:text="@string/settings_dark_mode_system" />
44
44
···
47
47
android:layout_width="wrap_content"
48
48
android:layout_height="0dp"
49
49
android:layout_marginEnd="12dp"
50
-
android:translationZ="4dp"
50
+
android:translationZ="@dimen/settings_card_elevation"
51
51
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
52
52
app:layout_constraintEnd_toEndOf="parent"
53
53
app:layout_constraintTop_toTopOf="@id/tvItemSettingsTitle" />
···
57
57
style="@style/SettingsDivider"
58
58
android:layout_width="match_parent"
59
59
android:layout_marginHorizontal="12dp"
60
-
android:translationZ="4dp"
60
+
android:outlineProvider="none"
61
+
android:translationZ="@dimen/settings_card_elevation"
61
62
app:layout_constraintTop_toBottomOf="@id/tvItemSettingsTitle" />
62
63
63
64
</androidx.constraintlayout.widget.ConstraintLayout>
+5
-4
features/feature_settings/src/main/res/layout/item_settings_spinner_not_checkable.xml
+5
-4
features/feature_settings/src/main/res/layout/item_settings_spinner_not_checkable.xml
···
19
19
android:layout_width="0dp"
20
20
android:layout_height="wrap_content"
21
21
android:layout_marginStart="4dp"
22
-
android:translationZ="4dp"
22
+
android:translationZ="@dimen/settings_card_elevation"
23
23
app:layout_constraintEnd_toEndOf="parent"
24
24
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsValue"
25
25
app:layout_constraintStart_toStartOf="parent"
···
35
35
android:paddingStart="8dp"
36
36
android:paddingEnd="8dp"
37
37
android:textColor="?appTextPrimaryColor"
38
-
android:translationZ="4dp"
38
+
android:translationZ="@dimen/settings_card_elevation"
39
39
app:layout_constraintBottom_toBottomOf="@id/spinnerItemSettings"
40
40
app:layout_constraintEnd_toEndOf="@id/spinnerItemSettings"
41
41
app:layout_constraintTop_toTopOf="@id/spinnerItemSettings"
···
46
46
android:layout_width="wrap_content"
47
47
android:layout_height="0dp"
48
48
android:layout_marginEnd="12dp"
49
-
android:translationZ="4dp"
49
+
android:translationZ="@dimen/settings_card_elevation"
50
50
app:customSpinnerCheckable="false"
51
51
app:layout_constraintBottom_toBottomOf="@id/tvItemSettingsTitle"
52
52
app:layout_constraintEnd_toEndOf="parent"
···
57
57
style="@style/SettingsDivider"
58
58
android:layout_width="match_parent"
59
59
android:layout_marginHorizontal="12dp"
60
-
android:translationZ="4dp"
60
+
android:outlineProvider="none"
61
+
android:translationZ="@dimen/settings_card_elevation"
61
62
app:layout_constraintBottom_toBottomOf="parent" />
62
63
63
64
</androidx.constraintlayout.widget.ConstraintLayout>
+3
-2
features/feature_settings/src/main/res/layout/item_settings_text.xml
+3
-2
features/feature_settings/src/main/res/layout/item_settings_text.xml
···
22
22
android:clickable="true"
23
23
android:focusable="true"
24
24
android:orientation="vertical"
25
-
android:translationZ="4dp"
25
+
android:translationZ="@dimen/settings_card_elevation"
26
26
app:layout_constraintTop_toTopOf="parent">
27
27
28
28
<Space
···
73
73
style="@style/SettingsDivider"
74
74
android:layout_width="match_parent"
75
75
android:layout_marginHorizontal="12dp"
76
-
android:translationZ="4dp"
76
+
android:outlineProvider="none"
77
+
android:translationZ="@dimen/settings_card_elevation"
77
78
app:layout_constraintTop_toBottomOf="@id/layoutItemSettingsText" />
78
79
79
80
</androidx.constraintlayout.widget.ConstraintLayout>
+2
-2
features/feature_settings/src/main/res/layout/item_settings_translator.xml
+2
-2
features/feature_settings/src/main/res/layout/item_settings_translator.xml
···
19
19
android:layout_width="0dp"
20
20
android:layout_height="wrap_content"
21
21
android:layout_marginStart="4dp"
22
-
android:translationZ="4dp"
22
+
android:translationZ="@dimen/settings_card_elevation"
23
23
app:layout_constraintBottom_toBottomOf="parent"
24
24
app:layout_constraintEnd_toStartOf="@id/tvItemSettingsTranslatorsLanguage"
25
25
app:layout_constraintStart_toStartOf="parent"
···
33
33
android:layout_height="wrap_content"
34
34
android:layout_marginEnd="4dp"
35
35
android:gravity="end"
36
-
android:translationZ="4dp"
36
+
android:translationZ="@dimen/settings_card_elevation"
37
37
app:layout_constraintBottom_toBottomOf="parent"
38
38
app:layout_constraintEnd_toEndOf="parent"
39
39
app:layout_constraintStart_toEndOf="@id/tvItemSettingsTranslators"
+2
features/feature_settings/src/main/res/values/dimens.xml
+2
features/feature_settings/src/main/res/values/dimens.xml
···
3
3
<dimen name="settings_background_height">14dp</dimen>
4
4
<dimen name="settings_background_bottom_shift">-14dp</dimen>
5
5
<dimen name="settings_background_height_double">28dp</dimen>
6
+
<!-- One dp bigger than background card elevation -->
7
+
<dimen name="settings_card_elevation">5dp</dimen>
6
8
</resources>