diff --git a/DEBIAN/control.development b/DEBIAN/control.development index a4ce1c13..dd360a93 100644 --- a/DEBIAN/control.development +++ b/DEBIAN/control.development @@ -3,7 +3,7 @@ Name: PojavLauncher iOS (Development) Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm -Version: 2.1 +Version: 2.1.1 Depends: firmware (>= 12.0), firmware (<< 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release, net.kdt.pojavlauncher.release-rootless, net.kdt.pojavlauncher.development-rootless Replaces: pojavlauncher-dev, pojavlauncher diff --git a/DEBIAN/control.development-rootless b/DEBIAN/control.development-rootless index 2458fd2e..259d8dbc 100644 --- a/DEBIAN/control.development-rootless +++ b/DEBIAN/control.development-rootless @@ -3,7 +3,7 @@ Name: PojavLauncher iOS (Development) Rootless Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm64 -Version: 2.1 +Version: 2.1.1 Depends: firmware (>= 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release, net.kdt.pojavlauncher.release-rootless, net.kdt.pojavlauncher.development Replaces: pojavlauncher-dev, pojavlauncher diff --git a/DEBIAN/control.release b/DEBIAN/control.release index a5754260..e7537df6 100644 --- a/DEBIAN/control.release +++ b/DEBIAN/control.release @@ -3,7 +3,7 @@ Name: PojavLauncher iOS Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm -Version: 2.1 +Version: 2.1.1 Depends: firmware (>= 12.0), firmware (<< 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release-rootless, net.kdt.pojavlauncher.development, net.kdt.pojavlauncher.development-rootless Replaces: pojavlauncher, pojavlauncher-dev diff --git a/DEBIAN/control.release-rootless b/DEBIAN/control.release-rootless index abd6fa7b..48a86c05 100644 --- a/DEBIAN/control.release-rootless +++ b/DEBIAN/control.release-rootless @@ -3,7 +3,7 @@ Name: PojavLauncher iOS Rootless Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm -Version: 2.1 +Version: 2.1.1 Depends: firmware (>= 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release, net.kdt.pojavlauncher.development, net.kdt.pojavlauncher.development-rootless Replaces: pojavlauncher, pojavlauncher-dev diff --git a/Natives/Info.plist b/Natives/Info.plist index 6f315c7c..acb2a388 100644 --- a/Natives/Info.plist +++ b/Natives/Info.plist @@ -67,7 +67,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.1 + 2.1.1 CFBundleSignature ???? CFBundleURLTypes @@ -82,7 +82,7 @@ CFBundleVersion - 2.1 + 2.1.1 GCSupportsControllerUserInteraction GCSupportedGameControllers diff --git a/Natives/LauncherNewsViewController.m b/Natives/LauncherNewsViewController.m index f5a54e09..abbfb412 100644 --- a/Natives/LauncherNewsViewController.m +++ b/Natives/LauncherNewsViewController.m @@ -1,6 +1,8 @@ #import #import #import "LauncherNewsViewController.h" +#import "LauncherPreferences.h" +#import "utils.h" @interface LauncherNewsViewController() @end @@ -36,6 +38,28 @@ UIEdgeInsets insets; [webView.scrollView setShowsHorizontalScrollIndicator:NO]; [webView loadRequest:request]; [self.view addSubview:webView]; + + if(roundf([[NSProcessInfo processInfo] physicalMemory] / 1048576) < 1900 && [getPreference(@"unsupported_warn_counter") intValue] == 0) { + UIAlertController *RAMAlert = [UIAlertController alertControllerWithTitle:localize(@"login.warn.title.a7", nil) message:localize(@"login.warn.message.a7", nil) preferredStyle:UIAlertControllerStyleAlert]; + UIAlertAction *ok = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleCancel handler:nil]; + [self presentViewController:RAMAlert animated:YES completion:nil]; + [RAMAlert addAction:ok]; + } + + int launchNum = [getPreference(@"unsupported_warn_counter") intValue]; + if(launchNum > 0) { + setPreference(@"unsupported_warn_counter", @(launchNum - 1)); + } else { + setPreference(@"unsupported_warn_counter", @(30)); + } + + if(!getenv("POJAV_DETECTEDJB") && [getPreference(@"ram_unjb_warn") boolValue] == YES && [getPreference(@"auto_ram") boolValue] == NO) { + UIAlertController *ramalert = [UIAlertController alertControllerWithTitle:localize(@"login.warn.title.ram_unjb", nil) message:localize(@"login.warn.message.ram_unjb", nil) preferredStyle:UIAlertControllerStyleAlert]; + UIAlertAction *ok = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleCancel handler:nil]; + [self presentViewController:ramalert animated:YES completion:nil]; + [ramalert addAction:ok]; + setPreference(@"ram_unjb_warn", @NO); + } } diff --git a/Natives/LauncherSplitViewController.m b/Natives/LauncherSplitViewController.m index b0e24eb5..f13b1960 100644 --- a/Natives/LauncherSplitViewController.m +++ b/Natives/LauncherSplitViewController.m @@ -26,28 +26,6 @@ extern NSMutableDictionary *prefDict; detailVc.toolbarHidden = NO; self.viewControllers = @[[[UINavigationController alloc] initWithRootViewController:masterVc], detailVc]; - - if(roundf([[NSProcessInfo processInfo] physicalMemory] / 1048576) < 1900 && [getPreference(@"unsupported_warn_counter") intValue] == 0) { - UIAlertController *RAMAlert = [UIAlertController alertControllerWithTitle:localize(@"login.warn.title.a7", nil) message:localize(@"login.warn.message.a7", nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction *ok = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleCancel handler:nil]; - [self presentViewController:RAMAlert animated:YES completion:nil]; - [RAMAlert addAction:ok]; - } - - int launchNum = [getPreference(@"unsupported_warn_counter") intValue]; - if(launchNum > 0) { - setPreference(@"unsupported_warn_counter", @(launchNum - 1)); - } else { - setPreference(@"unsupported_warn_counter", @(30)); - } - - if(!getenv("POJAV_DETECTEDJB") && [getPreference(@"ram_unjb_warn") boolValue] == YES && [getPreference(@"auto_ram") boolValue] == NO) { - UIAlertController *ramalert = [UIAlertController alertControllerWithTitle:localize(@"login.warn.title.ram_unjb", nil) message:localize(@"login.warn.message.ram_unjb", nil) preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction *ok = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleCancel handler:nil]; - [self presentViewController:ramalert animated:YES completion:nil]; - [ramalert addAction:ok]; - setPreference(@"ram_unjb_warn", @NO); - } } - (void)splitViewController:(UISplitViewController *)svc willChangeToDisplayMode:(UISplitViewControllerDisplayMode)displayMode { diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car index 24f2db3b..49a965ee 100644 Binary files a/Natives/resources/Assets.car and b/Natives/resources/Assets.car differ