Skip to content

Commit 96a334e

Browse files
khwolfkhwolf
authored
chore: use dimension for most layout distances (#201)
1 parent 41bdc8f commit 96a334e

17 files changed

Lines changed: 156 additions & 174 deletions

‎app/src/main/res/layout/add_app_fragment.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
android:id="@+id/add_app_fragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:layout_marginTop="@dimen/_8sdp"
9-
android:layout_marginStart="@dimen/_16sdp"
10-
android:layout_marginEnd="@dimen/_16sdp"
8+
android:layout_marginTop="@dimen/margin_top_small"
9+
android:layout_marginStart="@dimen/margin_sides"
10+
android:layout_marginEnd="@dimen/margin_sides"
1111
tools:context=".ui.options.AddAppFragment">
1212

1313
<EditText
@@ -40,7 +40,7 @@
4040
style="?android:attr/progressBarStyle"
4141
android:layout_width="wrap_content"
4242
android:layout_height="wrap_content"
43-
android:layout_marginTop="8dp"
43+
android:layout_marginTop="@dimen/margin_top_small"
4444
app:layout_constraintBottom_toBottomOf="parent"
4545
app:layout_constraintEnd_toEndOf="parent"
4646
app:layout_constraintStart_toStartOf="parent"

‎app/src/main/res/layout/add_app_fragment_list_item.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:id="@+id/aa_list_item_app_name"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:padding="6dp"
6+
android:padding="@dimen/padding"
77
android:stateListAnimator="@xml/animate_scale"
88
android:textAppearance="@style/TextAppearance.AppCompat"
99
android:textSize="@dimen/font_size_apps_list_item">

‎app/src/main/res/layout/app_drawer_fragment_header_item.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
android:layout_width="wrap_content"
1111
android:layout_height="wrap_content"
1212
android:layout_gravity="end"
13-
android:padding="6dp"
13+
android:padding="@dimen/padding"
1414
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
1515
android:textSize="@dimen/font_size_customize_group_header"
1616
tools:text="A" />
1717

1818
<View
1919
android:id="@+id/divider"
20-
android:layout_marginStart="6dp"
21-
android:layout_marginEnd="6dp"
20+
android:layout_marginStart="@dimen/margin_sides_small"
21+
android:layout_marginEnd="@dimen/margin_sides_small"
2222
android:layout_width="match_parent"
2323
android:layout_height="0dp"
2424
android:layout_weight="1"

‎app/src/main/res/layout/customise_apps_fragment.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
android:id="@+id/customise_apps_fragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:layout_marginTop="@dimen/_8sdp"
9-
android:layout_marginStart="@dimen/_16sdp"
10-
android:layout_marginEnd="@dimen/_16sdp"
8+
android:layout_marginTop="@dimen/margin_top_small"
9+
android:layout_marginStart="@dimen/margin_sides"
10+
android:layout_marginEnd="@dimen/margin_sides"
1111
tools:context=".ui.options.CustomiseAppsFragment">
1212

1313
<ImageView
1414
android:id="@+id/customise_apps_fragment_back"
1515
android:layout_width="wrap_content"
1616
android:layout_height="wrap_content"
17-
android:padding="@dimen/_8ssp"
17+
android:padding="@dimen/padding"
1818
android:paddingStart="0dp"
1919
app:layout_constraintTop_toTopOf="parent"
2020
app:layout_constraintStart_toStartOf="parent"
@@ -36,7 +36,7 @@
3636
android:id="@+id/customise_apps_fragment_list"
3737
android:layout_width="0dp"
3838
android:layout_height="0dp"
39-
android:layout_marginTop="8dp"
39+
android:layout_marginTop="@dimen/margin_top_small"
4040
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
4141
app:layout_constraintEnd_toEndOf="parent"
4242
app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +48,7 @@
4848
android:id="@+id/customise_apps_fragment_add"
4949
android:layout_width="wrap_content"
5050
android:layout_height="wrap_content"
51-
android:layout_marginBottom="8dp"
51+
android:layout_marginBottom="@dimen/margin_bottom_small"
5252
android:padding="@dimen/_12sdp"
5353
android:text="@string/customise_apps_fragment_add"
5454
android:textAppearance="@style/TextAppearance.AppCompat"
@@ -59,7 +59,7 @@
5959
android:id="@+id/customise_apps_fragment_remove_all"
6060
android:layout_width="wrap_content"
6161
android:layout_height="wrap_content"
62-
android:layout_marginBottom="8dp"
62+
android:layout_marginBottom="@dimen/margin_bottom_small"
6363
android:text="@string/customise_apps_fragment_remove_all"
6464
android:padding="@dimen/_12sdp"
6565
android:textSize="@dimen/font_size_add_apps_action"

‎app/src/main/res/layout/customise_apps_fragment_list_item.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:layout_marginTop="6dp"
8-
android:layout_marginBottom="6dp">
7+
android:layout_marginTop="@dimen/margin_top_small"
8+
android:layout_marginBottom="@dimen/margin_bottom_small">
99

1010
<TextView
1111
android:id="@+id/ca_list_item_drag_handle"
1212
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content"
14-
android:padding="8dp"
15-
android:paddingStart="12dp"
16-
android:paddingLeft="12dp"
17-
android:paddingEnd="12dp"
18-
android:paddingRight="12dp"
14+
android:padding="@dimen/padding"
15+
android:paddingStart="@dimen/padding"
16+
android:paddingEnd="@dimen/padding"
1917
android:text="="
2018
android:textAppearance="@style/TextAppearance.AppCompat"
2119
android:textSize="@dimen/font_size_customize_apps_list_item"
@@ -42,7 +40,7 @@
4240
android:id="@+id/ca_list_item_more_icon"
4341
android:layout_width="wrap_content"
4442
android:layout_height="wrap_content"
45-
android:padding="8dp"
43+
android:padding="@dimen/padding"
4644
app:layout_constraintBottom_toBottomOf="@+id/ca_list_item_app_name"
4745
app:layout_constraintEnd_toEndOf="parent"
4846
app:layout_constraintTop_toTopOf="@+id/ca_list_item_app_name"

‎app/src/main/res/layout/customize_app_drawer_app_list_fragment.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
android:id="@+id/customize_app_drawer_fragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:layout_marginStart="@dimen/_16sdp"
9-
android:layout_marginEnd="@dimen/_16sdp"
10-
android:layout_marginTop="@dimen/_8sdp"
8+
android:layout_marginStart="@dimen/margin_sides"
9+
android:layout_marginEnd="@dimen/margin_sides"
10+
android:layout_marginTop="@dimen/margin_top_small"
1111
tools:context=".ui.options.CustomizeAppDrawerFragment">
1212

1313
<ImageView
1414
android:id="@+id/customize_app_drawer_fragment_back"
1515
android:layout_width="wrap_content"
1616
android:layout_height="wrap_content"
17-
android:padding="@dimen/_8ssp"
17+
android:padding="@dimen/padding"
1818
android:paddingStart="0dp"
1919
app:layout_constraintTop_toTopOf="parent"
2020
app:layout_constraintStart_toStartOf="parent"
@@ -37,7 +37,7 @@
3737
android:id="@+id/customize_app_drawer_fragment_app_list"
3838
android:layout_width="0dp"
3939
android:layout_height="0dp"
40-
android:layout_marginTop="@dimen/_16sdp"
40+
android:layout_marginTop="@dimen/margin_top"
4141
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
4242
app:layout_constraintBottom_toBottomOf="parent"
4343
app:layout_constraintEnd_toEndOf="parent"
@@ -50,7 +50,7 @@
5050
style="?android:attr/progressBarStyle"
5151
android:layout_width="wrap_content"
5252
android:layout_height="wrap_content"
53-
android:layout_marginTop="8dp"
53+
android:layout_marginTop="@dimen/margin_top_small"
5454
app:layout_constraintBottom_toBottomOf="parent"
5555
app:layout_constraintEnd_toEndOf="parent"
5656
app:layout_constraintStart_toStartOf="parent"

‎app/src/main/res/layout/customize_app_drawer_fragment.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
android:id="@+id/customize_app_drawer_fragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:layout_marginStart="@dimen/_16sdp"
9-
android:layout_marginEnd="@dimen/_16sdp"
10-
android:layout_marginTop="@dimen/_8sdp"
8+
android:layout_marginStart="@dimen/margin_sides"
9+
android:layout_marginEnd="@dimen/margin_sides"
10+
android:layout_marginTop="@dimen/margin_top_small"
1111
tools:context=".ui.options.CustomizeAppDrawerFragment">
1212

1313
<ImageView
1414
android:id="@+id/customize_app_drawer_fragment_back"
1515
android:layout_width="wrap_content"
1616
android:layout_height="wrap_content"
17-
android:padding="@dimen/_8ssp"
17+
android:padding="@dimen/padding"
1818
android:paddingStart="0dp"
1919
app:layout_constraintTop_toTopOf="parent"
2020
app:layout_constraintStart_toStartOf="parent"
@@ -37,7 +37,7 @@
3737
android:layout_width="match_parent"
3838
android:layout_height="0dp"
3939
android:layout_marginTop="@dimen/margin_list_items"
40-
android:layout_marginStart="@dimen/_8sdp"
40+
android:layout_marginStart="@dimen/margin_sides_small"
4141
android:overScrollMode="ifContentScrolls"
4242
android:scrollbars="none"
4343
app:layout_constraintTop_toBottomOf="@id/customize_app_drawer_title">

‎app/src/main/res/layout/customize_app_drawer_fragment_app_list_item.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
android:id="@+id/customize_app_drawer_fragment_app_list_item"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:padding="6dp"
6+
android:padding="@dimen/padding"
77
android:textAppearance="@style/TextAppearance.AppCompat"
88
android:textSize="@dimen/font_size_visible_app_list_item" />

‎app/src/main/res/layout/customize_app_drawer_fragment_search_field_options.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/customize_app_drawer_fragment_search_field_options"
6-
android:layout_marginStart="@dimen/_16sdp"
7-
android:layout_marginEnd="@dimen/_16sdp"
8-
android:layout_marginTop="@dimen/_8sdp"
6+
android:layout_marginStart="@dimen/margin_sides"
7+
android:layout_marginEnd="@dimen/margin_sides"
8+
android:layout_marginTop="@dimen/margin_top_small"
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"
1111
tools:context=".ui.options.CustomizeSearchFieldFragment">
@@ -14,7 +14,7 @@
1414
android:id="@+id/customise_apps_fragment_back"
1515
android:layout_width="wrap_content"
1616
android:layout_height="wrap_content"
17-
android:padding="@dimen/_8ssp"
17+
android:padding="@dimen/padding"
1818
android:paddingStart="0dp"
1919
app:layout_constraintTop_toTopOf="parent"
2020
app:layout_constraintStart_toStartOf="parent"
@@ -36,8 +36,8 @@
3636
<ScrollView
3737
android:layout_width="match_parent"
3838
android:layout_height="0dp"
39-
android:layout_marginTop="@dimen/_16sdp"
40-
android:layout_marginStart="@dimen/_8sdp"
39+
android:layout_marginTop="@dimen/margin_top"
40+
android:layout_marginStart="@dimen/margin_sides_small"
4141
android:overScrollMode="ifContentScrolls"
4242
android:scrollbars="none"
4343
app:layout_constraintTop_toBottomOf="@id/customise_apps_fragment_title">

‎app/src/main/res/layout/customize_quick_buttons_fragment.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
android:id="@+id/customize_quick_buttons_fragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
android:layout_marginStart="@dimen/_16sdp"
9-
android:layout_marginEnd="@dimen/_16sdp"
10-
android:layout_marginTop="@dimen/_8sdp"
8+
android:layout_marginStart="@dimen/margin_sides"
9+
android:layout_marginEnd="@dimen/margin_sides"
10+
android:layout_marginTop="@dimen/margin_top_small"
1111
tools:context=".ui.options.CustomizeQuickButtonsFragment">
1212

1313
<ImageView
1414
android:id="@+id/customize_quick_buttons_fragment_back"
1515
android:layout_width="wrap_content"
1616
android:layout_height="wrap_content"
17-
android:padding="@dimen/_8ssp"
17+
android:padding="@dimen/padding"
1818
android:paddingStart="0dp"
1919
app:layout_constraintTop_toTopOf="parent"
2020
app:layout_constraintStart_toStartOf="parent"
@@ -36,9 +36,9 @@
3636
android:id="@+id/customize_quick_buttons_fragment_left"
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
39-
android:layout_marginStart="@dimen/_8sdp"
40-
android:layout_marginBottom="@dimen/_8sdp"
41-
android:padding="@dimen/_8sdp"
39+
android:layout_marginStart="@dimen/margin_sides_small"
40+
android:layout_marginBottom="@dimen/margin_bottom_small"
41+
android:padding="@dimen/padding"
4242
android:background="@layout/imageview_border"
4343
app:layout_constraintBottom_toBottomOf="parent"
4444
app:layout_constraintStart_toStartOf="parent"
@@ -48,9 +48,9 @@
4848
android:id="@+id/customize_quick_buttons_fragment_center"
4949
android:layout_width="wrap_content"
5050
android:layout_height="wrap_content"
51-
android:layout_marginBottom="@dimen/_8sdp"
51+
android:layout_marginBottom="@dimen/margin_bottom_small"
5252
android:alpha="1"
53-
android:padding="@dimen/_8sdp"
53+
android:padding="@dimen/padding"
5454
android:background="@layout/imageview_border"
5555
app:layout_constraintBottom_toBottomOf="parent"
5656
app:layout_constraintEnd_toStartOf="@+id/customize_quick_buttons_fragment_right"
@@ -61,9 +61,9 @@
6161
android:id="@+id/customize_quick_buttons_fragment_right"
6262
android:layout_width="wrap_content"
6363
android:layout_height="wrap_content"
64-
android:layout_marginEnd="@dimen/_8sdp"
65-
android:layout_marginBottom="@dimen/_8sdp"
66-
android:padding="@dimen/_8sdp"
64+
android:layout_marginEnd="@dimen/margin_sides_small"
65+
android:layout_marginBottom="@dimen/margin_bottom_small"
66+
android:padding="@dimen/padding"
6767
android:background="@layout/imageview_border"
6868
app:layout_constraintBottom_toBottomOf="parent"
6969
app:layout_constraintEnd_toEndOf="parent"

0 commit comments

Comments
 (0)