Multiples fixes

- Fully rewrite the album selection preference
- Fix multiple style
- Fix lints
- Resources cleanup

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

1 files changed, 57 insertions, 50 deletions

diff --git a/res/layout/album_info.xml b/res/layout/album_info.xml
index fc44edd..fa0e30e 100644
--- a/res/layout/album_info.xml
+++ b/res/layout/album_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,66 +14,73 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/PhotoPhase.Album">
+    android:layout_height="wrap_content">
 
-    <ImageView android:id="@+id/album_thumbnail"
-        android:layout_width="@dimen/album_size"
-        android:layout_height="@dimen/album_size"
-        android:scaleType="fitXY"
-        android:layout_marginRight="@dimen/album_margin"
-        android:contentDescription="@null"
-        style="@style/PhotoPhase.Album.Thumbnail" />
-
-   <TextView android:id="@+id/album_selected_items"
-        android:layout_width="wrap_content"
+    <org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfoView
+        android:id="@+id/album_info"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignRight="@id/album_thumbnail"
-        android:layout_alignBottom="@id/album_thumbnail"
-        style="@style/PhotoPhase.Notification" />
+        style="@style/PhotoPhase.Album">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_toRightOf="@id/album_thumbnail"
-        android:layout_alignTop="@id/album_thumbnail"
-        android:layout_alignBottom="@id/album_thumbnail"
-        android:orientation="vertical"
-        style="@style/PhotoPhase.Album.Info">
+        <ImageView android:id="@+id/album_thumbnail"
+            android:layout_width="@dimen/album_size"
+            android:layout_height="@dimen/album_size"
+            android:scaleType="fitXY"
+            android:layout_marginRight="@dimen/album_margin"
+            android:contentDescription="@null"
+            style="@style/PhotoPhase.Album.Thumbnail" />
 
-        <TextView android:id="@+id/album_name"
+        <TextView android:id="@+id/album_selected_items"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingBottom="@dimen/album_info_margin"
-            android:gravity="bottom"
-            android:ellipsize="end"
-            android:singleLine="true"
-            style="@style/PhotoPhase.TextAppearance.Primary" />
+            android:layout_alignRight="@id/album_thumbnail"
+            android:layout_alignBottom="@id/album_thumbnail"
+            style="@style/PhotoPhase.Notification" />
 
-        <TextView android:id="@+id/album_items"
+        <ImageView android:id="@+id/overflow_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="@dimen/album_info_margin"
-            android:gravity="top"
-            android:ellipsize="end"
-            android:singleLine="true"
-            style="@style/PhotoPhase.TextAppearance.Secondary" />
+            android:layout_alignParentRight="true"
+            android:layout_alignBottom="@id/album_thumbnail"
+            android:layout_gravity="top"
+            android:padding="@dimen/small_padding"
+            android:contentDescription="@null"
+            style="@style/PhotoPhase.Album.MenuBar.Overflow" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@id/album_thumbnail"
+            android:layout_toLeftOf="@id/overflow_button"
+            android:layout_alignTop="@id/album_thumbnail"
+            android:layout_alignBottom="@id/album_thumbnail"
+            android:orientation="vertical"
+            style="@style/PhotoPhase.Album.Info">
 
-    <ImageView android:id="@+id/overflow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignBottom="@id/album_thumbnail"
-        android:layout_gravity="top"
-        android:padding="@dimen/small_padding"
-        android:contentDescription="@null"
-        style="@style/PhotoPhase.Album.MenuBar.Overflow" />
+            <TextView android:id="@+id/album_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingBottom="@dimen/album_info_margin"
+                android:gravity="bottom"
+                android:ellipsize="end"
+                android:singleLine="true"
+                style="@style/PhotoPhase.TextAppearance.Primary" />
+
+            <TextView android:id="@+id/album_items"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingTop="@dimen/album_info_margin"
+                android:gravity="top"
+                android:ellipsize="end"
+                android:singleLine="true"
+                style="@style/PhotoPhase.TextAppearance.Secondary" />
+
+        </LinearLayout>
 
-</org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo>
+    </org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfoView>
+</FrameLayout>