Makes the toolbar shadow visible for pre-Lollipop android versions and fixes a crash when deleting a draft with no media attached.

app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java

@@ -131,12 +131,14 @@ public class SavedTootActivity extends BaseActivity implements SavedTootAdapter.
         // Delete any media files associated with the status.
         ArrayList<String> uris = new Gson().fromJson(item.getUrls(),
                 new TypeToken<ArrayList<String>>() {}.getType());
+        if (uris != null) {
             for (String uriString : uris) {
                 Uri uri = Uri.parse(uriString);
                 if (getContentResolver().delete(uri, null, null) == 0) {
                     Log.e(TAG, String.format("Did not delete file %s.", uriString));
                 }
             }
+        }
         // update DB
         tootDao.delete(item);
         // update adapter

app/src/main/res/color/drawer_visibility_panel_item.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/button_dark" android:state_checked="true" />
-    <item android:color="?material_drawer_primary_icon" />
-</selector>

app/src/main/res/drawable/ic_mute_24dp.xml

@@ -1,5 +1,6 @@
 <vector android:height="24dp" android:viewportHeight="35.43307"
-    android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true">
     <path android:fillAlpha="1" android:fillColor="#ffffff"
         android:pathData="m17.72,3.54 l-8.86,8.86 -7.09,0 0,10.63 7.09,0 8.86,8.86z"
         android:strokeAlpha="1" android:strokeColor="#00000000"

app/src/main/res/drawable/ic_unmute_24dp.xml

@@ -1,5 +1,6 @@
 <vector android:height="24dp" android:viewportHeight="35.43307"
-    android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true">
     <path android:fillAlpha="1" android:fillColor="#ffffff"
         android:pathData="m17.72,3.54 l-8.86,8.86 -7.09,0 0,10.63 7.09,0 8.86,8.86z"
         android:strokeAlpha="1" android:strokeColor="#00000000"

app/src/main/res/layout/activity_about.xml

@@ -1,26 +1,18 @@
 <?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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.AboutActivity">
 
-    <LinearLayout
+    <include layout="@layout/toolbar_basic" />
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/toolbar_background_color"
-            android:elevation="4dp" />
 
     <ScrollView
         android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -83,6 +75,6 @@
 
     </ScrollView>
 
-    </LinearLayout>
+    <include layout="@layout/toolbar_shadow_shim" />
 
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_account_list.xml

@@ -1,30 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.AccountListActivity">
 
-    <LinearLayout
+    <include layout="@layout/toolbar_basic" />
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
-            android:background="?attr/toolbar_background_color" />
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    </LinearLayout>
+    <include layout="@layout/toolbar_shadow_shim" />
 
     <FrameLayout
         android:id="@+id/overlay_fragment_container"

app/src/main/res/layout/activity_compose.xml

@@ -16,8 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_marginBottom="8dp"
-            android:background="@android:color/transparent"
+            android:background="@android:color/transparent" />
-            android:elevation="4dp" />
 
         <LinearLayout
             android:id="@+id/compose_content_warning_bar"

app/src/main/res/layout/activity_edit_profile.xml

@@ -7,22 +7,18 @@
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.EditProfileActivity">
 
+    <include layout="@layout/toolbar_basic" />
+
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/toolbar_background_color"
-                android:elevation="4dp" />
-
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -81,6 +77,7 @@
                     android:elevation="4dp"
                     android:background="@drawable/round_button"
                     android:contentDescription="@string/label_avatar" />
+
             </RelativeLayout>
 
             <android.support.design.widget.TextInputLayout
@@ -122,6 +119,8 @@
 
     </ScrollView>
 
+    <include layout="@layout/toolbar_shadow_shim" />
+
     <ProgressBar
         android:id="@+id/edit_profile_save_progress"
         android:layout_width="wrap_content"

app/src/main/res/layout/activity_favourites.xml

@@ -1,36 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.FavouritesActivity">
 
-    <LinearLayout
+    <include layout="@layout/toolbar_basic" />
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
-            android:background="?attr/toolbar_background_color" />
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_height="match_parent"
-
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-    </LinearLayout>
 
     <FrameLayout
         android:id="@+id/overlay_fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent" />
 
-    </FrameLayout>
+    <include layout="@layout/toolbar_shadow_shim" />
 
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_report.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <include layout="@layout/toolbar_basic" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
-        <android.support.v7.widget.Toolbar
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
-            android:background="?attr/toolbar_background_color" />
 
         <android.support.v7.widget.RecyclerView
             android:layout_width="match_parent"
@@ -38,4 +36,7 @@
             android:paddingBottom="8dp"
             android:hint="@string/report_comment_hint" />
     </LinearLayout>
+
+    <include layout="@layout/toolbar_shadow_shim" />
+
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_saved_toot.xml

@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.AccountListActivity">
 
+    <include layout="@layout/toolbar_basic" />
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/toolbar_background_color"
-            android:elevation="4dp" />
 
         <TextView
             android:id="@+id/no_content"
@@ -29,10 +25,10 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="match_parent" />
-            android:layout_below="@+id/toolbar" />
-
 
     </RelativeLayout>
 
+    <include layout="@layout/toolbar_shadow_shim" />
+
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_search.xml

@@ -6,10 +6,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="com.keylesspalace.tusky.SearchActivity">
 
-    <LinearLayout
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:stateListAnimator="@null"
+        android:elevation="0dp"
+        app:layout_collapseMode="pin">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
@@ -19,9 +21,12 @@
             app:navigationIcon="?attr/homeAsUpIndicator"
             app:contentInsetStartWithNavigation="0dp" />
 
+    </android.support.design.widget.AppBarLayout>
+
     <RelativeLayout
         android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <android.support.v7.widget.RecyclerView
             android:layout_width="match_parent"
@@ -46,6 +51,6 @@
 
     </RelativeLayout>
 
-    </LinearLayout>
+    <include layout="@layout/toolbar_shadow_shim" />
 
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_view_tag.xml

@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.ViewTagActivity">
 
-    <LinearLayout
+    <include layout="@layout/toolbar_basic" />
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
-            android:background="?attr/toolbar_background_color" />
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    </LinearLayout>
+    <include layout="@layout/toolbar_shadow_shim" />
 
     <FrameLayout
         android:id="@+id/overlay_fragment_container"

app/src/main/res/layout/activity_view_thread.xml

@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.keylesspalace.tusky.ViewThreadActivity">
 
-    <LinearLayout
+    <include layout="@layout/toolbar_basic" />
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="4dp"
-            android:background="?attr/toolbar_background_color" />
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_height="match_parent"
-    </LinearLayout>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <include layout="@layout/toolbar_shadow_shim" />
 
     <FrameLayout
         android:id="@+id/overlay_fragment_container"

app/src/main/res/layout/activity_view_video.xml

@@ -25,6 +25,5 @@
         android:layout_height="?attr/actionBarSize"
         android:theme="@style/AppTheme.Account.AppBarLayout"
         app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
-        android:elevation="4dp"
         android:background="@color/semi_transparent" />
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/toolbar_basic.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stateListAnimator="@null"
+        android:elevation="0dp"
+        app:layout_collapseMode="pin">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/toolbar_background_color" />
+
+    </android.support.design.widget.AppBarLayout>
+
+</merge>

app/src/main/res/layout/toolbar_shadow_shim.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <View
+        android:id="@+id/toolbar_shadow_shim"
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="@drawable/material_drawer_shadow_bottom"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_collapseMode="pin" />
+
+</merge>