From d683cae6ffe644a9f63eea6cf3b7e59d2bde617b Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 21 Dec 2017 02:16:34 -0500
Subject: Enhancement/fragment interface (#564)

* Begin fragment interfaces and themable contracts

* Prepare swiperefresh interface

* Snapshot

* Add compilable version

* Revamp once more

* Finalize layouts

* Cleanup
---
 app/src/main/res/layout/activity_web_overlay.xml   | 17 ++++++++++--
 app/src/main/res/layout/swipe_webview.xml          | 30 --------------------
 .../main/res/layout/view_content_base_recycler.xml | 32 ++++++++++++++++++++++
 app/src/main/res/layout/view_content_base_web.xml  | 31 +++++++++++++++++++++
 app/src/main/res/layout/view_content_recycler.xml  |  4 +++
 app/src/main/res/layout/view_content_web.xml       |  4 +++
 6 files changed, 86 insertions(+), 32 deletions(-)
 delete mode 100644 app/src/main/res/layout/swipe_webview.xml
 create mode 100644 app/src/main/res/layout/view_content_base_recycler.xml
 create mode 100644 app/src/main/res/layout/view_content_base_web.xml
 create mode 100644 app/src/main/res/layout/view_content_recycler.xml
 create mode 100644 app/src/main/res/layout/view_content_web.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_web_overlay.xml b/app/src/main/res/layout/activity_web_overlay.xml
index f518e518..fe223811 100644
--- a/app/src/main/res/layout/activity_web_overlay.xml
+++ b/app/src/main/res/layout/activity_web_overlay.xml
@@ -17,10 +17,23 @@
         app:layout_scrollFlags="scroll|enterAlways"
         app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    <com.pitchedapps.frost.web.FrostWebView
-        android:id="@+id/overlay_frost_webview"
+    <include
+        layout="@layout/view_content_web"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="?attr/actionBarSize" />
 
+    <!--<com.pitchedapps.frost.views.FrostRefreshView-->
+    <!--android:id="@+id/overlay_frost_refresh_view"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:layout_marginTop="?attr/actionBarSize">-->
+
+    <!--<com.pitchedapps.frost.views.FrostWebView-->
+    <!--android:id="@+id/overlay_frost_web_view"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent" />-->
+
+    <!--</com.pitchedapps.frost.views.FrostRefreshView>-->
+
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/swipe_webview.xml b/app/src/main/res/layout/swipe_webview.xml
deleted file mode 100644
index d7a33d5b..00000000
--- a/app/src/main/res/layout/swipe_webview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.pitchedapps.frost.web.FrostWebViewCore
-            android:id="@+id/frost_webview_core"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </android.support.v4.widget.SwipeRefreshLayout>
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/FrostProgressBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_content_base_recycler.xml b/app/src/main/res/layout/view_content_base_recycler.xml
new file mode 100644
index 00000000..efe69913
--- /dev/null
+++ b/app/src/main/res/layout/view_content_base_recycler.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@id/content_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@id/content_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.pitchedapps.frost.views.FrostRecyclerView
+            android:id="@id/content_core"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <ProgressBar
+        android:id="@id/content_progress"
+        style="@style/FrostProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_content_base_web.xml b/app/src/main/res/layout/view_content_base_web.xml
new file mode 100644
index 00000000..de10a82a
--- /dev/null
+++ b/app/src/main/res/layout/view_content_base_web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@id/content_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@id/content_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.pitchedapps.frost.views.FrostWebView
+            android:id="@id/content_core"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <ProgressBar
+        android:id="@id/content_progress"
+        style="@style/FrostProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_content_recycler.xml b/app/src/main/res/layout/view_content_recycler.xml
new file mode 100644
index 00000000..511cfe5d
--- /dev/null
+++ b/app/src/main/res/layout/view_content_recycler.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.pitchedapps.frost.views.FrostContentRecycler xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_content_web.xml b/app/src/main/res/layout/view_content_web.xml
new file mode 100644
index 00000000..1a51b136
--- /dev/null
+++ b/app/src/main/res/layout/view_content_web.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.pitchedapps.frost.views.FrostContentWeb xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
-- 
cgit v1.2.3