From cb0b6e1540f3eb9e4c76e3122de1603f2ee6fb90 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Thu, 20 Jul 2017 22:18:32 +0300
Subject: [PATCH] Layout fixes (mostly for tablets), rolled back recyclable

---
 .../mthmmy/activities/topic/TopicAdapter.java |  2 --
 .../main/res/layout-sw600dp/activity_main.xml | 34 +++++++++++++++++++
 app/src/main/res/layout/activity_about.xml    |  2 +-
 app/src/main/res/layout/activity_bookmark.xml |  4 +--
 .../main/res/layout/activity_downloads.xml    |  2 +-
 app/src/main/res/layout/activity_topic.xml    |  5 +--
 app/src/main/res/menu/topic_menu.xml          |  2 +-
 7 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index ecc7a011..b37ec5e4 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -178,8 +178,6 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
             final Post currentPost = postsList.get(position);
             final PostViewHolder holder = (PostViewHolder) currentHolder;
 
-            holder.setIsRecyclable(false);
-
             //Post's WebView parameters
             holder.post.setClickable(true);
             holder.post.setWebViewClient(new LinkLauncher());
diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
new file mode 100644
index 00000000..62b3d010
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/activity_main.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".activities.main.MainActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ToolbarTheme">
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabMaxWidth="0dp"
+            app:tabGravity="fill"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="@color/accent"
+            app:tabTextColor="@color/white"/>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 2e724601..797665a2 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -30,7 +30,7 @@
         android:id="@+id/scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="64dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:background="@color/background">
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_bookmark.xml b/app/src/main/res/layout/activity_bookmark.xml
index b2fa6e33..a12e5e68 100644
--- a/app/src/main/res/layout/activity_bookmark.xml
+++ b/app/src/main/res/layout/activity_bookmark.xml
@@ -30,9 +30,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="top|start"
-        android:layout_marginTop="64dp"
         android:background="@color/background"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:id="@+id/bookmarks_container"
diff --git a/app/src/main/res/layout/activity_downloads.xml b/app/src/main/res/layout/activity_downloads.xml
index 3547d5ea..f8fb406d 100644
--- a/app/src/main/res/layout/activity_downloads.xml
+++ b/app/src/main/res/layout/activity_downloads.xml
@@ -30,9 +30,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="top|start"
-        android:layout_marginTop="64dp"
         android:background="@color/background"
         android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:context="gr.thmmy.mthmmy.activities.downloads.DownloadsActivity">
     </android.support.v7.widget.RecyclerView>
 
diff --git a/app/src/main/res/layout/activity_topic.xml b/app/src/main/res/layout/activity_topic.xml
index 1334fe4e..27f9b6b1 100644
--- a/app/src/main/res/layout/activity_topic.xml
+++ b/app/src/main/res/layout/activity_topic.xml
@@ -37,12 +37,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="top|start"
-        android:layout_marginTop="64dp"
         android:background="@color/background"
+        android:paddingTop="4dp"
         android:paddingBottom="54dp"
         android:clipToPadding="false"
         android:scrollbars="none"
-        tools:context="gr.thmmy.mthmmy.activities.topic.TopicActivity">
+        tools:context="gr.thmmy.mthmmy.activities.topic.TopicActivity"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
     </android.support.v7.widget.RecyclerView>
 
     <LinearLayout
diff --git a/app/src/main/res/menu/topic_menu.xml b/app/src/main/res/menu/topic_menu.xml
index e9ca1807..516a4a48 100644
--- a/app/src/main/res/menu/topic_menu.xml
+++ b/app/src/main/res/menu/topic_menu.xml
@@ -10,7 +10,7 @@
     <item
         android:id="@+id/menu_info"
         android:icon="@drawable/ic_info"
-        app:showAsAction="ifRoom|withText"
+        app:showAsAction="ifRoom"
         android:title="@string/info">
     </item>
 </menu>
\ No newline at end of file