diff --git a/.gitmodules b/.gitmodules index c7a66354..486774ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,6 +8,3 @@ [submodule "Natives/external/AFNetworking"] path = Natives/external/AFNetworking url = https://github.com/AFNetworking/AFNetworking -[submodule "Natives/external/TOInsetGroupedTableView"] - path = Natives/external/TOInsetGroupedTableView - url = https://github.com/TimOliver/TOInsetGroupedTableView diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt index 64207f16..5dc632cc 100644 --- a/Natives/CMakeLists.txt +++ b/Natives/CMakeLists.txt @@ -22,7 +22,6 @@ include_directories( "external/AFNetworking/UIKit+AFNetworking" "external/DBNumberedSlider/Classes" "external/NRFileManager" - "external/TOInsetGroupedTableView/TOInsetGroupedTableView" "external/fishhook" "external/mesa" "external/AltKit" @@ -115,7 +114,6 @@ add_executable(PojavLauncher external/DBNumberedSlider/Classes/DBNumberedSlider.m external/NRFileManager/NSFileManager+NRFileManager.m - external/TOInsetGroupedTableView/TOInsetGroupedTableView/TOInsetGroupedTableView.m external/ballpa1n/HostManager.c external/ballpa1n/wrapped/HostManagerBridge.m diff --git a/Natives/Info.plist b/Natives/Info.plist index c9bd9219..43179c27 100644 --- a/Natives/Info.plist +++ b/Natives/Info.plist @@ -82,7 +82,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.2 + 3.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/Natives/LauncherPrefContCfgViewController.m b/Natives/LauncherPrefContCfgViewController.m index 1e27fe87..2b45c7d1 100644 --- a/Natives/LauncherPrefContCfgViewController.m +++ b/Natives/LauncherPrefContCfgViewController.m @@ -8,7 +8,6 @@ #import "LauncherPreferences.h" #import "LauncherPrefContCfgViewController.h" #import "PickTextField.h" -#import "TOInsetGroupedTableView.h" #import "ios_uikit_bridge.h" #import "utils.h" @@ -45,7 +44,7 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *); self.keyValueMap = [[NSMutableArray alloc] init]; initKeycodeTable(self.keyCodeMap, self.keyValueMap); - self.tableView = [[TOInsetGroupedTableView alloc] init]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleInsetGrouped]; self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive; self.tableView.sectionFooterHeight = 50; diff --git a/Natives/LauncherPrefGameDirViewController.m b/Natives/LauncherPrefGameDirViewController.m index 3d895a07..eb54e532 100644 --- a/Natives/LauncherPrefGameDirViewController.m +++ b/Natives/LauncherPrefGameDirViewController.m @@ -2,7 +2,6 @@ #import "LauncherPreferences.h" #import "LauncherPrefGameDirViewController.h" #import "NSFileManager+NRFileManager.h" -#import "TOInsetGroupedTableView.h" #import "ios_uikit_bridge.h" #import "utils.h" @@ -20,7 +19,7 @@ self.array = [[NSMutableArray alloc] init]; [self.array addObject:@"default"]; - self.tableView = [[TOInsetGroupedTableView alloc] init]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleInsetGrouped]; self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive; self.tableView.sectionFooterHeight = 50; diff --git a/Natives/LauncherPreferencesViewController.m b/Natives/LauncherPreferencesViewController.m index cfa748c7..06453c8d 100644 --- a/Natives/LauncherPreferencesViewController.m +++ b/Natives/LauncherPreferencesViewController.m @@ -8,7 +8,6 @@ #import "LauncherPreferencesViewController.h" #import "LauncherPrefContCfgViewController.h" #import "LauncherPrefGameDirViewController.h" -#import "TOInsetGroupedTableView.h" #import "UIKit+hook.h" #import "config.h" @@ -44,7 +43,7 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *); self.prefDetailVisible = self.navigationController == nil; - self.tableView = [[TOInsetGroupedTableView alloc] init]; + self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleInsetGrouped]; self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive; if (self.navigationController == nil) { diff --git a/README.md b/README.md index 36e0de1f..b4f0194a 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,6 @@ PojavLauncher is amazing, and surprisingly stable, and it wouldn't be this way w - [Java Native Access](https://github.com/java-native-access/jna): [Apache 2.0 License](https://github.com/java-native-access/jna/blob/master/LICENSE). - [shaderc](https://github.com/khanhduytran0/shaderc) (used by Vulkan rendering mods): [Apache 2.0 License](https://github.com/google/shaderc/blob/main/LICENSE). - [NRFileManager](https://github.com/mozilla-mobile/firefox-ios/tree/b2f89ac40835c5988a1a3eb642982544e00f0f90/ThirdParty/NRFileManager): [MPL-2.0 License](https://www.mozilla.org/en-US/MPL/2.0) -- [TOInsetGroupedTableView](https://github.com/TimOliver/TOInsetGroupedTableView): [MIT License](https://github.com/TimOliver/TOInsetGroupedTableView/blob/master/LICENSE). - [AltKit](https://github.com/rileytestut/AltKit) - Thanks to [MCHeads](https://mc-heads.net) for providing Minecraft avatars.