diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/broadcast/BroadcastBanner.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/broadcast/BroadcastBanner.kt index 33353938aa..c455211dda 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/broadcast/BroadcastBanner.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/broadcast/BroadcastBanner.kt @@ -161,10 +161,10 @@ private fun MiningContent( miningJobs: ImmutableList, onCancelJob: (String) -> Unit, ) { - // one shared pulse for the bolt — mining has no measurable progress, so + // one shared pulse for the gear — mining has no measurable progress, so // the animation is what says "the app is working right now". val pulse = rememberInfiniteTransition(label = "miningPulse") - val boltAlpha by pulse.animateFloat( + val gearAlpha by pulse.animateFloat( initialValue = 0.35f, targetValue = 1f, animationSpec = @@ -172,7 +172,7 @@ private fun MiningContent( animation = tween(700), repeatMode = RepeatMode.Reverse, ), - label = "boltAlpha", + label = "gearAlpha", ) // 1 Hz clock driving the per-job elapsed labels; only ticks while some @@ -194,9 +194,9 @@ private fun MiningContent( modifier = Modifier.fillMaxWidth(), ) { Icon( - symbol = MaterialSymbols.Bolt, + symbol = MaterialSymbols.Manufacturing, contentDescription = stringRes(R.string.pow_mining_title), - tint = MaterialTheme.colorScheme.primary.copy(alpha = boltAlpha), + tint = MaterialTheme.colorScheme.primary.copy(alpha = gearAlpha), modifier = Modifier.size(18.dp), ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/pow/PowOverrideButton.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/pow/PowOverrideButton.kt index 3c564e5551..b6274a59b4 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/pow/PowOverrideButton.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/creators/pow/PowOverrideButton.kt @@ -52,9 +52,10 @@ val POW_PRESETS = listOf(16, 20, 24, 28) /** * Composer options-row button showing the NIP-13 difficulty this post will be - * mined at: a bolt with the difficulty as a small badge when mining is on, - * a dimmed bolt when off. Tapping opens a menu to raise/lower/disable mining - * for this post only — the account setting is untouched. + * mined at: a manufacturing gear with the difficulty as a small badge when + * mining is on, a dimmed gear when off. Tapping opens a menu to + * raise/lower/disable mining for this post only — the account setting is + * untouched. * * [effectiveDifficulty] is what will actually be used at send time (override * or account default); null/0 means the post publishes without PoW. @@ -80,7 +81,7 @@ fun PowOverrideButton( .width(23.dp), ) { Icon( - symbol = MaterialSymbols.Bolt, + symbol = MaterialSymbols.Manufacturing, contentDescription = stringRes(R.string.pow_settings_title), modifier = Modifier.size(18.dp).align(Alignment.BottomStart), tint = diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt index aabe123276..7324d6d65d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt @@ -67,7 +67,7 @@ fun DisplayPoW(pow: Int) { .padding(horizontal = 6.dp, vertical = 1.dp), ) { Icon( - symbol = MaterialSymbols.Bolt, + symbol = MaterialSymbols.Manufacturing, contentDescription = stringRes(R.string.pow_settings_title), tint = MaterialTheme.colorScheme.onSecondaryContainer, modifier = Modifier.size(12.dp), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt index bf79d262e1..534927c0f1 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt @@ -834,6 +834,13 @@ private fun BottomRowActions( } } + PowOverrideButton( + effectiveDifficulty = postViewModel.effectivePowDifficulty(), + defaultDifficulty = postViewModel.defaultPowDifficulty(), + isOverridden = postViewModel.powOverride != null, + onSelect = { postViewModel.powOverride = it }, + ) + // A group thread's title is required, so the field is always shown for it — no toggle. if (postViewModel.groupThreadTarget == null) { AddSubjectButton(postViewModel.wantsSubject) { @@ -869,13 +876,6 @@ private fun BottomRowActions( postViewModel.wantsInvoice = !postViewModel.wantsInvoice } } - - PowOverrideButton( - effectiveDifficulty = postViewModel.effectivePowDifficulty(), - defaultDifficulty = postViewModel.defaultPowDifficulty(), - isOverridden = postViewModel.powOverride != null, - onSelect = { postViewModel.powOverride = it }, - ) } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt index fe5a328677..7544f3900d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt @@ -939,7 +939,7 @@ fun LimitationsCard(lim: Nip11RelayInformation.RelayInformationLimitation) { val minPoW = lim.min_pow_difficulty if (minPoW != null && minPoW > 0) { - InfoRow(MaterialSymbols.Bolt, stringRes(R.string.minimum_pow), stringRes(R.string.amount_in_bits, minPoW)) + InfoRow(MaterialSymbols.Manufacturing, stringRes(R.string.minimum_pow), stringRes(R.string.amount_in_bits, minPoW)) } else { lim.min_prefix?.let { if (it > 0) { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/ComposeSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/ComposeSettingsScreen.kt index 3cfb90b687..9c50952229 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/ComposeSettingsScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/ComposeSettingsScreen.kt @@ -144,7 +144,7 @@ private fun PowDifficultyTile(accountViewModel: AccountViewModel) { .collectAsStateWithLifecycle() SettingsBlockTile( - icon = MaterialSymbols.Bolt, + icon = MaterialSymbols.Manufacturing, title = stringRes(R.string.pow_difficulty_title), description = stringRes(R.string.pow_difficulty_explainer), ) { diff --git a/commons/src/commonMain/composeResources/font/material_symbols_outlined.ttf b/commons/src/commonMain/composeResources/font/material_symbols_outlined.ttf index 43a1428fc8..01bd58472e 100644 Binary files a/commons/src/commonMain/composeResources/font/material_symbols_outlined.ttf and b/commons/src/commonMain/composeResources/font/material_symbols_outlined.ttf differ diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/icons/symbols/MaterialSymbols.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/icons/symbols/MaterialSymbols.kt index 603098e77a..a038c5603d 100644 --- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/icons/symbols/MaterialSymbols.kt +++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/icons/symbols/MaterialSymbols.kt @@ -152,6 +152,7 @@ object MaterialSymbols { val Lock = MaterialSymbol("\uE899") val LockOpen = MaterialSymbol("\uE898") val Mail = MaterialSymbol("\uE159") + val Manufacturing = MaterialSymbol("\uE726") val MenuBook = MaterialSymbol("\uEA19") val Mic = MaterialSymbol("\uE31D") val MicOff = MaterialSymbol("\uE02B")