Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: QRSharePro/History.swift
TopGApps · Apr 18, 2024 · 3ff8e72 · 3ff8e72
2 parents f4da8a7 + b0cd904
commit 3ff8e72
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/QRSharePro.xcodeproj/project.pbxproj b/QRSharePro.xcodeproj/project.pbxproj
@@ -579,7 +579,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aaronhma.QRShare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -621,7 +621,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aaronhma.QRShare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

diff --git a/QRSharePro/History.swift b/QRSharePro/History.swift
@@ -54,6 +54,7 @@ struct History: View {
                 return "Deep Link"
             }
         }
+
         return "Text"
     }
 

diff --git a/QRSharePro/HistoryDetailInfo.swift b/QRSharePro/HistoryDetailInfo.swift
@@ -838,9 +838,6 @@ struct HistoryDetailInfo: View {
         }
         .onAppear {
             Task {
-                originalText = qrCode.text
-                generateQRCode(from: qrCode.text)
-
                 if qrCode.text.isValidURL() {
                     qrCode.text = URL(string: qrCode.text.removeTrackers())!.prettify().absoluteString
 
@@ -850,6 +847,9 @@ struct HistoryDetailInfo: View {
                         print(error.localizedDescription)
                     }
                 }
+
+                generateQRCode(from: qrCode.text)
+                originalText = qrCode.text
             }
         }
         .accentColor(accentColorManager.accentColor)
@@ -891,8 +891,9 @@ struct HistoryDetailInfo: View {
                     Label("Delete", systemImage: "trash")
                 }
             }
-            ToolbarItem(placement: .topBarTrailing) {
-                if !isEditing {
+
+            if !isEditing {
+                ToolbarItem(placement: .topBarTrailing) {
                     Menu {
                         Button {
                             if qrCode.text.count > 3000 {
@@ -958,9 +959,15 @@ struct HistoryDetailInfo: View {
                     } label: {
                         Label("More", systemImage: "ellipsis.circle")
                     }
-                } else {
+                }
+            }
+
+            if isEditing {
+                ToolbarItem(placement: .topBarTrailing) {
                     Button {
-                        isEditing.toggle()
+                        withAnimation {
+                            isEditing = false
+                        }
                     } label: {
                         Text("Done")
                     }

diff --git a/QRSharePro/Home.swift b/QRSharePro/Home.swift
@@ -421,7 +421,7 @@ struct Home: View {
                         } header: {
                             Text("Default Tab")
                         } footer: {
-                            Text("This will be the tab that opens when not using a quick action.")
+                            Text("Choose the tab that appears when launching the app.")
                         }
 
                         Section {
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ struct History: View { @@
                     return "Deep Link"
                 }
             }
             return "Text"
         }
@@ Expand Down @@