Skip to content

Commit 43545fa

Browse files
vrihvrih
committed
Follow material guidelines for side padding
Fixes #778
1 parent 0a4f621 commit 43545fa

10 files changed

+195
-187
lines changed

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

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="fill_parent"
44
android:layout_height="wrap_content"
5-
android:orientation="horizontal">
5+
android:orientation="horizontal"
6+
android:paddingLeft="16dp"
7+
android:paddingRight="16dp">
68

79
<TextView
810
android:id="@+id/item_name"
@@ -13,17 +15,13 @@
1315
android:background="@android:color/transparent"
1416
android:textColor="?attr/colorAccent"
1517
android:textStyle="bold"
16-
android:paddingLeft="6dp"
17-
android:paddingRight="6dp"
1818
android:paddingTop="8dp"
1919
android:paddingBottom="8dp"/>
2020

2121
<CheckBox
2222
android:id="@+id/item_checkbox"
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
25-
android:text="@string/main.albums_per_folder"
26-
android:layout_marginRight="6dp"
27-
android:layout_gravity="right"
25+
android:layout_gravity="end|center_vertical"
2826
android:textColor="?android:textColorPrimary"/>
29-
</LinearLayout>
27+
</LinearLayout>

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:orientation="horizontal"
43
android:layout_width="fill_parent"
54
android:layout_height="wrap_content"
6-
android:background="?attr/selectableItemBackground">
5+
android:background="?attr/selectableItemBackground"
6+
android:orientation="horizontal"
7+
android:paddingLeft="16dp"
8+
android:paddingRight="16dp">
79

810
<TextView
911
android:id="@+id/item_name"
1012
android:layout_width="0dip"
1113
android:layout_height="?android:attr/listPreferredItemHeight"
1214
android:layout_weight="1"
13-
android:textAppearance="?android:attr/textAppearanceMedium"
14-
android:gravity="left|center_vertical"
15-
android:paddingLeft="6dip"
16-
android:paddingRight="6dip"
1715
android:background="@android:color/transparent"
18-
android:textColor="?android:textColorPrimary"/>
16+
android:gravity="left|center_vertical"
17+
android:textAppearance="?android:attr/textAppearanceMedium"
18+
android:textColor="?android:textColorPrimary" />
1919

2020
<CheckBox
2121
android:id="@+id/item_checkbox"
22+
style="@style/MoreButton"
2223
android:layout_width="wrap_content"
2324
android:layout_height="fill_parent"
2425
android:layout_gravity="right|center_vertical"
25-
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
26-
style="@style/MoreButton"/>
26+
android:checkMark="?android:attr/listChoiceIndicatorMultiple" />
2727
</LinearLayout>

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

+12-13
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,34 @@
33
android:layout_width="fill_parent"
44
android:layout_height="wrap_content"
55
android:background="?attr/selectableItemBackground"
6-
android:minHeight="50dip">
6+
android:minHeight="50dip"
7+
android:paddingLeft="16dp"
8+
android:paddingRight="16dp">
79

810
<TextView
911
android:id="@+id/basic_count_name"
1012
android:layout_width="wrap_content"
1113
android:layout_height="fill_parent"
12-
android:textAppearance="?android:attr/textAppearanceMedium"
13-
android:gravity="left|center_vertical"
14-
android:paddingLeft="6dip"
15-
android:paddingRight="6dip"
1614
android:background="@android:color/transparent"
15+
android:gravity="left|center_vertical"
1716
android:text="Text"
18-
android:textColor="?android:textColorPrimary"/>
17+
android:textAppearance="?android:attr/textAppearanceMedium"
18+
android:textColor="?android:textColorPrimary" />
1919

2020
<TextView
2121
android:id="@+id/basic_count_count"
2222
android:layout_width="32dp"
2323
android:layout_height="32dp"
24+
android:layout_gravity="center_vertical"
25+
android:layout_marginLeft="20px"
2426
android:layout_marginRight="12dp"
27+
android:layout_marginBottom="4px"
2528
android:background="@drawable/ic_number_border"
2629
android:focusable="false"
27-
android:paddingRight="10dp"
28-
android:layout_marginLeft="20px"
29-
android:layout_marginBottom="4px"
30+
android:gravity="right|center_vertical"
3031
android:text="99"
3132
android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
32-
android:textSize="11sp"
33-
android:gravity="right|center_vertical"
34-
android:layout_gravity="center_vertical"
3533
android:textColor="?android:textColorPrimary"
36-
android:visibility="gone"/>
34+
android:textSize="11sp"
35+
android:visibility="gone" />
3736
</LinearLayout>

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

