Add bug report

androidApp/src/main/kotlin/com/prof18/feedflow/settings/SettingsScreen.kt

@@ -39,6 +39,7 @@ import com.prof18.feedflow.settings.components.BrowserSelectionDialog
 import com.prof18.feedflow.settings.components.SettingsDivider
 import com.prof18.feedflow.settings.components.SettingsMenuItem
 import com.prof18.feedflow.ui.preview.FeedFlowPreview
+import com.prof18.feedflow.utils.UserFeedbackReporter
 import dev.icerock.moko.resources.compose.stringResource
 import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
@@ -101,6 +102,12 @@ fun SettingsScreen(
  },
  navigateBack = navigateBack,
  onAboutClick = onAboutClick,
+ onBugReportClick = {
+ browserManager.openUrl(
+ url = UserFeedbackReporter.getFeedbackUrl(),
+ context = context,
+ )
+ },
  )
 }
 
@@ -114,6 +121,7 @@ private fun SettingsScreenContent(
  onBrowserSelected: (Browser) -> Unit,
  navigateBack: () -> Unit,
  onAboutClick: () -> Unit,
+ onBugReportClick: () -> Unit,
 ) {
  val openFileAction = rememberLauncherForActivityResult(
  ActivityResultContracts.OpenDocument(),
@@ -162,6 +170,7 @@ private fun SettingsScreenContent(
  openFileAction = openFileAction,
  createFileAction = createFileAction,
  onAboutClick = onAboutClick,
+ onBugReportClick = onBugReportClick,
  )
  }
 }
@@ -190,6 +199,7 @@ private fun SettingsNavBar(navigateBack: () -> Unit) {
  )
 }
 
