Add alternate Dark icon

Feature request from a whiiiiiiiiiile ago

.gitignore

@@ -8,5 +8,3 @@
 .DS_Store
 /pojavlauncher.xcodeproj
 /depends
-/Natives/resources/[email protected]
-/Natives/resources/AppIcon76x76@2x~ipad.png

Makefile

@@ -285,7 +285,7 @@ extras:
 	@echo 'Building PojavLauncher $(VERSION) - EXTRA - Start'
 	@if [ '$(IOS)' = '0' ]; then \
 		mkdir -p $(WORKINGDIR)/PojavLauncher.app/Base.lproj; \
-		xcrun actool $(SOURCEDIR)/Natives/Assets.xcassets --compile $(SOURCEDIR)/Natives/resources --platform iphoneos --minimum-deployment-target 12.0 --app-icon AppIcon --output-partial-info-plist /dev/null || exit 1; \
+		xcrun actool $(SOURCEDIR)/Natives/Assets.xcassets --compile $(SOURCEDIR)/Natives/resources --platform iphoneos --minimum-deployment-target 12.0 --app-icon AppIcon-Light --alternate-app-icon AppIcon-Dark --output-partial-info-plist /dev/null || exit 1; \
 		ibtool --compile $(WORKINGDIR)/PojavLauncher.app/Base.lproj/LaunchScreen.storyboardc $(SOURCEDIR)/Natives/en.lproj/LaunchScreen.storyboard || exit 1; \
 	elif [ '$(IOS)' = '1' ]; then \
 		echo 'Due to the required tools not being available, you cannot compile the extras for PojavLauncher with an iOS device.'; \

Natives/Assets.xcassets/AppIcon-Dark.appiconset/Contents.json

