From b3b478be108de9d5f6b44f9c9e9645a6264e8176 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Wed, 29 Jul 2026 02:07:08 +0200 Subject: [PATCH] wear: copy polish - compact notification-permission and nickname-edit descriptions, sentence-case labels across all screens (buttons, placeholders, empty states, prompts) --- .../java/com/bitchat/watch/MainActivity.kt | 22 +++++++++---------- .../com/bitchat/watch/ui/ChatActionBar.kt | 2 +- .../java/com/bitchat/watch/ui/ChatScreen.kt | 2 +- .../java/com/bitchat/watch/ui/DmScreen.kt | 4 ++-- .../bitchat/watch/ui/NicknameSetupScreen.kt | 6 ++--- .../com/bitchat/watch/ui/PeerDebugScreen.kt | 4 ++-- .../java/com/bitchat/watch/ui/PeopleScreen.kt | 6 ++--- .../com/bitchat/watch/ui/TextInputScreen.kt | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/wear/src/main/java/com/bitchat/watch/MainActivity.kt b/wear/src/main/java/com/bitchat/watch/MainActivity.kt index 4e82d260..b261a77a 100644 --- a/wear/src/main/java/com/bitchat/watch/MainActivity.kt +++ b/wear/src/main/java/com/bitchat/watch/MainActivity.kt @@ -218,9 +218,9 @@ fun WearNavHost(openDmPeer: String?, onOpenDmHandled: () -> Unit) { val mesh = WearMeshService.peek() NicknameSetupScreen( initialNickname = mesh?.nickname ?: "", - title = "you", - subtitle = "this is how nearby peers see you", - confirmLabel = "save", + title = "You", + subtitle = "How nearby peers see you", + confirmLabel = "Save", onConfirm = { name -> mesh?.setNickname(name) goBack() @@ -265,13 +265,13 @@ fun NotificationPermissionScreen(onResult: (Boolean) -> Unit, onSkip: () -> Unit verticalArrangement = Arrangement.Center ) { Text( - text = "message alerts", + text = "Message alerts", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary ) Text( - text = "get notified when an encrypted direct message arrives", + text = "Alerts for encrypted direct messages", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.Center, @@ -286,10 +286,10 @@ fun NotificationPermissionScreen(onResult: (Boolean) -> Unit, onSkip: () -> Unit } } ) { - Text("enable") + Text("Enable") } TextButton(onClick = onSkip) { - Text("not now") + Text("Not now") } } } @@ -314,7 +314,7 @@ fun PermissionRequestScreen(onGranted: () -> Unit) { color = MaterialTheme.colorScheme.primary ) Text( - text = "needs bluetooth to mesh with nearby devices", + text = "Needs Bluetooth to mesh with nearby devices", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.Center, @@ -323,7 +323,7 @@ fun PermissionRequestScreen(onGranted: () -> Unit) { Button(onClick = { launcher.launch(MainActivity.requiredPermissions().toTypedArray()) }) { - Text("grant access") + Text("Grant access") } } } @@ -342,7 +342,7 @@ fun BluetoothEnableScreen(onEnabled: () -> Unit) { verticalArrangement = Arrangement.Center ) { Text( - text = "bluetooth is off", + text = "Bluetooth is off", style = MaterialTheme.typography.titleSmall, color = MaterialTheme.colorScheme.onSurface ) @@ -350,7 +350,7 @@ fun BluetoothEnableScreen(onEnabled: () -> Unit) { onClick = { launcher.launch(Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)) }, modifier = Modifier.padding(top = 10.dp) ) { - Text("turn on") + Text("Turn on") } } } diff --git a/wear/src/main/java/com/bitchat/watch/ui/ChatActionBar.kt b/wear/src/main/java/com/bitchat/watch/ui/ChatActionBar.kt index 46fac58a..e7cf0e19 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/ChatActionBar.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/ChatActionBar.kt @@ -167,7 +167,7 @@ fun VoiceRecordOverlay(voice: VoiceNoteController) { modifier = Modifier.padding(top = 10.dp) ) Text( - text = "release to send", + text = "Release to send", style = ChatVisualTokens.SystemActionStyle, color = palette.textTertiary, textAlign = TextAlign.Center, diff --git a/wear/src/main/java/com/bitchat/watch/ui/ChatScreen.kt b/wear/src/main/java/com/bitchat/watch/ui/ChatScreen.kt index 41b5c2f2..7c902ea5 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/ChatScreen.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/ChatScreen.kt @@ -72,7 +72,7 @@ fun ChatScreen(onOpenPeople: () -> Unit, onOpenTextInput: () -> Unit) { ChatScaffold( messages = messages, myPeerID = myPeerID, - emptyText = "no messages yet\nsay hi to the mesh", + emptyText = "No messages yet\nSay hi to the mesh", voice = voice, onOpenImage = { viewerPath = it }, header = { expanded -> diff --git a/wear/src/main/java/com/bitchat/watch/ui/DmScreen.kt b/wear/src/main/java/com/bitchat/watch/ui/DmScreen.kt index f00e7ef7..689251a1 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/DmScreen.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/DmScreen.kt @@ -78,8 +78,8 @@ fun DmScreen(peerID: String, onOpenTextInput: () -> Unit) { ChatScaffold( messages = messages, myPeerID = myPeerID, - emptyText = if (sessionEstablished) "encrypted channel ready\nsay hi" - else "setting up encryption…", + emptyText = if (sessionEstablished) "Encrypted channel ready\nSay hi" + else "Setting up encryption…", voice = voice, onOpenImage = { viewerPath = it }, header = { expanded -> diff --git a/wear/src/main/java/com/bitchat/watch/ui/NicknameSetupScreen.kt b/wear/src/main/java/com/bitchat/watch/ui/NicknameSetupScreen.kt index 0a5190e8..68710025 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/NicknameSetupScreen.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/NicknameSetupScreen.kt @@ -45,8 +45,8 @@ import com.bitchat.watch.ui.theme.LocalBitchatPalette fun NicknameSetupScreen( initialNickname: String, title: String = "bitchat", - subtitle: String = "pick a nickname", - confirmLabel: String = "join the mesh", + subtitle: String = "Pick a nickname", + confirmLabel: String = "Join the mesh", onConfirm: (String) -> Unit ) { val palette = LocalBitchatPalette.current @@ -114,7 +114,7 @@ fun NicknameSetupScreen( Box(contentAlignment = Alignment.Center) { if (name.text.isEmpty()) { Text( - text = "nickname", + text = "Nickname", style = ChatVisualTokens.MessageBodyStyle, color = palette.textTertiary ) diff --git a/wear/src/main/java/com/bitchat/watch/ui/PeerDebugScreen.kt b/wear/src/main/java/com/bitchat/watch/ui/PeerDebugScreen.kt index 81183be9..17568387 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/PeerDebugScreen.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/PeerDebugScreen.kt @@ -47,7 +47,7 @@ fun PeerDebugScreen() { item { ListHeader { Text( - text = "peers (${peers.size})", + text = "Peers (${peers.size})", color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold ) @@ -56,7 +56,7 @@ fun PeerDebugScreen() { if (peers.isEmpty()) { item { Text( - text = "scanning for bitchat devices…", + text = "Scanning for bitchat devices…", style = MaterialTheme.typography.bodySmall, color = palette.textTertiary, textAlign = TextAlign.Center, diff --git a/wear/src/main/java/com/bitchat/watch/ui/PeopleScreen.kt b/wear/src/main/java/com/bitchat/watch/ui/PeopleScreen.kt index 20462231..f701a887 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/PeopleScreen.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/PeopleScreen.kt @@ -67,7 +67,7 @@ fun PeopleScreen(onOpenDm: (String) -> Unit, onEditNickname: () -> Unit) { if (peers.isEmpty()) { item { Text( - text = "no one nearby yet\nkeep the app open to mesh", + text = "No one nearby yet\nKeep the app open to mesh", style = ChatVisualTokens.SystemActionStyle, color = palette.textTertiary, textAlign = TextAlign.Center, @@ -123,7 +123,7 @@ private fun SelfRow(nickname: String, onClick: () -> Unit) { ) } Text( - text = "tap to rename", + text = "Tap to rename", style = ChatVisualTokens.SystemActionStyle, color = palette.textTertiary ) @@ -171,7 +171,7 @@ private fun PersonRow( } if (!encrypted) { Text( - text = "tap to chat", + text = "Tap to chat", style = ChatVisualTokens.SystemActionStyle, color = palette.textTertiary ) diff --git a/wear/src/main/java/com/bitchat/watch/ui/TextInputScreen.kt b/wear/src/main/java/com/bitchat/watch/ui/TextInputScreen.kt index 9fb2cb14..ad9e60e2 100644 --- a/wear/src/main/java/com/bitchat/watch/ui/TextInputScreen.kt +++ b/wear/src/main/java/com/bitchat/watch/ui/TextInputScreen.kt @@ -103,7 +103,7 @@ fun TextInputScreen(onSend: (String) -> Unit) { Box { if (text.isEmpty()) { Text( - text = "message", + text = "Message", style = ChatVisualTokens.MessageBodyStyle, color = palette.textTertiary ) @@ -127,7 +127,7 @@ fun TextInputScreen(onSend: (String) -> Unit) { RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM ) - putExtra(RecognizerIntent.EXTRA_PROMPT, "speak your message") + putExtra(RecognizerIntent.EXTRA_PROMPT, "Speak your message") } ) },