From a1deb78c78ecaa6f67be569dd24da485f4cbf996 Mon Sep 17 00:00:00 2001 From: John Trujillo Date: Thu, 8 May 2025 13:12:02 -0500 Subject: [PATCH 1/5] fix: Move email constant to strings.xml The feedback email constant was moved from `constants.kt` to `strings.xml` to align with resource management best practices. --- .../main/java/com/itsaky/androidide/fragments/MainFragment.kt | 2 +- app/src/main/res/values/strings.xml | 1 + constants/src/main/java/com/adfa/constants/constants.kt | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt index 0863ad7720..4e5996b911 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt +++ b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt @@ -188,7 +188,7 @@ class MainFragment : BaseFragment() { feedbackIntent.type = "text/plain" feedbackIntent.putExtra( Intent.EXTRA_EMAIL, - arrayOf(FEEDBACK_EMAIL) + arrayOf(R.string.feeback_email) ) feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, subject) feedbackIntent.putExtra(Intent.EXTRA_TEXT, feedbackMessage) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce287572c8..6116774dab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -117,4 +117,5 @@ Connected to the target VM, address: \'localhost:46423\', transport: \'socket\' More Send Email Close + feedback@appdevforall.com \ No newline at end of file diff --git a/constants/src/main/java/com/adfa/constants/constants.kt b/constants/src/main/java/com/adfa/constants/constants.kt index 08a9a793b6..8979c69f3f 100644 --- a/constants/src/main/java/com/adfa/constants/constants.kt +++ b/constants/src/main/java/com/adfa/constants/constants.kt @@ -151,10 +151,6 @@ const val CONTENT_KEY = "CONTENT_KEY" // Toml const val TOML_FILE_NAME = "libs.versions.toml" -//Email constant -const val FEEDBACK_EMAIL = "feedback@appdevforall.com" - - // Help const val HELP_PAGE_URL = "file:///android_asset/CoGoTooltips/html/cogohelp/index.html" From e4fdd7f7de88f82b5290a62ebb567851f9ddf137 Mon Sep 17 00:00:00 2001 From: John Trujillo Date: Thu, 8 May 2025 13:13:36 -0500 Subject: [PATCH 2/5] fix: Remove unused constant import The commit removes the unused import of `FEEDBACK_EMAIL` constant from `MainFragment.kt`. --- .../main/java/com/itsaky/androidide/fragments/MainFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt index 4e5996b911..d7a69962c9 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt +++ b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt @@ -13,7 +13,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.core.text.HtmlCompat import androidx.fragment.app.viewModels -import com.adfa.constants.FEEDBACK_EMAIL + import com.google.android.material.progressindicator.LinearProgressIndicator import com.itsaky.androidide.R import com.itsaky.androidide.activities.MainActivity From d98fa03c94ddeebf96cbe16842d786e6080f1b4c Mon Sep 17 00:00:00 2001 From: John Trujillo Date: Thu, 8 May 2025 18:12:09 -0500 Subject: [PATCH 3/5] lint --- app/src/main/assets/CoGoTooltips | 2 +- .../com/itsaky/androidide/fragments/MainFragment.kt | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/assets/CoGoTooltips b/app/src/main/assets/CoGoTooltips index 0bdf9639af..c8beb9a06d 160000 --- a/app/src/main/assets/CoGoTooltips +++ b/app/src/main/assets/CoGoTooltips @@ -1 +1 @@ -Subproject commit 0bdf9639aff16c2c91904ad31d5524ff1a527157 +Subproject commit c8beb9a06d36ac86932ec038a4c31fc2437a4563 diff --git a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt index d7a69962c9..3b7e6ddaba 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt +++ b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt @@ -2,7 +2,6 @@ package com.itsaky.androidide.fragments import android.content.Intent import android.net.Uri -import android.os.Build import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -13,8 +12,8 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.core.text.HtmlCompat import androidx.fragment.app.viewModels - import com.google.android.material.progressindicator.LinearProgressIndicator +import com.itsaky.androidide.BuildConfig import com.itsaky.androidide.R import com.itsaky.androidide.activities.MainActivity import com.itsaky.androidide.activities.PreferencesActivity @@ -22,10 +21,10 @@ import com.itsaky.androidide.activities.TerminalActivity import com.itsaky.androidide.adapters.MainActionsListAdapter import com.itsaky.androidide.app.BaseApplication import com.itsaky.androidide.app.BaseIDEActivity -import com.itsaky.androidide.buildinfo.BuildInfo import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding import com.itsaky.androidide.databinding.FragmentMainBinding import com.itsaky.androidide.idetooltips.IDETooltipDatabase +import com.itsaky.androidide.idetooltips.IDETooltipItem import com.itsaky.androidide.models.MainScreenAction import com.itsaky.androidide.preferences.databinding.LayoutDialogTextInputBinding import com.itsaky.androidide.preferences.internal.GITHUB_PAT @@ -50,8 +49,6 @@ import org.slf4j.LoggerFactory import java.io.File import java.text.MessageFormat import java.util.concurrent.CancellationException -import com.itsaky.androidide.BuildConfig -import com.itsaky.androidide.idetooltips.IDETooltipItem class MainFragment : BaseFragment() { @@ -170,7 +167,8 @@ class MainFragment : BaseFragment() { .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() } .setPositiveButton(android.R.string.ok) { dialog, _ -> run { - val stackTrace = Exception().stackTrace.asList().toString().replace(",", "\n") + val stackTrace = + Exception().stackTrace.asList().toString().replace(",", "\n") val feedbackMessage = getString( R.string.feedback_message, From 39845a080a6d428d2c5c406c4d1baf0559d4653a Mon Sep 17 00:00:00 2001 From: John Trujillo Date: Thu, 8 May 2025 18:12:45 -0500 Subject: [PATCH 4/5] lint --- .../main/java/com/itsaky/androidide/fragments/MainFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt index dc0533dda9..3b7e6ddaba 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt +++ b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt @@ -12,7 +12,6 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.core.text.HtmlCompat import androidx.fragment.app.viewModels -import org.adfa.constants.FEEDBACK_EMAIL import com.google.android.material.progressindicator.LinearProgressIndicator import com.itsaky.androidide.BuildConfig import com.itsaky.androidide.R From 75eab3b28841219d0a107315c479753cad80b87c Mon Sep 17 00:00:00 2001 From: John Trujillo Date: Fri, 9 May 2025 09:42:22 -0500 Subject: [PATCH 5/5] fix: Correct feedback email address Updates the feedback email address from `@appdevforall.com` to `@appdevforall.org`. --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6116774dab..6d1b8f88c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -117,5 +117,5 @@ Connected to the target VM, address: \'localhost:46423\', transport: \'socket\' More Send Email Close - feedback@appdevforall.com + feedback@appdevforall.org \ No newline at end of file