mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-01 19:33:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: prepare new strings for translation

Browse Source
This commit is contained in:
andrekir
2024-06-03 10:21:38 -03:00
parent 95120ee208
commit 4a9be026e2
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
View File

@@ -83,5 +83,5 @@ interface NodeInfoDao {
fun clearNodeInfo()
@Query("DELETE FROM NodeInfo WHERE num=:num")
fun delNode(num: Int)
fun deleteNode(num: Int)
}

7
app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
View File

@@ -71,9 +71,6 @@ class NodeDB @Inject constructor(
fun myNodeInfoFlow(): Flow<MyNodeInfo?> = nodeInfoDao.getMyNodeInfo()
fun delNode(num: Int) {
nodeInfoDao.delNode(num)
}
suspend fun upsert(node: NodeInfo) = withContext(Dispatchers.IO) {
nodeInfoDao.upsert(node)
}
@@ -86,4 +83,8 @@ class NodeDB @Inject constructor(
putAll(nodes)
}
}
suspend fun deleteNode(num: Int) = withContext(Dispatchers.IO) {
nodeInfoDao.deleteNode(num)
}
}

9
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -316,17 +316,16 @@ class UIViewModel @Inject constructor(
}
}
fun forgetNode(nodeNum: Int) {
fun removeNode(nodeNum: Int) = viewModelScope.launch(Dispatchers.IO) {
try {
val packetId = meshService?.packetId ?: return
val packetId = meshService?.packetId ?: return@launch
meshService?.removeByNodenum(packetId, nodeNum)
viewModelScope.launch(Dispatchers.IO) {
nodeDB.delNode(nodeNum)
}
nodeDB.deleteNode(nodeNum)
} catch (ex: RemoteException) {
errormsg("Request traceroute error: ${ex.message}")
}
}
fun requestPosition(destNum: Int, position: Position = Position(0.0, 0.0, 0)) {
try {
meshService?.requestPosition(destNum, position)

13
app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
View File

@@ -141,16 +141,15 @@ class UsersFragment : ScreenFragment("Users"), Logging {
debug("requesting traceroute for '${user.longName}'")
model.requestTraceroute(node.num)
}
R.id.forget_node -> {
R.id.remove -> {
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.forget_node)
.setMessage(getString(R.string.forget_node_message))
.setTitle(R.string.remove)
.setMessage(getString(R.string.remove_node_text))
.setNeutralButton(R.string.cancel) { _, _ -> }
.setPositiveButton(R.string.forget_node) {_,_ ->
debug("Forgetting node '${user.longName}'")
model.forgetNode(node.num)
onNodesChanged(nodes)
.setPositiveButton(R.string.send) {_,_ ->
debug("removing node '${user.longName}'")
model.removeNode(node.num)
}
.show()

7
app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt
View File

@@ -16,7 +16,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.geeksville.mesh.R
@@ -51,11 +50,11 @@ fun <T> PacketResponseStateDialog(
if (state.total == state.completed) onComplete()
}
if (state is ResponseState.Success) {
Text("Delivery confirmed")
Text(text = stringResource(id = R.string.delivery_confirmed))
}
if (state is ResponseState.Error) {
Text(text = "Error\n", textAlign = TextAlign.Center)
Text(state.error)
Text(text = stringResource(id = R.string.error), minLines = 2)
Text(text = state.error)
}
}
},

4
app/src/main/res/menu/menu_nodes.xml
View File

@@ -20,8 +20,8 @@
android:checked="false"
android:title="@string/ignore" />
<item
android:id="@+id/forget_node"
android:title="@string/forget_node"
android:id="@+id/remove"
android:title="@string/remove"
app:showAsAction="withText" />
</group>
<group android:id="@+id/group_admin">

12
app/src/main/res/values/strings.xml
View File

@@ -24,7 +24,7 @@
<string name="node_sort_last_heard">Last heard</string>
<string name="node_sort_via_mqtt">via MQTT</string>
<string name="elevation_suffix">ASL</string>
<string name="elevation_suffix" translatable="false">MSL</string>
<string name="channel_name">Channel Name</string>
<string name="channel_options">Channel options</string>
@@ -167,9 +167,11 @@
<string name="direct_message">Direct Message</string>
<string name="nodedb_reset">NodeDB reset</string>
<string name="nodedb_reset_description">This will clear all nodes from this list.</string>
<string name="delivery_confirmed">Delivery confirmed</string>
<string name="error">Error</string>
<string name="ignore">Ignore</string>
<string name="ignore_add">Add \'%s\' to ignore list? Your radio will reboot after making this change.</string>
<string name="ignore_remove">Remove \'%s\' from ignore list? Your radio will reboot after making this change.</string>
<string name="ignore_add">Add \'%s\' to ignore list?</string>
<string name="ignore_remove">Remove \'%s\' from ignore list?</string>
<string name="map_select_download_region">Select download region</string>
<string name="map_tile_download_estimate">Tile download estimate:</string>
<string name="map_start_download">Start Download</string>
@@ -196,8 +198,8 @@
<string name="waypoint_new">New waypoint</string>
<string name="waypoint_received">Received waypoint: %s</string>
<string name="error_duty_cycle">Duty Cycle limit reached. Cannot send messages right now, please try again later.</string>
<string name="forget_node">Forget Node</string>
<string name="forget_node_message">This node will be removed from your list until your node receives NodeInfo data from it again.</string>
<string name="remove">Remove</string>
<string name="remove_node_text">This node will be removed from your list until your node receives data from it again.</string>
<string name="mute">Mute</string>
<string name="mute_notifications">Mute notifications</string>
<string name="mute_8_hours">8 hours</string>