From 079e267daf0526a3f433219f930bc11083846b99 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Thu, 6 Oct 2022 23:59:15 +0200
Subject: [PATCH 1/3] Add AppVersionText view
---
.../AppCore/SharedUI/AppVersionText.swift | 31 +++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 Examples/xx-messenger/Sources/AppCore/SharedUI/AppVersionText.swift
diff --git a/Examples/xx-messenger/Sources/AppCore/SharedUI/AppVersionText.swift b/Examples/xx-messenger/Sources/AppCore/SharedUI/AppVersionText.swift
new file mode 100644
index 00000000..47c76873
--- /dev/null
+++ b/Examples/xx-messenger/Sources/AppCore/SharedUI/AppVersionText.swift
@@ -0,0 +1,31 @@
+import SwiftUI
+
+public struct AppVersionText: View {
+ public init() {}
+
+ public var body: some View {
+ Text("v\(version) (\(build))")
+ }
+
+ var version: String = Bundle.main.shortVersionString ?? "0.0.0"
+ var build: String = Bundle.main.versionString ?? "0"
+}
+
+private extension Bundle {
+ var shortVersionString: String? {
+ infoDictionary?["CFBundleShortVersionString"] as? String
+ }
+ var versionString: String? {
+ infoDictionary?["CFBundleVersion"] as? String
+ }
+}
+
+#if DEBUG
+struct AppVersionText_Previews: PreviewProvider {
+ static var previews: some View {
+ AppVersionText()
+ .padding()
+ .previewLayout(.sizeThatFits)
+ }
+}
+#endif
--
GitLab
From b481fa65bdb0c133fc5490121029c2e3e0765e4a Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 7 Oct 2022 00:00:41 +0200
Subject: [PATCH 2/3] Display app version on Home
---
Examples/xx-messenger/Sources/HomeFeature/HomeView.swift | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift b/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift
index 95bde09c..8a1775d6 100644
--- a/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift
+++ b/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift
@@ -1,3 +1,4 @@
+import AppCore
import BackupFeature
import ComposableArchitecture
import ComposablePresentation
@@ -137,6 +138,12 @@ public struct HomeView: View {
} header: {
Text("Account")
}
+
+ Section {
+ AppVersionText()
+ } header: {
+ Text("App version")
+ }
}
.navigationTitle("Home")
.alert(
--
GitLab
From 73f52d857b90e1f01882dd9fdaf74546353025c4 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Fri, 7 Oct 2022 00:00:55 +0200
Subject: [PATCH 3/3] Display app version on Welcome
---
Examples/xx-messenger/Package.swift | 1 +
.../xx-messenger/Sources/WelcomeFeature/WelcomeView.swift | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Examples/xx-messenger/Package.swift b/Examples/xx-messenger/Package.swift
index 30d0173a..2b2d1039 100644
--- a/Examples/xx-messenger/Package.swift
+++ b/Examples/xx-messenger/Package.swift
@@ -413,6 +413,7 @@ let package = Package(
.target(
name: "WelcomeFeature",
dependencies: [
+ .target(name: "AppCore"),
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "XXMessengerClient", package: "elixxir-dapps-sdk-swift"),
],
diff --git a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift
index 0050a572..64396fe1 100644
--- a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift
+++ b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift
@@ -1,3 +1,4 @@
+import AppCore
import ComposableArchitecture
import SwiftUI
@@ -23,7 +24,9 @@ public struct WelcomeView: View {
NavigationView {
Form {
Section {
- Text("xx messenger")
+ AppVersionText()
+ } header: {
+ Text("App version")
}
if let failure = viewStore.failure {
--
GitLab