Extract out some string constants

Author: pimterry

app/src/main/java/tech/httptoolkit/android/Constants.kt

@@ -7,4 +7,8 @@ object IntentExtras {
     const val PROXY_CONFIG_EXTRA = "tech.httptoolkit.android.PROXY_CONFIG"
     const val UNINTERCEPTED_APPS_EXTRA = "tech.httptoolkit.android.UNINTERCEPTED_APPS"
     const val INTERCEPTED_PORTS_EXTRA = "tech.httptoolkit.android.INTERCEPTED_PORTS"
-}
+}
+
+object Constants {
+    const val QR_CODE_URL_PREFIX = "https://android.httptoolkit.tech/connect/"
+}

app/src/main/java/tech/httptoolkit/android/appselection/AppListScreen.kt

@@ -109,7 +109,7 @@ fun AppListScreen(
                     IconButton(onClick = { showMenu = true }) {
                         Icon(
                             imageVector = Icons.Default.MoreVert,
-                            contentDescription = "More options"
+                            contentDescription = stringResource(R.string.cd_more_options)
                         )
                     }
 
@@ -240,7 +240,7 @@ fun AppListItem(
             // App icon
             Image(
                 painter = rememberDrawablePainter(drawable = appIcon),
-                contentDescription = "App icon for $appLabel",
+                contentDescription = stringResource(R.string.cd_app_icon, appLabel),
                 modifier = Modifier
                     .size(72.dp)
                     .padding(vertical = 8.dp)

app/src/main/java/tech/httptoolkit/android/portfilter/PortListScreen.kt

@@ -44,7 +44,7 @@ fun PortListScreen(
 
     val isValidInput = remember(inputText, ports) {
         inputText.toIntOrNull()?.let { port ->
-            port in 1..65535 && !ports.contains(port)
+            port in MIN_PORT..MAX_PORT && !ports.contains(port)
         } ?: false
     }
 
@@ -115,15 +115,15 @@ fun PortListScreen(
                 ) {
                     Icon(
                         imageVector = Icons.Default.Add,
-                        contentDescription = "Add port"
+                        contentDescription = stringResource(R.string.cd_add_port)
                     )
                 }
 
                 Box {
                     IconButton(onClick = { showMenu = true }) {
                         Icon(
                             imageVector = Icons.Default.MoreVert,
-                            contentDescription = "More options"
+                            contentDescription = stringResource(R.string.cd_more_options)
                         )
                     }
 
@@ -132,7 +132,7 @@ fun PortListScreen(
                         onDismissRequest = { showMenu = false }
                     ) {
                         DropdownMenuItem(
-                            text = { Text("Reset to defaults") },
+                            text = { Text(stringResource(R.string.menu_reset_to_defaults)) },
                             onClick = {
                                 showMenu = false
                                 ports = defaultPorts
@@ -203,7 +203,7 @@ fun PortItem(
             IconButton(onClick = onDelete) {
                 Icon(
                     imageVector = Icons.Default.Delete,
-                    contentDescription = "Delete port $port"
+                    contentDescription = stringResource(R.string.cd_delete_port, port)
                 )
             }
         }

app/src/main/java/tech/httptoolkit/android/qrscan/QRScanScreen.kt

@@ -4,26 +4,34 @@ import android.util.Log
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.ResultPoint
 import com.journeyapps.barcodescanner.BarcodeCallback
 import com.journeyapps.barcodescanner.BarcodeResult
 import com.journeyapps.barcodescanner.DecoratedBarcodeView
 import com.journeyapps.barcodescanner.DefaultDecoderFactory
+import tech.httptoolkit.android.Constants
+import tech.httptoolkit.android.R
+
+private const val TAG = "QRScanScreen"
 
 @Composable
 fun QRScanScreen(
     onQRCodeScanned: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
+    val context = LocalContext.current
+
     AndroidView(
-        factory = { context ->
+        factory = { ctx ->
             var lastScannedText: String? = null
 
-            DecoratedBarcodeView(context).apply {
+            DecoratedBarcodeView(ctx).apply {
                 barcodeView.decoderFactory = DefaultDecoderFactory(listOf(BarcodeFormat.QR_CODE))
-                setStatusText("Scan HTTP Toolkit QR code to connect")
+                setStatusText(context.getString(R.string.qr_scan_prompt))
+                contentDescription = context.getString(R.string.cd_camera_view)
 
                 // Add extra padding to the status text to ensure it's well clear of the nav bar
                 statusView?.setPadding(0, 0, 0, 48)
@@ -37,9 +45,9 @@ fun QRScanScreen(
                         }
 
                         lastScannedText = resultText
-                        Log.i("QRScanScreen", "Scanned: $resultText")
+                        Log.i(TAG, "Scanned: $resultText")
 
-                        if (resultText.startsWith("https://android.httptoolkit.tech/connect/")) {
+                        if (resultText.startsWith(Constants.QR_CODE_URL_PREFIX)) {
                             onQRCodeScanned(resultText)
                         }
                     }

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

@@ -36,6 +36,8 @@
     <string name="docs_button">Read the docs</string>
     <string name="try_again_button">Try again</string>
     <string name="test_button">Test interception</string>
+
+    <string name="qr_scan_prompt">Scan HTTP Toolkit QR code to connect</string>
     <string name="app_drawable">App Drawable</string>
     <string name="applications">Applications</string>
     <string name="all_applications">All applications</string>
@@ -57,4 +59,12 @@
     <string name="cancel">Cancel</string>
     <string name="proceed">Proceed</string>
     <string name="open_settings">Open Settings</string>
+
+    <string name="cd_more_options">More options</string>
+    <string name="cd_add_port">Add port</string>
+    <string name="cd_delete_port">Delete port %d</string>
+    <string name="cd_app_icon">App icon for %s</string>
+    <string name="cd_camera_view">Camera view for scanning QR codes</string>
+
+    <string name="menu_reset_to_defaults">Reset to defaults</string>
 </resources>