diff options
author | Allan Wang <me@allanwang.ca> | 2019-06-08 00:29:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-08 00:29:25 -0400 |
commit | 74488eb9f44a7ca40fbf258243e041ad297e62a4 (patch) | |
tree | 55244124c5423a4000da0107dc4727ba91cf4bf2 /app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | |
parent | 1c2109cc583633c369688000c5a55c3a810aa8e3 (diff) | |
parent | 86059c70e377eab5eb5d047e187ad3601bd2b194 (diff) | |
download | frost-74488eb9f44a7ca40fbf258243e041ad297e62a4.tar.gz frost-74488eb9f44a7ca40fbf258243e041ad297e62a4.tar.bz2 frost-74488eb9f44a7ca40fbf258243e041ad297e62a4.zip |
Merge pull request #1438 from AllanWang/fix/md
Fix/md
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt index b94acb63..6b031a03 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -33,6 +33,7 @@ import ca.allanwang.kau.utils.copyFromInputStream import ca.allanwang.kau.utils.fadeOut import ca.allanwang.kau.utils.isHidden import ca.allanwang.kau.utils.isVisible +import ca.allanwang.kau.utils.materialDialog import ca.allanwang.kau.utils.scaleXY import ca.allanwang.kau.utils.setIcon import ca.allanwang.kau.utils.tint @@ -58,7 +59,6 @@ import com.pitchedapps.frost.utils.frostSnackbar import com.pitchedapps.frost.utils.frostUriFromFile import com.pitchedapps.frost.utils.isIndirectImageUrl import com.pitchedapps.frost.utils.logFrostEvent -import com.pitchedapps.frost.utils.materialDialogThemed import com.pitchedapps.frost.utils.sendFrostEmail import com.pitchedapps.frost.utils.setFrostColors import com.sothree.slidinguppanel.SlidingUpPanelLayout @@ -297,18 +297,17 @@ internal enum class FabStates( val err = activity.errorRef?.takeIf { it !is FileNotFoundException && it.message != "Image failed to decode using JPEG decoder" } ?: return - activity.materialDialogThemed { + activity.materialDialog { title(R.string.kau_error) - content(R.string.bad_image_overlay) - positiveText(R.string.kau_yes) - onPositive { _, _ -> + message(R.string.bad_image_overlay) + positiveButton(R.string.kau_yes) { activity.sendFrostEmail(R.string.debug_image_link_subject) { addItem("Url", activity.imageUrl) addItem("Type", err.javaClass.name) addItem("Message", err.message ?: "Null") } } - negativeText(R.string.kau_no) + negativeButton(R.string.kau_no) } } }, |