diff --git a/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt b/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt index 1a54027a4..3de9ee80c 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt @@ -25,6 +25,7 @@ import androidx.compose.ui.graphics.Color val MeshtasticGreen = Color(0xFF67EA94) val MeshtasticAlt = Color(0xFF2C2D3C) val HyperlinkBlue = Color(0xFF43C3B0) +val AnnotationColor = Color(0xFF039BE5) object IAQColors { val IAQExcellent = Color(0xFF00E400) diff --git a/app/src/main/java/com/geeksville/mesh/ui/debug/Debug.kt b/app/src/main/java/com/geeksville/mesh/ui/debug/Debug.kt index 2a09a8591..192661894 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/debug/Debug.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/debug/Debug.kt @@ -61,7 +61,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle @@ -82,6 +81,7 @@ import com.geeksville.mesh.model.DebugViewModel import com.geeksville.mesh.model.DebugViewModel.UiMeshLog import com.geeksville.mesh.ui.common.components.CopyIconButton import com.geeksville.mesh.ui.common.components.SimpleAlertDialog +import com.geeksville.mesh.ui.common.theme.AnnotationColor import com.geeksville.mesh.ui.common.theme.AppTheme import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.Dispatchers @@ -290,7 +290,7 @@ private fun rememberAnnotatedString(text: String, searchText: String): Annotated @Composable private fun rememberAnnotatedLogMessage(log: UiMeshLog, searchText: String): AnnotatedString { val theme = MaterialTheme.colorScheme - val style = SpanStyle(color = colorResource(id = R.color.colorAnnotation), fontStyle = FontStyle.Italic) + val style = SpanStyle(color = AnnotationColor, fontStyle = FontStyle.Italic) val highlightStyle = SpanStyle(background = theme.primary.copy(alpha = 0.3f), color = theme.onSurface) return remember(log.uuid, searchText) { diff --git a/app/src/main/res/drawable-nodpi/channel_name_image.jpg b/app/src/main/res/drawable-nodpi/channel_name_image.jpg deleted file mode 100644 index 271bc5241..000000000 Binary files a/app/src/main/res/drawable-nodpi/channel_name_image.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/icon_meanings.png b/app/src/main/res/drawable-nodpi/icon_meanings.png deleted file mode 100644 index 3635df2e8..000000000 Binary files a/app/src/main/res/drawable-nodpi/icon_meanings.png and /dev/null differ diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml deleted file mode 100644 index 92129c9ae..000000000 --- a/app/src/main/res/values-night/colors.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - #141414 - #67EA94 - #141414 - #212121 - #28463C - #141414 - #FFFFFF - #67EA94 - #AAAAAA - #039BE5 - #141414 - #67EA94 - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index b4826228f..000000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - #FFFFFF - #67EA94 - #67EA94 - #F2F2F2 - #EDEAF4 - #FFFFFF - #000000 - #67EA94 - #212121 - #67EA94 - #535353 - #0288D1 - #67EA94 - #FFFFFF - diff --git a/app/src/main/res/values/curfirmwareversion.xml b/app/src/main/res/values/curfirmwareversion.xml deleted file mode 100644 index efe170b9c..000000000 --- a/app/src/main/res/values/curfirmwareversion.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - 0.2.0.abcdefg - 0.2.0 - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 17bf3b862..fa1453ca3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,20 +23,9 @@ 繁體中文 Meshtastic - 2.13 km SKH - Meshtastic_ac23 - Meshtastic_1267 - 55.332244 34.442211 hey I found the cache, it is over here next to the big tiger. I\'m kinda scared. - Messages - Users - Map - Channel - Settings - - \??? Meshtastic %s Filter clear node filter @@ -100,40 +89,27 @@ Controls the blinking LED on the device. For most devices this will control one of the up to 4 LEDs, the charger and GPS LEDs are not controllable. Whether in addition to sending it to MQTT and the PhoneAPI, our NeighborInfo should be transmitted over LoRa. Not available on a channel with default key and name. Public Key - Private Key MSL ChUtil %.1f%% AirUtilTX %.1f%% Channel Name - Channel options QR code - Unset - Connection status application icon Unknown Username Send - Send Text You haven\'t yet paired a Meshtastic compatible radio with this phone. Please pair a device and set your username.\n\nThis open-source application is in development, if you find problems please post on our forum: https://github.com/orgs/meshtastic/discussions.\n\nFor more information see our web page - www.meshtastic.org. You - Your Name Anonymous usage statistics and crash reports. - Looking for Meshtastic devices… - Starting pairing - A URL for joining a Meshtastic mesh Accept Cancel Clear changes - Change channel - Are you sure you want to change the channel? All communication with other nodes will stop until you share the new channel settings. New Channel URL received Meshtastic needs location permission and location must be turned on to find new devices via Bluetooth. You can turn it off again afterwards. Report Bug Report a bug Are you sure you want to report a bug? After reporting, please post in https://github.com/orgs/meshtastic/discussions so we can match up the report with what you found. Report - You have not paired a radio yet. - Change radio Pairing completed, starting service Pairing failed, please select again Location access is turned off, can not provide position to mesh. @@ -142,33 +118,21 @@ Disconnected Device sleeping Connected: %1$s online - Update Firmware IP Address: Port: Connected to radio Connected to radio (%s) Not connected Connected to radio, but it is sleeping - Update to %s Application update required You must update this application on the app store (or Github). It is too old to talk to this radio firmware. Please read our docs on this topic. None (disable) - Short Range / Turbo - Short Range / Fast - Medium Range / Fast - Long Range / Fast - Long Range / Moderate - Very Long Range / Slow - UNRECOGNIZED Service notifications - Location must be turned on to find new devices via Bluetooth. You can turn it off again afterwards. About - Text messages This Channel URL is invalid and can not be used Debug Panel Decoded Payload: Export Logs - 500 last messages Filters Active filters Search in logs… @@ -183,21 +147,14 @@ Match All | Any This will remove all log packets and database entries from your device - It is a full reset, and is permanent. Clear - Updating firmware, wait up to eight minutes… - Update successful - Update failed - message reception time - message reception state Message delivery status Direct message notifications Broadcast message notifications Alert notifications - Protocol stress test Firmware update required. The radio firmware is too old to talk to this application. For more information on this see our Firmware Installation guide. OK You must set a region! - Region Couldn\'t change channel, because radio is not yet connected. Please try again. Export rangetest.csv Reset @@ -205,23 +162,12 @@ Are you sure you want to change to the default channel? Reset to defaults Apply - No application found to send URLs Theme Light Dark System default Choose theme - Background location - For this feature, you must grant Location permission option \"Allow all the time\".\nThis allows Meshtastic to read your smartphone location and send it to other members of your mesh, even when the app is closed or not in use. - Required permissions Provide phone location to mesh - Camera permission - We must be granted access to the camera to read QR codes. No pictures or videos will be saved. - Notification permission - Meshtastic needs permission for service and message notifications. - Notification permission denied. To turn on notifications, access: Android Settings > Apps > Meshtastic > Notifications. - Short Range / Slow - Medium Range / Slow Delete message? Delete %s messages? @@ -232,7 +178,6 @@ Select all Close selection Delete selected - Long Range / Slow Style Selection Download Region Name @@ -247,11 +192,6 @@ Reboot Traceroute Show Introduction - Meshtastic is an open-source, off-grid, encrypted communication platform. The Meshtastic radios form a mesh network and communicate using the LoRa protocol to send text messages. - …Let\'s get started! - Connect your Meshtastic device by using either Bluetooth, Serial or WiFi. \n\nYou can see which devices are compatible at www.meshtastic.org/docs/hardware - "Setting up encryption" - As standard, a default encryption key is set. To enable your own channel and enhanced encryption, go to the channel tab and change the channel name, this will set a random key for AES256 encryption. \n\nTo communicate with other devices they will need to scan your QR code or follow the shared link to configure the channel settings. Message Quick chat options New quick chat @@ -261,12 +201,10 @@ Show quick chat menu Hide quick chat menu Factory reset - This will clear all device configuration you have done. Bluetooth disabled Meshtastic needs Nearby devices permission to find and connect to devices via Bluetooth. You can turn it off when not in use. Direct Message NodeDB reset - This will clear all nodes from this list. Delivery confirmed Error Ignore @@ -301,7 +239,6 @@ Duty Cycle limit reached. Cannot send messages right now, please try again later. Remove This node will be removed from your list until your node receives data from it again. - Mute Mute notifications 8 hours 1 week @@ -351,7 +288,6 @@ Good None Share to… - Share message Signal Signal Quality Traceroute Log @@ -370,10 +306,6 @@ Unknown Age Copy Alert Bell Character! - Channel Settings - Samsung Instructions - Enable Critical Alerts to bypass Do Not Disturb -
Samsung users may need to add an exception in system settings before enabling it for the Alerts Channel. Visit Samsung Support for assistance..]]>
Critical Alert! Favorite Add \'%s\' as a favorite node? @@ -651,7 +583,6 @@ Node Number User ID Uptime - Firmware version Timestamp Heading Speed @@ -665,7 +596,6 @@ No periodic telemetry broadcast Manual position request required Press and drag to reorder - Set Region Unmute Dynamic Scan QR Code @@ -683,7 +613,6 @@ When enabled, the device will display the time in 12-hour format on screen. Host Metrics Log Host - Host Metrics Free Memory Disk Free Load @@ -726,44 +655,14 @@ Scroll to bottom Meshtastic Scanning - Back - Next - Done - Skip Security Status Secure - - WARNING, insecure location enabled Warning Badge Unknown Channel Warning Overflow menu UV Lux Unknown - Normal - Satellite - Terrain - Hybrid - Manage Map Layers - Map Layers - No custom layers loaded. - Add Layer - Hide Layer - Show Layer - Remove Layer - Add Layer - Nodes at this location - Selected Map Type - Manage Custom Tile Sources - Add Custom Tile Source - No Custom Tile Sources - Edit Custom Tile Source - Delete Custom Tile Source - Name cannot be empty. - Provider name exists. - URL cannot be empty. - URL must contain placeholders. - URL Template - e.g. https://a.tile.openstreetmap.org/{z}/{x}/{y}.png A green lock means the channel is securely encrypted with either a 128 or 256 bit AES key. @@ -820,7 +719,6 @@ Track and Share Locations Share your location in real-time and keep your group coordinated with integrated GPS features. App Notifications - Send Notifications Incoming Messages Notifications for channel and direct messages. New Nodes @@ -833,7 +731,6 @@ Meshtastic uses your phone\'s location to enable a number of features. You can update your location permissions at any time from settings. Share Location Use your phone GPS to send locations to your node to instead of using a hardware GPS on your node. - Enable Location Sharing Distance Measurements Display the distance between your phone and other Meshtastic nodes with positions. Distance Filters diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3e4f43c0b..c2b8746f5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,23 +17,6 @@ - - diff --git a/mesh_service_example/src/main/res/values/colors.xml b/mesh_service_example/src/main/res/values/colors.xml index c8524cd96..a6b3daec9 100644 --- a/mesh_service_example/src/main/res/values/colors.xml +++ b/mesh_service_example/src/main/res/values/colors.xml @@ -1,5 +1,2 @@ - - #FF000000 - #FFFFFFFF - \ No newline at end of file + \ No newline at end of file