laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-12 09:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move shared browser/napplet strings to :commons to eliminate cross-module duplicate

Browse Source 
AGP 9.2.1 treats resources defined in both an app module and a library module
with the same key (qualifiers="") as an error in non-debug builds.

`browser_address_hint`, `browser_console_title_short`, `browser_console_title`,
`browser_console_clear`, and `napplet_untitled` were defined in both
`:amethyst/values/strings.xml` and `:nappletHost/values/strings.xml`.
Both `:amethyst` and `:nappletHost` depend on `:commons`, so the canonical
home for these shared strings is `commons/src/androidMain/res/values/strings.xml`.

Update callers in both modules to use `com.vitorpamplona.amethyst.commons.R as
CommonsR`. Locale translations in amethyst's `values-*/` directories remain as
Android resource overlays (app module overrides library module at merge time).

Fixes: Found item String/browser_console_clear more than one time (packageFdroidBenchmarkResources)
This commit is contained in:
Claude
2026-06-26 00:11:31 +00:00
parent a1732155b1
commit f2a7548434
11 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/browser/BrowserScreen.kt
+2 -1
View File
@@ -88,6 +88,7 @@ import com.vitorpamplona.amethyst.ui.navigation.routes.Route
import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.screen.loggedIn.favorites.favoriteAppItems
import com.vitorpamplona.amethyst.commons.R as CommonsR
/** How many of the most recent history entries the idle browser home surfaces under "Recent". */
private const val RECENTS_LIMIT = 12
@@ -269,7 +270,7 @@ private fun OmniBar(
onValueChange = onValueChange,
modifier = Modifier.weight(1f),
singleLine = true,
placeholder = { Text(stringResource(R.string.browser_address_hint)) },
placeholder = { Text(stringResource(CommonsR.string.browser_address_hint)) },
keyboardOptions =
KeyboardOptions(
capitalization = KeyboardCapitalization.None,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/embed/BottomConsoleSheet.kt
+3 -3
View File
@@ -63,7 +63,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.commons.R as CommonsR
/**
* A bottom **pull-up sheet** for JavaScript console output. Collapsed it's a small grabber at the
@@ -137,14 +137,14 @@ fun BottomConsoleSheet(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
stringResource(R.string.browser_console_title, logs.size),
stringResource(CommonsR.string.browser_console_title, logs.size),
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.weight(1f),
)
TextButton(onClick = onClear) {
Text(
stringResource(R.string.browser_console_clear),
stringResource(CommonsR.string.browser_console_clear),
style = MaterialTheme.typography.labelSmall,
)
}
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/embed/TopControlSheet.kt
+3 -2
View File
@@ -57,6 +57,7 @@ import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbol
import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
import com.vitorpamplona.amethyst.commons.R as CommonsR
/**
* A top **pull-down sheet** for a running app surface. Collapsed it's just a small grabber centered at
@@ -146,9 +147,9 @@ fun TopControlSheet(
symbol = MaterialSymbols.Code,
label =
if (consoleCount > 0) {
stringResource(R.string.browser_console_title, consoleCount)
stringResource(CommonsR.string.browser_console_title, consoleCount)
} else {
stringResource(R.string.browser_console_title_short)
stringResource(CommonsR.string.browser_console_title_short)
},
checked = consoleShowing,
onToggle = {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/NappletPermissionsScreen.kt
+2 -1
View File
@@ -80,6 +80,7 @@ import com.vitorpamplona.quartz.nip5dNapplets.RootNappletEvent
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import com.vitorpamplona.amethyst.commons.R as CommonsR
/** One napplet's persisted permission grants, ready to render. */
private data class NappletGrantsUi(
@@ -95,7 +96,7 @@ fun NappletPermissionsScreen(
) {
val context = LocalContext.current
val ledger = remember { NappletPermissionLedger(DataStoreNappletPermissionStore(context)) }
val untitled = stringResource(R.string.napplet_untitled)
val untitled = stringResource(CommonsR.string.napplet_untitled)
var items by remember { mutableStateOf<List<NappletGrantsUi>?>(null) }
var reload by remember { mutableIntStateOf(0) }
amethyst/src/main/res/values/strings.xml
-5
View File
@@ -667,11 +667,7 @@
<string name="nsites">nSites</string>
<string name="nsite_none_found">No nSites found yet.</string>
<string name="browser">Browser</string>
<string name="browser_address_hint">Search or enter address</string>
<string name="browser_reload">Reload</string>
<string name="browser_console_title_short">Console</string>
<string name="browser_console_title">Console (%1$d)</string>
<string name="browser_console_clear">Clear</string>
<string name="browser_tor_on">Loading over Tor. Tap to use the open web.</string>
<string name="browser_tor_off">Loading over the open web. Tap to use Tor.</string>
<string name="browser_unsupported">The in-app browser needs Android 11 or newer.</string>
@@ -704,7 +700,6 @@
<string name="napplet_permissions_forget">Forget this nApplet</string>
<string name="napplet_permissions_blocked">Blocked</string>
<string name="napplet_permissions_revoke">Revoke</string>
<string name="napplet_untitled">Untitled nApplet</string>
<string name="napplet_none_found">No nApplets found yet.</string>
<string name="napplet_fallback_title">nApplet %1$s…</string>
<!-- Napplet sandbox chrome (host top bar + live action notices) -->
commons/src/androidMain/res/values/strings.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="browser_address_hint">Search or enter address</string>
<string name="browser_console_title_short">Console</string>
<string name="browser_console_title">Console (%1$d)</string>
<string name="browser_console_clear">Clear</string>
<string name="napplet_untitled">Untitled nApplet</string>
</resources>
nappletHost/src/main/kotlin/com/vitorpamplona/amethyst/napplethost/NappletBrowserActivity.kt
+2 -1
View File
@@ -65,6 +65,7 @@ import com.vitorpamplona.amethyst.commons.napplet.NappletWebContract
import org.json.JSONObject
import java.io.ByteArrayOutputStream
import java.util.concurrent.Executor
import com.vitorpamplona.amethyst.commons.R as CommonsR
/**
* Full-screen **direct-WebView** browser for an arbitrary URL, running in the keyless `:napplet`
@@ -578,7 +579,7 @@ class NappletBrowserActivity : ComponentActivity() {
private var title: String = ""
private fun barTitle(): String = title.ifBlank { runCatching { Uri.parse(startUrl).host }.getOrNull() ?: getString(R.string.napplet_untitled) }
private fun barTitle(): String = title.ifBlank { runCatching { Uri.parse(startUrl).host }.getOrNull() ?: getString(CommonsR.string.napplet_untitled) }
/**
* The top pull-down sheet: a small grabber at the top edge (out of the corner where a site shows its
nappletHost/src/main/kotlin/com/vitorpamplona/amethyst/napplethost/NappletConsolePanel.kt
+4 -3
View File
@@ -34,6 +34,7 @@ import android.widget.LinearLayout
import android.widget.ScrollView
import android.widget.TextView
import androidx.core.content.ContextCompat
import com.vitorpamplona.amethyst.commons.R as CommonsR
/**
* The full-screen browser's **bottom pull-up sheet** for JavaScript console output. Collapsed it's
@@ -83,7 +84,7 @@ class NappletConsolePanel(
setPadding(dp(8), 0, dp(4), dp(4))
addView(
TextView(context).apply {
text = context.getString(R.string.browser_console_title_short)
text = context.getString(CommonsR.string.browser_console_title_short)
setTextColor(dimmed)
textSize = 12f
layoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f)
@@ -91,7 +92,7 @@ class NappletConsolePanel(
)
addView(
TextView(context).apply {
text = context.getString(R.string.browser_console_clear)
text = context.getString(CommonsR.string.browser_console_clear)
setTextColor(dimmed)
textSize = 12f
setPadding(dp(12), dp(6), dp(12), dp(6))
@@ -210,7 +211,7 @@ class NappletConsolePanel(
setColor(withAlpha(surface, 0.6f))
}
isClickable = true
contentDescription = context.getString(R.string.browser_console_title_short)
contentDescription = context.getString(CommonsR.string.browser_console_title_short)
addView(bar)
var downY = 0f
nappletHost/src/main/kotlin/com/vitorpamplona/amethyst/napplethost/NappletControlSheet.kt
+6 -5
View File
@@ -37,6 +37,7 @@ import android.widget.LinearLayout
import android.widget.Switch
import android.widget.TextView
import androidx.core.content.ContextCompat
import com.vitorpamplona.amethyst.commons.R as CommonsR
/**
* The full-screen sandbox surfaces' **top pull-down sheet** — the native-View twin of the embedded
@@ -131,7 +132,7 @@ class NappletControlSheet(
onConsole?.let { console ->
val label =
TextView(context).apply {
text = context.getString(R.string.browser_console_title_short)
text = context.getString(CommonsR.string.browser_console_title_short)
setTextColor(onSurface)
textSize = 15f
setPadding(dp(8), 0, 0, 0)
@@ -235,8 +236,8 @@ class NappletControlSheet(
setText(initial)
setTextColor(onSurface)
setHintTextColor(dimmed)
hint = context.getString(R.string.browser_address_hint)
contentDescription = context.getString(R.string.browser_address_hint)
hint = context.getString(CommonsR.string.browser_address_hint)
contentDescription = context.getString(CommonsR.string.browser_address_hint)
textSize = 15f
isSingleLine = true
setSelectAllOnFocus(true)
@@ -276,9 +277,9 @@ class NappletControlSheet(
fun updateConsoleCount(count: Int) {
consoleLabel?.text =
if (count > 0) {
context.getString(R.string.browser_console_title, count)
context.getString(CommonsR.string.browser_console_title, count)
} else {
context.getString(R.string.browser_console_title_short)
context.getString(CommonsR.string.browser_console_title_short)
}
}
nappletHost/src/main/kotlin/com/vitorpamplona/amethyst/napplethost/NappletHostActivity.kt
+2 -1
View File
@@ -79,6 +79,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.json.JSONObject
import java.util.concurrent.Executor
import com.vitorpamplona.amethyst.commons.R as CommonsR
/**
* Hosts a napplet/nsite WebView in the isolated `:napplet` process — a process that holds **no**
@@ -715,7 +716,7 @@ class NappletHostActivity : ComponentActivity() {
// ---- trusted sandbox chrome ----
private fun barTitle(): String = title.ifBlank { getString(R.string.napplet_untitled) }
private fun barTitle(): String = title.ifBlank { getString(CommonsR.string.napplet_untitled) }
/**
* The trusted top pull-down sheet: a small grabber at the top edge (out of the corner where the app
nappletHost/src/main/res/values/strings.xml
+2 -7
View File
@@ -3,7 +3,7 @@
<!-- Sandbox host (`:napplet` process) UI. Kept here so the sandbox module needs no app resources. -->
<string name="napplet_invalid">Invalid nApplet.</string>
<string name="napplet_webview_too_old">This device\'s WebView is too old to run nApplets safely.</string>
<string name="napplet_untitled">Untitled nApplet</string>
<!-- Trusted chrome (top bar + live action notices) -->
<string name="napplet_chrome_access_title">What “%1$s” can access</string>
@@ -11,12 +11,7 @@
<string name="napplet_chrome_static_site">Static site — it has no special access to your account.</string>
<string name="napplet_chrome_permissions_desc">What this app can access</string>
<string name="napplet_chrome_reload">Reload</string>
<!-- Browser address bar (direct-WebView browser only) -->
<string name="browser_address_hint">Search or enter address</string>
<!-- Browser developer console -->
<string name="browser_console_title_short">Console</string>
<string name="browser_console_title">Console (%1$d)</string>
<string name="browser_console_clear">Clear</string>
<!-- Browser address bar and developer console strings are in :commons -->
<string name="napplet_action_published">“%1$s” published a note as you</string>
<string name="napplet_action_uploaded">“%1$s” uploaded a file</string>
<string name="napplet_action_paid">“%1$s” made a payment</string>