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

Change-Id: Ifffd2ef386c301d546d4182bc5c3bf303194021c

20 files changed, 65 insertions, 93 deletions

diff --git a/res/drawable-hdpi/cardcontainer.9.png b/res/drawable-hdpi/cardcontainer.9.png
new file mode 100644
index 0000000..246064e
--- /dev/null
+++ b/res/drawable-hdpi/cardcontainer.9.png
diff --git a/res/drawable-mdpi/cardcontainer.9.png b/res/drawable-mdpi/cardcontainer.9.png
new file mode 100644
index 0000000..2e6032b
--- /dev/null
+++ b/res/drawable-mdpi/cardcontainer.9.png
diff --git a/res/drawable-xhdpi/cardcontainer.9.png b/res/drawable-xhdpi/cardcontainer.9.png
new file mode 100644
index 0000000..e019df0
--- /dev/null
+++ b/res/drawable-xhdpi/cardcontainer.9.png
diff --git a/res/drawable-xxhdpi/cardcontainer.9.png b/res/drawable-xxhdpi/cardcontainer.9.png
new file mode 100644
index 0000000..1048fc8
--- /dev/null
+++ b/res/drawable-xxhdpi/cardcontainer.9.png
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
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c9f3bde..258950e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -19,12 +19,10 @@
 
     <!-- Main TitlePageIndicator titles -->
     <string-array name="page_titles" translatable="false">
-        <item>@string/page_playlists</item>
-        <item>@string/page_recent</item>
         <item>@string/page_artists</item>
         <item>@string/page_albums</item>
         <item>@string/page_songs</item>
-        <item>@string/page_genres</item>
+        <item>@string/page_playlists</item>
     </string-array>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bbbee0d..3d57335 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -64,7 +64,7 @@
     <!-- Color for the action bar -->
     <color name="header_action_bar_color">#ff31353f</color>
     <color name="header_action_bar_text_color">@color/white</color>
-    <color name="bottom_action_bar_text_color">@color/white</color>
+    <color name="bottom_action_bar_text_color">@color/default_text_color_light</color>
 
 
     <!-- Color for the pop up menu -->
@@ -77,6 +77,7 @@
     <color name="list_item_text_color">@color/default_text_color</color>
     <color name="list_item_text_color_light">@color/default_text_color_light</color>
     <color name="list_item_divider_color">#4c231f20</color>
+    <color name="grid_list_item_text_color">#cc231f20</color>
 
     <!-- Top title page colors -->
     <color name="tpi_background_color">#fff4f4f4</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 72d0749..92aeb23 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -37,26 +37,30 @@
     <dimen name="list_item_header_size">16.0sp</dimen>
     <dimen name="list_item_main_text_size">14.0sp</dimen>
     <dimen name="list_item_secondary_text_size">12.0sp</dimen>
+    <dimen name="list_item_queue_text_padding_left">15.0dip</dimen>
 
     <!-- List view fast scroll padding left -->
     <dimen name="fast_scroll_padding_left">8.0dip</dimen>
     <!-- List view fast scroll padding right -->
     <dimen name="fast_scroll_padding_right">8.0dip</dimen>
     <!-- grid view vertical and horizontal spacing -->
-    <dimen name="grid_item_spacing">4.0dip</dimen>
+    <dimen name="grid_item_horizontal_spacing">4.0dip</dimen>
+    <dimen name="grid_item_vertical_spacing">6.0dip</dimen>
     <!-- List item detailed height -->
     <dimen name="list_item_detailed_height">120.0dip</dimen>
     <!-- Top margin of "line_two" -->
     <dimen name="list_item_line_two_margin_top">8.0dip</dimen>
     <!-- Left padding in the grid text -->
     <dimen name="grid_item_padding_left">8.0dip</dimen>
+    <!-- Left padding in the grid text -->
+    <dimen name="grid_bottom_height">40dip</dimen>
     <!-- Grid and list item normal height -->
     <dimen name="item_normal_height">70.0dip</dimen>
     <dimen name="list_item_image_height">50.0dip</dimen>
     <dimen name="list_item_image_width">50.0dip</dimen>
 
     <!-- Bottom Action Bar -->
-    <dimen name="bottom_action_bar_height">48.0dip</dimen>
+    <dimen name="bottom_action_bar_height">50.0dip</dimen>
     <dimen name="bottom_action_bar_item_width">56.0dip</dimen>
     <dimen name="bottom_action_bar_item_padding_left">12.0dip</dimen>
     <dimen name="bottom_action_bar_item_padding_right">12.0dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 108994e..02f0614 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -194,4 +194,6 @@
     <string name="header_1_album">1 Album</string>
     <string name="header_n_albums"><xliff:g id="number">%d</xliff:g> Albums</string>
     <string name="header_5_plus_albums">5+ Albums</string>
