aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/abstract_recycler_fragment.xml3
-rw-r--r--app/src/main/res/layout/album_cell_item.xml143
-rw-r--r--app/src/main/res/layout/basic_cell_item.xml65
-rw-r--r--app/src/main/res/layout/fast_scroller.xml4
4 files changed, 116 insertions, 99 deletions
diff --git a/app/src/main/res/layout/abstract_recycler_fragment.xml b/app/src/main/res/layout/abstract_recycler_fragment.xml
index 0e0c87f4..2537d222 100644
--- a/app/src/main/res/layout/abstract_recycler_fragment.xml
+++ b/app/src/main/res/layout/abstract_recycler_fragment.xml
@@ -19,7 +19,8 @@
android:id="@+id/fragment_recycler"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:scrollbars="vertical"/>
+ android:scrollbars="vertical"
+ android:paddingRight="6dp"/>
<github.daneren2005.dsub.view.FastScroller
android:id="@+id/fragment_fast_scroller"
diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
index f6693a7f..524727a0 100644
--- a/app/src/main/res/layout/album_cell_item.xml
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -1,90 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/selectableItemBackground">
+ android:layout_margin="2dp">
- <RelativeLayout
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground">
- <github.daneren2005.dsub.view.SquareImageView
- android:id="@+id/album_coverart"
+ <RelativeLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <RatingBar
- android:id="@+id/album_rating"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:isIndicator="true"
- android:layout_centerHorizontal="true"
- android:numStars="5"
- style="@android:style/Widget.Holo.RatingBar.Small"
- android:layout_alignParentBottom="true"
- android:visibility="gone"/>
- </RelativeLayout>
+ <github.daneren2005.dsub.view.SquareImageView
+ android:id="@+id/album_coverart"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="4dp"
- android:paddingLeft="2dp">
+ <RatingBar
+ android:id="@+id/album_rating"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:isIndicator="true"
+ android:layout_centerHorizontal="true"
+ android:numStars="5"
+ style="@android:style/Widget.Holo.RatingBar.Small"
+ android:layout_alignParentBottom="true"
+ android:visibility="gone"/>
+ </RelativeLayout>
<LinearLayout
- android:layout_width="0dp"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:gravity="center_vertical"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/album_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:text="@string/search.albums"
- android:textColor="?android:textColorPrimary"/>
+ android:orientation="horizontal"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingLeft="2dp">
<LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center_vertical"
+ android:orientation="vertical">
<TextView
- android:id="@+id/album_artist"
- android:layout_width="0dp"
- android:layout_weight="1"
+ android:id="@+id/album_title"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="12sp"
- android:textColor="?android:textColorSecondary"
+ android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
- android:text="@string/search.artists"/>
+ android:ellipsize="marquee"
+ android:text="@string/search.albums"
+ android:textColor="?android:textColorPrimary"
+ android:paddingLeft="@dimen/Card.TextLeftPadding"/>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <ImageButton
- android:id="@+id/album_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"/>
+ <TextView
+ android:id="@+id/album_artist"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textSize="12sp"
+ android:textColor="?android:textColorSecondary"
+ android:singleLine="true"
+ android:text="@string/search.artists"
+ android:paddingLeft="@dimen/Card.TextLeftPadding"/>
+
+ <ImageButton
+ android:id="@+id/album_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"/>
+ </LinearLayout>
</LinearLayout>
+
+ <ImageView
+ android:id="@+id/item_more"
+ android:src="?attr/download_none"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:paddingRight="2dp"
+ style="@style/BasicButton"/>
</LinearLayout>
- <ImageView
- android:id="@+id/item_more"
- android:src="?attr/download_none"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:paddingRight="2dp"
- style="@style/BasicButton"/>
</LinearLayout>
-
-</LinearLayout> \ No newline at end of file
+</github.daneren2005.dsub.view.CardView> \ No newline at end of file
diff --git a/app/src/main/res/layout/basic_cell_item.xml b/app/src/main/res/layout/basic_cell_item.xml
index f522b196..fcfb6da5 100644
--- a/app/src/main/res/layout/basic_cell_item.xml
+++ b/app/src/main/res/layout/basic_cell_item.xml
@@ -1,39 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/selectableItemBackground">
-
- <github.daneren2005.dsub.view.SquareImageView
- android:id="@+id/item_art"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_margin="2dp">
<LinearLayout
+ android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="4dp"
- android:paddingLeft="2dp">
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground">
- <TextView
- android:id="@+id/item_name"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:textColor="?android:textColorPrimary"/>
+ <github.daneren2005.dsub.view.SquareImageView
+ android:id="@+id/item_art"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
- <ImageView
- android:id="@+id/item_more"
- android:src="?attr/download_none"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:paddingRight="2dp"
- style="@style/BasicButton"/>
+ android:orientation="horizontal"
+ android:paddingTop="4dp"
+ android:paddingLeft="2dp">
+
+ <TextView
+ android:id="@+id/item_name"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:textColor="?android:textColorPrimary"
+ android:paddingLeft="@dimen/Card.TextLeftPadding"/>
+
+ <ImageView
+ android:id="@+id/item_more"
+ android:src="?attr/download_none"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:paddingRight="2dp"
+ style="@style/BasicButton"/>
+ </LinearLayout>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</github.daneren2005.dsub.view.CardView> \ No newline at end of file
diff --git a/app/src/main/res/layout/fast_scroller.xml b/app/src/main/res/layout/fast_scroller.xml
index b2e244e3..bfe990dd 100644
--- a/app/src/main/res/layout/fast_scroller.xml
+++ b/app/src/main/res/layout/fast_scroller.xml
@@ -18,8 +18,8 @@
<ImageView
android:id="@+id/fastscroller_handle"
android:layout_width="wrap_content"
- android:layout_marginRight="8dp"
- android:layout_marginLeft="8dp"
+ android:layout_marginRight="4dp"
+ android:layout_marginLeft="12dp"
android:layout_height="wrap_content"
android:src="@drawable/fast_scroller_handle"/>
</merge> \ No newline at end of file