From 526d090424eb8654b0086eaedb0cb8f938a96093 Mon Sep 17 00:00:00 2001
From: alome007 <astrocoder007@gmail.com>
Date: Wed, 16 Apr 2025 19:29:32 +0100
Subject: [PATCH] ADFA-514: Update contact dialog with send email button and
 new email address

---
 .../androidide/utils/EditorSidebarActions.kt    |  9 +++++++--
 app/src/main/res/layout/contact_dialog.xml      | 17 +++++++++++++++--
 app/src/main/res/values/strings.xml             |  4 +++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt b/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt
index 6dfb3498f6..67d77cb435 100644
--- a/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt
+++ b/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt
@@ -67,6 +67,7 @@ import com.itsaky.androidide.fragments.sidebar.EditorSidebarFragment
 import com.itsaky.androidide.idetooltips.IDETooltipItem
 import com.itsaky.androidide.utils.ContactDetails.EMAIL_SUPPORT
 import java.lang.ref.WeakReference
+import androidx.core.net.toUri
 
 
 /**
@@ -77,7 +78,7 @@ import java.lang.ref.WeakReference
  */
 
 object ContactDetails {
-    const val EMAIL_SUPPORT = "info@appdevforall.org"
+    const val EMAIL_SUPPORT = "feedback@appdevforall.org"
 }
 
 internal object EditorSidebarActions {
@@ -286,7 +287,7 @@ internal object EditorSidebarActions {
         // Prepare the email intent for reuse
         val emailIntent: () -> Unit = {
             val intent = Intent(Intent.ACTION_SENDTO).apply {
-                data = Uri.parse("mailto:$EMAIL_SUPPORT?subject=Feedback about Code on the Go")
+                data = "mailto:$EMAIL_SUPPORT?subject=Feedback about Code on the Go".toUri()
             }
             context.startActivity(intent)
         }
@@ -322,6 +323,10 @@ internal object EditorSidebarActions {
             emailIntent()
         }
 
+        // When the send email button is clicked:
+        binding.btnSendEmail.setOnClickListener {
+            emailIntent()
+        }
         // Close button action: dismiss the dialog.
         binding.btnClose.setOnClickListener {
             dialog.dismiss()
diff --git a/app/src/main/res/layout/contact_dialog.xml b/app/src/main/res/layout/contact_dialog.xml
index 733d90aa7e..b2250400cc 100644
--- a/app/src/main/res/layout/contact_dialog.xml
+++ b/app/src/main/res/layout/contact_dialog.xml
@@ -35,11 +35,24 @@
         android:layout_width="wrap_content"
         android:layout_height="44dp"
         android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
         android:textColor="@color/black"
         app:backgroundTint="@null"
         android:background="@drawable/rounded_button_bg"
-        android:text="@string/close"
+        android:text="@string/cancel"
+        app:layout_constraintEnd_toStartOf="@+id/btnSendEmail"
+        app:layout_constraintTop_toBottomOf="@id/tvDescription" />
+
+    <Button
+        android:id="@+id/btnSendEmail"
+        android:layout_width="wrap_content"
+        android:layout_height="44dp"
+        android:layout_marginTop="12dp"
+        android:textColor="@color/black"
+        app:backgroundTint="@null"
+        android:background="@drawable/rounded_button_bg"
+        android:text="@string/send_email"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvDescription" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4a27e941a..6346523715 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,7 +110,9 @@ Connected to the target VM, address: \'localhost:46423\', transport: \'socket\'
 
     <string name="msg_internet_access_required">Internet access is required.</string>
     <string name="msg_contact_app_dev_title">Contact App Dev for All</string>
-    <string name="msg_contact_app_dev_description">To report issues, make suggestions, and ask questions, email us at info@appdevforall.org. Internet access is required.</string>
+    <string name="msg_contact_app_dev_description">To report issues, make suggestions, and ask questions, email us at feedback@appdevforall.org. Internet access is required.</string>
     <string name="code_on_the_go">Code on the Go</string>
     <string name="offline_message">Offline</string>
+    <string name="send_email">Send Email</string>
+    <string name="close">Close</string>
 </resources>
\ No newline at end of file