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 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 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 @@ + + + + \ 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" /> + +