@@ -1,109 +1,109 @@
 {
   "images" : [
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "AppIcon_20x20.png",
+      "filename" : "AppIcon-Dark_20x20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
-      "filename" : "AppIcon_40x40.png",
+      "filename" : "AppIcon-Dark_20x20@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "AppIcon_29x29.png",
+      "filename" : "AppIcon-Dark_29x29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark_29x29@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "AppIcon_40x40.png",
+      "filename" : "AppIcon-Dark_40x40.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark_40x40@2x 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "AppIcon_76x76.png",
+      "filename" : "AppIcon-Dark_76x76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "[email protected]",
+      "filename" : "AppIcon-Dark[email protected]",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "AppIcon_83x83@2x.png",
+      "filename" : "AppIcon-Dark_83.5x83.5.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "AppIcon_1024x1024.png",
+      "filename" : "AppIcon-Dark_1024x1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

Natives/Assets.xcassets/AppIcon-Light.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "AppIcon-Light_20x20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "AppIcon-Light_20x20@2x 1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "AppIcon-Light_29x29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "AppIcon-Light_29x29@2x 1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "AppIcon-Light_40x40.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "AppIcon-Light_40x40@2x 1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "AppIcon-Light_76x76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "AppIcon-Light_83.5x83.5.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "AppIcon-Light_1024x1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Natives/Info.plist

@@ -14,27 +14,48 @@
 	<string>PojavLauncher</string>
 	<key>CFBundleIcons</key>
 	<dict>
+		<key>CFBundleAlternateIcons</key>
+		<dict>
+			<key>AppIcon-Dark</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>AppIcon-Dark60x60</string>
+				</array>
+			</dict>
+		</dict>
 		<key>CFBundlePrimaryIcon</key>
 		<dict>
 			<key>CFBundleIconFiles</key>
 			<array>
-				<string>AppIcon60x60</string>
+				<string>AppIcon-Light60x60</string>
 			</array>
 			<key>CFBundleIconName</key>
-			<string>AppIcon</string>
+			<string>AppIcon-Light</string>
 		</dict>
 	</dict>
 	<key>CFBundleIcons~ipad</key>
 	<dict>
+		<key>CFBundleAlternateIcons</key>
+		<dict>
+			<key>AppIcon-Dark</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>AppIcon-Dark60x60</string>
+					<string>AppIcon-Dark76x76</string>
+				</array>
+			</dict>
+		</dict>
 		<key>CFBundlePrimaryIcon</key>
 		<dict>
 			<key>CFBundleIconFiles</key>
 			<array>
-				<string>AppIcon60x60</string>
-				<string>AppIcon76x76</string>
+				<string>AppIcon-Light60x60</string>
+				<string>AppIcon-Light76x76</string>
 			</array>
 			<key>CFBundleIconName</key>
-			<string>AppIcon</string>
+			<string>AppIcon-Light</string>
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
@@ -69,7 +90,7 @@
 		<dict>
 			<key>ProfileName</key>
 			<string>ExtendedGamepad</string>
-		 </dict>
+		</dict>
 	</array>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>

Natives/LauncherPreferences.m

@@ -126,6 +126,7 @@ void loadPreferences(BOOL reset) {
     setDefaultValueForPref(envPrefDict, @"java_args", @"");
     setDefaultValueForPref(envPrefDict, @"allocated_memory", [NSNumber numberWithFloat:roundf(([[NSProcessInfo processInfo] physicalMemory] / 1048576) * 0.25)]);
     setDefaultValueForPref(envPrefDict, @"jitstreamer_server", @"69.69.0.1");
+    setDefaultValueForPref(prefDict, @"appicon", @"AppIcon-Light");
     setDefaultValueForPref(prefDict, @"debug_logging", @(CONFIG_RELEASE != 1));
     setDefaultValueForPref(prefDict, @"cosmetica", @YES);
     setDefaultValueForPref(envPrefDict, @"java_home", @"java-8-openjdk");

Natives/LauncherPreferencesViewController.m

@@ -79,6 +79,20 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
                 @"type": self.typeTextField,
                 @"enableCondition": whenNotInGame
             },
+            @{@"key": @"appicon",
+                @"hasDetail": @YES,
+                @"icon": @"paintbrush",
+                @"type": self.typePickField,
+                @"enableCondition": whenNotInGame,
+                @"pickKeys": @[
+                  @"AppIcon-Light",
+                  @"AppIcon-Dark"
+                ],
+                @"pickList": @[
+                  localize(@"preference.title.appicon-default", nil),
+                  localize(@"preference.title.appicon-black", nil)
+                ]
+            },
             @{@"key": @"reset_warnings",
                 @"icon": @"exclamationmark.triangle",
                 @"type": self.typeButton,
@@ -528,6 +542,19 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
         UIAlertAction *action = [UIAlertAction actionWithTitle:pickList[i] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             cell.detailTextLabel.text = pickKeys[i];
             setPreference(item[@"key"], pickKeys[i]);
+            if([item[@"key"] isEqualToString:@"appicon"]) {
+                NSString* iconName;
+                if([pickKeys[i] isEqualToString:@"AppIcon-Light"]) {
+                    iconName = nil;
+                } else {
+                    iconName = pickKeys[i];
+                }
+                if ([[UIApplication sharedApplication] respondsToSelector:@selector(supportsAlternateIcons)] && [[UIApplication sharedApplication] supportsAlternateIcons]) {
+                    [[UIApplication sharedApplication] setAlternateIconName:iconName completionHandler:^(NSError * _Nullable error) {
+                        NSLog(@"Error: %@", error);
+                    }];
+                }
+            }
         }];
         [picker addAction:action];
         

Natives/SurfaceViewController.m

@@ -96,13 +96,13 @@ BOOL slideableHotbar;
 
     [self performSelector:@selector(initCategory_Navigation)];
 
-    self.surfaceView = [[GameSurfaceView alloc] initWithFrame:self.view.frame];
-    self.surfaceView.layer.contentsScale = screenScale * resolutionScale;
-    self.surfaceView.layer.magnificationFilter = self.surfaceView.layer.minificationFilter = kCAFilterNearest;
-
-    self.touchView = [[UIView alloc] initWithFrame:self.view.frame];
+    self.touchView = [[UIView alloc] initWithFrame:CGRectFromString(getPreference(@"control_safe_area"))];
     self.touchView.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1];
     self.touchView.multipleTouchEnabled = YES;
+    
+    self.surfaceView = [[GameSurfaceView alloc] initWithFrame:self.touchView.frame];
+    self.surfaceView.layer.contentsScale = screenScale * resolutionScale;
+    self.surfaceView.layer.magnificationFilter = self.surfaceView.layer.minificationFilter = kCAFilterNearest;
     [self.touchView addSubview:self.surfaceView];
 
     [self.rootView addSubview:self.touchView];

Natives/en.lproj/Localizable.strings

@@ -151,6 +151,12 @@
 "preference.detail.debug_logging" = "Logs internal settings and actions to latestlog.txt. This helps the developers find issues easier, but Minecraft may run slower as the logs will be written to more often.";
 "preference.title.jitstreamer_server" = "JitStreamer server IP";
 "preference.detail.jitstreamer_server" = "Allows you to change to a custom JitStreamer server IP, such as for self-hosted instances. This option can be left alone if you use the default JitStreamer servers.";
+
+"preference.title.appicon" = "Set app icon";
+"preference.detail.appicon" = "Allows you to choose between different Home Screen icons for PojavLauncher.";
+"preference.title.appicon-default" = "Familiar PojavLauncher light";
+"preference.title.appicon-dark" = "Familiar PojavLauncher dark";
+
 "preference.title.reset_warnings" = "Reset all warnings";
 "preference.title.done.reset_warnings" = "All warnings have been reset.";