From f114539024d0769edb6c25d0268fef6cd558c845 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 11 Jun 2015 14:15:32 +0300
Subject: use dialogwhenlarge theme for image pager

---
 org.fox.ttrss/src/main/AndroidManifest.xml         |  1 +
 .../org/fox/ttrss/ArticleImagesPagerActivity.java  |  9 +++--
 .../src/main/res/layout/activity_images_pager.xml  | 38 ++++++++++++++++++++
 .../src/main/res/layout/article_images_pager.xml   | 42 ----------------------
 org.fox.ttrss/src/main/res/values/style.xml        |  8 +++++
 5 files changed, 51 insertions(+), 47 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_images_pager.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/article_images_pager.xml

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 2f5131c8..bf948df3 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -254,6 +254,7 @@
 
         <activity
             android:name=".ArticleImagesPagerActivity"
+            android:theme="@style/ImagePagerTheme"
             android:label="Article Images" >
         </activity>
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
index 0f7059ad..1981a727 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
@@ -14,7 +14,6 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.GestureDetector;
@@ -256,14 +255,14 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         m_prefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
 
-        setTheme(R.style.DarkTheme);
+        //setTheme(R.style.DarkTheme);
 
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.article_images_pager);
+        setContentView(R.layout.activity_images_pager);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        //Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        //setSupportActionBar(toolbar);
 
         m_progress = (ProgressBar) findViewById(R.id.article_images_progress);
 
diff --git a/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml b/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml
new file mode 100644
index 00000000..8e754bf7
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_images_pager.xml
@@ -0,0 +1,38 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/article_images"
+    android:layout_width="fill_parent"
+    android:animateLayoutChanges="true"
+    android:layout_height="fill_parent">
+
+    <org.fox.ttrss.ArticleImagesPager
+        android:id="@+id/article_images_pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="true" />
+
+    <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/article_images_progress"
+        android:progress="0"
+        android:indeterminate="false"
+        android:layout_above="@+id/article_images_indicator"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin" />
+
+    <me.relex.circleindicator.CircleIndicator
+        android:id="@+id/article_images_indicator"
+        android:layout_width="fill_parent"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:visibility="invisible" />
+
+
+</RelativeLayout>
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
deleted file mode 100755
index 8744af67..00000000
--- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true"
-    android:id="@+id/article_images"
-    android:layout_width="fill_parent"
-    android:animateLayoutChanges="true"
-    android:background="?headlinesBackground"
-    android:layout_height="fill_parent">
-
-    <org.fox.ttrss.ArticleImagesPager
-        android:id="@+id/article_images_pager"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentTop="true" />
-
-    <ProgressBar
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/article_images_progress"
-        android:progress="0"
-        android:indeterminate="false"
-        android:layout_above="@+id/article_images_indicator"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin" />
-
-    <me.relex.circleindicator.CircleIndicator
-        android:id="@+id/article_images_indicator"
-        android:layout_width="fill_parent"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:visibility="invisible" />
-
-
-    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-</RelativeLayout>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index a02ee887..25084641 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -123,4 +123,12 @@
         <item name="floatingActionButtonColor">?colorPrimaryDark</item>
     </style>
 
+    <style name="ImagePagerTheme" parent="Theme.AppCompat.DialogWhenLarge">
+        <item name="windowActionBarOverlay">true</item>
+
+        <item name="colorPrimary">#607D8B</item>
+        <item name="colorPrimaryDark">#455A64</item>
+        <item name="colorAccent">#D84315</item>
+    </style>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3