From 243ece96329a90e350bb6d3a3688d63b8aff4ff9 Mon Sep 17 00:00:00 2001 From: Himanshu Neema Date: Fri, 20 Sep 2024 12:56:05 -0700 Subject: [PATCH] source for macOS 1.0.1 (9) and iOS 1.0.1 (9) (#31) --- upvpn-apple/UpVPN/App/UpVPNApp.swift | 1 - upvpn-apple/UpVPN/App/Views/HomeCard.swift | 6 ++---- upvpn-apple/UpVPN/App/Views/HomeCardLocation.swift | 11 +++++++++-- upvpn-apple/UpVPN/App/Views/HomeView.swift | 1 - upvpn-apple/UpVPN/App/Views/LoginView.swift | 2 +- upvpn-apple/UpVPN/Config/Version.xcconfig | 2 +- upvpn-apple/UpVPN/iOS/Views/ResponsiveHomeView.swift | 1 - 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/upvpn-apple/UpVPN/App/UpVPNApp.swift b/upvpn-apple/UpVPN/App/UpVPNApp.swift index e1d00b6..c13d620 100644 --- 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 index 58c3896..5dde8d9 100644 --- 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 index ecb9214..cefd368 100644 --- 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 index 2263c5f..2365eb7 100644 --- 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 index 5505e28..ce600cc 100644 --- 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 index 0b7daff..aa83f85 100644 --- 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 index 04df0e6..467e458 100644 --- 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)