+19-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:id="@+id/item_name"
4-
android:layout_width="fill_parent"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:textAppearance="?android:attr/textAppearanceMedium"
7-
android:background="@android:color/transparent"
8-
android:textColor="?attr/colorAccent"
9-
android:textStyle="bold"
10-
android:paddingLeft="6dp"
11-
android:paddingRight="6dp"
12-
android:paddingTop="8dp"
13-
android:paddingBottom="8dp"/>
6+
android:background="?attr/selectableItemBackground"
7+
android:orientation="horizontal"
8+
android:paddingLeft="16dp"
9+
android:paddingRight="16dp">
10+
11+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
12+
android:id="@+id/item_name"
13+
android:layout_width="match_parent"
14+
android:layout_height="wrap_content"
15+
android:background="@android:color/transparent"
16+
android:paddingTop="8dp"
17+
android:paddingBottom="8dp"
18+
android:textAppearance="?android:attr/textAppearanceMedium"
19+
android:textColor="?attr/colorAccent"
20+
android:textStyle="bold" />
21+
</LinearLayout>

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

+20-21
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:orientation="horizontal"
4-
android:layout_width="fill_parent"
3+
android:layout_width="match_parent"
54
android:layout_height="wrap_content"
6-
android:background="?attr/selectableItemBackground">
5+
android:background="?attr/selectableItemBackground"
6+
android:orientation="horizontal"
7+
android:paddingLeft="16dp"
8+
android:paddingRight="16dp">
79

8-
<TextView
9-
android:id="@+id/item_name"
10-
android:layout_width="0dip"
11-
android:layout_height="wrap_content"
12-
android:layout_weight="1"
13-
android:textAppearance="?android:attr/textAppearanceMedium"
14-
android:gravity="left|center_vertical"
15-
android:paddingLeft="6dip"
16-
android:paddingRight="6dip"
17-
android:minHeight="50dip"
18-
android:background="@android:color/transparent"
19-
android:textColor="?android:textColorPrimary"/>
10+
<TextView
11+
android:id="@+id/item_name"
12+
android:layout_width="wrap_content"
13+
android:layout_height="wrap_content"
14+
android:background="@android:color/transparent"
15+
android:gravity="center_vertical|start"
16+
android:minHeight="50dip"
17+
android:textAppearance="?android:attr/textAppearanceMedium"
18+
android:textColor="?android:textColorPrimary" />
2019

2120
<ImageButton
2221
android:id="@+id/item_star"
2322
android:layout_width="@dimen/Star.Small"
2423
android:layout_height="@dimen/Star.Small"
25-
android:scaleType="fitCenter"
26-
android:layout_gravity="right|center_vertical"
24+
android:layout_gravity="center_vertical|end"
2725
android:background="@android:color/transparent"
2826
android:focusable="false"
29-
android:visibility="gone"/>
27+
android:scaleType="fitCenter"
28+
android:visibility="gone" />
3029

3130
<ImageView
3231
android:id="@+id/item_more"
33-
android:src="?attr/download_none"
32+
style="@style/MoreButton"
3433
android:layout_width="wrap_content"
3534
android:layout_height="fill_parent"
36-
android:layout_gravity="right|center_vertical"
37-
style="@style/MoreButton"/>
35+
android:layout_gravity="center_vertical|end"
36+
android:src="?attr/download_none" />
3837
</LinearLayout>

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

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,52 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:orientation="horizontal"
43
android:layout_width="fill_parent"
54
android:layout_height="?android:attr/listPreferredItemHeight"
6-
android:background="?attr/selectableItemBackground">
5+
android:background="?attr/selectableItemBackground"
6+
android:orientation="horizontal"
7+
android:paddingLeft="16dp"
8+
android:paddingRight="16dp">
79

8-
<LinearLayout android:orientation="vertical"
10+
<LinearLayout
911
android:layout_width="0dip"
1012
android:layout_height="wrap_content"
11-
android:layout_weight="1"
1213
android:layout_gravity="center_vertical"
13-
android:paddingLeft="6dip"
14-
android:paddingRight="6dip"
15-
android:gravity="left|center_vertical">
14+
android:layout_weight="1"
15+
android:gravity="left|center_vertical"
16+
android:orientation="vertical">
1617

