Add a default URL parameter

Setting a default URL in settings will allow for navigation to other websites. This change will be active on both the home button and app loading. Also make the WebViewModel an EnvironmentObject since it's used everywhere. Signed-off-by: kingbri <bdashore3@gmail.com>
bdashore3 · Oct 3, 2021 · 01cba70 · 01cba70
1 parent 88d30f1
commit 01cba70
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 24 deletions.
diff --git a/...odeproj/project.xcworkspace/xcuserdata/kingbri.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/kingbri.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Cubari/ContentView.swift b/Cubari/ContentView.swift
@@ -18,10 +18,11 @@ struct ContentView: View {
 
             // Navigation bar view
             if model.showNavigation  {
-                NavigationBarView(model: model)
+                NavigationBarView()
                     .zIndex(1)
             }
         }
+        .environmentObject(model)
     }
 }
 

diff --git a/Cubari/NavigationBarView.swift b/Cubari/NavigationBarView.swift
@@ -8,7 +8,6 @@
 import SwiftUI
 
 struct NavigationBarView: View {
-    @ObservedObject var model: WebViewModel
     @AppStorage("leftHandMode") var leftHandMode = false
     @State private var showAbout = false
 
@@ -19,21 +18,21 @@ struct NavigationBarView: View {
             // Sets button position depending on hand mode setting
             HStack {
                 if leftHandMode {
-                    ForwardBackButtonView(model: model)
+                    ForwardBackButtonView()
                     Spacer()
-                    SettingsButtonView(model: model)
+                    SettingsButtonView()
                     Spacer()
-                    HomeButtonView(model: model)
+                    HomeButtonView()
                     Spacer()
                     AboutButtonView()
                 } else {
                     AboutButtonView()
                     Spacer()
-                    HomeButtonView(model: model)
+                    HomeButtonView()
                     Spacer()
-                    SettingsButtonView(model: model)
+                    SettingsButtonView()
                     Spacer()
-                    ForwardBackButtonView(model: model)
+                    ForwardBackButtonView()
                 }
             }
             .padding()
@@ -47,7 +46,7 @@ struct NavigationBarView: View {
 #if DEBUG
 struct NavigationBarView_Previews: PreviewProvider {
     static var previews: some View {
-        NavigationBarView(model: WebViewModel())
+        NavigationBarView()
     }
 }
 #endif
diff --git a/Cubari/NavigationBarViews/ForwardBackButtonView.swift b/Cubari/NavigationBarViews/ForwardBackButtonView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct ForwardBackButtonView: View {
-    @ObservedObject var model: WebViewModel
+    @EnvironmentObject var model: WebViewModel
 
     var body: some View {
         Button(action: {
@@ -32,7 +32,7 @@ struct ForwardBackButtonView: View {
 #if DEBUG
 struct ForwardBackButtonView_Previews: PreviewProvider {
     static var previews: some View {
-        ForwardBackButtonView(model: WebViewModel())
+        ForwardBackButtonView()
     }
 }
 #endif
diff --git a/Cubari/NavigationBarViews/HomeButtonView.swift b/Cubari/NavigationBarViews/HomeButtonView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct HomeButtonView: View {
-    @ObservedObject var model: WebViewModel
+    @EnvironmentObject var model: WebViewModel
 
     var body: some View {
         Button(action: {
@@ -22,7 +22,7 @@ struct HomeButtonView: View {
 #if DEBUG
 struct HomeButtonView_Previews: PreviewProvider {
     static var previews: some View {
-        HomeButtonView(model: WebViewModel())
+        HomeButtonView()
     }
 }
 #endif
diff --git a/Cubari/NavigationBarViews/SettingsButtonView.swift b/Cubari/NavigationBarViews/SettingsButtonView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct SettingsButtonView: View {
-    @ObservedObject var model: WebViewModel
+    @EnvironmentObject var model: WebViewModel
     @State private var showSettings = false
 
     var body: some View {
@@ -18,15 +18,15 @@ struct SettingsButtonView: View {
             Image(systemName: "gear")
         })
         .sheet(isPresented: $showSettings) {
-            SettingsView(model: model, showView: $showSettings)
+            SettingsView(showView: $showSettings)
         }
     }
 }
 
 #if DEBUG
 struct SettingsButtonView_Previews: PreviewProvider {
     static var previews: some View {
-        SettingsButtonView(model: WebViewModel())
+        SettingsButtonView()
     }
 }
 #endif
diff --git a/Cubari/SettingsView.swift b/Cubari/SettingsView.swift
@@ -8,13 +8,14 @@
 import SwiftUI
 
 struct SettingsView: View {
-    @ObservedObject var model: WebViewModel
+    @EnvironmentObject var model: WebViewModel
     @Binding var showView: Bool
 
     // All settings here
     @AppStorage("leftHandMode") var leftHandMode = false
     @AppStorage("persistNavigation") var persistNavigation = false
     @AppStorage("blockAds") var blockAds = false
+    @AppStorage("defaultUrl") var defaultUrl = ""
 
     @State private var showAdblockAlert: Bool = false
 
@@ -53,6 +54,10 @@ struct SettingsView: View {
                             )
                         }
                 }
+                Section(header: Text("Default URL"), footer: Text("Sets the default URL when the app is launched. Https will be automatically added if you don't provide it")) {
+                    TextField("https://...", text: $defaultUrl)
+                        .textCase(.lowercase)
+                }
             }
             .navigationBarTitle("Settings")
             .toolbar {
@@ -69,7 +74,7 @@ struct SettingsView: View {
 #if DEBUG
 struct SettingsView_Previews: PreviewProvider {
     static var previews: some View {
-        SettingsView(model: WebViewModel(), showView: .constant(true))
+        SettingsView(showView: .constant(true))
     }
 }
 #endif
diff --git a/Cubari/WebViewModel.swift b/Cubari/WebViewModel.swift
@@ -15,10 +15,8 @@ class WebViewModel: ObservableObject {
 
     // All Settings go here
     @AppStorage("blockAds") var blockAds = false
-
-    // TODO: Change this to a default URL
-    private var homeUrl = URL(string: "https://cubari.moe")!
-
+    @AppStorage("defaultUrl") var defaultUrl = ""
+
     init() {
         let prefs = WKWebpagePreferences()
         prefs.allowsContentJavaScript = true
@@ -95,13 +93,24 @@ class WebViewModel: ObservableObject {
     // Force the home URL if the user wants to go home
     // Otherwise, use the current URL with the home URL as a fallback
     func loadUrl(goHome: Bool = false) {
-        let url = goHome ? homeUrl : webView.url ?? homeUrl
-        
+        let url = goHome ? buildHomeUrl() : webView.url ?? buildHomeUrl()
+
         let urlRequest = URLRequest(url: url)
 
         self.webView.load(urlRequest)
     }
 
+    // Builds homepage URL from settings
+    func buildHomeUrl() -> URL {
+        if defaultUrl == "" {
+            return URL(string: "https://cubari.moe")!
+        } else if defaultUrl.hasPrefix("https://") || defaultUrl.hasPrefix("http://") {
+            return URL(string: defaultUrl)!
+        } else {
+            return URL(string: "https://\(defaultUrl)")!
+        }
+    }
+
     func goForward() {
         webView.goForward()
     }