From 22ec85b3dd2e345b292ab97d9f6de5087f33539d Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 11 Jun 2019 11:21:56 +0800
Subject: Lazy mode in ViewUserDetailActivity. Fixed follow chip background
 color in dark mode in ViewUserDetailActivity. Fixed force stop after
 orientation change in ViewUserDetailActivity.

---
 .../main/res/layout/activity_view_subreddit_detail.xml  |  2 +-
 app/src/main/res/layout/activity_view_user_detail.xml   |  4 +++-
 app/src/main/res/layout/app_bar_main.xml                |  2 +-
 app/src/main/res/menu/menu_view_user_detail.xml         | 10 ----------
 .../main/res/menu/view_subreddit_detail_activity.xml    |  6 ++++++
 app/src/main/res/menu/view_user_detail_activity.xml     | 17 +++++++++++++++++
 6 files changed, 28 insertions(+), 13 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_view_user_detail.xml
 create mode 100644 app/src/main/res/menu/view_user_detail_activity.xml

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

diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index ac76d15b..24bff22c 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -24,7 +24,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <ImageView
+                <pl.droidsonroids.gif.GifImageView
                     android:id="@+id/banner_image_view_view_subreddit_detail_activity"
                     android:layout_width="match_parent"
                     android:scaleType="centerCrop"
diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml
index 70b225f8..fac8a2ca 100644
--- a/app/src/main/res/layout/activity_view_user_detail.xml
+++ b/app/src/main/res/layout/activity_view_user_detail.xml
@@ -8,11 +8,13 @@
     tools:context=".ViewUserDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_layout_view_user_detail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar_layout_view_user_detail_activity"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:titleEnabled="false"
@@ -24,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <ImageView
+                <pl.droidsonroids.gif.GifImageView
                     android:id="@+id/banner_image_view_view_user_detail_activity"
                     android:layout_width="match_parent"
                     android:scaleType="centerCrop"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index f7efde6c..1407326c 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -29,7 +29,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
                     app:layout_collapseMode="pin"
-                    app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
+                    app:layout_scrollFlags="scroll|enterAlways"
                     app:popupTheme="@style/AppTheme.PopupOverlay" />
 
                 <com.ferfalk.simplesearchview.SimpleSearchView
diff --git a/app/src/main/res/menu/menu_view_user_detail.xml b/app/src/main/res/menu/menu_view_user_detail.xml
deleted file mode 100644
index ec7d65b8..00000000
--- a/app/src/main/res/menu/menu_view_user_detail.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<menu 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"
-    tools:context="ml.docilealligator.infinityforreddit.ViewUserDetailActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index d9b85107..ede3e6b9 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -9,4 +9,10 @@
         android:title="@string/action_refresh"
         android:icon="@drawable/ic_refresh_white_24dp"
         app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_lazy_mode_view_subreddit_detail_activity"
+        android:orderInCategory="2"
+        android:title="@string/action_start_lazy_mode"
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml
new file mode 100644
index 00000000..6f550333
--- /dev/null
+++ b/app/src/main/res/menu/view_user_detail_activity.xml
@@ -0,0 +1,17 @@
+<menu 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"
+    tools:context="ml.docilealligator.infinityforreddit.ViewUserDetailActivity">
+    <item
+        android:id="@+id/action_refresh_view_user_detail_activity"
+        android:orderInCategory="1"
+        android:title="@string/action_refresh"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_lazy_mode_view_user_detail_activity"
+        android:orderInCategory="2"
+        android:title="@string/action_start_lazy_mode"
+        app:showAsAction="never" />
+</menu>
-- 
cgit v1.2.3