source for macOS 1.0.1 (9) and iOS 1.0.1 (9) (#31)

upvpn · Sep 20, 2024 · 243ece9 · 243ece9
1 parent f3df529
commit 243ece9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/upvpn-apple/UpVPN/App/UpVPNApp.swift b/upvpn-apple/UpVPN/App/UpVPNApp.swift
@@ -108,7 +108,6 @@ struct MenuBarExtraWrapper: View {
         case .signedIn:
             VStack(spacing: 10) {
                 HomeCard(tunnelStatus: tunnelViewModel.tunnelObserver.tunnelStatus,
-                         selectedLocation: locationViewModel.selected,
                          start: {
                     if let location = locationViewModel.selected {
                         locationViewModel.addRecent(location: location)

diff --git a/upvpn-apple/UpVPN/App/Views/HomeCard.swift b/upvpn-apple/UpVPN/App/Views/HomeCard.swift
@@ -9,7 +9,6 @@ import SwiftUI
 
 struct HomeCard: View {
     var tunnelStatus: TunnelStatus
-    var selectedLocation: Location?
     var start: () -> Void = {}
     var stop: () -> Void = {}
 
@@ -60,7 +59,6 @@ struct HomeCard: View {
             VStack(spacing: 15) {
 
                 HomeCardLocation(
-                    selectedLocation: selectedLocation ?? Location.default,
                     isDisconnectedOrConnected: tunnelStatus.isDisconnectedOrConnected(),
                     isDisconnected: tunnelStatus.isDisconnected())
 
@@ -79,11 +77,11 @@ struct HomeCard: View {
 }
 
 #Preview {
-    HomeCard(tunnelStatus: TunnelStatus.connected(Location.default, Date.now), selectedLocation: Location.default)
+    HomeCard(tunnelStatus: TunnelStatus.connected(Location.default, Date.now))
         .environmentObject(LocationViewModel(dataRepository: DataRepository.shared, isDisconnected: { return true }))
 }
 
 #Preview {
-    HomeCard(tunnelStatus: TunnelStatus.serverRunning(Location.default), selectedLocation: Location.default)
+    HomeCard(tunnelStatus: TunnelStatus.serverRunning(Location.default))
         .environmentObject(LocationViewModel(dataRepository: DataRepository.shared, isDisconnected: { return true }))
 }
diff --git a/upvpn-apple/UpVPN/App/Views/HomeCardLocation.swift b/upvpn-apple/UpVPN/App/Views/HomeCardLocation.swift
@@ -8,7 +8,14 @@
 import SwiftUI
 
 struct HomeCardLocation: View {
-    var selectedLocation: Location = Location.default
+    private var selectedLocation: Location {
+        // hack to always return updated location to get updated estimate
+        if let foundIdx = self.locationViewModel.locations.firstIndex(of: self.locationViewModel.selected ?? Location.default) {
+            return self.locationViewModel.locations[foundIdx]
+        } else {
+            return Location.default
+        }
+    }
     var isDisconnectedOrConnected: Bool = false
     var isDisconnected: Bool = true
 
@@ -24,11 +31,11 @@ struct HomeCardLocation: View {
                 Circle()
                     .fill(selectedLocation.warmOrColdColor())
                     .frame(width: 12, height: 12)
+                    .id(locationViewModel.locationsLastUpdated)
             } else {
                 ProgressView()
                     .modifier(ScaleEffectModifier())
             }
-
         }
         .padding()
         .cornerRadius(15)

diff --git a/upvpn-apple/UpVPN/App/Views/HomeView.swift b/upvpn-apple/UpVPN/App/Views/HomeView.swift
@@ -23,7 +23,6 @@ struct HomeView: View {
                         .fill(Color.uSystemGroupedBackground)
                         .ignoresSafeArea()
                     HomeCard(tunnelStatus: tunnelViewModel.tunnelObserver.tunnelStatus,
-                             selectedLocation: locationViewModel.selected,
                              start: {
                         if let location = locationViewModel.selected {
                             locationViewModel.addRecent(location: location)

diff --git a/upvpn-apple/UpVPN/App/Views/LoginView.swift b/upvpn-apple/UpVPN/App/Views/LoginView.swift
@@ -113,7 +113,7 @@ struct LoginView: View {
 
             HStack {
                 Text("""
-By using UpVPN you agree to our [Terms](https://upvpn.app/terms-of-service) and [Privacy Policy](https://upvpn.app/privacy-policy)
+By using UpVPN.app you agree to our [Terms](https://upvpn.app/terms-of-service) and [Privacy Policy](https://upvpn.app/privacy-policy)
 """)
             }
             .font(.caption)

diff --git a/upvpn-apple/UpVPN/Config/Version.xcconfig b/upvpn-apple/UpVPN/Config/Version.xcconfig
@@ -1,2 +1,2 @@
 VERSION_NAME = 1.0.1
-VERSION_ID = 8
+VERSION_ID = 9
diff --git a/upvpn-apple/UpVPN/iOS/Views/ResponsiveHomeView.swift b/upvpn-apple/UpVPN/iOS/Views/ResponsiveHomeView.swift
@@ -83,7 +83,6 @@ struct ResponsiveHomeView: View {
                 VStack(spacing: 0) {
                     HStack(spacing: 0) {
                         HomeCard(tunnelStatus: tunnelViewModel.tunnelObserver.tunnelStatus,
-                                 selectedLocation: locationViewModel.selected,
                                  start: {
                             if let location = locationViewModel.selected {
                                 locationViewModel.addRecent(location: location)