diff options
author | Iván Ávalos <avalos@disroot.org> | 2023-01-09 23:10:19 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2023-01-09 23:10:19 -0600 |
commit | 5cde397f72cdcce4af1ff46bfe42e1f781258044 (patch) | |
tree | 19acb91aaefea602bf343c4812c2466a24802471 | |
parent | e2c8c918478ea967b0a18fd95af421fd048b22c3 (diff) | |
parent | 7c0bd3d55b80cf4bb7aef4e629d20a845c0a5be7 (diff) | |
download | etbsa-trackermap-mobile-5cde397f72cdcce4af1ff46bfe42e1f781258044.tar.gz etbsa-trackermap-mobile-5cde397f72cdcce4af1ff46bfe42e1f781258044.tar.bz2 etbsa-trackermap-mobile-5cde397f72cdcce4af1ff46bfe42e1f781258044.zip |
Merged upstream
-rw-r--r-- | iosApp/iosApp.xcodeproj/project.pbxproj | 4 | ||||
-rw-r--r-- | iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 296 | ||||
-rw-r--r-- | iosApp/iosApp/Devices/DeviceRow.swift | 9 |
3 files changed, 159 insertions, 150 deletions
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 1d68452..031c33e 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -587,6 +587,8 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = iosApp/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = ETBSA; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.navigation"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -626,6 +628,8 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = iosApp/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = ETBSA; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.navigation"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f925bad..def898e 100644 --- a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,151 +1,149 @@ { - "object": { - "pins": [ - { - "package": "abseil", - "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", - "state": { - "branch": null, - "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version": "0.20200225.4" - } - }, - { - "package": "BoringSSL-GRPC", - "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", - "state": { - "branch": null, - "revision": "734a8247442fde37df4364c21f6a0085b6a36728", - "version": "0.7.2" - } - }, - { - "package": "Firebase", - "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", - "state": { - "branch": null, - "revision": "78f7087fd5d48eb7c36e299f330b6dddccd647b2", - "version": "8.12.1" - } - }, - { - "package": "geos", - "repositoryURL": "https://github.com/GEOSwift/geos.git", - "state": { - "branch": null, - "revision": "dc3a1e798e7ebb3cee1b6b219af2b0783820ff60", - "version": "7.0.0" - } - }, - { - "package": "GEOSwift", - "repositoryURL": "https://github.com/GEOSwift/GEOSwift", - "state": { - "branch": null, - "revision": "ab813f1acbd92986e8733356b73b3f6d4ddc08e0", - "version": "9.0.0" - } - }, - { - "package": "GoogleAppMeasurement", - "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", - "state": { - "branch": null, - "revision": "6cc2991c11872510a5314bc112cc7558dd9d046a", - "version": "8.12.0" - } - }, - { - "package": "GoogleDataTransport", - "repositoryURL": "https://github.com/google/GoogleDataTransport.git", - "state": { - "branch": null, - "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version": "9.1.2" - } - }, - { - "package": "GoogleUtilities", - "repositoryURL": "https://github.com/google/GoogleUtilities.git", - "state": { - "branch": null, - "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", - "version": "7.7.0" - } - }, - { - "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", - "state": { - "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" - } - }, - { - "package": "GTMSessionFetcher", - "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", - "state": { - "branch": null, - "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56", - "version": "1.7.0" - } - }, - { - "package": "leveldb", - "repositoryURL": "https://github.com/firebase/leveldb.git", - "state": { - "branch": null, - "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version": "1.22.2" - } - }, - { - "package": "nanopb", - "repositoryURL": "https://github.com/firebase/nanopb.git", - "state": { - "branch": null, - "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version": "2.30908.0" - } - }, - { - "package": "Promises", - "repositoryURL": "https://github.com/google/promises.git", - "state": { - "branch": null, - "revision": "611337c330350c9c1823ad6d671e7f936af5ee13", - "version": "2.0.0" - } - }, - { - "package": "SwiftProtobuf", - "repositoryURL": "https://github.com/apple/swift-protobuf.git", - "state": { - "branch": null, - "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", - "version": "1.18.0" - } - }, - { - "package": "SwiftTabler", - "repositoryURL": "https://github.com/openalloc/SwiftTabler", - "state": { - "branch": null, - "revision": "03d8c9f20d34142b0bb9a31f15b3e6d8c47b39c7", - "version": "0.6.4" - } - }, - { - "package": "SwiftUIX", - "repositoryURL": "https://github.com/ivan-avalos/SwiftUIX", - "state": { - "branch": "master", - "revision": "fa1358cc48610d1de52de29111923a52e92a17d9", - "version": null - } - } - ] - }, - "version": 1 + "pins" : [ + { + "identity" : "abseil-cpp-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git", + "state" : { + "revision" : "fffc3c2729be5747390ad02d5100291a0d9ad26a", + "version" : "0.20200225.4" + } + }, + { + "identity" : "boringssl-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/boringssl-SwiftPM.git", + "state" : { + "revision" : "734a8247442fde37df4364c21f6a0085b6a36728", + "version" : "0.7.2" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk.git", + "state" : { + "revision" : "78f7087fd5d48eb7c36e299f330b6dddccd647b2", + "version" : "8.12.1" + } + }, + { + "identity" : "geos", + "kind" : "remoteSourceControl", + "location" : "https://github.com/GEOSwift/geos.git", + "state" : { + "revision" : "dc3a1e798e7ebb3cee1b6b219af2b0783820ff60", + "version" : "7.0.0" + } + }, + { + "identity" : "geoswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/GEOSwift/GEOSwift", + "state" : { + "revision" : "ab813f1acbd92986e8733356b73b3f6d4ddc08e0", + "version" : "9.0.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "6cc2991c11872510a5314bc112cc7558dd9d046a", + "version" : "8.12.0" + } + }, + { + "identity" : "googledatatransport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleDataTransport.git", + "state" : { + "revision" : "15ccdfd25ac55b9239b82809531ff26605e7556e", + "version" : "9.1.2" + } + }, + { + "identity" : "googleutilities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleUtilities.git", + "state" : { + "revision" : "b3bb0c5551fb3f80ca939829639ab5b093edd14f", + "version" : "7.7.0" + } + }, + { + "identity" : "grpc-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/grpc-SwiftPM.git", + "state" : { + "revision" : "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", + "version" : "1.28.4" + } + }, + { + "identity" : "gtm-session-fetcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/gtm-session-fetcher.git", + "state" : { + "revision" : "bc6a19702ac76ac4e488b68148710eb815f9bc56", + "version" : "1.7.0" + } + }, + { + "identity" : "leveldb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/leveldb.git", + "state" : { + "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", + "version" : "1.22.2" + } + }, + { + "identity" : "nanopb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/nanopb.git", + "state" : { + "revision" : "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", + "version" : "2.30908.0" + } + }, + { + "identity" : "promises", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/promises.git", + "state" : { + "revision" : "611337c330350c9c1823ad6d671e7f936af5ee13", + "version" : "2.0.0" + } + }, + { + "identity" : "swift-protobuf", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-protobuf.git", + "state" : { + "revision" : "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", + "version" : "1.18.0" + } + }, + { + "identity" : "swifttabler", + "kind" : "remoteSourceControl", + "location" : "https://github.com/openalloc/SwiftTabler", + "state" : { + "revision" : "03d8c9f20d34142b0bb9a31f15b3e6d8c47b39c7", + "version" : "0.6.4" + } + }, + { + "identity" : "swiftuix", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ivan-avalos/SwiftUIX", + "state" : { + "branch" : "master", + "revision" : "fa1358cc48610d1de52de29111923a52e92a17d9" + } + } + ], + "version" : 2 } diff --git a/iosApp/iosApp/Devices/DeviceRow.swift b/iosApp/iosApp/Devices/DeviceRow.swift index ee3298d..8a826ca 100644 --- a/iosApp/iosApp/Devices/DeviceRow.swift +++ b/iosApp/iosApp/Devices/DeviceRow.swift @@ -64,7 +64,7 @@ struct DeviceRow: View { .padding(2.0) } } - + @ViewBuilder func getSharedContent() -> some View { VStack { @@ -83,6 +83,13 @@ struct DeviceRow: View { EmptyView() } + /* MARK: - Ignition */ + if (unit.getIgnition()) { + Image(systemName: "key.fill") + .foregroundColor(.systemYellow) + .imageScale(.small) + } + /* MARK: - Engine stop */ switch (unit.getEngineStop()) { case .on: |