From e2dc8ed8aeed7e98c482c306bc5f61420ca04c90 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 24 Jun 2022 08:00:18 -0700 Subject: [PATCH] Rename Project to satisfy app review --- .../project.pbxproj | 134 +++++++++--------- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../ANDROIDSIM.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/1024.png | Bin .../AppIcon.appiconset/120-1.png | Bin .../AppIcon.appiconset/120.png | Bin .../AppIcon.appiconset/152.png | Bin .../AppIcon.appiconset/167.png | Bin .../AppIcon.appiconset/180.png | Bin .../Assets.xcassets/AppIcon.appiconset/20.png | Bin .../Assets.xcassets/AppIcon.appiconset/29.png | Bin .../AppIcon.appiconset/40-1.png | Bin .../AppIcon.appiconset/40-2.png | Bin .../Assets.xcassets/AppIcon.appiconset/40.png | Bin .../AppIcon.appiconset/58-1.png | Bin .../Assets.xcassets/AppIcon.appiconset/58.png | Bin .../Assets.xcassets/AppIcon.appiconset/60.png | Bin .../Assets.xcassets/AppIcon.appiconset/76.png | Bin .../AppIcon.appiconset/80-1.png | Bin .../Assets.xcassets/AppIcon.appiconset/80.png | Bin .../Assets.xcassets/AppIcon.appiconset/87.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../Color.colorset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../DIYV.imageset/Contents.json | 0 .../DIYV.imageset/play_store_icon_114px-2.png | Bin .../DIYV.imageset/play_store_icon_114px-3.png | Bin .../DIYV.imageset/play_store_icon_114px-4.png | Bin .../GENIEBLOCKS.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../HELTECV20.imageset/Contents.json | 0 .../HELTECV20.imageset/Heltec_turq-1.jpg | Bin .../HELTECV20.imageset/Heltec_turq-2.jpg | Bin .../HELTECV20.imageset/Heltec_turq.jpg | Bin .../HELTECV21.imageset/Contents.json | 0 .../HELTECV21.imageset/Heltec_turq-1.jpg | Bin .../HELTECV21.imageset/Heltec_turq-2.jpg | Bin .../HELTECV21.imageset/Heltec_turq.jpg | Bin .../LORARELAYV1.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../NRF52840DK.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../NRF52UNKNOWN.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../PORTDUINO.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../PPR.imageset/Contents.json | 0 .../PPR.imageset/play_store_icon_114px-2.png | Bin .../PPR.imageset/play_store_icon_114px-3.png | Bin .../PPR.imageset/play_store_icon_114px-4.png | Bin .../RAK4631.imageset/Contents.json | 0 .../RAK4631.imageset/RAK_DEV_KIT-1.jpg | Bin .../RAK4631.imageset/RAK_DEV_KIT-2.jpg | Bin .../RAK4631.imageset/RAK_DEV_KIT.jpg | Bin .../TBEAM.imageset/Contents.json | 0 .../TBEAM.imageset/tbeam-1.jpg | Bin .../TBEAM.imageset/tbeam-2.jpg | Bin .../Assets.xcassets/TBEAM.imageset/tbeam.jpg | Bin .../TBEAM0P7.imageset/Contents.json | 0 .../TBEAM0P7.imageset/tbeam-1.jpg | Bin .../TBEAM0P7.imageset/tbeam-2.jpg | Bin .../TBEAM0P7.imageset/tbeam.jpg | Bin .../TECHO.imageset/Contents.json | 0 .../TECHO.imageset/techo-1.jpg | Bin .../TECHO.imageset/techo-2.jpg | Bin .../Assets.xcassets/TECHO.imageset/techo.jpg | Bin .../TLORAV1.imageset/Contents.json | 0 .../TLORAV1.imageset/TLORA_gray-1.jpg | Bin .../TLORAV1.imageset/TLORA_gray.jpg | Bin .../TLORAV1.imageset/TLORA_olive.jpg | Bin .../TLORAV11P3.imageset/Contents.json | 0 .../TLORAV11P3.imageset/TLORA_gray-1.jpg | Bin .../TLORAV11P3.imageset/TLORA_gray-2.jpg | Bin .../TLORAV11P3.imageset/TLORA_olive.jpg | Bin .../TLORAV2.imageset/Contents.json | 0 ...32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg | Bin ...32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg | Bin ...SP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg | Bin .../TLORAV211P6.imageset/Contents.json | 0 ...32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg | Bin ...32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg | Bin ...SP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg | Bin .../UNSET.imageset/Contents.json | 0 .../play_store_icon_114px-2.png | Bin .../play_store_icon_114px-3.png | Bin .../play_store_icon_114px-4.png | Bin .../Helpers/BLEManager.swift | 0 .../Helpers/BluetoothManager.swift | 0 .../Helpers/Extensions.swift | 0 .../Helpers/LocalNotificationManager.swift | 0 .../Helpers/LocationHelper.swift | 0 .../Helpers/MeshLogger.swift | 0 .../Helpers/MeshPackets.swift | 17 +-- .../Helpers/Preferences.swift | 0 {MeshtasticApple => Meshtastic}/Info.plist | 0 .../Meshtastic.entitlements | 0 .../Meshtastic.xcdatamodeld/.xccurrentversion | 0 .../contents | 0 .../MeshtasticApp.swift | 0 .../Model/MapLocation.swift | 0 .../Model/PeripheralModel.swift | 0 .../Model/UserSettings.swift | 0 .../Persistence/Persistence.swift | 0 .../Persistence/PositionEntityExtension.swift | 0 .../Persistence/UserEntityExtension.swift | 0 .../Preview Assets.xcassets/Contents.json | 0 .../Protobufs/admin.pb.swift | 0 .../Protobufs/apponly.pb.swift | 0 .../Protobufs/cannedmessages.pb.swift | 0 .../Protobufs/channel.pb.swift | 0 .../Protobufs/config.pb.swift | 0 .../Protobufs/deviceonly.pb.swift | 0 .../Protobufs/localonly.pb.swift | 0 .../Protobufs/mesh.pb.swift | 0 .../Protobufs/module_config.pb.swift | 0 .../Protobufs/mqtt.pb.swift | 0 .../Protobufs/portnums.pb.swift | 0 .../Protobufs/remote_hardware.pb.swift | 0 .../Protobufs/storeforward.pb.swift | 0 .../Protobufs/telemetry.pb.swift | 0 .../RELEASENOTES.md | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/1024.png | Bin .../AppIcon.appiconset/120-1.png | Bin .../AppIcon.appiconset/120.png | Bin .../AppIcon.appiconset/152.png | Bin .../AppIcon.appiconset/167.png | Bin .../AppIcon.appiconset/180.png | Bin .../Assets.xcassets/AppIcon.appiconset/20.png | Bin .../Assets.xcassets/AppIcon.appiconset/29.png | Bin .../AppIcon.appiconset/40-1.png | Bin .../AppIcon.appiconset/40-2.png | Bin .../Assets.xcassets/AppIcon.appiconset/40.png | Bin .../AppIcon.appiconset/58-1.png | Bin .../Assets.xcassets/AppIcon.appiconset/58.png | Bin .../Assets.xcassets/AppIcon.appiconset/60.png | Bin .../Assets.xcassets/AppIcon.appiconset/76.png | Bin .../AppIcon.appiconset/80-1.png | Bin .../Assets.xcassets/AppIcon.appiconset/80.png | Bin .../Assets.xcassets/AppIcon.appiconset/87.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../Color.colorset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 ...655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png | Bin ...655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png | Bin .../655DCEC0-309D-430A-AF50-2453B6ADB1F6.png | Bin .../HELTECV20.imageset/Contents.json | 0 .../TLORAV2.imageset/Contents.json | 0 .../TLORAV211p6.imageset/Contents.json | 0 .../UNSET.imageset/Contents.json | 0 .../rak4631.imageset/Contents.json | 0 ...69e-43fcef692ef6_739x@2x.progressive-1.png | Bin ...-a69e-43fcef692ef6_739x@2x.progressive.png | Bin .../tbeam.imageset/Contents.json | 0 .../tbeam.imageset/tbeam-1.jpg | Bin .../tbeam.imageset/tbeam-2.jpg | Bin .../Assets.xcassets/tbeam.imageset/tbeam.jpg | Bin .../techo.imageset/Contents.json | 0 .../techo.imageset/techo-1.jpg | Bin .../techo.imageset/techo-2.jpg | Bin .../Assets.xcassets/techo.imageset/techo.jpg | Bin .../tlorav1.imageset/Contents.json | 0 .../tlorav1.imageset/tlora-1.jpeg | Bin .../tlorav1.imageset/tlora-2.jpeg | Bin .../tlorav1.imageset/tlora.jpeg | Bin .../TBEAM.imageset/tbeam-1.jpg | Bin .../Assets.xcassets/TBEAM.imageset/tbeam.jpg | Bin .../Views/Bluetooth/Connect.swift | 6 +- .../Views/ContentView.swift | 0 .../Views/Helpers/BatteryIcon.swift | 0 .../Views/Helpers/CircleText.swift | 0 .../Views/Helpers/ConnectedDevice.swift | 0 .../Views/Helpers/DateTimeText.swift | 0 .../Views/Helpers/LastHeardText.swift | 0 .../Views/Helpers/MessageBubble.swift | 0 .../Views/Helpers/NodeAnnotation.swift | 0 .../Map/Custom/PositionAnnotationView.swift | 0 .../Views/Map/LocalMBTileOverlay.swift | 0 .../Views/Map/MapView.swift | 0 .../Views/Map/MapViewModule.swift | 0 .../Views/Messages/Contacts.swift | 0 .../Views/Messages/UserMessageList.swift | 0 .../Views/Nodes/NodeDetail.swift | 0 .../Views/Nodes/NodeList.swift | 0 .../Views/Nodes/NodeMap.swift | 0 .../Views/Nodes/NodeRow.swift | 0 .../Views/Settings/AppSettings.swift | 0 .../Views/Settings/Config/DeviceConfig.swift | 0 .../Views/Settings/Config/DisplayConfig.swift | 0 .../Views/Settings/Config/LoRaConfig.swift | 0 .../Config/Module/CannedMessagesConfig.swift | 0 .../Module/ExternalNotificationConfig.swift | 0 .../Config/Module/RangeTestConfig.swift | 0 .../Settings/Config/Module/SerialConfig.swift | 0 .../Config/Module/TelemetryConfig.swift | 0 .../Settings/Config/PositionConfig.swift | 0 .../Views/Settings/LogDocument.swift | 0 .../Views/Settings/MeshLog.swift | 0 .../Views/Settings/Settings.swift | 0 .../Views/Settings/ShareChannel.swift | 0 .../Info.plist | 0 .../MeshtasticAppleTests.swift | 0 .../Info.plist | 0 .../MeshtasticAppleUITests.swift | 0 gen_protos.sh | 2 +- 222 files changed, 78 insertions(+), 81 deletions(-) rename {Meshtastic Apple.xcodeproj => Meshtastic.xcodeproj}/project.pbxproj (91%) rename {Meshtastic Apple.xcodeproj => Meshtastic.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {Meshtastic Apple.xcodeproj => Meshtastic.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {Meshtastic Apple.xcodeproj => Meshtastic.xcodeproj}/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename {Meshtastic Apple.xcodeproj => Meshtastic.xcodeproj}/project.xcworkspace/xcshareddata/swiftpm/Package.resolved (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/ANDROIDSIM.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/1024.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/120-1.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/120.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/152.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/167.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/180.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/20.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/29.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/40-1.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/40-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/40.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/58-1.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/58.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/60.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/76.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/80-1.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/80.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/87.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/Color.colorset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/DIYV.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV20.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV21.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/LORARELAYV1.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52840DK.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PORTDUINO.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PPR.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/RAK4631.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM.imageset/tbeam.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM0P7.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TECHO.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TECHO.imageset/techo-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TECHO.imageset/techo-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TECHO.imageset/techo.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV1.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV11P3.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV2.imageset/Contents.json (100%) rename {MeshtasticApple => 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 (100%) rename {MeshtasticApple => 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 (100%) rename {MeshtasticApple => 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 (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/TLORAV211P6.imageset/Contents.json (100%) rename {MeshtasticApple => 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 (100%) rename {MeshtasticApple => 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 (100%) rename {MeshtasticApple => 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 (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/UNSET.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/UNSET.imageset/play_store_icon_114px-2.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png (100%) rename {MeshtasticApple => Meshtastic}/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png (100%) rename {MeshtasticApple => Meshtastic}/Helpers/BLEManager.swift (100%) rename {MeshtasticApple => Meshtastic}/Helpers/BluetoothManager.swift (100%) rename {MeshtasticApple => Meshtastic}/Helpers/Extensions.swift (100%) rename {MeshtasticApple => Meshtastic}/Helpers/LocalNotificationManager.swift (100%) rename {MeshtasticApple => Meshtastic}/Helpers/LocationHelper.swift (100%) rename {MeshtasticApple => Meshtastic}/Helpers/MeshLogger.swift (100%) rename {MeshtasticApple => Meshtastic}/Helpers/MeshPackets.swift (98%) rename {MeshtasticApple => Meshtastic}/Helpers/Preferences.swift (100%) rename {MeshtasticApple => Meshtastic}/Info.plist (100%) rename MeshtasticApple/MeshtasticApple.entitlements => Meshtastic/Meshtastic.entitlements (100%) rename {MeshtasticApple => Meshtastic}/Meshtastic.xcdatamodeld/.xccurrentversion (100%) rename {MeshtasticApple => Meshtastic}/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents (100%) rename MeshtasticApple/MeshtasticAppleApp.swift => Meshtastic/MeshtasticApp.swift (100%) rename {MeshtasticApple => Meshtastic}/Model/MapLocation.swift (100%) rename {MeshtasticApple => Meshtastic}/Model/PeripheralModel.swift (100%) rename {MeshtasticApple => Meshtastic}/Model/UserSettings.swift (100%) rename {MeshtasticApple => Meshtastic}/Persistence/Persistence.swift (100%) rename {MeshtasticApple => Meshtastic}/Persistence/PositionEntityExtension.swift (100%) rename {MeshtasticApple => Meshtastic}/Persistence/UserEntityExtension.swift (100%) rename {MeshtasticApple => Meshtastic}/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/admin.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/apponly.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/cannedmessages.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/channel.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/config.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/deviceonly.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/localonly.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/mesh.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/module_config.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/mqtt.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/portnums.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/remote_hardware.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/storeforward.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/Protobufs/telemetry.pb.swift (100%) rename {MeshtasticApple => Meshtastic}/RELEASENOTES.md (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg (100%) rename {MeshtasticApple => Meshtastic}/Resources/Assets.xcassets/TBEAM.imageset/tbeam.jpg (100%) rename {MeshtasticApple => Meshtastic}/Views/Bluetooth/Connect.swift (99%) rename {MeshtasticApple => Meshtastic}/Views/ContentView.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/BatteryIcon.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/CircleText.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/ConnectedDevice.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/DateTimeText.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/LastHeardText.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/MessageBubble.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Helpers/NodeAnnotation.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Map/Custom/PositionAnnotationView.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Map/LocalMBTileOverlay.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Map/MapView.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Map/MapViewModule.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Messages/Contacts.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Messages/UserMessageList.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Nodes/NodeDetail.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Nodes/NodeList.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Nodes/NodeMap.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Nodes/NodeRow.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/AppSettings.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/DeviceConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/DisplayConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/LoRaConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/Module/CannedMessagesConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/Module/ExternalNotificationConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/Module/RangeTestConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/Module/SerialConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/Module/TelemetryConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Config/PositionConfig.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/LogDocument.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/MeshLog.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/Settings.swift (100%) rename {MeshtasticApple => Meshtastic}/Views/Settings/ShareChannel.swift (100%) rename {MeshtasticAppleTests => MeshtasticTests}/Info.plist (100%) rename {MeshtasticAppleTests => MeshtasticTests}/MeshtasticAppleTests.swift (100%) rename {MeshtasticAppleUITests => MeshtasticUITests}/Info.plist (100%) rename {MeshtasticAppleUITests => MeshtasticUITests}/MeshtasticAppleUITests.swift (100%) diff --git a/Meshtastic Apple.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj similarity index 91% rename from Meshtastic Apple.xcodeproj/project.pbxproj rename to Meshtastic.xcodeproj/project.pbxproj index ae7b671d..514705a8 100644 --- a/Meshtastic Apple.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -60,7 +60,7 @@ DDAF8C6926ED0D070058C060 /* deviceonly.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAF8C6826ED0D070058C060 /* deviceonly.pb.swift */; }; DDAF8C6E26ED19040058C060 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAF8C6D26ED19040058C060 /* Extensions.swift */; }; DDB2CC6E27F3EB47009C5FCC /* telemetry.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB2CC6D27F3EB47009C5FCC /* telemetry.pb.swift */; }; - DDC2E15826CE248E0042C5E4 /* MeshtasticAppleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E15726CE248E0042C5E4 /* MeshtasticAppleApp.swift */; }; + DDC2E15826CE248E0042C5E4 /* MeshtasticApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E15726CE248E0042C5E4 /* MeshtasticApp.swift */; }; DDC2E15C26CE248F0042C5E4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDC2E15B26CE248F0042C5E4 /* Assets.xcassets */; }; DDC2E15F26CE248F0042C5E4 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDC2E15E26CE248F0042C5E4 /* Preview Assets.xcassets */; }; DDC2E16F26CE248F0042C5E4 /* MeshtasticAppleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E16E26CE248F0042C5E4 /* MeshtasticAppleTests.swift */; }; @@ -130,7 +130,7 @@ DD836AE626F6B38600ABCC23 /* Connect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connect.swift; sourceTree = ""; }; DD882F5C2772E4640005BF05 /* Contacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contacts.swift; sourceTree = ""; }; DD8EBF42285058FA00426DCA /* DisplayConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisplayConfig.swift; sourceTree = ""; }; - DD90860A26F645B700DC5189 /* MeshtasticApple.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MeshtasticApple.entitlements; sourceTree = ""; }; + DD90860A26F645B700DC5189 /* Meshtastic.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Meshtastic.entitlements; sourceTree = ""; }; DD90860B26F684AF00DC5189 /* BatteryIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryIcon.swift; sourceTree = ""; }; DD90860D26F69BAE00DC5189 /* NodeMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeMap.swift; sourceTree = ""; }; DD913638270DFF4C00D7ACF3 /* LocalNotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNotificationManager.swift; sourceTree = ""; }; @@ -148,16 +148,16 @@ DDAF8C6D26ED19040058C060 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = ""; }; DDB2CC6D27F3EB47009C5FCC /* telemetry.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = telemetry.pb.swift; sourceTree = ""; }; DDB2CC6F27F3F0AC009C5FCC /* MeshtasticDataModel v 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MeshtasticDataModel v 3.xcdatamodel"; sourceTree = ""; }; - DDC2E15426CE248E0042C5E4 /* MeshtasticApple.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MeshtasticApple.app; sourceTree = BUILT_PRODUCTS_DIR; }; - DDC2E15726CE248E0042C5E4 /* MeshtasticAppleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticAppleApp.swift; sourceTree = ""; }; + DDC2E15426CE248E0042C5E4 /* Meshtastic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Meshtastic.app; sourceTree = BUILT_PRODUCTS_DIR; }; + DDC2E15726CE248E0042C5E4 /* MeshtasticApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticApp.swift; sourceTree = ""; }; DDC2E15B26CE248F0042C5E4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = ../Assets.xcassets; sourceTree = ""; }; DDC2E15E26CE248F0042C5E4 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; DDC2E16526CE248F0042C5E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DDC2E16A26CE248F0042C5E4 /* MeshtasticAppleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeshtasticAppleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DDC2E16E26CE248F0042C5E4 /* MeshtasticAppleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticAppleTests.swift; sourceTree = ""; }; + DDC2E16A26CE248F0042C5E4 /* MeshtasticTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeshtasticTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + DDC2E16E26CE248F0042C5E4 /* MeshtasticTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticTests.swift; sourceTree = ""; }; DDC2E17026CE248F0042C5E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DDC2E17526CE248F0042C5E4 /* MeshtasticAppleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeshtasticAppleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DDC2E17926CE248F0042C5E4 /* MeshtasticAppleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticAppleUITests.swift; sourceTree = ""; }; + DDC2E17526CE248F0042C5E4 /* MeshtasticUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeshtasticUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + DDC2E17926CE248F0042C5E4 /* MeshtasticUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticUITests.swift; sourceTree = ""; }; DDC2E17B26CE248F0042C5E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DDC2E18E26CE25FE0042C5E4 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationHelper.swift; sourceTree = ""; }; @@ -302,9 +302,9 @@ isa = PBXGroup; children = ( DD9D8F2D2764403B00080993 /* Meshtastic.xcdatamodeld */, - DDC2E15626CE248E0042C5E4 /* MeshtasticApple */, - DDC2E16D26CE248F0042C5E4 /* MeshtasticAppleTests */, - DDC2E17826CE248F0042C5E4 /* MeshtasticAppleUITests */, + DDC2E15626CE248E0042C5E4 /* Meshtastic */, + DDC2E16D26CE248F0042C5E4 /* MeshtasticTests */, + DDC2E17826CE248F0042C5E4 /* MeshtasticUITests */, DDC2E15526CE248E0042C5E4 /* Products */, DD8EDE9226F97A2B00A5A10B /* Frameworks */, ); @@ -314,28 +314,28 @@ DDC2E15526CE248E0042C5E4 /* Products */ = { isa = PBXGroup; children = ( - DDC2E15426CE248E0042C5E4 /* MeshtasticApple.app */, - DDC2E16A26CE248F0042C5E4 /* MeshtasticAppleTests.xctest */, - DDC2E17526CE248F0042C5E4 /* MeshtasticAppleUITests.xctest */, + DDC2E15426CE248E0042C5E4 /* Meshtastic.app */, + DDC2E16A26CE248F0042C5E4 /* MeshtasticTests.xctest */, + DDC2E17526CE248F0042C5E4 /* MeshtasticUITests.xctest */, ); name = Products; sourceTree = ""; }; - DDC2E15626CE248E0042C5E4 /* MeshtasticApple */ = { + DDC2E15626CE248E0042C5E4 /* Meshtastic */ = { isa = PBXGroup; children = ( - DD90860A26F645B700DC5189 /* MeshtasticApple.entitlements */, + DD90860A26F645B700DC5189 /* Meshtastic.entitlements */, DDC4D5662754996200A4208E /* Persistence */, DDAF8C5626ED07740058C060 /* Protobufs */, DDC2E1A526CEB32B0042C5E4 /* Helpers */, DDC2E18726CE24E40042C5E4 /* Views */, DDC2E18826CE24EE0042C5E4 /* Model */, DDC2E18926CE24F70042C5E4 /* Resources */, - DDC2E15726CE248E0042C5E4 /* MeshtasticAppleApp.swift */, + DDC2E15726CE248E0042C5E4 /* MeshtasticApp.swift */, DDC2E16526CE248F0042C5E4 /* Info.plist */, DDC2E15D26CE248F0042C5E4 /* Preview Content */, ); - path = MeshtasticApple; + path = Meshtastic; sourceTree = ""; }; DDC2E15D26CE248F0042C5E4 /* Preview Content */ = { @@ -346,22 +346,22 @@ path = "Preview Content"; sourceTree = ""; }; - DDC2E16D26CE248F0042C5E4 /* MeshtasticAppleTests */ = { + DDC2E16D26CE248F0042C5E4 /* MeshtasticTests */ = { isa = PBXGroup; children = ( - DDC2E16E26CE248F0042C5E4 /* MeshtasticAppleTests.swift */, + DDC2E16E26CE248F0042C5E4 /* MeshtasticTests.swift */, DDC2E17026CE248F0042C5E4 /* Info.plist */, ); - path = MeshtasticAppleTests; + path = MeshtasticTests; sourceTree = ""; }; - DDC2E17826CE248F0042C5E4 /* MeshtasticAppleUITests */ = { + DDC2E17826CE248F0042C5E4 /* MeshtasticUITests */ = { isa = PBXGroup; children = ( - DDC2E17926CE248F0042C5E4 /* MeshtasticAppleUITests.swift */, + DDC2E17926CE248F0042C5E4 /* MeshtasticUITests.swift */, DDC2E17B26CE248F0042C5E4 /* Info.plist */, ); - path = MeshtasticAppleUITests; + path = MeshtasticUITests; sourceTree = ""; }; DDC2E18726CE24E40042C5E4 /* Views */ = { @@ -445,9 +445,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - DDC2E15326CE248E0042C5E4 /* MeshtasticApple */ = { + DDC2E15326CE248E0042C5E4 /* Meshtastic */ = { isa = PBXNativeTarget; - buildConfigurationList = DDC2E17E26CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticApple" */; + buildConfigurationList = DDC2E17E26CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "Meshtastic" */; buildPhases = ( DDC2E15026CE248E0042C5E4 /* Sources */, DDC2E15126CE248E0042C5E4 /* Frameworks */, @@ -458,18 +458,18 @@ ); dependencies = ( ); - name = MeshtasticApple; + name = Meshtastic; packageProductDependencies = ( DD5394FB276993AD00AD86B1 /* SwiftProtobuf */, C9697FA427933B8C00250207 /* SQLite */, ); productName = MeshtasticClient; - productReference = DDC2E15426CE248E0042C5E4 /* MeshtasticApple.app */; + productReference = DDC2E15426CE248E0042C5E4 /* Meshtastic.app */; productType = "com.apple.product-type.application"; }; - DDC2E16926CE248F0042C5E4 /* MeshtasticAppleTests */ = { + DDC2E16926CE248F0042C5E4 /* MeshtasticTests */ = { isa = PBXNativeTarget; - buildConfigurationList = DDC2E18126CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticAppleTests" */; + buildConfigurationList = DDC2E18126CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticTests" */; buildPhases = ( DDC2E16626CE248F0042C5E4 /* Sources */, DDC2E16726CE248F0042C5E4 /* Frameworks */, @@ -480,14 +480,14 @@ dependencies = ( DDC2E16C26CE248F0042C5E4 /* PBXTargetDependency */, ); - name = MeshtasticAppleTests; + name = MeshtasticTests; productName = MeshtasticClientTests; - productReference = DDC2E16A26CE248F0042C5E4 /* MeshtasticAppleTests.xctest */; + productReference = DDC2E16A26CE248F0042C5E4 /* MeshtasticTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - DDC2E17426CE248F0042C5E4 /* MeshtasticAppleUITests */ = { + DDC2E17426CE248F0042C5E4 /* MeshtasticUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = DDC2E18426CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticAppleUITests" */; + buildConfigurationList = DDC2E18426CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticUITests" */; buildPhases = ( DDC2E17126CE248F0042C5E4 /* Sources */, DDC2E17226CE248F0042C5E4 /* Frameworks */, @@ -498,9 +498,9 @@ dependencies = ( DDC2E17726CE248F0042C5E4 /* PBXTargetDependency */, ); - name = MeshtasticAppleUITests; + name = MeshtasticUITests; productName = MeshtasticClientUITests; - productReference = DDC2E17526CE248F0042C5E4 /* MeshtasticAppleUITests.xctest */; + productReference = DDC2E17526CE248F0042C5E4 /* MeshtasticUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -526,7 +526,7 @@ }; }; }; - buildConfigurationList = DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic Apple" */; + buildConfigurationList = DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic" */; compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -543,9 +543,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - DDC2E15326CE248E0042C5E4 /* MeshtasticApple */, - DDC2E16926CE248F0042C5E4 /* MeshtasticAppleTests */, - DDC2E17426CE248F0042C5E4 /* MeshtasticAppleUITests */, + DDC2E15326CE248E0042C5E4 /* Meshtastic */, + DDC2E16926CE248F0042C5E4 /* MeshtasticTests */, + DDC2E17426CE248F0042C5E4 /* MeshtasticUITests */, ); }; /* End PBXProject section */ @@ -660,7 +660,7 @@ DD41582A28585C32009B0E59 /* RangeTestConfig.swift in Sources */, DDAF8C6726ED0C8C0058C060 /* remote_hardware.pb.swift in Sources */, DDAF8C6526ED0A490058C060 /* channel.pb.swift in Sources */, - DDC2E15826CE248E0042C5E4 /* MeshtasticAppleApp.swift in Sources */, + DDC2E15826CE248E0042C5E4 /* MeshtasticApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -676,7 +676,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DDC2E17A26CE248F0042C5E4 /* MeshtasticAppleUITests.swift in Sources */, + DDC2E17A26CE248F0042C5E4 /* MeshtasticUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -685,12 +685,12 @@ /* Begin PBXTargetDependency section */ DDC2E16C26CE248F0042C5E4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DDC2E15326CE248E0042C5E4 /* MeshtasticApple */; + target = DDC2E15326CE248E0042C5E4 /* Meshtastic */; targetProxy = DDC2E16B26CE248F0042C5E4 /* PBXContainerItemProxy */; }; DDC2E17726CE248F0042C5E4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DDC2E15326CE248E0042C5E4 /* MeshtasticApple */; + target = DDC2E15326CE248E0042C5E4 /* Meshtastic */; targetProxy = DDC2E17626CE248F0042C5E4 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -821,14 +821,14 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = MeshtasticApple/MeshtasticApple.entitlements; + CODE_SIGN_ENTITLEMENTS = Meshtastic/Meshtastic.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"MeshtasticApple/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "\"Meshtastic/Preview Content\""; DEVELOPMENT_TEAM = GCH7VS5Y9R; ENABLE_PREVIEWS = YES; - INFOPLIST_FILE = MeshtasticApple/Info.plist; + INFOPLIST_FILE = Meshtastic/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Meshtastic; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -853,14 +853,14 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = MeshtasticApple/MeshtasticApple.entitlements; + CODE_SIGN_ENTITLEMENTS = Meshtastic/Meshtastic.entitlements; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"MeshtasticApple/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "\"Meshtastic/Preview Content\""; DEVELOPMENT_TEAM = GCH7VS5Y9R; ENABLE_PREVIEWS = YES; - INFOPLIST_FILE = MeshtasticApple/Info.plist; + INFOPLIST_FILE = Meshtastic/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Meshtastic; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -885,18 +885,18 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GCH7VS5Y9R; - INFOPLIST_FILE = MeshtasticAppleTests/Info.plist; + INFOPLIST_FILE = MeshtasticTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticAppleTests; + PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MeshtasticApple.app/MeshtasticApple"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Meshtastic.app/Meshtastic"; }; name = Debug; }; @@ -908,18 +908,18 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GCH7VS5Y9R; - INFOPLIST_FILE = MeshtasticAppleTests/Info.plist; + INFOPLIST_FILE = MeshtasticTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticAppleTests; + PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MeshtasticApple.app/MeshtasticApple"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Meshtastic.app/Meshtastic"; }; name = Release; }; @@ -929,17 +929,17 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GCH7VS5Y9R; - INFOPLIST_FILE = MeshtasticAppleUITests/Info.plist; + INFOPLIST_FILE = MeshtasticUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticAppleUITests; + PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = MeshtasticApple; + TEST_TARGET_NAME = Meshtastic; }; name = Debug; }; @@ -949,24 +949,24 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GCH7VS5Y9R; - INFOPLIST_FILE = MeshtasticAppleUITests/Info.plist; + INFOPLIST_FILE = MeshtasticUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticAppleUITests; + PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = MeshtasticApple; + TEST_TARGET_NAME = Meshtastic; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic Apple" */ = { + DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC2E17C26CE248F0042C5E4 /* Debug */, @@ -975,7 +975,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DDC2E17E26CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticApple" */ = { + DDC2E17E26CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "Meshtastic" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC2E17F26CE248F0042C5E4 /* Debug */, @@ -984,7 +984,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DDC2E18126CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticAppleTests" */ = { + DDC2E18126CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticTests" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC2E18226CE248F0042C5E4 /* Debug */, @@ -993,7 +993,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DDC2E18426CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticAppleUITests" */ = { + DDC2E18426CE248F0042C5E4 /* Build configuration list for PBXNativeTarget "MeshtasticUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC2E18526CE248F0042C5E4 /* Debug */, @@ -1047,7 +1047,7 @@ ); currentVersion = DD619373285CC7D600E59241 /* MeshtasticDataModel v 4.xcdatamodel */; name = Meshtastic.xcdatamodeld; - path = MeshtasticApple/Meshtastic.xcdatamodeld; + path = Meshtastic/Meshtastic.xcdatamodeld; sourceTree = ""; versionGroupType = wrapper.xcdatamodel; }; diff --git a/Meshtastic Apple.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Meshtastic.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Meshtastic Apple.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Meshtastic.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Meshtastic Apple.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Meshtastic Apple.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Meshtastic Apple.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Meshtastic Apple.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Meshtastic Apple.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from Meshtastic Apple.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/Contents.json b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/Contents.json rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/AccentColor.colorset/Contents.json b/Meshtastic/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/AccentColor.colorset/Contents.json rename to Meshtastic/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/1024.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/1024.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/1024.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/1024.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/120-1.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/120-1.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/120-1.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/120-1.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/120.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/120.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/120.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/120.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/152.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/152.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/152.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/152.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/167.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/167.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/167.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/167.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/180.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/180.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/180.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/180.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/20.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/20.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/20.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/20.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/29.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/29.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/29.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/29.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/40-1.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/40-1.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/40-1.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/40-1.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/40-2.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/40-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/40-2.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/40-2.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/40.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/40.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/40.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/40.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/58-1.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/58-1.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/58-1.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/58-1.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/58.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/58.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/58.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/58.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/60.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/60.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/60.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/60.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/76.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/76.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/76.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/76.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/80-1.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/80-1.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/80-1.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/80-1.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/80.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/80.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/80.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/80.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/87.png b/Meshtastic/Assets.xcassets/AppIcon.appiconset/87.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/87.png rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/87.png diff --git a/MeshtasticApple/Assets.xcassets/AppIcon.appiconset/Contents.json b/Meshtastic/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Meshtastic/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/Color.colorset/Contents.json b/Meshtastic/Assets.xcassets/Color.colorset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/Color.colorset/Contents.json rename to Meshtastic/Assets.xcassets/Color.colorset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/Contents.json b/Meshtastic/Assets.xcassets/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/Contents.json rename to Meshtastic/Assets.xcassets/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/DIYV.imageset/Contents.json b/Meshtastic/Assets.xcassets/DIYV.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/DIYV.imageset/Contents.json rename to Meshtastic/Assets.xcassets/DIYV.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json rename to Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Contents.json rename to Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg rename to Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg rename to Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg rename to Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg diff --git a/MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Contents.json rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg rename to Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg diff --git a/MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/Contents.json rename to Meshtastic/Assets.xcassets/NRF52840DK.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json rename to Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/Contents.json b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/Contents.json rename to Meshtastic/Assets.xcassets/PORTDUINO.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/PPR.imageset/Contents.json b/Meshtastic/Assets.xcassets/PPR.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/PPR.imageset/Contents.json rename to Meshtastic/Assets.xcassets/PPR.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Assets.xcassets/RAK4631.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/RAK4631.imageset/Contents.json rename to Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-1.jpg b/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-1.jpg rename to Meshtastic/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-2.jpg b/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-2.jpg rename to Meshtastic/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT.jpg b/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT.jpg rename to Meshtastic/Assets.xcassets/RAK4631.imageset/RAK_DEV_KIT.jpg diff --git a/MeshtasticApple/Assets.xcassets/TBEAM.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg rename to Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg rename to Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/TBEAM.imageset/tbeam.jpg b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM.imageset/tbeam.jpg rename to Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.jpg diff --git a/MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TBEAM0P7.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg b/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg rename to Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg b/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg rename to Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg b/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg rename to Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg diff --git a/MeshtasticApple/Assets.xcassets/TECHO.imageset/Contents.json b/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TECHO.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/TECHO.imageset/techo-1.jpg b/Meshtastic/Assets.xcassets/TECHO.imageset/techo-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TECHO.imageset/techo-1.jpg rename to Meshtastic/Assets.xcassets/TECHO.imageset/techo-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/TECHO.imageset/techo-2.jpg b/Meshtastic/Assets.xcassets/TECHO.imageset/techo-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TECHO.imageset/techo-2.jpg rename to Meshtastic/Assets.xcassets/TECHO.imageset/techo-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/TECHO.imageset/techo.jpg b/Meshtastic/Assets.xcassets/TECHO.imageset/techo.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TECHO.imageset/techo.jpg rename to Meshtastic/Assets.xcassets/TECHO.imageset/techo.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg rename to Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg rename to Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg diff --git a/MeshtasticApple/Assets.xcassets/TLORAV2.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV2.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json diff --git a/MeshtasticApple/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 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 MeshtasticApple/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 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/MeshtasticApple/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 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 MeshtasticApple/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 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/MeshtasticApple/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 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 MeshtasticApple/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 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/MeshtasticApple/Assets.xcassets/TLORAV211P6.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/TLORAV211P6.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json diff --git a/MeshtasticApple/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 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 MeshtasticApple/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 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/MeshtasticApple/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 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 MeshtasticApple/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 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/MeshtasticApple/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 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 MeshtasticApple/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 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/MeshtasticApple/Assets.xcassets/UNSET.imageset/Contents.json b/Meshtastic/Assets.xcassets/UNSET.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Assets.xcassets/UNSET.imageset/Contents.json rename to Meshtastic/Assets.xcassets/UNSET.imageset/Contents.json diff --git a/MeshtasticApple/Assets.xcassets/UNSET.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-2.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/UNSET.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-2.png diff --git a/MeshtasticApple/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png diff --git a/MeshtasticApple/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png similarity index 100% rename from MeshtasticApple/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png diff --git a/MeshtasticApple/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift similarity index 100% rename from MeshtasticApple/Helpers/BLEManager.swift rename to Meshtastic/Helpers/BLEManager.swift diff --git a/MeshtasticApple/Helpers/BluetoothManager.swift b/Meshtastic/Helpers/BluetoothManager.swift similarity index 100% rename from MeshtasticApple/Helpers/BluetoothManager.swift rename to Meshtastic/Helpers/BluetoothManager.swift diff --git a/MeshtasticApple/Helpers/Extensions.swift b/Meshtastic/Helpers/Extensions.swift similarity index 100% rename from MeshtasticApple/Helpers/Extensions.swift rename to Meshtastic/Helpers/Extensions.swift diff --git a/MeshtasticApple/Helpers/LocalNotificationManager.swift b/Meshtastic/Helpers/LocalNotificationManager.swift similarity index 100% rename from MeshtasticApple/Helpers/LocalNotificationManager.swift rename to Meshtastic/Helpers/LocalNotificationManager.swift diff --git a/MeshtasticApple/Helpers/LocationHelper.swift b/Meshtastic/Helpers/LocationHelper.swift similarity index 100% rename from MeshtasticApple/Helpers/LocationHelper.swift rename to Meshtastic/Helpers/LocationHelper.swift diff --git a/MeshtasticApple/Helpers/MeshLogger.swift b/Meshtastic/Helpers/MeshLogger.swift similarity index 100% rename from MeshtasticApple/Helpers/MeshLogger.swift rename to Meshtastic/Helpers/MeshLogger.swift diff --git a/MeshtasticApple/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift similarity index 98% rename from MeshtasticApple/Helpers/MeshPackets.swift rename to Meshtastic/Helpers/MeshPackets.swift index e2704e93..bbd4752c 100644 --- a/MeshtasticApple/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -632,9 +632,8 @@ func nodeInfoAppPacket (packet: MeshPacket, meshLogging: Bool, context: NSManage } } - } else { - //return } + do { try context.save() @@ -657,26 +656,26 @@ func nodeInfoAppPacket (packet: MeshPacket, meshLogging: Bool, context: NSManage func adminAppPacket (packet: MeshPacket, meshLogging: Bool, context: NSManagedObjectContext) { - if let deviceConfig = try? MeshtasticApple.Config.DeviceConfig(serializedData: packet.decoded.payload) { + if let deviceConfig = try? Config.DeviceConfig(serializedData: packet.decoded.payload) { print(try! deviceConfig.jsonString()) - } else if let displayConfig = try? MeshtasticApple.Config.DisplayConfig(serializedData: packet.decoded.payload) { + } else if let displayConfig = try? Config.DisplayConfig(serializedData: packet.decoded.payload) { print(try! displayConfig.jsonUTF8Data()) print(displayConfig.gpsFormat) - } else if let loraConfig = try? MeshtasticApple.Config.LoRaConfig(serializedData: packet.decoded.payload) { + } else if let loraConfig = try? Config.LoRaConfig(serializedData: packet.decoded.payload) { print(try! loraConfig.jsonUTF8Data()) print(loraConfig.region) - } else if let positionConfig = try? MeshtasticApple.Config.PositionConfig(serializedData: packet.decoded.payload) { + } else if let positionConfig = try? Config.PositionConfig(serializedData: packet.decoded.payload) { print(try! positionConfig.jsonUTF8Data()) print(positionConfig.positionBroadcastSecs) - } else if let powerConfig = try? MeshtasticApple.Config.PowerConfig(serializedData: packet.decoded.payload) { + } else if let powerConfig = try? Config.PowerConfig(serializedData: packet.decoded.payload) { print(try! powerConfig.jsonUTF8Data()) print(powerConfig.meshSdsTimeoutSecs) @@ -723,10 +722,8 @@ func positionPacket (packet: MeshPacket, meshLogging: Bool, context: NSManagedOb fetchedNode[0].positions = mutablePositions.copy() as? NSOrderedSet } - } else { - - //return } + do { try context.save() diff --git a/MeshtasticApple/Helpers/Preferences.swift b/Meshtastic/Helpers/Preferences.swift similarity index 100% rename from MeshtasticApple/Helpers/Preferences.swift rename to Meshtastic/Helpers/Preferences.swift diff --git a/MeshtasticApple/Info.plist b/Meshtastic/Info.plist similarity index 100% rename from MeshtasticApple/Info.plist rename to Meshtastic/Info.plist diff --git a/MeshtasticApple/MeshtasticApple.entitlements b/Meshtastic/Meshtastic.entitlements similarity index 100% rename from MeshtasticApple/MeshtasticApple.entitlements rename to Meshtastic/Meshtastic.entitlements diff --git a/MeshtasticApple/Meshtastic.xcdatamodeld/.xccurrentversion b/Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion similarity index 100% rename from MeshtasticApple/Meshtastic.xcdatamodeld/.xccurrentversion rename to Meshtastic/Meshtastic.xcdatamodeld/.xccurrentversion diff --git a/MeshtasticApple/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents similarity index 100% rename from MeshtasticApple/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents rename to Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModel v 4.xcdatamodel/contents diff --git a/MeshtasticApple/MeshtasticAppleApp.swift b/Meshtastic/MeshtasticApp.swift similarity index 100% rename from MeshtasticApple/MeshtasticAppleApp.swift rename to Meshtastic/MeshtasticApp.swift diff --git a/MeshtasticApple/Model/MapLocation.swift b/Meshtastic/Model/MapLocation.swift similarity index 100% rename from MeshtasticApple/Model/MapLocation.swift rename to Meshtastic/Model/MapLocation.swift diff --git a/MeshtasticApple/Model/PeripheralModel.swift b/Meshtastic/Model/PeripheralModel.swift similarity index 100% rename from MeshtasticApple/Model/PeripheralModel.swift rename to Meshtastic/Model/PeripheralModel.swift diff --git a/MeshtasticApple/Model/UserSettings.swift b/Meshtastic/Model/UserSettings.swift similarity index 100% rename from MeshtasticApple/Model/UserSettings.swift rename to Meshtastic/Model/UserSettings.swift diff --git a/MeshtasticApple/Persistence/Persistence.swift b/Meshtastic/Persistence/Persistence.swift similarity index 100% rename from MeshtasticApple/Persistence/Persistence.swift rename to Meshtastic/Persistence/Persistence.swift diff --git a/MeshtasticApple/Persistence/PositionEntityExtension.swift b/Meshtastic/Persistence/PositionEntityExtension.swift similarity index 100% rename from MeshtasticApple/Persistence/PositionEntityExtension.swift rename to Meshtastic/Persistence/PositionEntityExtension.swift diff --git a/MeshtasticApple/Persistence/UserEntityExtension.swift b/Meshtastic/Persistence/UserEntityExtension.swift similarity index 100% rename from MeshtasticApple/Persistence/UserEntityExtension.swift rename to Meshtastic/Persistence/UserEntityExtension.swift diff --git a/MeshtasticApple/Preview Content/Preview Assets.xcassets/Contents.json b/Meshtastic/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from MeshtasticApple/Preview Content/Preview Assets.xcassets/Contents.json rename to Meshtastic/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/MeshtasticApple/Protobufs/admin.pb.swift b/Meshtastic/Protobufs/admin.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/admin.pb.swift rename to Meshtastic/Protobufs/admin.pb.swift diff --git a/MeshtasticApple/Protobufs/apponly.pb.swift b/Meshtastic/Protobufs/apponly.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/apponly.pb.swift rename to Meshtastic/Protobufs/apponly.pb.swift diff --git a/MeshtasticApple/Protobufs/cannedmessages.pb.swift b/Meshtastic/Protobufs/cannedmessages.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/cannedmessages.pb.swift rename to Meshtastic/Protobufs/cannedmessages.pb.swift diff --git a/MeshtasticApple/Protobufs/channel.pb.swift b/Meshtastic/Protobufs/channel.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/channel.pb.swift rename to Meshtastic/Protobufs/channel.pb.swift diff --git a/MeshtasticApple/Protobufs/config.pb.swift b/Meshtastic/Protobufs/config.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/config.pb.swift rename to Meshtastic/Protobufs/config.pb.swift diff --git a/MeshtasticApple/Protobufs/deviceonly.pb.swift b/Meshtastic/Protobufs/deviceonly.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/deviceonly.pb.swift rename to Meshtastic/Protobufs/deviceonly.pb.swift diff --git a/MeshtasticApple/Protobufs/localonly.pb.swift b/Meshtastic/Protobufs/localonly.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/localonly.pb.swift rename to Meshtastic/Protobufs/localonly.pb.swift diff --git a/MeshtasticApple/Protobufs/mesh.pb.swift b/Meshtastic/Protobufs/mesh.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/mesh.pb.swift rename to Meshtastic/Protobufs/mesh.pb.swift diff --git a/MeshtasticApple/Protobufs/module_config.pb.swift b/Meshtastic/Protobufs/module_config.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/module_config.pb.swift rename to Meshtastic/Protobufs/module_config.pb.swift diff --git a/MeshtasticApple/Protobufs/mqtt.pb.swift b/Meshtastic/Protobufs/mqtt.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/mqtt.pb.swift rename to Meshtastic/Protobufs/mqtt.pb.swift diff --git a/MeshtasticApple/Protobufs/portnums.pb.swift b/Meshtastic/Protobufs/portnums.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/portnums.pb.swift rename to Meshtastic/Protobufs/portnums.pb.swift diff --git a/MeshtasticApple/Protobufs/remote_hardware.pb.swift b/Meshtastic/Protobufs/remote_hardware.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/remote_hardware.pb.swift rename to Meshtastic/Protobufs/remote_hardware.pb.swift diff --git a/MeshtasticApple/Protobufs/storeforward.pb.swift b/Meshtastic/Protobufs/storeforward.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/storeforward.pb.swift rename to Meshtastic/Protobufs/storeforward.pb.swift diff --git a/MeshtasticApple/Protobufs/telemetry.pb.swift b/Meshtastic/Protobufs/telemetry.pb.swift similarity index 100% rename from MeshtasticApple/Protobufs/telemetry.pb.swift rename to Meshtastic/Protobufs/telemetry.pb.swift diff --git a/MeshtasticApple/RELEASENOTES.md b/Meshtastic/RELEASENOTES.md similarity index 100% rename from MeshtasticApple/RELEASENOTES.md rename to Meshtastic/RELEASENOTES.md diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg diff --git a/MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg b/Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg rename to Meshtastic/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg diff --git a/MeshtasticApple/Resources/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg b/Meshtastic/Resources/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg rename to Meshtastic/Resources/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg diff --git a/MeshtasticApple/Resources/Assets.xcassets/TBEAM.imageset/tbeam.jpg b/Meshtastic/Resources/Assets.xcassets/TBEAM.imageset/tbeam.jpg similarity index 100% rename from MeshtasticApple/Resources/Assets.xcassets/TBEAM.imageset/tbeam.jpg rename to Meshtastic/Resources/Assets.xcassets/TBEAM.imageset/tbeam.jpg diff --git a/MeshtasticApple/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift similarity index 99% rename from MeshtasticApple/Views/Bluetooth/Connect.swift rename to Meshtastic/Views/Bluetooth/Connect.swift index 6155c3f2..efd87c4c 100644 --- a/MeshtasticApple/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -272,10 +272,10 @@ struct Connect: View { .navigationViewStyle(StackNavigationViewStyle()) .onAppear(perform: { + self.bleManager.context = context + self.bleManager.userSettings = userSettings + if initialLoad { - - self.bleManager.context = context - self.bleManager.userSettings = userSettings // Ask for notification permission UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { success, error in diff --git a/MeshtasticApple/Views/ContentView.swift b/Meshtastic/Views/ContentView.swift similarity index 100% rename from MeshtasticApple/Views/ContentView.swift rename to Meshtastic/Views/ContentView.swift diff --git a/MeshtasticApple/Views/Helpers/BatteryIcon.swift b/Meshtastic/Views/Helpers/BatteryIcon.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/BatteryIcon.swift rename to Meshtastic/Views/Helpers/BatteryIcon.swift diff --git a/MeshtasticApple/Views/Helpers/CircleText.swift b/Meshtastic/Views/Helpers/CircleText.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/CircleText.swift rename to Meshtastic/Views/Helpers/CircleText.swift diff --git a/MeshtasticApple/Views/Helpers/ConnectedDevice.swift b/Meshtastic/Views/Helpers/ConnectedDevice.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/ConnectedDevice.swift rename to Meshtastic/Views/Helpers/ConnectedDevice.swift diff --git a/MeshtasticApple/Views/Helpers/DateTimeText.swift b/Meshtastic/Views/Helpers/DateTimeText.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/DateTimeText.swift rename to Meshtastic/Views/Helpers/DateTimeText.swift diff --git a/MeshtasticApple/Views/Helpers/LastHeardText.swift b/Meshtastic/Views/Helpers/LastHeardText.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/LastHeardText.swift rename to Meshtastic/Views/Helpers/LastHeardText.swift diff --git a/MeshtasticApple/Views/Helpers/MessageBubble.swift b/Meshtastic/Views/Helpers/MessageBubble.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/MessageBubble.swift rename to Meshtastic/Views/Helpers/MessageBubble.swift diff --git a/MeshtasticApple/Views/Helpers/NodeAnnotation.swift b/Meshtastic/Views/Helpers/NodeAnnotation.swift similarity index 100% rename from MeshtasticApple/Views/Helpers/NodeAnnotation.swift rename to Meshtastic/Views/Helpers/NodeAnnotation.swift diff --git a/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift b/Meshtastic/Views/Map/Custom/PositionAnnotationView.swift similarity index 100% rename from MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift rename to Meshtastic/Views/Map/Custom/PositionAnnotationView.swift diff --git a/MeshtasticApple/Views/Map/LocalMBTileOverlay.swift b/Meshtastic/Views/Map/LocalMBTileOverlay.swift similarity index 100% rename from MeshtasticApple/Views/Map/LocalMBTileOverlay.swift rename to Meshtastic/Views/Map/LocalMBTileOverlay.swift diff --git a/MeshtasticApple/Views/Map/MapView.swift b/Meshtastic/Views/Map/MapView.swift similarity index 100% rename from MeshtasticApple/Views/Map/MapView.swift rename to Meshtastic/Views/Map/MapView.swift diff --git a/MeshtasticApple/Views/Map/MapViewModule.swift b/Meshtastic/Views/Map/MapViewModule.swift similarity index 100% rename from MeshtasticApple/Views/Map/MapViewModule.swift rename to Meshtastic/Views/Map/MapViewModule.swift diff --git a/MeshtasticApple/Views/Messages/Contacts.swift b/Meshtastic/Views/Messages/Contacts.swift similarity index 100% rename from MeshtasticApple/Views/Messages/Contacts.swift rename to Meshtastic/Views/Messages/Contacts.swift diff --git a/MeshtasticApple/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift similarity index 100% rename from MeshtasticApple/Views/Messages/UserMessageList.swift rename to Meshtastic/Views/Messages/UserMessageList.swift diff --git a/MeshtasticApple/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift similarity index 100% rename from MeshtasticApple/Views/Nodes/NodeDetail.swift rename to Meshtastic/Views/Nodes/NodeDetail.swift diff --git a/MeshtasticApple/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift similarity index 100% rename from MeshtasticApple/Views/Nodes/NodeList.swift rename to Meshtastic/Views/Nodes/NodeList.swift diff --git a/MeshtasticApple/Views/Nodes/NodeMap.swift b/Meshtastic/Views/Nodes/NodeMap.swift similarity index 100% rename from MeshtasticApple/Views/Nodes/NodeMap.swift rename to Meshtastic/Views/Nodes/NodeMap.swift diff --git a/MeshtasticApple/Views/Nodes/NodeRow.swift b/Meshtastic/Views/Nodes/NodeRow.swift similarity index 100% rename from MeshtasticApple/Views/Nodes/NodeRow.swift rename to Meshtastic/Views/Nodes/NodeRow.swift diff --git a/MeshtasticApple/Views/Settings/AppSettings.swift b/Meshtastic/Views/Settings/AppSettings.swift similarity index 100% rename from MeshtasticApple/Views/Settings/AppSettings.swift rename to Meshtastic/Views/Settings/AppSettings.swift diff --git a/MeshtasticApple/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/DeviceConfig.swift rename to Meshtastic/Views/Settings/Config/DeviceConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/DisplayConfig.swift b/Meshtastic/Views/Settings/Config/DisplayConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/DisplayConfig.swift rename to Meshtastic/Views/Settings/Config/DisplayConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/LoRaConfig.swift b/Meshtastic/Views/Settings/Config/LoRaConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/LoRaConfig.swift rename to Meshtastic/Views/Settings/Config/LoRaConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/Module/CannedMessagesConfig.swift b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/Module/CannedMessagesConfig.swift rename to Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/Module/ExternalNotificationConfig.swift b/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/Module/ExternalNotificationConfig.swift rename to Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/Module/RangeTestConfig.swift b/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/Module/RangeTestConfig.swift rename to Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/Module/SerialConfig.swift b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/Module/SerialConfig.swift rename to Meshtastic/Views/Settings/Config/Module/SerialConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/Module/TelemetryConfig.swift rename to Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift diff --git a/MeshtasticApple/Views/Settings/Config/PositionConfig.swift b/Meshtastic/Views/Settings/Config/PositionConfig.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Config/PositionConfig.swift rename to Meshtastic/Views/Settings/Config/PositionConfig.swift diff --git a/MeshtasticApple/Views/Settings/LogDocument.swift b/Meshtastic/Views/Settings/LogDocument.swift similarity index 100% rename from MeshtasticApple/Views/Settings/LogDocument.swift rename to Meshtastic/Views/Settings/LogDocument.swift diff --git a/MeshtasticApple/Views/Settings/MeshLog.swift b/Meshtastic/Views/Settings/MeshLog.swift similarity index 100% rename from MeshtasticApple/Views/Settings/MeshLog.swift rename to Meshtastic/Views/Settings/MeshLog.swift diff --git a/MeshtasticApple/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift similarity index 100% rename from MeshtasticApple/Views/Settings/Settings.swift rename to Meshtastic/Views/Settings/Settings.swift diff --git a/MeshtasticApple/Views/Settings/ShareChannel.swift b/Meshtastic/Views/Settings/ShareChannel.swift similarity index 100% rename from MeshtasticApple/Views/Settings/ShareChannel.swift rename to Meshtastic/Views/Settings/ShareChannel.swift diff --git a/MeshtasticAppleTests/Info.plist b/MeshtasticTests/Info.plist similarity index 100% rename from MeshtasticAppleTests/Info.plist rename to MeshtasticTests/Info.plist diff --git a/MeshtasticAppleTests/MeshtasticAppleTests.swift b/MeshtasticTests/MeshtasticAppleTests.swift similarity index 100% rename from MeshtasticAppleTests/MeshtasticAppleTests.swift rename to MeshtasticTests/MeshtasticAppleTests.swift diff --git a/MeshtasticAppleUITests/Info.plist b/MeshtasticUITests/Info.plist similarity index 100% rename from MeshtasticAppleUITests/Info.plist rename to MeshtasticUITests/Info.plist diff --git a/MeshtasticAppleUITests/MeshtasticAppleUITests.swift b/MeshtasticUITests/MeshtasticAppleUITests.swift similarity index 100% rename from MeshtasticAppleUITests/MeshtasticAppleUITests.swift rename to MeshtasticUITests/MeshtasticAppleUITests.swift diff --git a/gen_protos.sh b/gen_protos.sh index 0dd3c382..968e1e39 100755 --- a/gen_protos.sh +++ b/gen_protos.sh @@ -13,7 +13,7 @@ if [ ! -x "`which protoc`" ]; then fi pdir=$(realpath "../Meshtastic-protobufs") -sdir=$(realpath "./MeshtasticApple/Protobufs") +sdir=$(realpath "./Meshtastic/Protobufs") echo "pdir:$pdir sdir:$sdir" pfiles="admin.proto apponly.proto cannedmessages.proto channel.proto config.proto deviceonly.proto localonly.proto mesh.proto module_config.proto mqtt.proto portnums.proto remote_hardware.proto storeforward.proto telemetry.proto"