diff --git a/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/Contents.json b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/Contents.json rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/DIY_V1.imageset/Contents.json b/Meshtastic/Assets.xcassets/DIYV1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/DIY_V1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/DIYV1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/DR_DEV.imageset/Contents.json b/Meshtastic/Assets.xcassets/DRDEV.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/DR_DEV.imageset/Contents.json rename to Meshtastic/Assets.xcassets/DRDEV.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/HELTECV1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-1.jpg b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-1.jpg rename to Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq-1.jpg diff --git a/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-2.jpg b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-2.jpg rename to Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq-2.jpg diff --git a/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq.jpg b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq.jpg rename to Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq.jpg diff --git a/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-1.jpg b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-1.jpg rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg diff --git a/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-2.jpg b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-2.jpg rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg diff --git a/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq.jpg b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq.jpg rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg diff --git a/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/Contents.json b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/Contents.json rename to Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/Contents.json b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.jpg b/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/NANO_G1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.jpg rename to Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.jpg diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.jpg b/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/NANO_G1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.jpg rename to Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.jpg diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1.jpg b/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/NANO_G1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1.jpg rename to Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1.jpg diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/Contents.json b/Meshtastic/Assets.xcassets/NANOG1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/NANO_G1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/NANOG1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/Contents.json rename to Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/Contents.json b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/Contents.json rename to Meshtastic/Assets.xcassets/PRIVATEHW.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/Contents.json b/Meshtastic/Assets.xcassets/STATIONG1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/STATION_G1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/STATIONG1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/meshtastic_mesh_device_station_edition_overview 1.jpg b/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/STATION_G1.imageset/meshtastic_mesh_device_station_edition_overview 1.jpg rename to Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 1.jpg diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/meshtastic_mesh_device_station_edition_overview 2.jpg b/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/STATION_G1.imageset/meshtastic_mesh_device_station_edition_overview 2.jpg rename to Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 2.jpg diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/meshtastic_mesh_device_station_edition_overview.jpg b/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/STATION_G1.imageset/meshtastic_mesh_device_station_edition_overview.jpg rename to Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview.jpg diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json index fb2eadda..382e42da 100644 --- a/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "tbeam-2.jpg", + "filename" : "tbeam 2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "tbeam-1.jpg", + "filename" : "tbeam 1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "tbeam.jpg", + "filename" : "tbeam.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 1.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 1.png new file mode 100644 index 00000000..75fec7be Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 1.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 2.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 2.png new file mode 100644 index 00000000..75fec7be Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 2.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg deleted file mode 100644 index 69865801..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg deleted file mode 100644 index 69865801..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.jpg b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.jpg deleted file mode 100644 index 69865801..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.png new file mode 100644 index 00000000..75fec7be Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json similarity index 73% rename from Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json index d839cdeb..382e42da 100644 --- a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "tbeam.jpg", + "filename" : "tbeam 2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "tbeam-1.jpg", + "filename" : "tbeam 1.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "tbeam-2.jpg", + "filename" : "tbeam.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 1.png b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 1.png new file mode 100644 index 00000000..75fec7be Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 1.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 2.png b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 2.png new file mode 100644 index 00000000..75fec7be Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 2.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam.png b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam.png new file mode 100644 index 00000000..75fec7be Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-1.jpg b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-1.jpg deleted file mode 100644 index 69865801..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-2.jpg b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-2.jpg deleted file mode 100644 index 69865801..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam.jpg b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam.jpg deleted file mode 100644 index 69865801..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/T_ECHO.imageset/Contents.json b/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/T_ECHO.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/T_ECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.jpg b/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/T_ECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.jpg rename to Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.jpg diff --git a/Meshtastic/Assets.xcassets/T_ECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.jpg b/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/T_ECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.jpg rename to Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.jpg diff --git a/Meshtastic/Assets.xcassets/T_ECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1.jpg b/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/T_ECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1.jpg rename to Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V1.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray-1.jpg b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray-1.jpg rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray.jpg b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray.jpg rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_olive.jpg b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_olive.jpg rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-1.jpg b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-1.jpg rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-2.jpg b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-2.jpg rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_olive.jpg b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_olive.jpg rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg b/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg rename to Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg b/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg rename to Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg b/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg rename to Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg rename to Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg rename to Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg rename to Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV211P8.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg rename to Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg rename to Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg rename to Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg diff --git a/Meshtastic/Views/ContentView.swift b/Meshtastic/Views/ContentView.swift index bfcf5845..ba37fb99 100644 --- a/Meshtastic/Views/ContentView.swift +++ b/Meshtastic/Views/ContentView.swift @@ -30,45 +30,30 @@ struct ContentView: View { Contacts() .tabItem { Label("Messages", systemImage: "message") - .symbolRenderingMode(.hierarchical) - .symbolVariant(.none) - } .tag(Tab.contacts) } Connect() .tabItem { Label("Bluetooth", systemImage: "antenna.radiowaves.left.and.right") - .symbolRenderingMode(.hierarchical) - .symbolVariant(.none) } .tag(Tab.ble) NodeList() .tabItem { Label("Nodes", systemImage: "flipphone") - .symbolRenderingMode(.hierarchical) - .symbolVariant(.none) } .tag(Tab.nodes) NodeMap() .tabItem { Label("Mesh Map", systemImage: "map") - .symbolRenderingMode(.hierarchical) - .symbolVariant(.none) } .tag(Tab.map) Settings() .tabItem { Label("Settings", systemImage: "gear") - .symbolRenderingMode(.hierarchical) - .symbolVariant(.none) } .tag(Tab.settings) - } - .onAppear( - - ) } } diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index d75fea7b..48ea6eaa 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -106,7 +106,7 @@ struct ChannelMessageList: View { } if !currentUser { VStack { - Text("SNR \(message.snr)") + Text("SNR \(String(format: "%.2f", message.snr)) dB") } } if currentUser && message.receivedACK { @@ -133,7 +133,7 @@ struct ChannelMessageList: View { } if message.ackSNR != 0 { VStack { - Text("Ack SNR \(String(message.ackSNR))") + Text("Ack SNR\(String(format: "%.2f", message.ackSNR)) dB") .font(.caption2) .foregroundColor(.gray) } diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift index a869f6bb..0cc30403 100644 --- a/Meshtastic/Views/Messages/UserMessageList.swift +++ b/Meshtastic/Views/Messages/UserMessageList.swift @@ -17,13 +17,12 @@ struct UserMessageList: View { enum Field: Hashable { case messageText } - // Keyboard State @State var typingMessage: String = "" @State private var totalBytes = 0 var maxbytes = 228 @FocusState var focusedField: Field? - + // View State Items @ObservedObject var user: UserEntity @State var showDeleteMessageAlert = false @State private var deleteMessageId: Int64 = 0 @@ -108,7 +107,7 @@ struct UserMessageList: View { } if !currentUser { VStack { - Text("SNR \(message.snr)") + Text("SNR \(String(format: "%.2f", message.snr)) dB") } } if currentUser && message.receivedACK { @@ -135,7 +134,7 @@ struct UserMessageList: View { } if message.ackSNR != 0 { VStack { - Text("Ack SNR \(String(message.ackSNR))") + Text("Ack SNR\(String(format: "%.2f", message.ackSNR)) dB") .font(.caption2) .foregroundColor(.gray) } @@ -213,7 +212,6 @@ struct UserMessageList: View { } }, secondaryButton: .cancel()) } - } } } @@ -264,23 +262,15 @@ struct UserMessageList: View { let userLongName = bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown" sendPositionWithMessage = true if user.num == bleManager.broadcastNodeNum { - if userSettings.meshtasticUsername.count > 0 { - typingMessage = "📍 " + userSettings.meshtasticUsername + " has shared their position with the mesh from node " + userLongName } else { - typingMessage = "📍 " + userLongName + " has shared their position with the mesh." } - } else { - if userSettings.meshtasticUsername.count > 0 { - typingMessage = "📍 " + userSettings.meshtasticUsername + " has shared their position with you from node " + userLongName - } else { - typingMessage = "📍 " + userLongName + " has shared their position with you." } } @@ -289,7 +279,6 @@ struct UserMessageList: View { .symbolRenderingMode(.hierarchical) .imageScale(.large).foregroundColor(.accentColor) } - ProgressView("Bytes: \(totalBytes) / \(maxbytes)", value: Double(totalBytes), total: Double(maxbytes)) .frame(width: 130) .padding(5) @@ -301,9 +290,7 @@ struct UserMessageList: View { .focused($focusedField, equals: .messageText) .multilineTextAlignment(.leading) .frame(minHeight: 50) - Text(typingMessage).opacity(0).padding(.all, 0) - } .overlay(RoundedRectangle(cornerRadius: 20).stroke(.tertiary, lineWidth: 1)) .padding(.bottom, 15) diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift index 2940cbda..553c2364 100644 --- a/Meshtastic/Views/Nodes/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/NodeDetail.swift @@ -104,7 +104,7 @@ struct NodeDetail: View { .symbolRenderingMode(.hierarchical) .padding(.bottom, 10) Text("SNR").font(.largeTitle).fixedSize() - Text(String(node.snr)) + Text("\(String(format: "%.2f", node.snr)) dB") .font(.largeTitle) .foregroundColor(.gray) .fixedSize() @@ -222,7 +222,7 @@ struct NodeDetail: View { .foregroundColor(.accentColor) .symbolRenderingMode(.hierarchical) Text("SNR").font(.title2).fixedSize() - Text(String(node.snr)) + Text("\(String(format: "%.2f", node.snr)) dB") .font(.title2) .foregroundColor(.gray) .fixedSize() diff --git a/Meshtastic/Views/Nodes/PositionLog.swift b/Meshtastic/Views/Nodes/PositionLog.swift index 78774925..b31e9b2a 100644 --- a/Meshtastic/Views/Nodes/PositionLog.swift +++ b/Meshtastic/Views/Nodes/PositionLog.swift @@ -47,7 +47,7 @@ struct PositionLog: View { Text(String(position.heading)) } TableColumn("SNR") { position in - Text(String(position.snr)) + Text("\(String(format: "%.2f", position.snr)) dB") } TableColumn("Time Stamp") { position in Text(position.time?.formattedDate(format: "MM/dd/yy hh:mm") ?? "Unknown time")