From 3174728996fd970846f110f6cb349d7cd2caf9ba Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 11 Jan 2021 21:26:02 -0800 Subject: Add back email sender with blank email and remove more senders --- .../kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 10 +--------- .../com/pitchedapps/frost/activities/SettingsActivity.kt | 11 ----------- 2 files changed, 1 insertion(+), 20 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities') 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 bcfd9c99..8f3cecf4 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -363,15 +363,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) } } }, 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 a016ca22..d086b24c 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.prefs.Prefs import com.pitchedapps.frost.settings.getAppearancePrefs @@ -249,7 +245,6 @@ class SettingsActivity : KPrefActivity() { toolbar.tint(prefs.iconColor) setMenuIcons( menu, prefs.iconColor, - R.id.action_email to GoogleMaterial.Icon.gmd_email, R.id.action_changelog to GoogleMaterial.Icon.gmd_info ) return true @@ -257,12 +252,6 @@ 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_changelog -> frostChangelog() else -> return super.onOptionsItemSelected(item) } -- cgit v1.2.3 From 9cb8215f5397cf5db390efce794012205022b772 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 11 Jan 2021 21:29:23 -0800 Subject: Spotless --- app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 1 - 1 file changed, 1 deletion(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities') 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 8f3cecf4..621f89e9 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 -- cgit v1.2.3 From 520b1b98f589a890b26b067fa281b82440a7e040 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 11 Jan 2021 21:37:37 -0800 Subject: Add github link in place of email support --- .../kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 2 ++ app/src/main/res/menu/menu_settings.xml | 6 ++++++ app/src/main/res/values/strings_no_translate.xml | 1 + 3 files changed, 9 insertions(+) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities') 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 d086b24c..aac714ce 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -245,6 +245,7 @@ class SettingsActivity : KPrefActivity() { toolbar.tint(prefs.iconColor) setMenuIcons( menu, prefs.iconColor, + R.id.action_github to CommunityMaterial.Icon2.cmd_github, R.id.action_changelog to GoogleMaterial.Icon.gmd_info ) return true @@ -252,6 +253,7 @@ class SettingsActivity : KPrefActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { + R.id.action_github -> startLink(R.string.github_url) R.id.action_changelog -> frostChangelog() else -> return super.onOptionsItemSelected(item) } diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml index b5d257ee..5832bf4b 100644 --- a/app/src/main/res/menu/menu_settings.xml +++ b/app/src/main/res/menu/menu_settings.xml @@ -3,6 +3,12 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="com.pitchedapps.frost.activities.SettingsActivity"> + + Pitched Apps https://crwd.in/frost-for-facebook + GitHub https://github.com/AllanWang/Frost-for-Facebook https://github.com/AllanWang/Frost-for-Facebook/releases https://f-droid.org/en/packages/com.pitchedapps.frost -- cgit v1.2.3 From f30e67588c49c8e7ed9af124337f67d54a372bb9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 11 Jan 2021 21:38:33 -0800 Subject: Show error classname if message does not exist --- app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities') 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 621f89e9..06626752 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -362,7 +362,7 @@ internal enum class FabStates( ?: return activity.materialDialog { title(R.string.kau_error) - message(text = err.message) + message(text = err.message ?: err.javaClass.name) } } }, -- cgit v1.2.3