Add Knux icon

twodayslate · Dec 9, 2022 · 7d1c3a3 · 7d1c3a3
1 parent 3b25c87
commit 7d1c3a3
Show file tree

Hide file tree

Showing 8 changed files with 2,372 additions and 5 deletions.
diff --git a/claw.xcodeproj/project.pbxproj b/claw.xcodeproj/project.pbxproj
@@ -953,7 +953,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Akhmad437LobsterLightIcon Akhmad437LobsterDarkIcon";
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Akhmad437LobsterLightIcon Akhmad437LobsterDarkIcon KnuxIcon";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
@@ -983,7 +983,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Akhmad437LobsterLightIcon Akhmad437LobsterDarkIcon";
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Akhmad437LobsterLightIcon Akhmad437LobsterDarkIcon KnuxIcon";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;

diff --git a/claw/Assets.xcassets/KnuxIcon-thumb.imageset/Contents.json b/claw/Assets.xcassets/KnuxIcon-thumb.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "LobsterIcon_ZacGorak.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/claw/Assets.xcassets/KnuxIcon-thumb.imageset/LobsterIcon_ZacGorak.svg b/claw/Assets.xcassets/KnuxIcon-thumb.imageset/LobsterIcon_ZacGorak.svg
diff --git a/claw/Assets.xcassets/KnuxIcon.appiconset/Contents.json b/claw/Assets.xcassets/KnuxIcon.appiconset/Contents.json
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "LobsterIcon_ZacGorak.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/claw/Assets.xcassets/KnuxIcon.appiconset/LobsterIcon_ZacGorak.png b/claw/Assets.xcassets/KnuxIcon.appiconset/LobsterIcon_ZacGorak.png
diff --git a/claw/CommentHierarchy.swift b/claw/CommentHierarchy.swift
@@ -108,7 +108,7 @@ struct HierarchyCommentView<RowContent, HeaderContent>: View where RowContent: V
                 withAnimation(.easeIn) {
                     isExpanded.toggle()
                 }
-            }, label: {Label(isExpanded ? "Collapse" : "Expand", systemImage: "rectangle.expand.vertical")})
+            }, label: {Label(isExpanded ? "Collapse" : "Expand", systemImage: isExpanded ? "rectangle.compress.vertical" : "rectangle.expand.vertical")})
         }).onTapGesture(count: /*@START_MENU_TOKEN@*/1/*@END_MENU_TOKEN@*/, perform: {
             withAnimation(.easeIn) {
                 backgroundColorState = Color(UIColor.systemGray4)

diff --git a/claw/GenericArrayFetcher.swift b/claw/GenericArrayFetcher.swift
@@ -23,14 +23,12 @@ class GenericArrayFetcher<T: Hashable & Codable>: ObservableObject {
         }
     }
 
-
     func reload() {
         self.session?.cancel()
         self.moreSession?.cancel()
         self.isReloading = true
         self.load()
     }
-
 
     func load() {
         self.page = 1

diff --git a/claw/Settings/AppIconChooserView.swift b/claw/Settings/AppIconChooserView.swift
@@ -53,6 +53,23 @@ struct AppIconChooserView: View {
                         .environmentObject(settings)
                 })
             }
+            Section {
+                Button(action: {
+                    UIApplication.shared.setAlternateIconName("KnuxIcon", completionHandler: {error in
+                        guard error == nil else {
+                            // show error
+                            return
+                        }
+                        settings.alternateIconName = "KnuxIcon"
+                        try? settings.managedObjectContext?.save()
+                        self.presentationMode.wrappedValue.dismiss()
+                    })
+                }, label: {
+                    AppIconView(icon: AppIcon(alternateIconName: "KnuxIcon", name: "Pixel Lobster", assetName: "KnuxIcon-thumb", subtitle: "Knux 400"))
+                        .environmentObject(settings)
+                })
+            }
+
             VStack(alignment: .leading) {
                 HStack(alignment: .bottom) {
                     Spacer()