remove X more image prompt

implement pager-based browser for article images, enabled if more than one detected
add (unused) dimens for activity margins

6 files changed, 83 insertions, 28 deletions

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>