Merge branch 'master' into fix-issue-255

Author: yogeshpaliyal

.github/workflows/pr-check.yml

@@ -20,7 +20,6 @@ concurrency:
 
 permissions:
   contents: read
-  pull-requests: write
 
 jobs:
   validate-pr:
@@ -65,29 +64,4 @@ jobs:
           path: app/build/outputs/apk/github/debug/*.apk
           retention-days: 3
 
-      - name: 💬 Comment on PR with APK Link
-        uses: actions/github-script@v7
-        if: github.event_name == 'pull_request'
-        with:
-          script: |
-            const runId = context.runId;
-            const repo = context.repo;
-            const prNumber = context.issue.number;
-
-            const comment = `## 📱 APK Build Complete!
-
-            Your debug APK has been built successfully and is ready for testing.
-
-            ### 📥 Download APK
-            [Download app-debug.apk](https://github.com/${repo.owner}/${repo.repo}/actions/runs/${runId})
-
-            **Note:** Click the link above, scroll down to the "Artifacts" section, and download the \`app-debug\` artifact.
-
-            **Retention:** This artifact will be available for 3 days.`;
 
-            github.rest.issues.createComment({
-              owner: repo.owner,
-              repo: repo.repo,
-              issue_number: prNumber,
-              body: comment
-            });

.github/workflows/pr-comment.yml

@@ -0,0 +1,71 @@
+name: PR Comment
+
+on:
+  workflow_run:
+    workflows: ["PR Check"]
+    types:
+      - completed
+
+permissions:
+  pull-requests: write
+
+jobs:
+  comment:
+    name: 'Comment on PR'
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: 💬 Comment on PR with APK Link
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const workflowRun = context.payload.workflow_run;
+            const runId = workflowRun.id;
+            const repo = context.repo;
+            
+            // Get the PR number from the workflow run
+            const prNumber = workflowRun.pull_requests[0]?.number;
+            
+            if (!prNumber) {
+              console.log('No PR number found, skipping comment');
+              return;
+            }
+            
+            // Check if we already commented on this PR for this run
+            const comments = await github.rest.issues.listComments({
+              owner: repo.owner,
+              repo: repo.repo,
+              issue_number: prNumber
+            });
+            
+            const existingComment = comments.data.find(comment => 
+              comment.body.includes(`actions/runs/${runId}`) &&
+              comment.body.includes('APK Build Complete')
+            );
+            
+            if (existingComment) {
+              console.log('Comment already exists for this run, skipping');
+              return;
+            }
+
+            const comment = `## 📱 APK Build Complete!
+
+            Your debug APK has been built successfully and is ready for testing.
+
+            ### 📥 Download APK
+            [Download app-debug.apk](https://github.com/${repo.owner}/${repo.repo}/actions/runs/${runId})
+
+            **Note:** Click the link above, scroll down to the "Artifacts" section, and download the \`app-debug\` artifact.
+
+            **Retention:** This artifact will be available for 3 days.`;
+
+            await github.rest.issues.createComment({
+              owner: repo.owner,
+              repo: repo.repo,
+              issue_number: prNumber,
+              body: comment
+            });
+            
+            console.log(`Comment added to PR #${prNumber}`);

app/src/main/java/com/yogeshpaliyal/deepr/preference/AppPreferenceDataStore.kt

@@ -112,7 +112,7 @@ class AppPreferenceDataStore(
 
     val getThemeMode: Flow<String> =
         context.appDataStore.data.map { preferences ->
-            preferences[THEME_MODE] ?: "light" // Default to light theme
+            preferences[THEME_MODE] ?: "system" // Default to system theme
         }
 
     val getShowOpenCounter: Flow<Boolean> =

app/src/main/java/com/yogeshpaliyal/deepr/ui/components/ThemeSelectionDialog.kt

@@ -13,7 +13,9 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.yogeshpaliyal.deepr.R
 
 @Composable
 fun ThemeSelectionDialog(
@@ -23,16 +25,16 @@ fun ThemeSelectionDialog(
 ) {
     val themeOptions =
         listOf(
-            "system" to "System default",
-            "light" to "Light",
-            "dark" to "Dark",
+            "system" to stringResource(R.string.system_default),
+            "light" to stringResource(R.string.theme_light),
+            "dark" to stringResource(R.string.theme_dark),
         )
 
     AlertDialog(
         onDismissRequest = onDismiss,
         title = {
             Text(
-                text = "Select Theme",
+                text = stringResource(R.string.theme_dialog_title),
                 style = MaterialTheme.typography.headlineSmall,
             )
         },
@@ -62,8 +64,8 @@ fun ThemeSelectionDialog(
         },
         confirmButton = {
             TextButton(onClick = onDismiss) {
-                Text("Close")
+                Text(stringResource(R.string.close))
             }
         },
     )
-}
+}

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/Settings.kt

@@ -233,12 +233,12 @@ fun SettingsScreen(
 
                 SettingsItem(
                     TablerIcons.Moon,
-                    title = "Theme",
+                    title = stringResource(R.string.theme),
                     description =
                         when (themeMode) {
-                            "light" -> "Light"
-                            "dark" -> "Dark"
-                            else -> "System default"
+                            "light" -> stringResource(R.string.theme_light)
+                            "dark" -> stringResource(R.string.theme_dark)
+                            else -> stringResource(R.string.system_default)
                         },
                     onClick = {
                         showThemeDialog = true

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

@@ -111,6 +111,12 @@
     <string name="shortcut_icon">Icona Scorciatoia</string>
     <string name="use_link_app_icon">Usa l\'icona dell\'app di supporto del link</string>
     <string name="use_deepr_app_icon">Usa l\'icona dell\'app Deepr</string>
+
+    <string name="theme">Tema</string>
+    <string name="theme_dialog_title">Seleziona Tema</string>
+    <string name="theme_light">Chiaro</string>
+    <string name="theme_dark">Scuro</string>
+    <string name="close">Chiudi</string>
     <string name="shortcut_icon_setting">Impostazione Icona Scorciatoia</string>
     <string name="language">Lingua</string>
     <string name="language_description">Cambia la lingua dell\'app</string>

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

@@ -281,4 +281,9 @@
     <!-- Clipboard Link Detection Setting -->
     <string name="clipboard_link_detection">Clipboard link detection</string>
     <string name="clipboard_link_detection_description">Automatically detect links in clipboard and show a banner to add them</string>
+    <string name="theme">Theme</string>
+    <string name="theme_dialog_title">Select Theme</string>
+    <string name="theme_light">Light</string>
+    <string name="theme_dark">Dark</string>
+    <string name="close">Close</string>
 </resources>