Skip to content

Commit

Permalink
Follow material guidelines for side padding
Browse files Browse the repository at this point in the history 
Fixes #778
  • Loading branch information
@vrih
vrih committed Dec 9, 2018
1 parent 2b26df3 commit 399e861
Show file tree
Hide file tree
Showing 10 changed files with 195 additions and 187 deletions.
12 changes: 5 additions & 7 deletions app/src/main/res/layout/album_list_header.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<TextView
android:id="@+id/item_name"
Expand All @@ -13,17 +15,13 @@
android:background="@android:color/transparent"
android:textColor="?attr/colorAccent"
android:textStyle="bold"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>

<CheckBox
android:id="@+id/item_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/main.albums_per_folder"
android:layout_marginRight="6dp"
android:layout_gravity="right"
android:layout_gravity="end|center_vertical"
android:textColor="?android:textColorPrimary"/>
</LinearLayout>
</LinearLayout>
18 changes: 9 additions & 9 deletions app/src/main/res/layout/basic_choice_item.xml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground">
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<TextView
android:id="@+id/item_name"
android:layout_width="0dip"
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="left|center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:background="@android:color/transparent"
android:textColor="?android:textColorPrimary"/>
android:gravity="left|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary" />

<CheckBox
android:id="@+id/item_checkbox"
style="@style/MoreButton"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
style="@style/MoreButton"/>
android:checkMark="?android:attr/listChoiceIndicatorMultiple" />
</LinearLayout>
25 changes: 12 additions & 13 deletions app/src/main/res/layout/basic_count_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,34 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="50dip">
android:minHeight="50dip"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<TextView
android:id="@+id/basic_count_name"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="left|center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:background="@android:color/transparent"
android:gravity="left|center_vertical"
android:text="Text"
android:textColor="?android:textColorPrimary"/>
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary" />

<TextView
android:id="@+id/basic_count_count"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20px"
android:layout_marginRight="12dp"
android:layout_marginBottom="4px"
android:background="@drawable/ic_number_border"
android:focusable="false"
android:paddingRight="10dp"
android:layout_marginLeft="20px"
android:layout_marginBottom="4px"
android:gravity="right|center_vertical"
android:text="99"
android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
android:textSize="11sp"
android:gravity="right|center_vertical"
android:layout_gravity="center_vertical"
android:textColor="?android:textColorPrimary"
android:visibility="gone"/>
android:textSize="11sp"
android:visibility="gone" />
</LinearLayout>
30 changes: 19 additions & 11 deletions app/src/main/res/layout/basic_header.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_name"
android:layout_width="fill_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@android:color/transparent"
android:textColor="?attr/colorAccent"
android:textStyle="bold"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?attr/colorAccent"
android:textStyle="bold" />
</LinearLayout>
41 changes: 20 additions & 21 deletions app/src/main/res/layout/basic_list_item.xml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground">
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<TextView
android:id="@+id/item_name"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="left|center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:minHeight="50dip"
android:background="@android:color/transparent"
android:textColor="?android:textColorPrimary"/>
<TextView
android:id="@+id/item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:gravity="center_vertical|start"
android:minHeight="50dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary" />

<ImageButton
android:id="@+id/item_star"
android:layout_width="@dimen/Star.Small"
android:layout_height="@dimen/Star.Small"
android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
android:layout_gravity="center_vertical|end"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>
android:scaleType="fitCenter"
android:visibility="gone" />

<ImageView
android:id="@+id/item_more"
android:src="?attr/download_none"
style="@style/MoreButton"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
style="@style/MoreButton"/>
android:layout_gravity="center_vertical|end"
android:src="?attr/download_none" />
</LinearLayout>
31 changes: 16 additions & 15 deletions app/src/main/res/layout/complex_list_item.xml
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:background="?attr/selectableItemBackground">
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<LinearLayout android:orientation="vertical"
<LinearLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:gravity="left|center_vertical">
android:layout_weight="1"
android:gravity="left|center_vertical"
android:orientation="vertical">

<TextView
android:id="@+id/item_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@android:color/transparent"
android:textColor="?android:textColorPrimary"/>
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary" />

<TextView
android:id="@+id/item_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:background="@android:color/transparent"
android:textColor="?android:textColorSecondary"/>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary" />
</LinearLayout>

<ImageButton
android:id="@+id/item_star"
android:layout_width="@dimen/Star.Small"
android:layout_height="@dimen/Star.Small"
android:scaleType="fitCenter"
android:layout_gravity="right|center_vertical"
android:background="@android:color/transparent"
android:focusable="false"
android:visibility="gone"/>
android:scaleType="fitCenter"
android:visibility="gone" />

<ImageView
android:id="@+id/item_more"
android:src="?attr/download_none"
style="@style/MoreButton"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
style="@style/MoreButton"/>
android:src="?attr/download_none" />
</LinearLayout>
18 changes: 10 additions & 8 deletions app/src/main/res/layout/details_item.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="8dp">
android:orientation="horizontal"
android:padding="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">

<TextView
android:id="@+id/detail_name"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary"
android:paddingLeft="14dp"
android:layout_gravity="center_vertical"/>
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary" />

<TextView
android:id="@+id/detail_value"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"
android:paddingLeft="14dp"
android:layout_gravity="center_vertical"/>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary" />

</LinearLayout>
8 changes: 3 additions & 5 deletions app/src/main/res/layout/expandable_header.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="horizontal">

<TextView
Expand All @@ -13,8 +15,6 @@
android:background="@android:color/transparent"
android:textColor="?attr/colorAccent"
android:textStyle="bold"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>

Expand All @@ -25,8 +25,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"/>
</LinearLayout>
</LinearLayout>
Loading

0 comments on commit 399e861

Please sign in to comment.