meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove extra list page now that I understand how to force single column navigation view, add some icons

Browse source
This commit is contained in:
Garth Vander Houwen 2021-08-20 08:55:38 -07:00
parent 8be3ac2bba
commit f1623e715a
16 changed files with 20 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MeshtasticClient.xcodeproj/project.pbxproj → Meshtastic Client.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
DDC2E1A326CE2F940042C5E4 /* DeviceBLE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceBLE.swift; sourceTree = "<group>"; };
DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationHelper.swift; sourceTree = "<group>"; };
DDC2E1A826CF85020042C5E4 /* DeviceList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceList.swift; sourceTree = "<group>"; };
/* 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 = "<group>";
@ -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 */,

7
Meshtastic Client.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:/Users/garthvanderhouwen/Documents/source/MeshtasticClient/Meshtastic Client.xcodeproj">
</FileRef>
</Workspace>

0
MeshtasticClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → Meshtastic Client.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file

0
MeshtasticClient.xcodeproj/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist → Meshtastic Client.xcodeproj/xcuserdata/garthvanderhouwen.xcuserdatad/xcschemes/xcschememanagement.plist
View file

7
MeshtasticClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>

6
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/Contents.json
View file

@ -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"

BIN
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px-5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
MeshtasticClient/Assets.xcassets/AppIcon.appiconset/play_store_icon_114px.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

6
MeshtasticClient/Info.plist
View file

@ -2,10 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We use your location to center maps of the mesh</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Meshtastic Client</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
@ -22,6 +22,8 @@
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We use your location to center maps of the mesh</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>

5
MeshtasticClient/Views/ContentView.swift
View file

@ -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")

2
MeshtasticClient/Views/Devices/DeviceHome.swift
View file

@ -36,7 +36,7 @@ struct DeviceHome: View {
}
}
.navigationTitle("All Devices")
}
}.navigationViewStyle(StackNavigationViewStyle()) // Force Full screen master details
}
}

49
MeshtasticClient/Views/Devices/DeviceList.swift
View file

@ -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())
}
}