Fix image display issue and style of Image Picker

MarcDonald · Aug 20, 2020 · 9911a70 · 9911a70
1 parent 1dc1ff9
commit 9911a70
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
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
@@ -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
 	}
 }
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
@@ -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
@@ -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
 	}
 }
diff --git 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" />