feat: display app build in tray

marmos91 · Jan 28, 2024 · 957b7ea · 957b7ea
1 parent 6f9309d
commit 957b7ea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CubbitDS3Sync/Assets/Localizable.xcstrings b/CubbitDS3Sync/Assets/Localizable.xcstrings
@@ -193,8 +193,15 @@
     "Two-factor authentication (2FA)" : {
 
     },
-    "Version %@" : {
-
+    "Version %@ (%@)" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Version %1$@ (%2$@)"
+          }
+        }
+      }
     },
     "View in Finder" : {
 

diff --git a/CubbitDS3Sync/Views/Tray/Views/TrayMenuFooterView.swift b/CubbitDS3Sync/Views/Tray/Views/TrayMenuFooterView.swift
@@ -3,6 +3,7 @@ import SwiftUI
 struct TrayMenuFooterView: View {
     var status: String
     var version: String
+    var build: String
 
     var body: some View {
         ZStack {
@@ -17,7 +18,7 @@ struct TrayMenuFooterView: View {
 
                 Spacer()
 
-                Text("Version \(version)")
+                Text("Version \(version) (\(build))")
                     .font(.custom("Nunito", size: 12))
                     .foregroundStyle(Color(.darkWhite))
                     .padding(.horizontal)
@@ -29,6 +30,7 @@ struct TrayMenuFooterView: View {
 #Preview {
     TrayMenuFooterView(
         status: "Idle",
-        version: "1.0.0"
+        version: "1.0.0",
+        build: "1"
     )
 }
diff --git a/CubbitDS3Sync/Views/Tray/Views/TrayMenuView.swift b/CubbitDS3Sync/Views/Tray/Views/TrayMenuView.swift
@@ -66,7 +66,8 @@ struct TrayMenuView: View {
 
                 TrayMenuFooterView(
                     status: appStatusManager.status.toString(),
-                    version: DefaultSettings.appVersion
+                    version: DefaultSettings.appVersion,
+                    build: DefaultSettings.appBuild
                 )
             }
         }

diff --git a/DS3Lib/Constants/DefaultSettings.swift b/DS3Lib/Constants/DefaultSettings.swift
@@ -36,6 +36,10 @@ enum DefaultSettings {
         return Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0.0.0"
     }()
 
+    static let appBuild: String = {
+        return Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "0"
+    }()
+
     static let appIsLoginItem: Bool = {
         return SMAppService().status.rawValue == 1
     }()