bug fix of in app icon

underthestars-zhy · underthestars-zhy · commit 8eb744b05da4 · 2022-06-27T14:15:00.000+08:00
diff --git a/IconChanger.xcodeproj/project.pbxproj b/IconChanger.xcodeproj/project.pbxproj
@@ -345,7 +345,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"IconChanger/Preview Content\"";
 				DEVELOPMENT_TEAM = 44BN78992X;
@@ -377,7 +377,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"IconChanger/Preview Content\"";
 				DEVELOPMENT_TEAM = 44BN78992X;
diff --git a/IconChanger/AliasName.swift b/IconChanger/AliasName.swift
@@ -23,7 +23,6 @@ struct AliasName {
     }
 
     static func getNames(for raw: String) -> String? {
-        print(getNames())
         return getNames()[raw]
     }
 
diff --git a/IconChanger/ChangeView.swift b/IconChanger/ChangeView.swift
@@ -65,6 +65,9 @@ struct ChangeView: View {
             }
         }
         .frame(width: 500, height: 400)
+        .onAppear {
+            inIcons = iconManager.getIconInPath(setPath.url)
+        }
         .task {
             do {
                 icons = try await iconManager.getIcons(setPath)
diff --git a/IconChanger/IconManager.swift b/IconChanger/IconManager.swift
@@ -53,8 +53,8 @@ class IconManager: ObservableObject {
         }
     }
 
-    func getIconInPath(_ url: String) -> [URL] {
-        let url = URL(fileURLWithPath: url).appendingPathComponent("Contents").appendingPathComponent("Resources")
+    func getIconInPath(_ url: URL) -> [URL] {
+        let url = url.appendingPathComponent("Contents").appendingPathComponent("Resources")
         let file = (try? FileManager.default.contentsOfDirectory(atPath: url.path)) ?? [String]()
         return file.filter {
             $0.contains(".icns")

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ struct AliasName {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`static func getNames(for raw: String) -> String? {`
`26`		`- print(getNames())`
`27`	`26`	`return getNames()[raw]`
`28`	`27`	`}`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@ struct ChangeView: View {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`.frame(width: 500, height: 400)`
	`68`	`+ .onAppear {`
	`69`	`+ inIcons = iconManager.getIconInPath(setPath.url)`
	`70`	`+ }`
`68`	`71`	`.task {`
`69`	`72`	`do {`
`70`	`73`	`icons = try await iconManager.getIcons(setPath)`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ class IconManager: ObservableObject {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- func getIconInPath(_ url: String) -> [URL] {`
`57`		`- let url = URL(fileURLWithPath: url).appendingPathComponent("Contents").appendingPathComponent("Resources")`
	`56`	`+ func getIconInPath(_ url: URL) -> [URL] {`
	`57`	`+ let url = url.appendingPathComponent("Contents").appendingPathComponent("Resources")`
`58`	`58`	`let file = (try? FileManager.default.contentsOfDirectory(atPath: url.path)) ?? [String]()`
`59`	`59`	`return file.filter {`
`60`	`60`	`$0.contains(".icns")`