diff options
author | Allan Wang <me@allanwang.ca> | 2021-01-12 00:00:44 -0800 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2021-01-12 00:00:44 -0800 |
commit | 82fa4c5d6c75e245e74d903328b3e5d96b01b5ca (patch) | |
tree | 98250a0cd09119312c4eaabf246e7172f157a474 /app/src/main/kotlin/com/pitchedapps/frost/activities | |
parent | fd2cbf25f5744a939ef6245809a1655e013a6420 (diff) | |
parent | 68db99597b68c87f1e0eb2d1feb6b6c63bbff1e9 (diff) | |
download | frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.tar.gz frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.tar.bz2 frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.zip |
Merge branch 'dev' into messenger
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 11 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 13 |
2 files changed, 3 insertions, 21 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 ea81bcde..609ed049 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -65,7 +65,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.sendFrostEmail import com.pitchedapps.frost.utils.setFrostColors import java.io.File import java.io.FileNotFoundException @@ -363,15 +362,7 @@ internal enum class FabStates( ?: return activity.materialDialog { title(R.string.kau_error) - 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") - } - } - negativeButton(R.string.kau_no) + message(text = err.message ?: err.javaClass.name) } } }, diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt index ee0cd669..3f2cb6ce 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -29,19 +29,15 @@ import ca.allanwang.kau.kpref.activity.KPrefActivity import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder import ca.allanwang.kau.ui.views.RippleCanvas import ca.allanwang.kau.utils.finishSlideOut -import ca.allanwang.kau.utils.materialDialog import ca.allanwang.kau.utils.setMenuIcons import ca.allanwang.kau.utils.startActivityForResult import ca.allanwang.kau.utils.startLink -import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.tint import ca.allanwang.kau.utils.withSceneTransitionAnimation -import com.afollestad.materialdialogs.list.listItems import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import com.pitchedapps.frost.R import com.pitchedapps.frost.db.NotificationDao -import com.pitchedapps.frost.enums.Support import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.injectors.ThemeProvider import com.pitchedapps.frost.prefs.Prefs @@ -251,7 +247,7 @@ class SettingsActivity : KPrefActivity() { toolbar.tint(prefs.iconColor) setMenuIcons( menu, prefs.iconColor, - R.id.action_email to GoogleMaterial.Icon.gmd_email, + R.id.action_github to CommunityMaterial.Icon2.cmd_github, R.id.action_changelog to GoogleMaterial.Icon.gmd_info ) return true @@ -259,12 +255,7 @@ class SettingsActivity : KPrefActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.action_email -> materialDialog { - title(R.string.subject) - listItems(items = Support.values().map { string(it.title) }) { _, index, _ -> - Support.values()[index].sendEmail(this@SettingsActivity) - } - } + R.id.action_github -> startLink(R.string.github_url) R.id.action_changelog -> frostChangelog() else -> return super.onOptionsItemSelected(item) } |