a few more strings

app/src/main/java/com/geeksville/mesh/MainActivity.kt

@@ -248,7 +248,7 @@ class MainActivity : AppCompatActivity(), Logging,
         } else {
             Toast.makeText(
                 this,
-                "Error - this app requires bluetooth",
+                R.string.error_bluetooth,
                 Toast.LENGTH_LONG
             )
                 .show()

app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt

@@ -167,114 +167,18 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
 }
 
 /*
-import androidx.compose.Composable
-import androidx.compose.state
-import androidx.ui.core.Modifier
-import androidx.ui.foundation.Text
-import androidx.ui.foundation.VerticalScroller
-import androidx.ui.graphics.Color
-import androidx.ui.input.ImeAction
-import androidx.ui.layout.Column
-import androidx.ui.layout.LayoutPadding
-import androidx.ui.layout.LayoutSize
-import androidx.ui.layout.Row
-import androidx.ui.material.Emphasis
-import androidx.ui.material.MaterialTheme
-import androidx.ui.material.ProvideEmphasis
-import androidx.ui.text.TextStyle
-import androidx.ui.tooling.preview.Preview
-import androidx.ui.unit.dp
-import com.geeksville.mesh.model.MessagesState
-import com.geeksville.mesh.model.MessagesState.messages
-import com.geeksville.mesh.model.NodeDB
-import com.geeksville.mesh.model.TextMessage
-import java.text.SimpleDateFormat
-
 
 private val dateFormat = SimpleDateFormat("h:mm a")
 
-val TimestampEmphasis = object : Emphasis {
-    override fun emphasize(color: Color) = color.copy(alpha = 0.25f)
-}
 
 
-/// A pretty version the text, with user icon to the left, name and time of arrival (copy slack look and feel)
-@Composable
-fun MessageCard(msg: TextMessage, modifier: Modifier = Modifier.None) {
-    Row(modifier = modifier) {
-        UserIcon(NodeDB.nodes[msg.from])
-
-        Column(modifier = LayoutPadding(start = 12.dp)) {
-            Row {
-                val nodes = NodeDB.nodes
-
-                // If we can't find the sender, just use the ID
-                val node = nodes.get(msg.from)
-                val user = node?.user
-                val senderName = user?.longName ?: msg.from
-                Text(text = senderName)
                 ProvideEmphasis(emphasis = TimestampEmphasis) {
                     Text(
                         text = dateFormat.format(msg.date),
                         modifier = LayoutPadding(start = 8.dp),
                         style = MaterialTheme.typography.caption
                     )
-                }
-            }
-            if (msg.errorMessage != null)
-                Text(text = msg.errorMessage, style = TextStyle(color = palette.error))
-            else
-                Text(text = msg.text)
-        }
-    }
-}
 
 
-@Composable
-fun MessagesContent() {
-    Column(modifier = LayoutSize.Fill) {
-
-        val sidePad = 8.dp
-        val topPad = 4.dp
-
-        VerticalScroller(
-            modifier = LayoutWeight(1f)
-        ) {
-            Column {
-                messages.forEach { msg ->
-                    MessageCard(
-                        msg, modifier = LayoutPadding(
-                            start = sidePad,
-                            end = sidePad,
-                            top = topPad,
-                            bottom = topPad
-                        )
-                    )
-                }
-            }
-        }
-
-        // Spacer(LayoutFlexible(1f))
-
-        val message = state { "" }
-        StyledTextField(
-            value = message.value,
-            onValueChange = { message.value = it },
-            textStyle = TextStyle(
-                color = palette.onSecondary.copy(alpha = 0.8f)
-            ),
-            imeAction = ImeAction.Send,
-            onImeActionPerformed = {
-                MessagesState.info("did IME action")
-
-                val str = message.value
-                MessagesState.sendMessage(str)
-                message.value = "" // blow away the string the user just entered
-            },
-            hintText = "Type your message here..."
-        )
-    }
-}
-
 
 */

app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt

@@ -124,7 +124,7 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
 
             if (s == null) {
                 errorText.value =
-                    "This application requires bluetooth access. Please grant access in android settings."
+                    context.getString(R.string.requires_bluetooth)
             } else {
                 debug("starting scan")
 

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

@@ -21,4 +21,6 @@
     <string name="looking_for_meshtastic_devices">Looking for Meshtastic devices...</string>
     <string name="test__devname1" translatable="false">Meshtastic_ac23</string>
     <string name="test_devname2" translatable="false">Meshtastic_1267</string>
+    <string name="requires_bluetooth">This application requires bluetooth access. Please grant access in android settings.</string>
+    <string name="error_bluetooth">Error - this app requires bluetooth</string>
 </resources>