新しいアプリアイコン

EhPanda.xcodeproj/project.pbxproj

@@ -12,6 +12,16 @@
 		AB1CBE5C25B81D8900CD6A5B /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = AB1CBE5B25B81D8900CD6A5B /* Introspect */; };
 		AB40CFDC25983EC200D1DC9A /* FileStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB40CFDB25983EC200D1DC9A /* FileStorage.swift */; };
 		AB40CFDF25983EDF00D1DC9A /* FileHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB40CFDE25983EDF00D1DC9A /* FileHelper.swift */; };
+		AB47FD9F25BC81A40007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FD9925BC81A40007765D /* [email protected] */; };
+		AB47FDA025BC81A40007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FD9A25BC81A40007765D /* [email protected] */; };
+		AB47FDA125BC81A40007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FD9B25BC81A40007765D /* [email protected] */; };
+		AB47FDA225BC81A40007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FD9C25BC81A40007765D /* [email protected] */; };
+		AB47FDAD25BC85060007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDAA25BC85060007765D /* [email protected] */; };
+		AB47FDAE25BC85060007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDAB25BC85060007765D /* [email protected] */; };
+		AB47FDAF25BC85060007765D /* Normal-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDAC25BC85060007765D /* Normal-ipad.png */; };
+		AB47FDB425BC859E0007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDB125BC859E0007765D /* [email protected] */; };
+		AB47FDB525BC859E0007765D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDB225BC859E0007765D /* [email protected] */; };
+		AB47FDB625BC859E0007765D /* Weird-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDB325BC859E0007765D /* Weird-ipad.png */; };
 		AB718B2525A0C0AC00D32962 /* CommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB718B2425A0C0AC00D32962 /* CommentView.swift */; };
 		AB89AF4925B3CE8800A0E1BA /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = AB89AF4825B3CE8800A0E1BA /* Kingfisher */; };
 		AB975F6025B5697700741E1A /* AppearanceSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB975F5F25B5697700741E1A /* AppearanceSettingView.swift */; };
