From bf2401a33760c82b88f00d56b6f868fe98b45bb4 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Sat, 9 Feb 2019 13:25:39 +0000
Subject: [PATCH] Add scrim to collapsing toolbar layout for better title
 visibility

---
 app/src/main/java/com/readrops/app/ItemActivity.java      | 4 ++++
 .../main/java/com/readrops/app/database/dao/ItemDao.java  | 2 +-
 app/src/main/res/drawable/toolbar_scrim.xml               | 8 ++++++++
 app/src/main/res/layout/activity_item.xml                 | 7 +++++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/toolbar_scrim.xml

diff --git a/app/src/main/java/com/readrops/app/ItemActivity.java b/app/src/main/java/com/readrops/app/ItemActivity.java
index bca212e9..fa0fd07a 100644
--- a/app/src/main/java/com/readrops/app/ItemActivity.java
+++ b/app/src/main/java/com/readrops/app/ItemActivity.java
@@ -32,6 +32,8 @@ import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import okhttp3.internal.Util;
+
 public class ItemActivity extends AppCompatActivity {
 
     private ItemViewModel viewModel;
@@ -83,6 +85,8 @@ public class ItemActivity extends AppCompatActivity {
         } else {
             appBarLayout.setExpanded(true);
             toolbarLayout.setTitleEnabled(true);
+            toolbarLayout.setExpandedTitleColor(Color.WHITE);
+            toolbarLayout.setCollapsedTitleTextColor(Color.WHITE);
 
             GlideApp.with(this)
                     .load(imageUrl)
diff --git a/app/src/main/java/com/readrops/app/database/dao/ItemDao.java b/app/src/main/java/com/readrops/app/database/dao/ItemDao.java
index 3c185da8..a2f5d544 100644
--- a/app/src/main/java/com/readrops/app/database/dao/ItemDao.java
+++ b/app/src/main/java/com/readrops/app/database/dao/ItemDao.java
@@ -32,6 +32,6 @@ public interface ItemDao {
     @Insert
     void insertAll(List<Item> items);
 
-    @Query("Select title, Item.description, content, pub_date, image_link, author, 0 as color, read_time, name from Item Inner Join Feed on Item.feed_id = Feed.id And Item.id = :id")
+    @Query("Select title, Item.description, content, pub_date, image_link, author, color, read_time, name from Item Inner Join Feed on Item.feed_id = Feed.id And Item.id = :id")
     LiveData<ItemWithFeed> getItemById(int id);
 }
diff --git a/app/src/main/res/drawable/toolbar_scrim.xml b/app/src/main/res/drawable/toolbar_scrim.xml
new file mode 100644
index 00000000..0d65b59f
--- /dev/null
+++ b/app/src/main/res/drawable/toolbar_scrim.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:endColor="@android:color/transparent"
+        android:startColor="#66000000"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_item.xml b/app/src/main/res/layout/activity_item.xml
index 7d097006..ce109189 100644
--- a/app/src/main/res/layout/activity_item.xml
+++ b/app/src/main/res/layout/activity_item.xml
@@ -27,11 +27,18 @@
                 android:fitsSystemWindows="true"
                 app:layout_collapseMode="parallax" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:layout_gravity="bottom"
+                android:background="@drawable/toolbar_scrim"/>
+
             <android.support.v7.widget.Toolbar
                 android:id="@+id/collasping_layout_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
+                android:theme="@style/AlertDialog.AppCompat.Light"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 
         </android.support.design.widget.CollapsingToolbarLayout>