+
+    <string name="combine_two_strings">%1$s | %2$s</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 30bd95b..9aa37a0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,12 +53,14 @@
 
     <!-- Sets up the pop up menu text color and size -->
     <style name="SmallPopupMenu" parent="@android:style/TextAppearance.Widget.PopupMenu.Small">
+        <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:textColor">@color/menu_text_color</item>
         <item name="android:textSize">@dimen/text_size_medium</item>
     </style>
 
     <!-- Sets up the pop up menu text color and size -->
     <style name="LargePopupMenu" parent="@android:style/TextAppearance.Widget.PopupMenu.Large">
+        <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:textColor">@color/menu_text_color</item>
         <item name="android:textSize">@dimen/text_size_medium</item>
     </style>
@@ -88,6 +90,7 @@
     <style name="ListItemMainText">
         <item name="android:textColor">@color/list_item_text_color</item>
         <item name="android:textSize">@dimen/list_item_main_text_size</item>
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">bold</item>
         <item name="android:ellipsize">end</item>
     </style>
@@ -96,10 +99,16 @@
         <item name="android:singleLine">true</item>
     </style>
 
+    <style name="ListItemMainText.Grid.Single" parent="ListItemMainText.Single">
+        <item name="android:textColor">@color/grid_list_item_text_color</item>
+    </style>
+
     <!-- The list item secondary text style/color -->
     <style name="ListItemSecondaryText">
         <item name="android:textColor">@color/list_item_text_color</item>
         <item name="android:textSize">@dimen/list_item_secondary_text_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textStyle">normal</item>
         <item name="android:ellipsize">end</item>
     </style>
 
@@ -107,6 +116,10 @@
         <item name="android:singleLine">true</item>
     </style>
 
+    <style name="ListItemSecondaryText.Grid.Single" parent="ListItemSecondaryText.Single">
+        <item name="android:textColor">@color/grid_list_item_text_color</item>
+    </style>
+
     <style name="ListItemMainText.Light.Single" parent="ListItemMainText.Single">
         <item name="android:textColor">@color/list_item_text_color_light</item>
     </style>
@@ -170,18 +183,22 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">end</item>
         <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">16dp</item>
         <item name="android:gravity">top|left|center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textAllCaps">true</item>
         <item name="android:textColor">@color/bottom_action_bar_text_color</item>
-        <item name="android:textSize">@dimen/text_size_extra_micro</item>
     </style>
 
     <style name="BottomActionBarLineOne" parent="@style/BottomActionBarText">
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
     </style>
 
-    <style name="BottomActionBarLineTwo" parent="@style/BottomActionBarText"></style>
+    <style name="BottomActionBarLineTwo" parent="@style/BottomActionBarText">
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textSize">@dimen/text_size_extra_micro</item>
+    </style>
 
     <!-- Bottom Action Bar Image Buttons -->
     <style name="BottomActionBarItem">
diff --git a/res/values/vpi__attrs.xml b/res/values/vpi__attrs.xml
index a4d1f10..989d302 100644
--- a/res/values/vpi__attrs.xml
+++ b/res/values/vpi__attrs.xml
@@ -102,6 +102,8 @@
         <attr name="selectedColor" />
         <!-- Whether or not the selected item is displayed as bold. -->
         <attr name="selectedBold" format="boolean" />
+        <!-- Whether or not to bold all items. -->
+        <attr name="boldAll" format="boolean" />
         <!-- Color of regular titles. -->
         <attr name="android:textColor" />
         <!-- Size of title text. -->
diff --git a/res/values/vpi__defaults.xml b/res/values/vpi__defaults.xml
index e4d44cb..84e2dce 100644
--- a/res/values/vpi__defaults.xml
+++ b/res/values/vpi__defaults.xml
@@ -41,6 +41,7 @@
     <integer name="default_title_indicator_line_position">0</integer>
     <color name="default_title_indicator_selected_color">#FFFFFFFF</color>
     <bool name="default_title_indicator_selected_bold">true</bool>
+    <bool name="default_title_indicator_bold_all">false</bool>
     <color name="default_title_indicator_text_color">#BBFFFFFF</color>
     <dimen name="default_title_indicator_text_size">15dp</dimen>
     <dimen name="default_title_indicator_title_padding">5dp</dimen>