From f1623e715a610dc1b5786a345ebce961d0ec6e53 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 20 Aug 2021 08:55:38 -0700 Subject: [PATCH] Remove extra list page now that I understand how to force single column navigation view, add some icons --- .../project.pbxproj | 8 +-- .../contents.xcworkspacedata | 7 +++ .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcschemes/xcschememanagement.plist | 0 .../contents.xcworkspacedata | 7 --- .../AppIcon.appiconset/Contents.json | 6 +++ .../play_store_icon_114px-1.png | Bin 0 -> 8529 bytes .../play_store_icon_114px-2.png | Bin 0 -> 14455 bytes .../play_store_icon_114px-3.png | Bin 0 -> 5433 bytes .../play_store_icon_114px-4.png | Bin 0 -> 5320 bytes .../play_store_icon_114px-5.png | Bin 0 -> 6389 bytes .../play_store_icon_114px.png | Bin 0 -> 8529 bytes MeshtasticClient/Info.plist | 6 ++- MeshtasticClient/Views/ContentView.swift | 5 -- .../Views/Devices/DeviceHome.swift | 2 +- .../Views/Devices/DeviceList.swift | 49 ------------------ 16 files changed, 20 insertions(+), 70 deletions(-) rename {MeshtasticClient.xcodeproj => Meshtastic Client.xcodeproj}/project.pbxproj (98%) create mode 100644 Meshtastic Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename {MeshtasticClient.xcodeproj => Meshtastic Client.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {MeshtasticClient.xcodeproj => Meshtastic Client.xcodeproj}/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist (100%) delete mode 100644 MeshtasticClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-1.png create mode 100644 MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-2.png create mode 100644 MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-3.png create mode 100644 MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-4.png create mode 100644 MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-5.png create mode 100644 MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px.png delete mode 100644 MeshtasticClient/Views/Devices/DeviceList.swift 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 0000000000000000000000000000000000000000..60a9a0f93d0186b510a60016aeb384c9fd7dbb0c GIT binary patch literal 8529 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cf2f2ace32b69a516867360c9077001345bb0e6e GIT binary patch literal 5433 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 c{Y{u-c&6oH-TH>vKcK9wwpiv^{B`L60D(^b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..613a0af530ff4e56f1d5080f515de966fc16aa22 GIT binary patch literal 5320 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4998870c0c2051aa821f6f9e41f4d2a1662e9dbc GIT binary patch literal 6389 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 - 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()) - } -}