diff --git a/MeshtasticClient.xcodeproj/project.pbxproj b/Meshtastic Client.xcodeproj/project.pbxproj similarity index 98% rename from MeshtasticClient.xcodeproj/project.pbxproj rename to Meshtastic Client.xcodeproj/project.pbxproj index 7eb6b71a..aef514d9 100644 --- a/MeshtasticClient.xcodeproj/project.pbxproj +++ b/Meshtastic Client.xcodeproj/project.pbxproj @@ -24,7 +24,6 @@ DDC2E1A226CE29AC0042C5E4 /* deviceData.json in Resources */ = {isa = PBXBuildFile; fileRef = DDC2E18A26CE25690042C5E4 /* deviceData.json */; }; DDC2E1A426CE2F940042C5E4 /* DeviceBLE.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A326CE2F940042C5E4 /* DeviceBLE.swift */; }; DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */; }; - DDC2E1A926CF85020042C5E4 /* DeviceList.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A826CF85020042C5E4 /* DeviceList.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -68,7 +67,6 @@ DDC2E19E26CE27630042C5E4 /* Device.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Device.swift; sourceTree = ""; }; DDC2E1A326CE2F940042C5E4 /* DeviceBLE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceBLE.swift; sourceTree = ""; }; DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationHelper.swift; sourceTree = ""; }; - DDC2E1A826CF85020042C5E4 /* DeviceList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceList.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -201,7 +199,6 @@ DDC2E19626CE26840042C5E4 /* DeviceRow.swift */, DDC2E19826CE26940042C5E4 /* DeviceMap.swift */, DDC2E1A326CE2F940042C5E4 /* DeviceBLE.swift */, - DDC2E1A826CF85020042C5E4 /* DeviceList.swift */, ); path = Devices; sourceTree = ""; @@ -300,7 +297,7 @@ }; }; }; - buildConfigurationList = DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "MeshtasticClient" */; + buildConfigurationList = DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic Client" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -352,7 +349,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DDC2E1A926CF85020042C5E4 /* DeviceList.swift in Sources */, DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */, DDC2E19F26CE27630042C5E4 /* Device.swift in Sources */, DDC2E19926CE26940042C5E4 /* DeviceMap.swift in Sources */, @@ -647,7 +643,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "MeshtasticClient" */ = { + DDC2E14F26CE248E0042C5E4 /* Build configuration list for PBXProject "Meshtastic Client" */ = { isa = XCConfigurationList; buildConfigurations = ( DDC2E17C26CE248F0042C5E4 /* Debug */, diff --git a/Meshtastic Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Meshtastic Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..bb6f0e78 --- /dev/null +++ b/Meshtastic Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/MeshtasticClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Meshtastic Client.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from MeshtasticClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Meshtastic Client.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/MeshtasticClient.xcodeproj/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist b/Meshtastic Client.xcodeproj/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from MeshtasticClient.xcodeproj/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist rename to Meshtastic Client.xcodeproj/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/MeshtasticClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MeshtasticClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a6..00000000 --- a/MeshtasticClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/Contents.json b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9bb..4962da8d 100644 --- a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -6,11 +6,13 @@ "size" : "20x20" }, { + "filename" : "play_store_icon_114px-4.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "play_store_icon_114px-3.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" @@ -26,16 +28,19 @@ "size" : "40x40" }, { + "filename" : "play_store_icon_114px-1.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "play_store_icon_114px.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "play_store_icon_114px-2.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" @@ -71,6 +76,7 @@ "size" : "40x40" }, { + "filename" : "play_store_icon_114px-5.png", "idiom" : "ipad", "scale" : "1x", "size" : "76x76" diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-1.png b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-1.png new file mode 100644 index 00000000..60a9a0f9 Binary files /dev/null and b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-1.png differ diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-2.png b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-2.png new file mode 100644 index 00000000..fad2ffa1 Binary files /dev/null and b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-2.png differ diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-3.png b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-3.png new file mode 100644 index 00000000..cf2f2ace Binary files /dev/null and b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-3.png differ diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-4.png b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-4.png new file mode 100644 index 00000000..613a0af5 Binary files /dev/null and b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-4.png differ diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-5.png b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-5.png new file mode 100644 index 00000000..4998870c Binary files /dev/null and b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-5.png differ diff --git a/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px.png b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px.png new file mode 100644 index 00000000..60a9a0f9 Binary files /dev/null and b/MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px.png differ diff --git a/MeshtasticClient/Info.plist b/MeshtasticClient/Info.plist index fb22c1b7..7fdbeb36 100644 --- a/MeshtasticClient/Info.plist +++ b/MeshtasticClient/Info.plist @@ -2,10 +2,10 @@ - NSLocationWhenInUseUsageDescription - We use your location to center maps of the mesh CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Meshtastic Client CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -22,6 +22,8 @@ 1 LSRequiresIPhoneOS + NSLocationWhenInUseUsageDescription + We use your location to center maps of the mesh UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/MeshtasticClient/Views/ContentView.swift b/MeshtasticClient/Views/ContentView.swift index bfa9f056..eff5d3de 100644 --- a/MeshtasticClient/Views/ContentView.swift +++ b/MeshtasticClient/Views/ContentView.swift @@ -24,11 +24,6 @@ struct ContentView: View { Label("Devices", systemImage: "flipphone") } .tag(Tab.devices) - DeviceList() - .tabItem { - Label("Device List", systemImage: "list.bullet.rectangle") - } - .tag(Tab.devices) DeviceMap() .tabItem { Label("Mesh Map", systemImage: "map") diff --git a/MeshtasticClient/Views/Devices/DeviceHome.swift b/MeshtasticClient/Views/Devices/DeviceHome.swift index 3a36016c..76ee0b42 100644 --- a/MeshtasticClient/Views/Devices/DeviceHome.swift +++ b/MeshtasticClient/Views/Devices/DeviceHome.swift @@ -36,7 +36,7 @@ struct DeviceHome: View { } } .navigationTitle("All Devices") - } + }.navigationViewStyle(StackNavigationViewStyle()) // Force Full screen master details } } diff --git a/MeshtasticClient/Views/Devices/DeviceList.swift b/MeshtasticClient/Views/Devices/DeviceList.swift deleted file mode 100644 index 7b30e808..00000000 --- a/MeshtasticClient/Views/Devices/DeviceList.swift +++ /dev/null @@ -1,49 +0,0 @@ -// -// DeviceHome.swift -// Landmarks -// -// Created by Garth Vander Houwen on 8/7/21. -// See LICENSE folder for app licensing information. -// - -// Abstract: -// A view showing devices above a list of devices -// grouped by device. - -import SwiftUI - -struct DeviceList: View { - @EnvironmentObject var modelData: ModelData - @State private var showGPSOnly = false - - var filteredDevices: [Device] { - modelData.devices.filter { device in - (!showGPSOnly || device.hasGPS) - } - } - var body: some View { - NavigationView { - - List { - Toggle(isOn: $showGPSOnly) { - Text("GPS only") - } - - ForEach(filteredDevices) { device in - NavigationLink(destination: DeviceDetail(device: device)) { - DeviceRow(device: device) - } - } - } - .navigationTitle("All Devices") - }.navigationViewStyle(StackNavigationViewStyle()) - - } -} - -struct DeviceList_Previews: PreviewProvider { - static var previews: some View { - DeviceHome() - .environmentObject(ModelData()) - } -}