aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2021-01-12 00:00:44 -0800
committerAllan Wang <me@allanwang.ca>2021-01-12 00:00:44 -0800
commit82fa4c5d6c75e245e74d903328b3e5d96b01b5ca (patch)
tree98250a0cd09119312c4eaabf246e7172f157a474 /app/src/main/kotlin/com/pitchedapps
parentfd2cbf25f5744a939ef6245809a1655e013a6420 (diff)
parent68db99597b68c87f1e0eb2d1feb6b6c63bbff1e9 (diff)
downloadfrost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.tar.gz
frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.tar.bz2
frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.zip
Merge branch 'dev' into messenger
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt11
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt13
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/enums/Support.kt40
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt15
5 files changed, 5 insertions, 77 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)
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/enums/Support.kt b/app/src/main/kotlin/com/pitchedapps/frost/enums/Support.kt
deleted file mode 100644
index 23ea5a8f..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/enums/Support.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2018 Allan Wang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.pitchedapps.frost.enums
-
-import android.content.Context
-import androidx.annotation.StringRes
-import ca.allanwang.kau.utils.string
-import com.pitchedapps.frost.R
-import com.pitchedapps.frost.utils.sendFrostEmail
-
-/**
- * Created by Allan Wang on 2017-06-29.
- */
-enum class Support(@StringRes val title: Int) {
- FEEDBACK(R.string.feedback),
- BUG(R.string.bug_report),
- THEME(R.string.theme_issue),
- FEATURE(R.string.feature_request);
-
- fun sendEmail(context: Context) {
- with(context) {
- this.sendFrostEmail("${string(R.string.frost_prefix)} ${string(title)}") {
- }
- }
- }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 63483da0..883ea9aa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -409,7 +409,7 @@ inline fun Context.sendFrostEmail(
sendFrostEmail(string(subjectId), builder)
inline fun Context.sendFrostEmail(subjectId: String, crossinline builder: EmailBuilder.() -> Unit) =
- sendEmail(string(R.string.dev_email), subjectId) {
+ sendEmail("", subjectId) {
builder()
addFrostDetails()
}
@@ -418,7 +418,6 @@ fun EmailBuilder.addFrostDetails() {
val prefs = Prefs.get()
addItem("Prev version", prefs.prevVersionCode.toString())
val proTag = "FO"
-// if (IS_FROST_PRO) "TY" else "FP"
addItem("Random Frost ID", "${prefs.frostId}-$proTag")
addItem("Locale", Locale.getDefault().displayName)
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt
index 3ab924e2..03dbb9fb 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt
@@ -75,20 +75,7 @@ enum class WebContextType(
{ c, wc, fc -> c.launchWebOverlay(wc.url!!, fc, Prefs.get()) }),
COPY_LINK(R.string.copy_link, { it.hasUrl }, { c, wc, _ -> c.copyToClipboard(wc.url) }),
COPY_TEXT(R.string.copy_text, { it.hasText }, { c, wc, _ -> c.copyToClipboard(wc.text) }),
- SHARE_LINK(R.string.share_link, { it.hasUrl }, { c, wc, _ -> c.shareText(wc.url) }),
- DEBUG_LINK(R.string.debug_link, { it.hasUrl }, { c, wc, _ ->
- c.materialDialog {
- title(R.string.debug_link)
- message(R.string.debug_link_desc)
- positiveButton(R.string.kau_ok) {
- c.sendFrostEmail(R.string.debug_link_subject) {
- message = c.string(R.string.debug_link_content)
- addItem("Unformatted url", wc.unformattedUrl!!)
- addItem("Formatted url", wc.url!!)
- }
- }
- }
- })
+ SHARE_LINK(R.string.share_link, { it.hasUrl }, { c, wc, _ -> c.shareText(wc.url) })
;
companion object {