+@Suppress("LongMethod")
 @Composable
 private fun SettingsList(
  modifier: Modifier = Modifier,
@@ -198,6 +208,7 @@ private fun SettingsList(
  openFileAction: ManagedActivityResultLauncher<Array<String>, Uri?>,
  createFileAction: ManagedActivityResultLauncher<String, Uri?>,
  onAboutClick: () -> Unit,
+ onBugReportClick: () -> Unit,
 ) {
  LazyColumn(
  modifier = modifier,
@@ -252,6 +263,20 @@ private fun SettingsList(
  SettingsDivider()
  }
 
+ item {
+ SettingsMenuItem(
+ text = stringResource(
+ resource = MR.strings.report_issue_button,
+ ),
+ ) {
+ onBugReportClick()
+ }
+ }
+
+ item {
+ SettingsDivider()
+ }
+
  item {
  SettingsMenuItem(
  text = stringResource(
@@ -289,6 +314,7 @@ private fun SettingsScreenPreview() {
  onBrowserSelected = {},
  navigateBack = {},
  onAboutClick = {},
+ onBugReportClick = {},
  )
  }
 }

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/Main.kt

@@ -55,6 +55,7 @@ import com.prof18.feedflow.presentation.SettingsViewModel
 import com.prof18.feedflow.ui.style.FeedFlowTheme
 import com.prof18.feedflow.ui.style.rememberDesktopDarkTheme
 import com.prof18.feedflow.utils.AppEnvironment
+import com.prof18.feedflow.utils.UserFeedbackReporter
 import com.prof18.feedflow.utils.initSentry
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch
@@ -182,6 +183,9 @@ fun main() = application {
  onAboutClick = {
  aboutDialogState = true
  },
+ onBugReportClick = {
+ openInBrowser(UserFeedbackReporter.getFeedbackUrl())
+ },
  )
 
  MainContent(

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/home/MenuBar.kt

@@ -24,6 +24,7 @@ fun FrameWindowScope.FeedFlowMenuBar(
  onFeedsListClick: () -> Unit,
  onClearOldFeedClick: () -> Unit,
  onAboutClick: () -> Unit,
+ onBugReportClick: () -> Unit,
 ) {
  MenuBar {
  Menu("File", mnemonic = 'F') {
@@ -69,6 +70,13 @@ fun FrameWindowScope.FeedFlowMenuBar(
 
  Separator()
 
+ Item(
+ text = stringResource(resource = MR.strings.report_issue_button),
+ onClick = onBugReportClick,
+ )
+
+ Separator()
+
  Item(
  text = stringResource(resource = MR.strings.about_button),
  onClick = onAboutClick,

iosApp/FeedFlow.xcodeproj/xcshareddata/xcschemes/FeedFlow.xcscheme

@@ -31,7 +31,7 @@
  </Testables>
  </TestAction>
  <LaunchAction
- buildConfiguration = "Release"
+ buildConfiguration = "Debug"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  launchStyle = "0"

iosApp/Source/Home/HomeScreen.swift

@@ -183,6 +183,8 @@ struct HomeContent: View {
  @EnvironmentObject var browserSelector: BrowserSelector
  @EnvironmentObject var appState: AppState
 
+ @Environment(\.openURL) var openURL
+
  @Binding var loadingState: FeedUpdateStatus?
  @Binding var feedState: [FeedItem]
  @Binding var showLoading: Bool
@@ -324,6 +326,20 @@ struct HomeContent: View {
  }
  )
 
+ Button(
+ action: {
+ if let url = URL(string: UserFeedbackReporter.shared.getFeedbackUrl()) {
+ self.openURL(url)
+ }
+ },
+ label: {
+ Label(
+ MR.strings().report_issue_button.localized,
+ systemImage: "ladybug"
+ )
+ }
+ )
+
  NavigationLink(value: Route.aboutScreen) {
  Label(
  MR.strings().about_button.localized,

iosApp/Source/Utils/IosHtmlParser.swift

@@ -17,7 +17,8 @@ class IosHtmlParser: HtmlParser {
  let doc: Document = try SwiftSoup.parse(html)
  return try doc.text()
  } catch {
- KotlinDependencies.shared.getLogger(tag: "IosHtmlParser").e(messageString: "Error during html parsing: \(error)")
+ KotlinDependencies.shared.getLogger(tag: "IosHtmlParser")
+ .e(messageString: "Error during html parsing: \(error)")
  return nil
  }
  }

shared/build.gradle.kts

@@ -47,6 +47,8 @@ kotlin {
  implementation(libs.kotlinx.coroutines.core)
  implementation(libs.com.prof18.rss.parser)
  implementation(libs.multiplatform.settings)
+ implementation(libs.kotlin.test)
+ implementation(libs.kotlin.test.junit)
 
  api(libs.touchlab.kermit)
  api(libs.moko.resources)

shared/src/commonJvmAndroidMain/kotlin/com/prof18/feedflow/domain/DateUtilsJvmAndroid.kt

@@ -7,14 +7,16 @@ import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.*
+import java.util.Locale
 
-internal actual fun getDateMillisFromString(dateString: String, logger: Logger): Long? {
+internal actual fun getDateMillisFromString(dateString: String, logger: Logger?): Long? {
  val dateFormat = SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z", Locale.getDefault())
  return try {
  dateFormat.parse(dateString)?.time
  } catch (e: ParseException) {
- logger.e(e) { "Error while trying to format the date with dateFormatter. Date: $dateString" }
+ logger?.e(e) {
+ "Error while trying to format the date with dateFormatter. Date: $dateString"
+ }
  null
  }
 }

shared/src/commonMain/kotlin/com/prof18/feedflow/domain/DateUtils.kt

@@ -2,7 +2,10 @@ package com.prof18.feedflow.domain
 
 import co.touchlab.kermit.Logger
 
-internal expect fun getDateMillisFromString(dateString: String, logger: Logger): Long?
+internal expect fun getDateMillisFromString(
+ dateString: String,
+ logger: Logger? = null,
+): Long?
 
 internal expect fun formatDate(millis: Long): String
 

shared/src/commonMain/kotlin/com/prof18/feedflow/utils/UserFeedbackReporter.kt

@@ -0,0 +1,15 @@
+package com.prof18.feedflow.utils
+
+object UserFeedbackReporter {
+ private const val baseUrl = "https://github.com/prof18/feed-flow/issues/new"
+ private const val title = "App issue"
+ private const val body = "Please describe the issue and provide a link to the RSS Feed that causes the issues:\n"
+
+ fun getFeedbackUrl(): String {
+ val encodedTitle = title.replace(" ", "+")
+ val encodedContent = body
+ .replace(" ", "+")
+ .replace("\n", "%0A")
+ return "$baseUrl?title=$encodedTitle&body=$encodedContent"
+ }
+}

shared/src/commonMain/resources/MR/base/strings.xml

@@ -40,4 +40,5 @@
  <string name="about_the_app">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</string>
  <string name="about_nav_bar">About</string>
  <string name="open_source_nav_bar">Open source licenses</string>
+ <string name="report_issue_button">Report issue</string>
 </resources>

shared/src/commonMobileMain/kotlin/com/prof18/feedflow/logging/FeedFlowLogWriter.kt

@@ -1,6 +1,8 @@
 package com.prof18.feedflow.logging
 
+import co.touchlab.kermit.ExperimentalKermitApi
 import co.touchlab.kermit.LogWriter
 import co.touchlab.kermit.crashlytics.CrashlyticsLogWriter
 
+@OptIn(ExperimentalKermitApi::class)
 actual fun crashReportingLogWriter(): LogWriter = CrashlyticsLogWriter()

shared/src/desktopMain/kotlin/com/prof18/feedflow/logging/SentryLogWriter.kt

@@ -15,6 +15,7 @@ class SentryLogWriter(
 ) : LogWriter() {
 
  init {
+ @Suppress("UseRequire")
  if (minCrashSeverity != null && minSeverity > minCrashSeverity) {
  throw IllegalArgumentException(
  "minSeverity ($minSeverity) cannot be greater than minCrashSeverity ($minCrashSeverity)",

shared/src/iosMain/kotlin/com/prof18/feedflow/domain/DateUtils.kt

@@ -12,7 +12,7 @@ import platform.Foundation.dateWithTimeIntervalSince1970
 import platform.Foundation.timeIntervalSince1970
 
 @Suppress("TooGenericExceptionCaught")
-internal actual fun getDateMillisFromString(dateString: String, logger: Logger): Long? {
+internal actual fun getDateMillisFromString(dateString: String, logger: Logger?): Long? {
  val dateFormatter = NSDateFormatter().apply {
  setDateFormat("E, d MMM yyyy HH:mm:ss Z")
  setLocale(NSLocale("en_US_POSIX"))
@@ -45,7 +45,7 @@ internal actual fun getDateMillisFromString(dateString: String, logger: Logger):
 
  if (date == null) {
  if (exception != null && message != null) {
- logger.e(exception) {
+ logger?.e(exception) {
  message
  }
  }

website/config.toml

@@ -16,7 +16,7 @@ theme = "apsho"
  weight = 2
 [[menu.sitemap]]
  name = "Privacy & Policy"
- url = "/privacy"
+ url = "https://www.prof18.com/feed-flow/pp/privacy-policy-jul23/"
  weight = 3
 [[menu.sitemap]]
  name = "Report issue"