Merge pull request #5 from BenjaminHornbeck6/main

Improvements
haxi0 · Nov 13, 2022 · a7fb477 · a7fb477
2 parents 2df1123 + 234e6a3
commit a7fb477
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -7,6 +7,6 @@ App Store, but for TrollStore
 As the description says, "App Store, but for TrollStore". The App fetches an API from my website and loads a list of popular TrollStore apps to download. Then when you press the "GET" button the app opens the url scheme (apple-magnifier://install?url=) to TrollStore which downloads and installs the you have chosen app. All of this means also if whenever an app update of a TrollStore app which is in the list is out, I just have to update a variable in the API and won't need to have to update TrollApps and you would need to install the new version of it. You need to have a WiFi or either a cellular connection for this to work! **This works for iOS 15.0 and up, make sure to be on the latest version of TrollStore**
 
 # Want to submit an app?
-If you want to submit an app, PM me on Twitter with the request. My Twitter is @haxi0sm
+If you want to submit an app, DM me on Twitter with the request. My Twitter is @haxi0sm
 
 
diff --git a/TrollApps/TrollApps/AppsView.swift b/TrollApps/TrollApps/AppsView.swift
@@ -9,7 +9,6 @@ import SwiftUI
 
 struct AppsView: View {
     @Environment(\.openURL) var openURL
-
     var body: some View {
         NavigationView {
             List(FetchApps()) { json in
@@ -19,7 +18,8 @@ struct AppsView: View {
                         Spacer()
                         Button("GET") {
                             openURL(URL(string: json.link)!)
-                        }.buttonStyle(appstorestyle())
+                        }
+                        .buttonStyle(appstorestyle())
                     }
                 } icon: {
                     AsyncImage(url: URL(string: json.urlimg)) { image in
@@ -30,8 +30,10 @@ struct AppsView: View {
                     .frame(width: 30, height: 30)
                     .clipShape(RoundedRectangle(cornerRadius: 7))
                 }
-            }.navigationTitle("Apps")
+            }
+            .navigationTitle("Apps")
         }
+        .navigationViewStyle(.stack)
     }
 }
 

diff --git a/TrollApps/TrollApps/ContentView.swift b/TrollApps/TrollApps/ContentView.swift
@@ -9,12 +9,11 @@ import SwiftUI
 
 struct ContentView: View {
     @AppStorage("FirstStart") var alertShouldBeShown = true
-
     var body: some View {
         TabView {
             AppsView()
                 .tabItem {
-                    Image(systemName: "iphone.and.arrow.forward")
+                    Image(systemName: "apps.iphone")
                     Text("Apps")
                 }
                 .alert(isPresented: $alertShouldBeShown, content: {
@@ -29,8 +28,8 @@ struct ContentView: View {
                 })
             OtherView()
                 .tabItem {
-                    Image(systemName: "ellipsis")
-                    Text("Other")
+                    Image(systemName: "person")
+                    Text("Credits")
                 }
         }
     }

diff --git a/TrollApps/TrollApps/JSONStuff.swift b/TrollApps/TrollApps/JSONStuff.swift
@@ -21,7 +21,7 @@ func FetchApps() -> [stuff] {
     do {
         return try JSONDecoder().decode([stuff].self, from: try! Data(contentsOf: URL(string: "https://haxi0-dev.com/api/trollapps-0.1.json")!))
     } catch {
-        print("oopsie")
+        print(error)
         return []
     }
 }
diff --git a/TrollApps/TrollApps/OtherView.swift b/TrollApps/TrollApps/OtherView.swift
@@ -9,7 +9,6 @@ import SwiftUI
 
 struct OtherView: View {
     @Environment(\.openURL) var openURL
-
     var body: some View {
         NavigationView {
             List {
@@ -31,12 +30,12 @@ struct OtherView: View {
                     }
                     Label {
                         HStack {
-                            Button("iOScreator - JSON Fetching") {
-                                openURL(URL(string: "https://www.ioscreator.com/tutorials/swiftui-json-list-tutorial")!)
+                            Button("AppInstaller iOS - JSON Fetching") {
+                                openURL(URL(string: "https://twitter.com/AppInstalleriOS")!)
                             }
                         }
                     } icon: {
-                        AsyncImage(url: URL(string: "https://cdn.discordapp.com/attachments/969879614379921418/1040887934640979988/iOScreator.png")) { image in
+                        AsyncImage(url: URL(string: "https://appinstallerios.com/Img/AppInstalleriOSIcon.png")) { image in
                             image.resizable()
                         } placeholder: {
                             Color.black
@@ -74,10 +73,12 @@ struct OtherView: View {
                         .frame(width: 30, height: 30)
                         .clipShape(RoundedRectangle(cornerRadius: 7))
                     }
-
+                    
                 }
-            }.navigationTitle("Other")
+            }
+            .navigationTitle("Credits")
         }
+        .navigationViewStyle(.stack)
     }
 }