From 9911a70f9359f822882270ddb2ae33875f9b9ce0 Mon Sep 17 00:00:00 2001
From: Marc Donald <marcsdeveloperemail@gmail.com>
Date: Thu, 20 Aug 2020 20:19:48 +0100
Subject: [PATCH] Fix image display issue and style of Image Picker

---
 .../hibi/screens/entries/ImageRecyclerAdapter.kt           | 1 +
 .../hibi/screens/entries/addentry/AddEntryFragment.kt      | 5 +++++
 .../screens/entries/viewentry/FullscreenImageFragment.kt   | 1 +
 app/src/main/res/values/styles.xml                         | 7 +++++++
 4 files changed, 14 insertions(+)

diff --git a/app/src/main/java/com/marcdonald/hibi/screens/entries/ImageRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/screens/entries/ImageRecyclerAdapter.kt
index a834d85..f3d07c0 100644
--- a/app/src/main/java/com/marcdonald/hibi/screens/entries/ImageRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/screens/entries/ImageRecyclerAdapter.kt
@@ -81,5 +81,6 @@ class ImageRecyclerViewHolder(itemView: View,
 			.apply(RequestOptions().centerCrop())
 			.apply(RequestOptions().error(itemView.resources.getDrawable(R.drawable.ic_error_24dp, theme)))
 			.into(imageDisplay)
+		imageDisplay.imageTintList = null
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/screens/entries/addentry/AddEntryFragment.kt b/app/src/main/java/com/marcdonald/hibi/screens/entries/addentry/AddEntryFragment.kt
index 1c47c2c..4bdb46a 100644
--- a/app/src/main/java/com/marcdonald/hibi/screens/entries/addentry/AddEntryFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/screens/entries/addentry/AddEntryFragment.kt
@@ -446,6 +446,11 @@ class AddEntryFragment : HibiFragment() {
 			ImagePicker.create(this)
 				.includeVideo(false)
 				.includeAnimation(false)
+				.toolbarImageTitle(resources.getString(R.string.add_images))
+				.toolbarFolderTitle(resources.getString(R.string.add_images))
+				.showCamera(false)
+				.folderMode(true)
+				.theme(R.style.Hibi_ImagePicker)
 				.start()
 		}
 	}
diff --git a/app/src/main/java/com/marcdonald/hibi/screens/entries/viewentry/FullscreenImageFragment.kt b/app/src/main/java/com/marcdonald/hibi/screens/entries/viewentry/FullscreenImageFragment.kt
index 015cd60..2ac5bf4 100644
--- a/app/src/main/java/com/marcdonald/hibi/screens/entries/viewentry/FullscreenImageFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/screens/entries/viewentry/FullscreenImageFragment.kt
@@ -44,5 +44,6 @@ class FullscreenImageFragment : HibiFragment() {
 			.apply(RequestOptions().fitCenter())
 			.apply(RequestOptions().error(resources.getDrawable(R.drawable.ic_error_24dp, requireActivity().theme)))
 			.into(imageView)
+		imageView.imageTintList = null
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 973994c..7c590c2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -53,6 +53,13 @@
     <item name="android:tint">@color/iconTint</item>
   </style>
 
+  <style name="Hibi.ImagePicker" parent="ef_BaseTheme">
+    <item name="colorPrimary">@color/colorToolbar</item>
+    <item name="colorPrimaryDark">@color/colorToolbar</item>
+    <item name="colorAccent">@color/colorSecondary</item>
+    <item name="android:colorBackground">@color/colorBackground</item>
+  </style>
+
   <!--region Widgets-->
   <style name="Widget.Hibi" parent="@android:style/Widget" />