From eb758ed0771da3de95f916d4bdc5fa46b8852dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Sun, 11 Aug 2019 20:25:01 +0200
Subject: [PATCH] Added scrollbars to recyclerview dialog, fixed a crash on
 Marshmallow caused by casting to AnimatedVectorDrawable instead of
 AnimatedVectorDrawableCompat, fixed a bug that tinted the status bar blue
 instead of white/dark on certain devices while in light mode

---
 app/build.gradle                                             | 4 ++--
 app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt | 3 ++-
 app/src/main/java/com/denizd/substitutionplan/FirstTime.kt   | 3 ++-
 app/src/main/java/com/denizd/substitutionplan/Main.kt        | 1 +
 app/src/main/res/layout/bg_colour_picker.xml                 | 3 ++-
 app/src/main/res/layout/recycler_dialog.xml                  | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a99f8ea..90fa5ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.denizd.substitutionplan"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 21
-        versionName "2.1.4"
+        versionCode 22
+        versionName "2.1.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
index 21f12f8..946a290 100644
--- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
@@ -22,7 +22,7 @@ class CardAdapter(private var mSubst: List<Subst>) : RecyclerView.Adapter<CardAd
     private var colourString = ""
     private var colorCheck = ""
 
-    class CardViewHolder (view: View) : RecyclerView.ViewHolder(view), View.OnClickListener {
+    class CardViewHolder(view: View) : RecyclerView.ViewHolder(view), View.OnClickListener {
 
         var mImageView: ImageView = itemView.findViewById(R.id.iconView)
         var mGroup: TextView = itemView.findViewById(R.id.group)
@@ -74,6 +74,7 @@ class CardAdapter(private var mSubst: List<Subst>) : RecyclerView.Adapter<CardAd
             psa = true
             holder.mDate.visibility = View.GONE
             holder.mDate.text = currentItem.date
+            holder.mTime.text = " "
             holder.mImageView.setImageResource(R.drawable.ic_idea)
             holder.mCard.setCardBackgroundColor(ContextCompat.getColor(holder.mImageView.context, R.color.colorAccent))
         } else {
diff --git a/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt b/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt
index 97bf6a5..11874d9 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/FirstTime.kt
@@ -38,6 +38,7 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
             AppCompatDelegate.MODE_NIGHT_NO, AppCompatDelegate.MODE_NIGHT_UNSPECIFIED -> {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    window.statusBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                     window.navigationBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                 } else {
                     window.statusBarColor = ContextCompat.getColor(this, R.color.legacyBlack)
@@ -120,7 +121,7 @@ class FirstTime : AppCompatActivity(R.layout.activity_first_time) {
                 }
             })
             handler.postDelayed({
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
                     val mImgCheck = findViewById<ImageView>(R.id.imageView).drawable as AnimatedVectorDrawable
                     mImgCheck.start()
                 } else {
diff --git a/app/src/main/java/com/denizd/substitutionplan/Main.kt b/app/src/main/java/com/denizd/substitutionplan/Main.kt
index 354f1cf..a50f722 100644
--- a/app/src/main/java/com/denizd/substitutionplan/Main.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/Main.kt
@@ -64,6 +64,7 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                        window.statusBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                         window.navigationBarColor = ContextCompat.getColor(this, R.color.colorBackground)
                     } else {
                         window.statusBarColor = ContextCompat.getColor(this, R.color.legacyBlack)
diff --git a/app/src/main/res/layout/bg_colour_picker.xml b/app/src/main/res/layout/bg_colour_picker.xml
index c541b2d..c0aac54 100644
--- a/app/src/main/res/layout/bg_colour_picker.xml
+++ b/app/src/main/res/layout/bg_colour_picker.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    android:scrollbars="vertical">
 
     <TableRow
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/recycler_dialog.xml b/app/src/main/res/layout/recycler_dialog.xml
index 9580b13..4d18b9d 100644
--- a/app/src/main/res/layout/recycler_dialog.xml
+++ b/app/src/main/res/layout/recycler_dialog.xml
@@ -24,7 +24,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:scrollbars="vertical"/>
 
     </RelativeLayout>