just fixes + initial new method for apis request + loading

cranci1 · May 13, 2024 · 238a1c1 · 238a1c1
1 parent 05fec18
commit 238a1c1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 29 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AnimeGen/APIs Requests/pic-re.swift b/AnimeGen/APIs Requests/pic-re.swift
@@ -12,6 +12,8 @@ extension ViewController {
     func loadImageFromPicRe() {
         startLoadingIndicator()
 
+        let startTime = DispatchTime.now()
+
         DispatchQueue.global().async {
             guard let url = URL(string: "https://pic.re/image") else {
                 print("Invalid URL")
@@ -49,18 +51,25 @@ extension ViewController {
                 let tags = imageTagsString.components(separatedBy: ",")
 
                 DispatchQueue.main.async {
-                    self.addImageToHistory(image: newImage, tags: tags)
-                    self.currentImageURL = imageUrlString
-                    self.updateUIWithTags(tags)
-                    self.addToHistory(image: newImage)
-                    self.tagsLabel.isHidden = false
-                    self.imageView.image = newImage
-                    self.animateImageChange(with: newImage)
-                    self.stopLoadingIndicator()
-                    self.incrementCounter()
+                    self.handleImageLoadingCompletion(with: newImage, tags: tags, imageUrlString: imageUrlString)
+
+                    let endTime = DispatchTime.now()
+                    let executionTime = endTime.uptimeNanoseconds - startTime.uptimeNanoseconds
+                    print("Execution time: \(Double(executionTime) / 1_000_000_000) seconds")
                 }
             }.resume()
         }
     }
 
+    private func handleImageLoadingCompletion(with newImage: UIImage, tags: [String], imageUrlString: String) {
+        addImageToHistory(image: newImage, tags: tags)
+        currentImageURL = imageUrlString
+        updateUIWithTags(tags)
+        addToHistory(image: newImage)
+        tagsLabel.isHidden = false
+        imageView.image = newImage
+        animateImageChange(with: newImage)
+        stopLoadingIndicator()
+        incrementCounter()
+    }
 }
diff --git a/AnimeGen/Extension/Tags.swift b/AnimeGen/Extension/Tags.swift
@@ -20,15 +20,13 @@ extension ViewController {
             if !tagsString.isEmpty {
                 tagsString += "\n"
             }
-
             tagsString += "Author: \(author)"
         }
 
         if let category = category, !category.isEmpty {
-            if !tagsString.isEmpty || (author != nil && !author!.isEmpty) {
+            if !tagsString.isEmpty || author != nil && !author!.isEmpty {
                 tagsString += "\n"
             }
-
             tagsString += "Category: \(category)"
         }
 
@@ -45,6 +43,7 @@ extension ViewController {
         tagsLabel.attributedText = attributedString
     }
 
+
     func startLoadingIndicator() {
         activityIndicator.startAnimating()
     }
@@ -53,6 +52,7 @@ extension ViewController {
         activityIndicator.stopAnimating()
     }
 
+
     func animateFeedback() {
         guard UserDefaults.standard.bool(forKey: "enableAnimations") else {
             return
@@ -62,14 +62,14 @@ extension ViewController {
             self.imageView.transform = CGAffineTransform(scaleX: 1.1, y: 1.1)
         }) { _ in
             UIView.animate(withDuration: 0.3) {
-                self.imageView.transform = CGAffineTransform.identity
+                self.imageView.transform = .identity
             }
         }
     }
 
     func animateImageChange(with newImage: UIImage) {
         guard UserDefaults.standard.bool(forKey: "enableAnimations") else {
-            self.imageView.image = newImage
+            imageView.image = newImage
             return
         }
 

diff --git a/AnimeGen/Settings/Developer.swift b/AnimeGen/Settings/Developer.swift
@@ -33,15 +33,15 @@ class DeveloperPref: UITableViewController {
 
     @IBAction func waifuit(_ sender: UITapGestureRecognizer) {
         if let navigationController = self.navigationController,
-           !(navigationController.topViewController is UIHostingController<APIsSuppport>) {
+           !(navigationController.topViewController is UIHostingController<waifuitView>) {
             let swiftUIView = waifuitView()
             navigationController.pushViewController(UIHostingController(rootView: swiftUIView), animated: true)
         }
     }
 
     @IBAction func hmtaipage(_ sender: UITapGestureRecognizer) {
         if let navigationController = self.navigationController,
-           !(navigationController.topViewController is UIHostingController<APIsSuppport>) {
+           !(navigationController.topViewController is UIHostingController<HmtaiView>) {
             let swiftUIView = HmtaiView()
             navigationController.pushViewController(UIHostingController(rootView: swiftUIView), animated: true)
         }

diff --git a/AnimeGen/Settings/Developer/Hmtai-pref.swift b/AnimeGen/Settings/Developer/Hmtai-pref.swift
@@ -21,11 +21,6 @@ struct HmtaiView: View {
     var body: some View {
         VStack {
             VStack(spacing: 20) {
-                Text("Hmtai Preferences")
-                    .font(.largeTitle)
-                    .fontWeight(.semibold)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-
                 TextField("Bot DiscordTokenHere", text: $apiToken)
                     .padding()
                     .background(RoundedRectangle(cornerRadius: 10).stroke(Color.gray, lineWidth: 1))
@@ -73,7 +68,7 @@ struct HmtaiView: View {
             Spacer()
         }
         .padding()
-        .navigationBarTitle("Hmtai Settings", displayMode: .inline)
+        .navigationBarTitle("Hmtai Settings")
     }
 
     private func saveValues() {

diff --git a/AnimeGen/Settings/Developer/waifu-it-pref.swift b/AnimeGen/Settings/Developer/waifu-it-pref.swift
@@ -17,12 +17,7 @@ struct waifuitView: View {
 
     var body: some View {
         VStack {
-            VStack(spacing: 20) {
-                Text("Waifu.it Preferences")
-                    .font(.largeTitle)
-                    .fontWeight(.semibold)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-
+            VStack(spacing: 20) {                
                 TextField("API Token", text: $waifuittoken)
                     .padding()
                     .background(RoundedRectangle(cornerRadius: 10).stroke(Color.gray, lineWidth: 1))
@@ -52,7 +47,7 @@ struct waifuitView: View {
             Spacer()
         }
         .padding()
-        .navigationBarTitle("Waifu.it Settings", displayMode: .inline)
+        .navigationBarTitle("Waifu.it Settings")
 
     }