From 350f599b8eb7e764355cc564c590fe43dc49ffb2 Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@cowboyprogrammer.org>
Date: Wed, 9 Oct 2024 20:48:42 +0200
Subject: [PATCH] Changed so bug report button opens github issues instead of
 email

---
 .../java/com/nononsenseapps/feeder/util/BugReportKTest.kt | 4 ++--
 .../nononsenseapps/feeder/ui/compose/feed/FeedScreen.kt   | 8 ++++----
 .../main/java/com/nononsenseapps/feeder/util/BugReport.kt | 4 ++--
 app/src/main/res/values/strings.xml                       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/com/nononsenseapps/feeder/util/BugReportKTest.kt b/app/src/androidTest/java/com/nononsenseapps/feeder/util/BugReportKTest.kt
index 2b7a7130c9..92a56be276 100644
--- a/app/src/androidTest/java/com/nononsenseapps/feeder/util/BugReportKTest.kt
+++ b/app/src/androidTest/java/com/nononsenseapps/feeder/util/BugReportKTest.kt
@@ -51,9 +51,9 @@ class BugReportKTest {
 
     @Test
     fun issuesIntentIsCorrect() {
-        val intent = openGitlabIssues()
+        val intent = openGithubIssues()
 
         assertEquals(ACTION_VIEW, intent.action)
-        assertEquals(Uri.parse("https://gitlab.com/spacecowboy/Feeder/issues"), intent.data)
+        assertEquals(Uri.parse("https://github.com/spacecowboy/feeder/issues"), intent.data)
     }
 }
diff --git a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feed/FeedScreen.kt b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feed/FeedScreen.kt
index c36a522da4..461399203d 100644
--- a/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feed/FeedScreen.kt
+++ b/app/src/main/java/com/nononsenseapps/feeder/ui/compose/feed/FeedScreen.kt
@@ -41,12 +41,12 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.CheckBox
 import androidx.compose.material.icons.filled.CheckBoxOutlineBlank
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.DoneAll
 import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Email
 import androidx.compose.material.icons.filled.FilterList
 import androidx.compose.material.icons.filled.ImportExport
 import androidx.compose.material.icons.filled.Menu
@@ -151,7 +151,7 @@ import com.nononsenseapps.feeder.ui.compose.utils.onKeyEventLikeEscape
 import com.nononsenseapps.feeder.ui.compose.utils.rememberIsItemMostlyVisible
 import com.nononsenseapps.feeder.util.ActivityLauncher
 import com.nononsenseapps.feeder.util.ToastMaker
-import com.nononsenseapps.feeder.util.emailBugReportIntent
+import com.nononsenseapps.feeder.util.openGithubIssues
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -324,7 +324,7 @@ fun FeedScreen(
             onSendFeedback = {
                 activityLauncher.startActivity(
                     openAdjacentIfSuitable = true,
-                    intent = emailBugReportIntent(),
+                    intent = openGithubIssues(),
                 )
             },
             onImport = {
@@ -819,7 +819,7 @@ fun FeedScreen(
                             },
                             leadingIcon = {
                                 Icon(
-                                    Icons.Default.Email,
+                                    Icons.Default.BugReport,
                                     contentDescription = null,
                                 )
                             },
diff --git a/app/src/main/java/com/nononsenseapps/feeder/util/BugReport.kt b/app/src/main/java/com/nononsenseapps/feeder/util/BugReport.kt
index a43cff6b3a..af5b942912 100644
--- a/app/src/main/java/com/nononsenseapps/feeder/util/BugReport.kt
+++ b/app/src/main/java/com/nononsenseapps/feeder/util/BugReport.kt
@@ -56,9 +56,9 @@ fun emailCrashReportIntent(throwable: Throwable): Intent =
         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     }
 
-fun openGitlabIssues(): Intent =
+fun openGithubIssues(): Intent =
     Intent(ACTION_VIEW).also {
-        it.data = Uri.parse("https://gitlab.com/spacecowboy/Feeder/issues")
+        it.data = Uri.parse("https://github.com/spacecowboy/feeder/issues")
     }
 
 const val KOFI_URL = "https://ko-fi.com/spacecowboy"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8227728098..c5e999e445 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,7 +113,7 @@
   <string name="sort_newest_first">Newest first</string>
   <string name="sort_oldest_first">Oldest first</string>
   <string name="sort">Sort by</string>
-  <string name="send_bug_report">Send bug-report</string>
+  <string name="send_bug_report">Send bug report</string>
   <string name="no_email_client">Could not open e-mail client</string>
   <string name="touch_to_play_video">Touch to play video</string>
   <string name="javascript">JavaScript</string>