From 6f1afb1ef00e9c700832c33f71d008549740c2c0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Fri, 2 Jun 2017 14:51:11 +0300
Subject: rename article pager and related stuff to gallery

---
 .../src/main/res/layout/activity_gallery.xml       | 43 +++++++++++++++++++
 .../src/main/res/layout/article_images_pager.xml   | 43 -------------------
 .../src/main/res/layout/fragment_article_image.xml | 49 ----------------------
 .../src/main/res/layout/fragment_gallery_entry.xml | 49 ++++++++++++++++++++++
 4 files changed, 92 insertions(+), 92 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_gallery.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/article_images_pager.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/fragment_article_image.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml

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

diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
new file mode 100644
index 00000000..de99eedb
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -0,0 +1,43 @@
+<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="@android:color/black"
+    android:layout_height="fill_parent">
+
+    <com.bogdwellers.pinchtozoom.view.ImageViewPager
+        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:visibility="gone"
+        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/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
deleted file mode 100755
index de99eedb..00000000
--- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
+++ /dev/null
@@ -1,43 +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="@android:color/black"
-    android:layout_height="fill_parent">
-
-    <com.bogdwellers.pinchtozoom.view.ImageViewPager
-        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:visibility="gone"
-        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/layout/fragment_article_image.xml b/org.fox.ttrss/src/main/res/layout/fragment_article_image.xml
deleted file mode 100644
index e5fe47f4..00000000
--- a/org.fox.ttrss/src/main/res/layout/fragment_article_image.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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" />
-
-    <TextureView
-        android:id="@+id/flavor_video"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:layout_gravity="center"
-        android:scaleType="fitCenter" />
-
-    <ImageView
-        android:id="@+id/flavor_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:layout_gravity="center"
-        android:scaleType="fitCenter" />
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:id="@+id/flavor_image_progress" />
-
-    <ImageView
-        android:id="@+id/flavor_image_overflow"
-        android:clickable="true"
-        android:layout_width="wrap_content"
-        android:layout_height="26dp"
-        android:layout_weight="0"
-        android:background="@drawable/ripple"
-        android:src="@drawable/ic_dots_vertical"
-        android:layout_gravity="top|right"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="@dimen/activity_vertical_margin" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml b/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml
new file mode 100644
index 00000000..e5fe47f4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_gallery_entry.xml
@@ -0,0 +1,49 @@
+<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" />
+
+    <TextureView
+        android:id="@+id/flavor_video"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter" />
+
+    <ImageView
+        android:id="@+id/flavor_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter" />
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:id="@+id/flavor_image_progress" />
+
+    <ImageView
+        android:id="@+id/flavor_image_overflow"
+        android:clickable="true"
+        android:layout_width="wrap_content"
+        android:layout_height="26dp"
+        android:layout_weight="0"
+        android:background="@drawable/ripple"
+        android:src="@drawable/ic_dots_vertical"
+        android:layout_gravity="top|right"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="@dimen/activity_vertical_margin" />
+
+</FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3