diff --git a/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/domain/EventNames.kt b/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/domain/EventNames.kt index a535807..54df85f 100644 --- a/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/domain/EventNames.kt +++ b/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/domain/EventNames.kt @@ -21,7 +21,7 @@ object EventNames { const val SNACKBAR = "snackbar" object Type { - const val HELP = "help" + const val FEEDBACK = "feedback" const val COFFEE = "coffee" const val OSS = "oss" const val URL = "url" diff --git a/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/AboutScreen.kt b/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/AboutScreen.kt index 08c0ad3..4b3e588 100644 --- a/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/AboutScreen.kt +++ b/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/AboutScreen.kt @@ -43,7 +43,6 @@ import tt.co.jesses.moonlight.android.view.util.Constants import tt.co.jesses.moonlight.android.view.util.Constants.basePadding import tt.co.jesses.moonlight.android.view.util.Constants.bodyFontSize import tt.co.jesses.moonlight.android.view.util.Constants.headerFontSize -import tt.co.jesses.moonlight.android.view.util.EmailUtil.composeEmail import tt.co.jesses.moonlight.android.view.util.GradientUtil import tt.co.jesses.moonlight.android.view.util.VersionUtil import tt.co.jesses.moonlight.android.view.util.angledGradientBackground @@ -70,10 +69,9 @@ fun AboutScreen( val versionInfo = VersionUtil.getVersionName(context = context) - val helpMessage = stringResource(R.string.credits_info_help_message) - val helpAction = stringResource(R.string.credits_info_help_action) - val helpEmailAddress = stringResource(R.string.credits_info_help_action_email_address) - val helpEmailSubject = stringResource(R.string.credits_info_help_action_email_subject) + val feedbackMessage = stringResource(R.string.credits_info_feedback_message) + val feedbackAction = stringResource(R.string.credits_info_feedback_action) + val feedbackUrl = stringResource(R.string.credits_info_feedback_action_url) val supportMessage = stringResource(R.string.credits_info_coffee_message) val supportAction = stringResource(R.string.credits_info_coffee_action) @@ -242,27 +240,23 @@ fun AboutScreen( onClick = { coroutineScope.launch { val snackbarResult = scaffoldState.snackbarHostState.showSnackbar( - message = helpMessage, - actionLabel = helpAction, + message = feedbackMessage, + actionLabel = feedbackAction, ).also { logger.logEvent( eventName = EventNames.Action.SNACKBAR, params = mapOf( - EventNames.Action.Type.HELP to EventNames.Action.Params.SNACKBAR_SHOWN + EventNames.Action.Type.FEEDBACK to EventNames.Action.Params.SNACKBAR_SHOWN ), ) } when (snackbarResult) { SnackbarResult.ActionPerformed -> { - composeEmail( - addresses = arrayOf(helpEmailAddress), - subject = helpEmailSubject, - context = context - ) + context.launchCustomTabs(url = feedbackUrl) logger.logEvent( eventName = EventNames.Action.SNACKBAR, params = mapOf( - EventNames.Action.Type.HELP to EventNames.Action.Params.BUTTON_CLICK + EventNames.Action.Type.FEEDBACK to EventNames.Action.Params.BUTTON_CLICK ), ) } @@ -273,7 +267,7 @@ fun AboutScreen( border = borderStroke, ) { Text( - text = stringResource(R.string.credits_info_help), + text = stringResource(R.string.credits_info_feedback), fontSize = bodyFontSize, style = textStyle, ) diff --git a/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/util/EmailUtil.kt b/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/util/EmailUtil.kt deleted file mode 100644 index d7a857b..0000000 --- a/app/androidApp/src/main/java/tt/co/jesses/moonlight/android/view/util/EmailUtil.kt +++ /dev/null @@ -1,23 +0,0 @@ -package tt.co.jesses.moonlight.android.view.util - -import android.content.Context -import android.content.Intent -import androidx.core.content.ContextCompat.startActivity -import androidx.core.net.toUri - -object EmailUtil { - fun composeEmail( - addresses: Array, - subject: String, - context: Context, - ) { - val intent = Intent(Intent.ACTION_SENDTO).apply { - data = "mailto:".toUri() - putExtra(Intent.EXTRA_EMAIL, addresses) - putExtra(Intent.EXTRA_SUBJECT, subject) - } - intent.resolveActivity(context.packageManager)?.let { - startActivity(context, intent, null) - } - } -} \ No newline at end of file diff --git a/app/androidApp/src/main/res/values/strings.xml b/app/androidApp/src/main/res/values/strings.xml index a3c6e15..52c4fec 100644 --- a/app/androidApp/src/main/res/values/strings.xml +++ b/app/androidApp/src/main/res/values/strings.xml @@ -55,11 +55,10 @@ Version %s - Help - Send me an email if you have feedback, questions, or concerns! - email - js@jesses.co.tt - Feedback from the moonlight app + Feedback + Send me your feedback, questions, or concerns! + submit + https://workable-zydeco-5d0.notion.site/3171a41696ff80fdb7a8d43084bb74cb?pvs=105 Buy me a coffee This project is a labour of love. If you are able and willing to support my work, please buy me a coffee diff --git a/app/gradle.properties b/app/gradle.properties index 2941d20..d1a7dc6 100644 --- a/app/gradle.properties +++ b/app/gradle.properties @@ -10,7 +10,7 @@ org.gradle.configureondemand=true # When configured, Gradle will run in incubating parallel mode org.gradle.parallel=true -# Enables Gradle Virtual File System which can speedup build times +# Enables Gradle Virtual File System which can speed up build times org.gradle.vfs.watch=true # Enables Gradle Configuration Cache - https://docs.gradle.org/current/userguide/configuration_cache.html