Skip to content

Commit a8b061b

Browse files
authored
Merge pull request #127 from appdevforall/fix/adfa-609
Fix/ADFA 609 feedback email
2 parents de66fc5 + 96faef1 commit a8b061b

4 files changed

Lines changed: 7 additions & 10 deletions

File tree

app/src/main/assets/CoGoTooltips

app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import androidx.activity.result.contract.ActivityResultContracts
1212
import androidx.appcompat.app.AlertDialog
1313
import androidx.core.text.HtmlCompat
1414
import androidx.fragment.app.viewModels
15-
import org.adfa.constants.FEEDBACK_EMAIL
1615
import com.google.android.material.progressindicator.LinearProgressIndicator
16+
import com.itsaky.androidide.BuildConfig
1717
import com.itsaky.androidide.R
1818
import com.itsaky.androidide.activities.MainActivity
1919
import com.itsaky.androidide.activities.PreferencesActivity
@@ -24,6 +24,7 @@ import com.itsaky.androidide.app.BaseIDEActivity
2424
import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding
2525
import com.itsaky.androidide.databinding.FragmentMainBinding
2626
import com.itsaky.androidide.idetooltips.IDETooltipDatabase
27+
import com.itsaky.androidide.idetooltips.IDETooltipItem
2728
import com.itsaky.androidide.models.MainScreenAction
2829
import com.itsaky.androidide.preferences.databinding.LayoutDialogTextInputBinding
2930
import com.itsaky.androidide.preferences.internal.GITHUB_PAT
@@ -48,8 +49,6 @@ import org.slf4j.LoggerFactory
4849
import java.io.File
4950
import java.text.MessageFormat
5051
import java.util.concurrent.CancellationException
51-
import com.itsaky.androidide.BuildConfig
52-
import com.itsaky.androidide.idetooltips.IDETooltipItem
5352

5453
class MainFragment : BaseFragment() {
5554

@@ -168,7 +167,8 @@ class MainFragment : BaseFragment() {
168167
.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
169168
.setPositiveButton(android.R.string.ok) { dialog, _ ->
170169
run {
171-
val stackTrace = Exception().stackTrace.asList().toString().replace(",", "\n")
170+
val stackTrace =
171+
Exception().stackTrace.asList().toString().replace(",", "\n")
172172

173173
val feedbackMessage = getString(
174174
R.string.feedback_message,
@@ -186,7 +186,7 @@ class MainFragment : BaseFragment() {
186186
feedbackIntent.type = "text/plain"
187187
feedbackIntent.putExtra(
188188
Intent.EXTRA_EMAIL,
189-
arrayOf(FEEDBACK_EMAIL)
189+
arrayOf(R.string.feeback_email)
190190
)
191191
feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
192192
feedbackIntent.putExtra(Intent.EXTRA_TEXT, feedbackMessage)

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,5 @@ Connected to the target VM, address: \'localhost:46423\', transport: \'socket\'
117117
<string name="more_label">More</string>
118118
<string name="send_email">Send Email</string>
119119
<string name="close">Close</string>
120+
<string name="feeback_email">feedback@appdevforall.org</string>
120121
</resources>

composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ const val CONTENT_KEY = "CONTENT_KEY"
152152
// Toml
153153
const val TOML_FILE_NAME = "libs.versions.toml"
154154

155-
//Email constant
156-
const val FEEDBACK_EMAIL = "feedback@appdevforall.com"
157-
158-
159155
// Help
160156
const val HELP_PAGE_URL =
161157
"file:///android_asset/CoGoTooltips/html/cogohelp/index.html"

0 commit comments

Comments
 (0)