1718
<TextView
1819
android:id="@+id/item_name"
1920
android:layout_width="fill_parent"
2021
android:layout_height="wrap_content"
21-
android:textAppearance="?android:attr/textAppearanceMedium"
2222
android:background="@android:color/transparent"
23-
android:textColor="?android:textColorPrimary"/>
23+
android:textAppearance="?android:attr/textAppearanceMedium"
24+
android:textColor="?android:textColorPrimary" />
2425

2526
<TextView
2627
android:id="@+id/item_description"
2728
android:layout_width="fill_parent"
2829
android:layout_height="wrap_content"
29-
android:textAppearance="?android:attr/textAppearanceSmall"
3030
android:background="@android:color/transparent"
31-
android:textColor="?android:textColorSecondary"/>
31+
android:textAppearance="?android:attr/textAppearanceSmall"
32+
android:textColor="?android:textColorSecondary" />
3233
</LinearLayout>
3334

3435
<ImageButton
3536
android:id="@+id/item_star"
3637
android:layout_width="@dimen/Star.Small"
3738
android:layout_height="@dimen/Star.Small"
38-
android:scaleType="fitCenter"
3939
android:layout_gravity="right|center_vertical"
4040
android:background="@android:color/transparent"
4141
android:focusable="false"
42-
android:visibility="gone"/>
42+
android:scaleType="fitCenter"
43+
android:visibility="gone" />
4344

4445
<ImageView
4546
android:id="@+id/item_more"
46-
android:src="?attr/download_none"
47+
style="@style/MoreButton"
4748
android:layout_width="wrap_content"
4849
android:layout_height="fill_parent"
4950
android:layout_gravity="right|center_vertical"
50-
style="@style/MoreButton"/>
51+
android:src="?attr/download_none" />
5152
</LinearLayout>

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

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:orientation="horizontal"
43
android:layout_width="match_parent"
54
android:layout_height="match_parent"
6-
android:padding="8dp">
5+
android:orientation="horizontal"
6+
android:padding="8dp"
7+
android:paddingLeft="16dp"
8+
android:paddingRight="16dp">
79

810
<TextView
911
android:id="@+id/detail_name"
1012
android:layout_width="0dip"
1113
android:layout_height="wrap_content"
14+
android:layout_gravity="center_vertical"
1215
android:layout_weight="1"
13-
android:textAppearance="?android:attr/textAppearanceMedium"
14-
android:textColor="?android:textColorPrimary"
1516
android:paddingLeft="14dp"
16-
android:layout_gravity="center_vertical"/>
17+
android:textAppearance="?android:attr/textAppearanceMedium"
18+
android:textColor="?android:textColorPrimary" />
1719

1820
<TextView
1921
android:id="@+id/detail_value"
2022
android:layout_width="0dip"
2123
android:layout_height="wrap_content"
24+
android:layout_gravity="center_vertical"
2225
android:layout_weight="1"
23-
android:textAppearance="?android:attr/textAppearanceSmall"
24-
android:textColor="?android:textColorSecondary"
2526
android:paddingLeft="14dp"
26-
android:layout_gravity="center_vertical"/>
27+
android:textAppearance="?android:attr/textAppearanceSmall"
28+
android:textColor="?android:textColorSecondary" />
2729

2830
</LinearLayout>

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="fill_parent"
44
android:layout_height="wrap_content"
5+
android:paddingLeft="16dp"
6+
android:paddingRight="16dp"
57
android:orientation="horizontal">
68

79
<TextView
@@ -13,8 +15,6 @@
1315
android:background="@android:color/transparent"
1416
android:textColor="?attr/colorAccent"
1517
android:textStyle="bold"
16-
android:paddingLeft="6dp"
17-
android:paddingRight="6dp"
1818
android:paddingTop="8dp"
1919
android:paddingBottom="8dp"/>
2020

@@ -25,8 +25,6 @@
2525
android:layout_width="wrap_content"
2626
android:layout_height="wrap_content"
2727
android:paddingRight="10dp"
28-
android:paddingLeft="10dp"
29-
android:paddingTop="10dp"
3028
android:background="?attr/selectableItemBackgroundBorderless"
3129
android:clickable="true"/>
32-
</LinearLayout>
30+
</LinearLayout>

0 commit comments

Comments
 (0)