From 1bfc708bc0ba129c1e77ad7034e715e28ac50d12 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 29 Oct 2014 08:59:33 +0300
Subject: UIL: use time-limited disk cache instead of flushing it on startup
 flavor images: show X more label if more than one image  fix crash on
 loadmore row

---
 org.fox.ttrss/src/main/res/layout/headlines_row.xml               | 8 ++++++++
 org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml      | 8 ++++++++
 .../src/main/res/layout/headlines_row_selected_unread.xml         | 8 ++++++++
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml        | 8 ++++++++
 org.fox.ttrss/src/main/res/values/strings.xml                     | 2 +-
 5 files changed, 33 insertions(+), 1 deletion(-)

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

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 40eb4914..8b2107c1 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -93,6 +93,14 @@
                     android:scaleType="fitCenter"
                     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" />
             </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 dcdedc9a..6d8a68ab 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
@@ -93,6 +93,14 @@
                     android:scaleType="fitCenter"
                     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" />
             </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 8d9734c4..47e24ab7 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
@@ -94,6 +94,14 @@
                     android:scaleType="fitCenter"
                     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" />
             </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 d3c1aa72..83e60fbb 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
@@ -94,6 +94,14 @@
                     android:scaleType="fitCenter"
                     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" />
             </FrameLayout>
         </TableRow>
 
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 784c8dc2..f452ca05 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -232,5 +232,5 @@
     <string name="pref_headlines_full_content_long">Show full article content in headlines. Resource intensive, can cause UI lag on some devices.</string>
     <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>
 </resources>
-- 
cgit v1.2.3