From 4acc9ac37e3363552cebc7a37e16e254f9438f4d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Jun 2015 19:40:08 +0300
Subject: further refactoring

---
 .../src/main/res/layout/activity_detail.xml        | 24 ++++++++++++
 .../res/layout/activity_headlines_articles.xml     | 24 ------------
 .../src/main/res/layout/activity_login.xml         | 17 +++++++++
 .../src/main/res/layout/activity_master.xml        | 44 ++++++++++++++++++++++
 .../src/main/res/layout/activity_preferences.xml   | 22 +++++++++++
 .../main/res/layout/dialog_select_font_size.xml    | 22 -----------
 org.fox.ttrss/src/main/res/layout/headlines.xml    | 44 ----------------------
 org.fox.ttrss/src/main/res/layout/login.xml        | 17 ---------
 org.fox.ttrss/src/main/res/layout/preferences.xml  | 22 -----------
 .../main/res/layout/settings_select_font_size.xml  | 22 +++++++++++
 .../src/main/res/layout/settings_tasker.xml        | 36 ++++++++++++++++++
 .../src/main/res/layout/tasker_settings.xml        | 36 ------------------
 12 files changed, 165 insertions(+), 165 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_detail.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_login.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_master.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_preferences.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/headlines.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/login.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/preferences.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/settings_select_font_size.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/settings_tasker.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/tasker_settings.xml

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

diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail.xml b/org.fox.ttrss/src/main/res/layout/activity_detail.xml
new file mode 100644
index 00000000..e9cfdc35
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_detail.xml
@@ -0,0 +1,24 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines"
+    android:fitsSystemWindows="true"
+    android:animateLayoutChanges="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <FrameLayout
+        android:id="@+id/article_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?articleBackground">
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/headlines_fragment"
+        android:visibility="gone"
+        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:background="?headlinesBackground">
+    </FrameLayout>
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml
deleted file mode 100644
index e9cfdc35..00000000
--- a/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
-    android:fitsSystemWindows="true"
-    android:animateLayoutChanges="true"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <FrameLayout
-        android:id="@+id/article_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?articleBackground">
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/headlines_fragment"
-        android:visibility="gone"
-        android:layout_height="0dp"
-        android:layout_width="0dp"
-        android:background="?headlinesBackground">
-    </FrameLayout>
-
-    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_login.xml b/org.fox.ttrss/src/main/res/layout/activity_login.xml
new file mode 100644
index 00000000..add839b5
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_login.xml
@@ -0,0 +1,17 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loading_container"
+    android:fitsSystemWindows="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+        <TextView
+            android:background="?android:colorBackground"
+            android:id="@+id/loading_message"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/loading_message" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml
new file mode 100644
index 00000000..69ef2c15
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml
@@ -0,0 +1,44 @@
+    <android.support.v4.widget.DrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fitsSystemWindows="true"
+        android:id="@+id/headlines_drawer"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+        <FrameLayout
+            android:fitsSystemWindows="true"
+            android:animateLayoutChanges="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <FrameLayout
+                android:id="@+id/headlines_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="?headlinesBackground"></FrameLayout>
+
+            <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+        </FrameLayout>
+
+        <org.fox.ttrss.util.ScrimInsetsFrameLayout
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/scrimInsetsFrameLayout"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:background="@android:color/white"
+            android:elevation="10dp"
+            android:fitsSystemWindows="true"
+            app:insetForeground="#4000">
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="match_parent"
+            android:background="?feedlistBackground"
+            android:layout_height="match_parent" >
+        </FrameLayout>
+
+        </org.fox.ttrss.util.ScrimInsetsFrameLayout>
+
+    </android.support.v4.widget.DrawerLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/activity_preferences.xml b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml
new file mode 100644
index 00000000..431b7da4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_preferences.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/preferences_container"
+        android:background="?android:colorBackground"
+        android:fitsSystemWindows="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_below="@+id/toolbar">
+    </FrameLayout>
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml b/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml
deleted file mode 100644
index f77cc151..00000000
--- a/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/text_progress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dip"
-        android:gravity="center_horizontal" >
-    </TextView>
-
-    <SeekBar
-        android:id="@+id/seek_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dip"
-        android:layout_marginTop="6dip" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml
deleted file mode 100644
index 69ef2c15..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-    <android.support.v4.widget.DrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:fitsSystemWindows="true"
-        android:id="@+id/headlines_drawer"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-
-        <FrameLayout
-            android:fitsSystemWindows="true"
-            android:animateLayoutChanges="true"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <FrameLayout
-                android:id="@+id/headlines_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?headlinesBackground"></FrameLayout>
-
-            <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-        </FrameLayout>
-
-        <org.fox.ttrss.util.ScrimInsetsFrameLayout
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/scrimInsetsFrameLayout"
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="start"
-            android:background="@android:color/white"
-            android:elevation="10dp"
-            android:fitsSystemWindows="true"
-            app:insetForeground="#4000">
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="match_parent"
-            android:background="?feedlistBackground"
-            android:layout_height="match_parent" >
-        </FrameLayout>
-
-        </org.fox.ttrss.util.ScrimInsetsFrameLayout>
-
-    </android.support.v4.widget.DrawerLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/login.xml b/org.fox.ttrss/src/main/res/layout/login.xml
deleted file mode 100755
index add839b5..00000000
--- a/org.fox.ttrss/src/main/res/layout/login.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/loading_container"
-    android:fitsSystemWindows="true"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-        <TextView
-            android:background="?android:colorBackground"
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="@string/loading_message" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/preferences.xml b/org.fox.ttrss/src/main/res/layout/preferences.xml
deleted file mode 100755
index 431b7da4..00000000
--- a/org.fox.ttrss/src/main/res/layout/preferences.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/preferences_container"
-        android:background="?android:colorBackground"
-        android:fitsSystemWindows="true"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@+id/toolbar">
-    </FrameLayout>
-
-    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/settings_select_font_size.xml b/org.fox.ttrss/src/main/res/layout/settings_select_font_size.xml
new file mode 100644
index 00000000..f77cc151
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/settings_select_font_size.xml
@@ -0,0 +1,22 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/text_progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:gravity="center_horizontal" >
+    </TextView>
+
+    <SeekBar
+        android:id="@+id/seek_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="6dip"
+        android:layout_marginTop="6dip" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/settings_tasker.xml b/org.fox.ttrss/src/main/res/layout/settings_tasker.xml
new file mode 100644
index 00000000..efdd76ab
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/settings_tasker.xml
@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="5dp" >
+
+    <Button
+        android:id="@+id/close_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:text="@string/tasker_save_and_close" />
+
+    <RadioGroup
+        android:id="@+id/taskerActions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true" >
+
+        <RadioButton
+            android:id="@+id/actionDownload"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/download_articles_and_go_offline" />
+
+        <RadioButton
+            android:id="@+id/actionUpload"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/synchronize_read_articles_and_go_online" />
+    </RadioGroup>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/tasker_settings.xml b/org.fox.ttrss/src/main/res/layout/tasker_settings.xml
deleted file mode 100644
index efdd76ab..00000000
--- a/org.fox.ttrss/src/main/res/layout/tasker_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="5dp" >
-
-    <Button
-        android:id="@+id/close_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:text="@string/tasker_save_and_close" />
-
-    <RadioGroup
-        android:id="@+id/taskerActions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true" >
-
-        <RadioButton
-            android:id="@+id/actionDownload"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="@string/download_articles_and_go_offline" />
-
-        <RadioButton
-            android:id="@+id/actionUpload"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/synchronize_read_articles_and_go_online" />
-    </RadioGroup>
-
-</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3