From 136726d671e87e0214f2fe184379bf5100ecc51e Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 5 Jan 2023 16:26:50 -0600 Subject: [android] Bump version to 1.3.5 to match ETBSA. --- androidApp/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 099d4a3..eb091cb 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -11,11 +11,11 @@ android { applicationId = "mx.trackermap.TrackerMap" minSdk = 21 targetSdk = 31 - versionCode = 1 - versionName = "1.0" + versionCode = 1305 + versionName = "1.3.5" ndk { abiFilters.clear() - //abiFilters += listOf("armeabi-v7a", "arm64-v8a") + abiFilters += listOf("armeabi-v7a", "arm64-v8a") } } buildTypes { -- cgit v1.2.3 From 1039633225ee601d0ada7f42dd43165964938218 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 5 Jan 2023 18:23:18 -0600 Subject: [android] Bump version to 1.3.6, because Google rejected past build. abiFilters is now on by default, so this doesn't happen again. --- androidApp/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index eb091cb..f087e25 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -11,8 +11,8 @@ android { applicationId = "mx.trackermap.TrackerMap" minSdk = 21 targetSdk = 31 - versionCode = 1305 - versionName = "1.3.5" + versionCode = 1306 + versionName = "1.3.6" ndk { abiFilters.clear() abiFilters += listOf("armeabi-v7a", "arm64-v8a") -- cgit v1.2.3 From 7c0bd3d55b80cf4bb7aef4e629d20a845c0a5be7 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 9 Jan 2023 23:01:00 -0600 Subject: Bumped version to 1.4 and added ignition icon --- iosApp/iosApp.xcodeproj/project.pbxproj | 8 ++++++-- iosApp/iosApp/Devices/DeviceRow.swift | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 6706004..38eeaf7 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -586,11 +586,13 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = iosApp/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = TrackerMap; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.navigation"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.4; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -624,11 +626,13 @@ "$(PROJECT_DIR)", ); INFOPLIST_FILE = iosApp/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = TrackerMap; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.navigation"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.4; OTHER_LDFLAGS = ( "$(inherited)", "-framework", 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: -- cgit v1.2.3