@@ -59,6 +69,16 @@
 		AB1CBE5725B81ACC00CD6A5B /* Home.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Home.swift; sourceTree = "<group>"; };
 		AB40CFDB25983EC200D1DC9A /* FileStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileStorage.swift; sourceTree = "<group>"; };
 		AB40CFDE25983EDF00D1DC9A /* FileHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileHelper.swift; sourceTree = "<group>"; };
+		AB47FD9925BC81A40007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FD9A25BC81A40007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FD9B25BC81A40007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FD9C25BC81A40007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FDAA25BC85060007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FDAB25BC85060007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FDAC25BC85060007765D /* Normal-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Normal-ipad.png"; sourceTree = "<group>"; };
+		AB47FDB125BC859E0007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FDB225BC859E0007765D /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		AB47FDB325BC859E0007765D /* Weird-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Weird-ipad.png"; sourceTree = "<group>"; };
 		AB718B2425A0C0AC00D32962 /* CommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentView.swift; sourceTree = "<group>"; };
 		AB975F5F25B5697700741E1A /* AppearanceSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceSettingView.swift; sourceTree = "<group>"; };
 		AB975F6225B56B1D00741E1A /* ReadingSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadingSettingView.swift; sourceTree = "<group>"; };
@@ -128,6 +148,23 @@
 			path = "ツール";
 			sourceTree = "<group>";
 		};
+		AB47FDA625BC823F0007765D /* 予備アイコン */ = {
+			isa = PBXGroup;
+			children = (
+				AB47FD9A25BC81A40007765D /* [email protected] */,
+				AB47FD9925BC81A40007765D /* [email protected] */,
+				AB47FDAC25BC85060007765D /* Normal-ipad.png */,
+				AB47FDAA25BC85060007765D /* [email protected] */,
+				AB47FDAB25BC85060007765D /* [email protected] */,
+				AB47FD9C25BC81A40007765D /* [email protected] */,
+				AB47FD9B25BC81A40007765D /* [email protected] */,
+				AB47FDB325BC859E0007765D /* Weird-ipad.png */,
+				AB47FDB125BC859E0007765D /* [email protected] */,
+				AB47FDB225BC859E0007765D /* [email protected] */,
+			);
+			path = "予備アイコン";
+			sourceTree = "<group>";
+		};
 		ABC3C74B2593696C00E0C11B = {
 			isa = PBXGroup;
 			children = (
@@ -168,6 +205,7 @@
 				ABC3C7762593699A00E0C11B /* ViewModifiers.swift */,
 				ABEE0AFC2595C6F800C997AE /* Localizable.strings */,
 				ABC3C7692593699A00E0C11B /* Assets.xcassets */,
+				AB47FDA625BC823F0007765D /* 予備アイコン */,
 				ABC3C76E2593699A00E0C11B /* Info.plist */,
 			);
 			path = "アプリ";
@@ -337,7 +375,17 @@
 			buildActionMask = 2147483647;
 			files = (
 				ABC3C7852593699B00E0C11B /* Assets.xcassets in Resources */,
+				AB47FD9F25BC81A40007765D /* [email protected] in Resources */,
+				AB47FDAF25BC85060007765D /* Normal-ipad.png in Resources */,
+				AB47FDA225BC81A40007765D /* [email protected] in Resources */,
 				ABEE0AFA2595C6F800C997AE /* Localizable.strings in Resources */,
+				AB47FDA025BC81A40007765D /* [email protected] in Resources */,
+				AB47FDB425BC859E0007765D /* [email protected] in Resources */,
+				AB47FDB625BC859E0007765D /* Weird-ipad.png in Resources */,
+				AB47FDB525BC859E0007765D /* [email protected] in Resources */,
+				AB47FDAE25BC85060007765D /* [email protected] in Resources */,
+				AB47FDA125BC81A40007765D /* [email protected] in Resources */,
+				AB47FDAD25BC85060007765D /* [email protected] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EhPanda/アプリ/Assets.xcassets/表示用アイコン/AppIcon_Default.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon_Default.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

EhPanda/アプリ/Assets.xcassets/表示用アイコン/AppIcon_Normal.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon_Normal.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

EhPanda/アプリ/Assets.xcassets/表示用アイコン/AppIcon_Weird.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon_Weird.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

EhPanda/アプリ/Assets.xcassets/表示用アイコン/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

EhPanda/アプリ/Common.swift

@@ -99,6 +99,19 @@ public var vcsCount: Int {
     return navigationVC.viewControllers.count
 }
 
+public var appIconType: IconType {
+    if let alterName = UIApplication
+        .shared.alternateIconName,
+       let selection = IconType.allCases.filter(
+        { alterName.contains($0.fileName ?? "") }
+       ).first
+       {
+        return selection
+    } else {
+        return .Default
+    }
+}
+
 // MARK: 容量管理
 public func readableUnit(bytes: Int64) -> String {
     let formatter = ByteCountFormatter()

EhPanda/アプリ/Info.plist

@@ -6,6 +6,48 @@
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundleAlternateIcons</key>
+		<dict>
+			<key>Normal</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>Normal</string>
+				</array>
+			</dict>
+			<key>Weird</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>Weird</string>
+				</array>
+			</dict>
+		</dict>
+	</dict>
+	<key>CFBundleIcons~ipad</key>
+	<dict>
+		<key>CFBundleAlternateIcons</key>
+		<dict>
+			<key>Normal</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>Normal-ipad</string>
+					<string>Normal-ipad-pro</string>
+				</array>
+			</dict>
+			<key>Weird</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>Weird-ipad</string>
+					<string>Weird-ipad-pro</string>
+				</array>
+			</dict>
+		</dict>
+	</dict>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -31,6 +73,8 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSceneManifest</key>
@@ -40,8 +84,6 @@
 	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 	<key>UILaunchScreen</key>
 	<dict/>
 	<key>UIRequiredDeviceCapabilities</key>

EhPanda/アプリ/en.lproj/Localizable.strings

@@ -71,6 +71,10 @@
 "外観" = "Apperance";
 "全般" = "Global";
 "テーマ" = "Theme";
+"アプリアイコン" = "App Icon";
+"普通" = "Normal";
+"既定" = "Default";
+"怪奇" = "Weird";
 "自動" = "Automatic";
 "ライト" = "Light";
 "ダーク" = "Dark";

EhPanda/アプリ/zh-Hans.lproj/Localizable.strings

@@ -71,6 +71,10 @@
 "外観" = "外观";
 "全般" = "全局";
 "テーマ" = "主题";
+"アプリアイコン" = "应用图标";
+"普通" = "普通";
+"既定" = "默认";
+"怪奇" = "诡异";
 "自動" = "自动";
 "ライト" = "浅色";
 "ダーク" = "深色";

EhPanda/データフロー/AppAction.swift

@@ -19,6 +19,7 @@ enum AppAction {
     case cleanCommentViewCommentContent
     case saveReadingProgress(id: String, tag: Int)
     case updateDiskImageCacheSize(size: String)
+    case updateAppIconType(iconType: IconType)
 
     case toggleNavBarHidden(isHidden: Bool)
     case toggleHomeListType(type: HomeListType)

EhPanda/データフロー/Store.swift

@@ -42,6 +42,8 @@ class Store: ObservableObject {
             appState.cachedList.insertReadingProgress(id: id, progress: tag)
         case .updateDiskImageCacheSize(let size):
             appState.settings.setting?.diskImageCacheSize = size
+        case .updateAppIconType(let iconType):
+            appState.settings.setting?.appIconType = iconType
 
         // MARK: アプリ環境
         case .toggleHomeListType(let type):