Merge branch 'master' into copilot/fix-profile-linking-issue

yogeshpaliyal · web-flow · commit 3f226589fd8c · 2026-02-21T21:35:52.000+05:30
diff --git a/.github/workflows/pr-check.yml b/.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
-            });
diff --git a/.github/workflows/pr-comment.yml b/.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}`);
diff --git a/app/src/main/java/com/yogeshpaliyal/deepr/preference/AppPreferenceDataStore.kt b/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> =
diff --git a/app/src/main/java/com/yogeshpaliyal/deepr/ui/components/ThemeSelectionDialog.kt b/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))
             }
         },
     )
-}
+}
diff --git a/app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/ScanQRVirtualScreen.kt b/app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/ScanQRVirtualScreen.kt
diff --git a/app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/Settings.kt b/app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/Settings.kt
@@ -193,8 +193,6 @@ fun SettingsScreen(
                     },
                 )
 
-                ScanQRCode()
-
                 SettingsItem(
                     TablerIcons.Settings,
                     title = stringResource(R.string.shortcut_icon),
@@ -235,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
diff --git a/app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/addlink/AddLinkScreen.kt b/app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/addlink/AddLinkScreen.kt
@@ -1,6 +1,7 @@
 package com.yogeshpaliyal.deepr.ui.screens.addlink
 
 import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
@@ -64,12 +65,14 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil3.compose.AsyncImage
+import com.journeyapps.barcodescanner.ScanOptions
 import com.yogeshpaliyal.deepr.DeeprQueries
 import com.yogeshpaliyal.deepr.GetLinksAndTags
 import com.yogeshpaliyal.deepr.R
 import com.yogeshpaliyal.deepr.Tags
 import com.yogeshpaliyal.deepr.ui.LocalNavigator
 import com.yogeshpaliyal.deepr.ui.components.ClearInputIconButton
+import com.yogeshpaliyal.deepr.util.QRScanner
 import com.yogeshpaliyal.deepr.util.isValidDeeplink
 import com.yogeshpaliyal.deepr.util.normalizeLink
 import com.yogeshpaliyal.deepr.util.openDeeplink
@@ -82,6 +85,7 @@ import compose.icons.tablericons.Link
 import compose.icons.tablericons.Note
 import compose.icons.tablericons.Photo
 import compose.icons.tablericons.Plus
+import compose.icons.tablericons.Qrcode
 import compose.icons.tablericons.Tag
 import compose.icons.tablericons.User
 import compose.icons.tablericons.X
@@ -108,6 +112,18 @@ fun AddLinkScreen(
     var isError by remember { mutableStateOf(false) }
     var isNameError by remember { mutableStateOf(false) }
     var isFetchingMetadata by remember { mutableStateOf(false) }
+
+    val qrScanner =
+        rememberLauncherForActivityResult(
+            QRScanner(),
+        ) { result ->
+            if (result.contents != null) {
+                val normalizedLink = normalizeLink(result.contents)
+                deeprInfo = deeprInfo.copy(link = normalizedLink)
+                isError = false
+            }
+        }
+
     // Tags
     var newTagName by remember { mutableStateOf("") }
     val allTags by viewModel.allTags.collectAsStateWithLifecycle()
@@ -290,19 +306,27 @@ fun AddLinkScreen(
                                     Text(text = stringResource(R.string.invalid_empty_deeplink))
                                 }
                             },
-                            trailingIcon =
-                                if (deeprInfo.link.isEmpty()) {
-                                    null
-                                } else {
-                                    {
+                            trailingIcon = {
+                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                    if (deeprInfo.link.isNotEmpty()) {
                                         ClearInputIconButton(
                                             onClick = {
                                                 deeprInfo = deeprInfo.copy(link = "")
                                                 isError = false
                                             },
                                         )
                                     }
-                                },
+                                    IconButton(onClick = {
+                                        qrScanner.launch(ScanOptions())
+                                    }) {
+                                        Icon(
+                                            imageVector = TablerIcons.Qrcode,
+                                            contentDescription = stringResource(R.string.qr_scanner),
+                                            tint = MaterialTheme.colorScheme.primary,
+                                        )
+                                    }
+                                }
+                            },
                             singleLine = true,
                             shape = RoundedCornerShape(12.dp),
                         )
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -127,4 +127,19 @@
     <string name="sync_status_invalid">⚠ El formato del archivo es inválido</string>
     <string name="sync_status_no_file">No se seleccionó archivo de sincronización</string>
     <string name="sync_now_description">Sincronizar manualmente enlaces profundos al archivo seleccionado</string>
+    <string name="all_tags">Todas las etiquetas</string>
+    <string name="favourites">Favoritos</string>
+    <string name="add_to_favourites">Añadir a favoritos</string>
+    <string name="remove_from_favourites">Eliminar de favoritos</string>
+    <string name="add">Añadir</string>
+    <string name="clipboard_link_detected">Enlace detectado en el portapapeles</string>
+    <string name="add_tag">Añadir etiqueta</string>
+    <string name="no_favourites_found">Sin favoritos todavía</string>
+    <string name="no_favourites_description">Marca enlaces como favoritos para verlos aquí.</string>
+    <string name="no_search_results">Sin resutados</string>
+    <string name="no_search_results_description">Pruebe a buscar diferentes palabras clave.</string>
+    <string name="no_links_with_tags">No hay enlaces con las etiquetas seleccionadas</string>
+    <string name="no_links_with_tags_description">Prueba a seleccionar diferentes etiquetas o reestablecer los filtros.</string>
+    <string name="no_favourites_with_tags">Sin favoritos en las etiquetas seleccionadas</string>
+    <string name="no_favourites_with_tags_description">Marca enlaces con estas etiquetas como favoritos o pruebe diferentes etiquetas.</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
@@ -244,4 +244,8 @@
     <string name="invalid_link_silent_save">Vigane link</string>
     <string name="failed_to_save_link">Lingi salvestamine ei õnnestunud</string>
     <string name="link_already_exists">Selline link on juba olemas</string>
+    <string name="clipboard_link_detection">Lingi tuvastus lõikelaualt</string>
+    <string name="clipboard_link_detection_description">Tuvasta lõikelaual asuvad lingid automaatselt ja kuva teade nende lisamiseks</string>
+    <string name="silent_save_profile">Profiili vaikne salvestamine</string>
+    <string name="silent_save_profile_description">„Salvesta vaikselt“ valiku puhul salvestuvad lingid siia profiili</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class AppPreferenceDataStore(`
`112`	`112`
`113`	`113`	`val getThemeMode: Flow<String> =`
`114`	`114`	`context.appDataStore.data.map { preferences ->`
`115`		`- preferences[THEME_MODE] ?: "light" // Default to light theme`
	`115`	`+ preferences[THEME_MODE] ?: "system" // Default to system theme`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`val getShowOpenCounter: Flow<Boolean> =`