Eleven: lots of ui tweaks (fonts, padding, grid layout) and cancel tasks smarter

Change-Id: Ifffd2ef386c301d546d4182bc5c3bf303194021c

9 files changed, 31 insertions, 84 deletions

diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index 57f510c..57603c6 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -29,8 +29,8 @@
 
     <FrameLayout
         android:id="@+id/edit_track_list_container"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_normal_height"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/edit_track_list_item_handle"
         android:gravity="center_vertical" >
 
diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml
index c461c79..d62ffc2 100644
--- a/res/layout/fragment_music_browser_phone.xml
+++ b/res/layout/fragment_music_browser_phone.xml
@@ -30,6 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"
             android:textColor="@color/tpi_text_color"
+            tpi:boldAll="true"
             tpi:selectedColor="@color/tpi_selected_text_color"
             tpi:footerLineHeight="@dimen/tpi_footer_line_height"
             tpi:footerIndicatorHeight="@dimen/tpi_footer_indicator_height"
diff --git a/res/layout/fragment_themes_base.xml b/res/layout/fragment_themes_base.xml
deleted file mode 100644
index d9b9584..0000000
--- a/res/layout/fragment_themes_base.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2012 Andrew Neal
- 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-       http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/grid_item_spacing" >
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="155.0dip"
-        android:scaleType="centerCrop"
-        tools:ignore="ContentDescription" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/image" >
-
-        <TextView
-            android:id="@+id/line_one"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:background="@color/transparent_black"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_dayum" />
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/grid_base.xml b/res/layout/grid_base.xml
index 3b51674..ad38b92 100644
--- a/res/layout/grid_base.xml
+++ b/res/layout/grid_base.xml
@@ -40,9 +40,9 @@
         android:drawSelectorOnTop="true"
         android:fadingEdge="vertical"
         android:fastScrollEnabled="true"
-        android:horizontalSpacing="@dimen/grid_item_spacing"
+        android:horizontalSpacing="@dimen/grid_item_horizontal_spacing"
         android:scrollbarStyle="outsideOverlay"
         android:scrollbars="vertical"
-        android:verticalSpacing="@dimen/grid_item_spacing" />
+        android:verticalSpacing="@dimen/grid_item_vertical_spacing" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index 69c447d..f61af9a 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -16,37 +16,31 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center_vertical" >
 
     <include layout="@layout/square_image_view" />
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/item_normal_height"
-        android:layout_alignParentBottom="true"
-        android:background="@color/transparent_black"
-        android:gravity="center_vertical"
+        android:layout_height="@dimen/grid_bottom_height"
+        android:layout_below="@+id/square_view"
+        android:background="@drawable/cardcontainer"
         android:paddingLeft="@dimen/grid_item_padding_left" >
 
         <TextView
             android:id="@+id/line_one"
+            style="@style/ListItemMainText.Grid.Single"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:maxLines="2"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_medium"
-            android:textStyle="bold" />
+            android:layout_alignParentTop="true" />
 
         <TextView
             android:id="@+id/line_two"
+            style="@style/ListItemSecondaryText.Grid.Single"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/line_one"
-            android:singleLine="true"
-            android:textColor="@color/transparent_white"
-            android:textSize="@dimen/text_size_small" />
+            android:layout_below="@+id/line_one" />
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index 6230573..b83a818 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -28,6 +28,7 @@
         android:layout_weight="1"
         android:ellipsize="end"
         android:singleLine="true"
+        android:textAllCaps="true"
         android:textColor="@color/header_action_bar_text_color"
         android:textSize="@dimen/text_size_large" />
 
diff --git a/res/layout/list_header.xml b/res/layout/list_header.xml
index f10aa90..aff83b4 100644
--- a/res/layout/list_header.xml
+++ b/res/layout/list_header.xml
@@ -21,4 +21,5 @@
     android:background="@null"
     android:gravity="center_vertical"
     android:textColor="@color/list_item_header_text_color"
-    android:textSize="@dimen/list_item_header_size" />
+    android:textSize="@dimen/list_item_header_size"
+    android:fontFamily="sans-serif-light" />
diff --git a/res/layout/list_item_normal.xml b/res/layout/list_item_normal.xml
index ee34ec9..775ec1f 100644
--- a/res/layout/list_item_normal.xml
+++ b/res/layout/list_item_normal.xml
@@ -30,7 +30,7 @@
         android:layout_height="@dimen/list_item_image_height"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:scaleType="fitXY" />
+        android:scaleType="centerCrop" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index f3efbdb..9cf1fc5 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -5,15 +5,26 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/item_normal_height"
     android:gravity="center_vertical"
-    android:minHeight="@dimen/item_normal_height">
+    android:minHeight="@dimen/item_normal_height"
+    android:paddingTop="@dimen/list_item_padding_top"
+    android:paddingBottom="@dimen/list_item_padding_bottom">
+
+    <com.cyngn.eleven.widgets.SquareImageView
+        android:id="@+id/image"
+        android:layout_width="@dimen/list_item_image_width"
+        android:layout_height="@dimen/list_item_image_height"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:scaleType="centerCrop" />
 
     <!-- center the text views vertically -->
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:gravity="center_vertical"
-        android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/play_pause_container"
+        android:layout_toRightOf="@id/image"
+        android:paddingLeft="@dimen/list_item_queue_text_padding_left"
         android:orientation="vertical">
         <TextView
             android:id="@+id/line_one"
@@ -26,12 +37,6 @@
             style="@style/ListItemSecondaryText.Light.Single"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-
-        <TextView
-            android:id="@+id/line_three"
-            style="@style/ListItemSecondaryText.Light.Single"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
     </LinearLayout>
 
     <FrameLayout
@@ -39,7 +44,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/line_one_right"
+        android:layout_alignParentRight="true"
         android:paddingLeft="@dimen/list_item_progress_padding_left"
         android:paddingRight="@dimen/list_item_progress_padding_right">
         <include
@@ -48,12 +53,4 @@
             android:layout_centerVertical="true"
             layout="@layout/play_pause_progress_button"/>
     </FrameLayout>
-
-    <TextView
-        android:id="@+id/line_one_right"
-        style="@style/ListItemSecondaryText.Light.Single"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true" />
 </RelativeLayout>
\ No newline at end of file