summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/album_set.xml26
-rw-r--r--res/layout/album_set_item.xml40
-rw-r--r--res/values/dimensions.xml6
3 files changed, 71 insertions, 1 deletions
diff --git a/res/layout/album_set.xml b/res/layout/album_set.xml
new file mode 100644
index 000000000..5ff1d23ff
--- /dev/null
+++ b/res/layout/album_set.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <GridView
+ android:id="@id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:numColumns="auto_fit"
+ android:columnWidth="@dimen/album_set_item_width"
+ android:stretchMode="columnWidth"
+ android:drawSelectorOnTop="true"
+ android:padding="10dp"
+ android:horizontalSpacing="10dp"
+ android:verticalSpacing="10dp" />
+
+ <TextView
+ android:id="@id/android:empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/empty_album" />
+
+</FrameLayout> \ No newline at end of file
diff --git a/res/layout/album_set_item.xml b/res/layout/album_set_item.xml
new file mode 100644
index 000000000..46084e938
--- /dev/null
+++ b/res/layout/album_set_item.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:background="#FFF" >
+
+ <TextView
+ android:id="@+id/album_set_item_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="10dp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/album_set_item_date"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@+id/album_set_item_title"
+ android:layout_below="@+id/album_set_item_title"
+ android:layout_marginBottom="10dp"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <ImageView
+ android:id="@+id/album_set_item_image"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/album_set_item_image_height"
+ android:layout_below="@+id/album_set_item_date"
+ android:scaleType="centerCrop" />
+
+ <ProgressBar
+ android:id="@+id/album_set_item_upload_progress"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="invisible"
+ android:layout_alignParentBottom="true" />
+</RelativeLayout> \ No newline at end of file
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index dc9e8c300..ae506807a 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -19,7 +19,7 @@
<dimen name="stack_photo_width">160dp</dimen>
<dimen name="stack_photo_height">120dp</dimen>
- <!-- configuration for album set page -->
+ <!-- configuration for legacy album set page -->
<integer name="albumset_rows_land">2</integer>
<integer name="albumset_rows_port">3</integer>
<dimen name="albumset_padding_top">7dp</dimen>
@@ -50,4 +50,8 @@
<!-- configuration for filtershow UI -->
<dimen name="thumbnail_size">96dip</dimen>
<dimen name="thumbnail_margin">3dip</dimen>
+
+ <!-- configuration for album set page -->
+ <dimen name="album_set_item_image_height">100dp</dimen>
+ <dimen name="album_set_item_width">160dp</dimen>
</resources>