From f8bc884ad315aefbf6e71932f115f8c571ff9d6d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 29 Oct 2014 16:23:07 +0300
Subject: remove X more image prompt implement pager-based browser for article
 images, enabled if more than one detected add (unused) dimens for activity
 margins

---
 .../src/main/res/layout/article_images_image.xml   | 29 ++++++++++++++++++++++
 .../src/main/res/layout/article_images_pager.xml   | 24 ++++++++++++++++++
 .../src/main/res/layout/headlines_row.xml          | 14 +++++------
 .../src/main/res/layout/headlines_row_selected.xml | 15 +++++------
 .../res/layout/headlines_row_selected_unread.xml   | 15 +++++------
 .../src/main/res/layout/headlines_row_unread.xml   | 14 +++++------
 .../src/main/res/menu/article_images_pager.xml     |  9 +++++++
 org.fox.ttrss/src/main/res/values/dimens.xml       |  5 ++++
 org.fox.ttrss/src/main/res/values/strings.xml      | 11 ++++++++
 9 files changed, 108 insertions(+), 28 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/article_images_image.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/article_images_pager.xml
 create mode 100644 org.fox.ttrss/src/main/res/menu/article_images_pager.xml
 create mode 100644 org.fox.ttrss/src/main/res/values/dimens.xml

(limited to 'org.fox.ttrss/src/main/res')

diff --git a/org.fox.ttrss/src/main/res/layout/article_images_image.xml b/org.fox.ttrss/src/main/res/layout/article_images_image.xml
new file mode 100644
index 00000000..b78410ad
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/article_images_image.xml
@@ -0,0 +1,29 @@
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flavorImageHolder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="invisible"
+        android:text="@string/error_loading_image"
+        android:id="@+id/flavor_image_error" />
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:id="@+id/flavor_image_progress" />
+
+
+    <org.fox.ttrss.util.EnlargingImageView
+        android:id="@+id/flavor_image"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"
+        android:visibility="visible" />
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
new file mode 100644
index 00000000..2735cc90
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
@@ -0,0 +1,24 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/article_images"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+/*
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"> */
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/article_images_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+    </android.support.v4.view.ViewPager>
+
+    <com.viewpagerindicator.UnderlinePageIndicator
+        android:id="@+id/article_images_indicator"
+        android:layout_width="fill_parent"
+        android:layout_height="2dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true" />
+
+</RelativeLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 8b2107c1..ef44fde3 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -94,13 +94,13 @@
                     android:cropToPadding="true"
                     android:visibility="visible" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="(5 more)"
-                    android:alpha="0.5"
-                    android:layout_gravity="bottom|right"
-                    android:id="@+id/flavorImageMore" />
+                <org.fox.ttrss.util.ArrowRight
+                    android:layout_marginRight="4dp"
+                    android:id="@+id/flavorImageArrow"
+                    android:layout_width="64dp"
+                    android:layout_gravity="center|right"
+                    android:visibility="gone"
+                    android:layout_height="64dp" />
             </FrameLayout>
         </TableRow>
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
index 6d8a68ab..978b5b4e 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
@@ -94,13 +94,14 @@
                     android:cropToPadding="true"
                     android:visibility="visible" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="(5 more)"
-                    android:alpha="0.5"
-                    android:layout_gravity="bottom|right"
-                    android:id="@+id/flavorImageMore" />
+                <org.fox.ttrss.util.ArrowRight
+                    android:layout_marginRight="4dp"
+                    android:id="@+id/flavorImageArrow"
+                    android:layout_width="64dp"
+                    android:layout_gravity="center|right"
+                    android:visibility="gone"
+                    android:layout_height="64dp" />
+
             </FrameLayout>
         </TableRow>
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
index 47e24ab7..680158e0 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
@@ -95,13 +95,14 @@
                     android:cropToPadding="true"
                     android:visibility="visible" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="(5 more)"
-                    android:alpha="0.5"
-                    android:layout_gravity="bottom|right"
-                    android:id="@+id/flavorImageMore" />
+                <org.fox.ttrss.util.ArrowRight
+                    android:layout_marginRight="4dp"
+                    android:id="@+id/flavorImageArrow"
+                    android:layout_width="64dp"
+                    android:layout_gravity="center|right"
+                    android:visibility="gone"
+                    android:layout_height="64dp" />
+
             </FrameLayout>
         </TableRow>
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index 83e60fbb..0e671095 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -95,13 +95,13 @@
                     android:cropToPadding="true"
                     android:visibility="visible" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="(5 more)"
-                    android:alpha="0.5"
-                    android:layout_gravity="bottom|right"
-                    android:id="@+id/flavorImageMore" />
+                <org.fox.ttrss.util.ArrowRight
+                    android:layout_marginRight="4dp"
+                    android:id="@+id/flavorImageArrow"
+                    android:layout_width="64dp"
+                    android:layout_gravity="center|right"
+                    android:visibility="gone"
+                    android:layout_height="64dp" />
             </FrameLayout>
         </TableRow>
 
diff --git a/org.fox.ttrss/src/main/res/menu/article_images_pager.xml b/org.fox.ttrss/src/main/res/menu/article_images_pager.xml
new file mode 100644
index 00000000..bafc53ab
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/menu/article_images_pager.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.fox.ttrss.ArticleImagesPagerActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/org.fox.ttrss/src/main/res/values/dimens.xml b/org.fox.ttrss/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..47c82246
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index f452ca05..32608dc6 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -149,10 +149,12 @@
     <string name="prefs_dim_status_bar">Dim status bar</string>
     <string name="prefs_dim_status_bar_long">Dim status bar when reading</string>
     <string name="article_comments">%1$d comments</string>
+
     <plurals name="trial_mode_prompt">
         <item quantity="one">Trial mode, only one day left.</item>
         <item quantity="other">Trial mode, %1$d days left.</item>
     </plurals>
+
     <string name="trial_purchase">Unlock full version</string>
     <string name="trial_expired">Trial expired</string>
     <string name="trial_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string>
@@ -198,17 +200,21 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Light theme is not supported on Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Mark read on scroll</string>
     <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string>
+
     <plurals name="mark_num_headlines_as_read">
         <item quantity="one">Mark %1$d article as read?</item>
         <item quantity="other">Mark %1$d articles as read?</item>
     </plurals>
+
     <string name="prefs_confirm_headlines_catchup">Confirm marking articles as read</string>
     <string name="author_formatted">by %1$s</string>
+
     <plurals name="n_unread_articles">
         <item quantity="zero">No unread articles</item>
         <item quantity="one">One unread article</item>
         <item quantity="other">%1$d unread articles</item>
     </plurals>
+
     <string name="pref_headline_font_size">Headline text size</string>
     <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string>
     <string name="theme_system">Device Default</string>
@@ -233,4 +239,9 @@
     <string name="pref_headlines_full_content">Show full content</string>
     <string name="prefs_headlines_show_flavor_image">Show article image</string>
     <string name="flavor_image_more">(%1$d more)</string>
+    <string name="title_activity_article_images_pager">ArticleImagesPagerActivity</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+    <string name="error_loading_image">Error loading image.</string>
+
 </resources>
-- 
cgit v1.2.3