diff --git a/iNDS.xcodeproj/project.pbxproj b/iNDS.xcodeproj/project.pbxproj index 00583ce..fa18a0d 100644 --- a/iNDS.xcodeproj/project.pbxproj +++ b/iNDS.xcodeproj/project.pbxproj @@ -140,6 +140,8 @@ BFCFE246176634EE000A70CF /* slot2_piano.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFCFE23A176634EE000A70CF /* slot2_piano.cpp */; }; BFCFE247176634EE000A70CF /* slot2_rumblepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFCFE23B176634EE000A70CF /* slot2_rumblepak.cpp */; }; BFCFE26B1766379F000A70CF /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFCFE13017650FB0000A70CF /* addons.cpp */; }; + C0521478204505F100B6C336 /* iNDS-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C052147A204505F100B6C336 /* iNDS-Info.plist */; }; + C052147E20450E8100B6C336 /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C052147D20450E8100B6C336 /* Photos.framework */; }; C345B67218906BB40065A795 /* iNDSMFIControllerSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = C345B67118906BB40065A795 /* iNDSMFIControllerSupport.mm */; }; CA031AB01BE951B700EDE98D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CA031AAF1BE951B700EDE98D /* Images.xcassets */; }; CA031ADF1BEB103B00EDE98D /* iNDSRomDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = CA031ADE1BEB103B00EDE98D /* iNDSRomDownloader.m */; }; @@ -210,7 +212,6 @@ CAA59B131CAC778D0084AB5D /* iNDSBugReportSaveStateTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAA59B121CAC778D0084AB5D /* iNDSBugReportSaveStateTableViewController.m */; }; CAB2C40E1CB2033600ED22BB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB2C40D1CB2033600ED22BB /* AppDelegate.m */; }; CAB2C4261CB2039B00ED22BB /* iNDSEmulatorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CAB2C4251CB2039B00ED22BB /* iNDSEmulatorViewController.mm */; }; - CAB2C42A1CB2041900ED22BB /* iNDS-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = CAB2C4291CB2041900ED22BB /* iNDS-Info.plist */; }; CAB2C4301CB2234300ED22BB /* cheats.rar in Resources */ = {isa = PBXBuildFile; fileRef = CAB2C42F1CB222AF00ED22BB /* cheats.rar */; }; CAB2C4311CB2234300ED22BB /* cheats.7z in Resources */ = {isa = PBXBuildFile; fileRef = CAB2C42B1CB21C2000ED22BB /* cheats.7z */; }; CAB2C4391CB2D86C00ED22BB /* iNDSGameTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB2C4371CB2D86C00ED22BB /* iNDSGameTableView.m */; }; @@ -545,6 +546,11 @@ BFCFE239176634EE000A70CF /* slot2_paddle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2_paddle.cpp; path = desmume/src/addons/slot2_paddle.cpp; sourceTree = SOURCE_ROOT; }; BFCFE23A176634EE000A70CF /* slot2_piano.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2_piano.cpp; path = desmume/src/addons/slot2_piano.cpp; sourceTree = SOURCE_ROOT; }; BFCFE23B176634EE000A70CF /* slot2_rumblepak.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = slot2_rumblepak.cpp; path = desmume/src/addons/slot2_rumblepak.cpp; sourceTree = SOURCE_ROOT; }; + C01A07F520446752003E5852 /* CommonMacro.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonMacro.h; sourceTree = ""; }; + C0521479204505F100B6C336 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = "Base.lproj/iNDS-Info.plist"; sourceTree = ""; }; + C052147B204505F800B6C336 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hans"; path = "zh-Hans.lproj/iNDS-Info.plist"; sourceTree = ""; }; + C052147C204505FE00B6C336 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hant"; path = "zh-Hant.lproj/iNDS-Info.plist"; sourceTree = ""; }; + C052147D20450E8100B6C336 /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; }; C345B67018906BB40065A795 /* iNDSMFIControllerSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iNDSMFIControllerSupport.h; path = iNDS/controls/iNDSMFIControllerSupport.h; sourceTree = SOURCE_ROOT; }; C345B67118906BB40065A795 /* iNDSMFIControllerSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = iNDSMFIControllerSupport.mm; path = iNDS/controls/iNDSMFIControllerSupport.mm; sourceTree = SOURCE_ROOT; }; CA031AAF1BE951B700EDE98D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; @@ -681,7 +687,6 @@ CAB2C40C1CB2033600ED22BB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; CAB2C40D1CB2033600ED22BB /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; CAB2C4251CB2039B00ED22BB /* iNDSEmulatorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iNDSEmulatorViewController.mm; sourceTree = ""; }; - CAB2C4291CB2041900ED22BB /* iNDS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iNDS-Info.plist"; sourceTree = ""; }; CAB2C42B1CB21C2000ED22BB /* cheats.7z */ = {isa = PBXFileReference; lastKnownFileType = file; name = cheats.7z; path = Resources/cheats/cheats.7z; sourceTree = ""; }; CAB2C42C1CB21D8E00ED22BB /* UnrarKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UnrarKit.framework; sourceTree = ""; }; CAB2C42F1CB222AF00ED22BB /* cheats.rar */ = {isa = PBXFileReference; lastKnownFileType = file; name = cheats.rar; path = Resources/cheats/cheats.rar; sourceTree = ""; }; @@ -805,6 +810,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C052147E20450E8100B6C336 /* Photos.framework in Frameworks */, CA3224E31CD41D7C00C5BEA7 /* Security.framework in Frameworks */, CA6E609C1CB0574B000B269D /* MobileCoreServices.framework in Frameworks */, CA8EA1421C37C42E0082A3F8 /* MediaPlayer.framework in Frameworks */, @@ -1027,6 +1033,7 @@ BFCFE0F11764FBD3000A70CF /* Frameworks */, BFCFE0F01764FBD3000A70CF /* Products */, CA32245E1CCD4C2400C5BEA7 /* OptimizationProfiles */, + C053F72E20444EBF00927158 /* Recovered References */, ); sourceTree = ""; }; @@ -1041,6 +1048,7 @@ BFCFE0F11764FBD3000A70CF /* Frameworks */ = { isa = PBXGroup; children = ( + C052147D20450E8100B6C336 /* Photos.framework */, CA6E609B1CB0574B000B269D /* MobileCoreServices.framework */, CA8EA1411C37C42E0082A3F8 /* MediaPlayer.framework */, CABE38971C30FA9800BE8857 /* libsqlite3.tbd */, @@ -1070,6 +1078,7 @@ BFCFE0F81764FBD3000A70CF /* Main */ = { isa = PBXGroup; children = ( + C01A07F420446740003E5852 /* Global */, 9C8DDCCD19FDD8D500D03AB2 /* App Init */, BFCFE12F17650ED0000A70CF /* DeSmuME */, BF9D51751786A60E00B5864B /* Settings */, @@ -1094,7 +1103,7 @@ children = ( AE2F3B5E18EF7F5A007A4BA0 /* Localizable.strings */, 8BEA0991178733DB0060B347 /* iNDS-Prefix.pch */, - CAB2C4291CB2041900ED22BB /* iNDS-Info.plist */, + C052147A204505F100B6C336 /* iNDS-Info.plist */, 8BEA097B17872C5E0060B347 /* main.m */, ); name = "Supporting Files"; @@ -1291,6 +1300,22 @@ path = ../desmume/src/JIT; sourceTree = ""; }; + C01A07F420446740003E5852 /* Global */ = { + isa = PBXGroup; + children = ( + C01A07F520446752003E5852 /* CommonMacro.h */, + ); + path = Global; + sourceTree = ""; + }; + C053F72E20444EBF00927158 /* Recovered References */ = { + isa = PBXGroup; + children = ( + 8B28306A178DDC7F00E92785 /* iNDSDonationViewController.m */, + ); + name = "Recovered References"; + sourceTree = ""; + }; CA031CBB1BEBDC3500EDE98D /* Zip */ = { isa = PBXGroup; children = ( @@ -1756,6 +1781,11 @@ CLASSPREFIX = iNDS; LastUpgradeCheck = 0700; ORGANIZATIONNAME = iNDS; + TargetAttributes = { + BFCFE0EE1764FBD3000A70CF = { + DevelopmentTeam = PGNG7584J8; + }; + }; }; buildConfigurationList = BFCFE0EA1764FBD3000A70CF /* Build configuration list for PBXProject "iNDS" */; compatibilityVersion = "Xcode 3.2"; @@ -1815,7 +1845,7 @@ BF9D516B17867F7D00B5864B /* DPad@2x.png in Resources */, CABE38C71C34B8C600BE8857 /* Sync@2x.png in Resources */, CABE38C61C34B8C600BE8857 /* Sync.png in Resources */, - CAB2C42A1CB2041900ED22BB /* iNDS-Info.plist in Resources */, + C0521478204505F100B6C336 /* iNDS-Info.plist in Resources */, BF9D516C17867F7D00B5864B /* JoystickBackground.png in Resources */, BF9D516D17867F7D00B5864B /* JoystickBackground@2x.png in Resources */, BF9D516E17867F7D00B5864B /* JoystickButton.png in Resources */, @@ -2096,6 +2126,16 @@ name = Localizable.strings; sourceTree = ""; }; + C052147A204505F100B6C336 /* iNDS-Info.plist */ = { + isa = PBXVariantGroup; + children = ( + C0521479204505F100B6C336 /* Base */, + C052147B204505F800B6C336 /* zh-Hans */, + C052147C204505FE00B6C336 /* zh-Hant */, + ); + name = "iNDS-Info.plist"; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -2229,6 +2269,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1.6.0; + DEVELOPMENT_TEAM = PGNG7584J8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -2238,6 +2279,7 @@ "\"$(SRCROOT)/iNDS/Reveal\"", "$(PROJECT_DIR)", "$(PROJECT_DIR)/iNDS/frameworks", + "\"$(SRCROOT)/\"", ); GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2261,7 +2303,7 @@ "-ObjC", "$(inherited)", ); - PRODUCT_BUNDLE_IDENTIFIER = com.ApprenticeMediaLLC.iNDS; + PRODUCT_BUNDLE_IDENTIFIER = com.Shvier.iNDS; PRODUCT_NAME = iNDS; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2283,6 +2325,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1.6.0; + DEVELOPMENT_TEAM = PGNG7584J8; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -2292,6 +2335,7 @@ "\"$(SRCROOT)/iNDS/Reveal\"", "$(PROJECT_DIR)", "$(PROJECT_DIR)/iNDS/frameworks", + "\"$(SRCROOT)/\"", ); GCC_OPTIMIZATION_LEVEL = fast; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2315,7 +2359,7 @@ "-ObjC", "$(inherited)", ); - PRODUCT_BUNDLE_IDENTIFIER = com.ApprenticeMediaLLC.iNDS; + PRODUCT_BUNDLE_IDENTIFIER = com.Shvier.iNDS; PRODUCT_NAME = iNDS; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/iNDS/AppDelegate.m b/iNDS/AppDelegate.m index 0a43c5c..4aebc6a 100644 --- a/iNDS/AppDelegate.m +++ b/iNDS/AppDelegate.m @@ -59,7 +59,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [self.window setTintColor:[UIColor colorWithRed:1 green:59/255.0 blue:48/255.0 alpha:1]]; - [[UIBarButtonItem appearance] setBackButtonTitlePositionAdjustment:UIOffsetMake(0, -60) + [[UIBarButtonItem appearance] setBackButtonTitlePositionAdjustment:UIOffsetMake(-200, 0) forBarMetrics:UIBarMetricsDefault]; diff --git a/iNDS/Base.lproj/MainStoryboard.storyboard b/iNDS/Base.lproj/MainStoryboard.storyboard index f21fb4b..68f7877 100755 --- a/iNDS/Base.lproj/MainStoryboard.storyboard +++ b/iNDS/Base.lproj/MainStoryboard.storyboard @@ -1,34 +1,46 @@ - - + + + + + - + + + + + AlNile-Bold + + + Menlo-Regular + + - + - + - + - + - - + + @@ -37,25 +49,25 @@ - - + + - + - + - + - - + + @@ -64,79 +76,79 @@ - - + + - + - + - + - - + + - + - + - + - - + + - + - + - + - - + + @@ -145,57 +157,57 @@ - - + + - + - + - + - - + + - + - + - + @@ -204,107 +216,107 @@ - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - + - - + + @@ -313,12 +325,12 @@ - - + + - + @@ -326,17 +338,17 @@ Enabling Dropbox will add an "iNDS" folder to your Dropbox account. Your game saves will be synced back to that folder so it will carry across devices (iPhone, iPad, iPod touch, Android, PC, etc). - + - + - - + + @@ -345,47 +357,47 @@ - - + + - + - + - + - + - + - + - - + + @@ -394,183 +406,183 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -579,12 +591,12 @@ - - + + - + @@ -597,7 +609,6 @@ - @@ -634,41 +645,41 @@ - + - + - - + - + - + - @@ -823,35 +833,35 @@ - - + + - + - + - + @@ -891,49 +901,53 @@ - + + + + + - - - + + + - - - + - + @@ -943,7 +957,7 @@ - + @@ -963,34 +977,34 @@ - + - + - + - + @@ -1010,12 +1024,12 @@ - + - - + + - + @@ -1032,17 +1046,16 @@ - + - + - + - @@ -1057,13 +1070,13 @@ - + - - + + - - + + @@ -1080,28 +1093,28 @@ - + - + - + - + - + - + - + @@ -1113,82 +1126,82 @@ - + - + - + - + - + - + - + - + @@ -1209,7 +1222,7 @@ - + @@ -1236,9 +1249,8 @@ - - + @@ -1256,12 +1268,12 @@ - + - - + + - + @@ -1280,7 +1292,7 @@ - + @@ -1288,25 +1300,25 @@ - + - + @@ -1315,26 +1327,26 @@ - + - + @@ -1343,19 +1355,19 @@ - + - + @@ -1364,31 +1376,31 @@ - + - + - + @@ -1406,25 +1418,25 @@ - + - + - + @@ -1433,37 +1445,37 @@ - + - + - + - + @@ -1491,7 +1503,7 @@ - + @@ -1499,14 +1511,14 @@ - + @@ -1516,14 +1528,14 @@ - + @@ -1533,14 +1545,14 @@ - + @@ -1550,14 +1562,14 @@ - + @@ -1584,15 +1596,15 @@ - + - + - + @@ -1609,16 +1621,16 @@ - + - + - + @@ -1659,13 +1671,13 @@ - + - + - + @@ -1697,13 +1709,13 @@ - + - + - + @@ -1726,13 +1738,13 @@ - + - + @@ -1755,32 +1767,32 @@ - + - + - + - + @@ -1812,9 +1824,9 @@ - + - + @@ -1826,12 +1838,12 @@ - + - - + + - + @@ -1846,7 +1858,7 @@ - + @@ -1857,5 +1869,5 @@ - + diff --git a/iNDS/Base.lproj/iNDS-Info.plist b/iNDS/Base.lproj/iNDS-Info.plist new file mode 100755 index 0000000..76bbe18 --- /dev/null +++ b/iNDS/Base.lproj/iNDS-Info.plist @@ -0,0 +1,241 @@ + + + + + NSPhotoLibraryUsageDescription + Need Permission to Access Photos + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleDocumentTypes + + + CFBundleTypeName + All Files + LSItemContentTypes + + public.content + public.data + + + + CFBundleTypeIconFiles + + Document-molecules-320.png + Document-molecules-64.png + + CFBundleTypeName + iNDS Zip + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + com.pkware.zip-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + iNDS 7z + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + org.7-zip.7-zip-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + iNDS Rar + CFBundleTypeRole + Owner + LSHandlerRank + Viewer + LSItemContentTypes + + com.rarlab.rar-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + iNDS nds + CFBundleTypeRole + Owner + LSHandlerRank + Viewer + LSItemContentTypes + + net.psychosity.nds + + + + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIcons + + CFBundleIcons~ipad + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER)${BUNDLE_ID_SUFFIX} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} ${BUNDLE_DISPLAY_NAME_SUFFIX} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.4.1 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleIdentifier + + CFBundleTypeRole + Viewer + CFBundleURLIconFile + ABXYPad + CFBundleURLSchemes + + db-ks1ulr086qvvy1k + + + + CFBundleVersion + 2 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + UIFileSharingEnabled + + UILaunchStoryboardName + MainStoryboard + UIMainStoryboardFile + MainStoryboard + UIPrerenderedIcon + + UIRequiredDeviceCapabilities + + armv7 + + UIStatusBarHidden + + UIStatusBarStyle + UIStatusBarStyleLightContent + UIStatusBarTintParameters + + UINavigationBar + + Style + UIBarStyleDefault + Translucent + + + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown + + UIViewControllerBasedStatusBarAppearance + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS ROM + UTTypeIdentifier + net.psychosity.nds + UTTypeTagSpecification + + public.filename-extension + iNDS + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS 7z + UTTypeIdentifier + org.7-zip.7-zip-archive + UTTypeTagSpecification + + public.filename-extension + 7z + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS Rar + UTTypeIdentifier + com.rarlab.rar-archive + UTTypeTagSpecification + + public.filename-extension + rar + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS nds + UTTypeIdentifier + net.psychosity.nds + UTTypeTagSpecification + + public.filename-extension + nds + + + + UTImportedTypeDeclarations + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS nds + UTTypeIdentifier + net.psychosity.nds + UTTypeTagSpecification + + public.filename-extension + nds + + + + + diff --git a/iNDS/Global/CommonMacro.h b/iNDS/Global/CommonMacro.h new file mode 100644 index 0000000..7e93e9a --- /dev/null +++ b/iNDS/Global/CommonMacro.h @@ -0,0 +1,23 @@ +// +// CommonMacro.h +// iNDS +// +// Created by Shvier on 27/02/2018. +// Copyright © 2018 iNDS. All rights reserved. +// + +#ifndef CommonMacro_h +#define CommonMacro_h + +#define ScreenWidth \ +([[UIScreen mainScreen] respondsToSelector:@selector(nativeBounds)] ? [UIScreen mainScreen].nativeBounds.size.width/[UIScreen mainScreen].nativeScale : CGRectGetWidth([[UIScreen mainScreen] bounds])) + +#define ScreenHeight \ +([[UIScreen mainScreen] respondsToSelector:@selector(nativeBounds)] ? [UIScreen mainScreen].nativeBounds.size.height/[UIScreen mainScreen].nativeScale : CGRectGetHeight([[UIScreen mainScreen] bounds])) + +#define ScreenMaxLength (MAX(ScreenWidth, ScreenHeight)) +#define IsiPhone (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) + +#define IsiPhoneX (IsiPhone && ScreenMaxLength == 812.0) + +#endif /* CommonMacro_h */ diff --git a/iNDS/iNDSBugReportRomTableViewController.m b/iNDS/iNDSBugReportRomTableViewController.m index 7e480ac..721e69a 100755 --- a/iNDS/iNDSBugReportRomTableViewController.m +++ b/iNDS/iNDSBugReportRomTableViewController.m @@ -11,8 +11,15 @@ #import "iNDSGame.h" @implementation iNDSBugReportRomTableViewController +- (void)configUI +{ + self.tableView.tableFooterView = [UIView new]; +} + - (void)viewDidLoad { + [super viewDidLoad]; + [self configUI]; self.navigationItem.title = NSLocalizedString(@"ROM_LIST", nil); } diff --git a/iNDS/iNDSBugReportTableViewController.m b/iNDS/iNDSBugReportTableViewController.m index 1f7e98e..71fd3aa 100755 --- a/iNDS/iNDSBugReportTableViewController.m +++ b/iNDS/iNDSBugReportTableViewController.m @@ -35,8 +35,21 @@ @interface iNDSBugReportTableViewController () 1) { dispatch_async(dispatch_get_main_queue(), ^{ - self.fpsLabel.text = [NSString stringWithFormat:@"%d FPS %d Max Core", MIN((int)videoFps, 60), (int)(coreFps / self.speed)]; + if (IsiPhoneX) { + self.fpsLabel.text = [NSString stringWithFormat:@"FPS %d\nMax Core %d", MIN((int)videoFps, 60), (int)(coreFps / self.speed)]; + } else { + self.fpsLabel.text = [NSString stringWithFormat:@"FPS %d Max Core %d", MIN((int)videoFps, 60), (int)(coreFps / self.speed)]; + } }); fpsUpdateTime = CACurrentMediaTime(); } diff --git a/iNDS/iNDSGameTableView.m b/iNDS/iNDSGameTableView.m index 2adedb3..6a167ba 100755 --- a/iNDS/iNDSGameTableView.m +++ b/iNDS/iNDSGameTableView.m @@ -17,9 +17,15 @@ @interface iNDSGameTableView() { @implementation iNDSGameTableView +- (void)configUI +{ + self.tableView.tableFooterView = [UIView new]; +} + -(void) viewDidLoad { [super viewDidLoad]; + [self configUI]; self.navigationItem.title = _game.gameTitle; [[AppDelegate sharedInstance].currentEmulatorViewController.settingsContainer addObserver:self forKeyPath:@"hidden" options:NSKeyValueObservingOptionNew context:nil]; diff --git a/iNDS/iNDSSettingsTableViewController.m b/iNDS/iNDSSettingsTableViewController.m index f0dcc7a..79950a2 100644 --- a/iNDS/iNDSSettingsTableViewController.m +++ b/iNDS/iNDSSettingsTableViewController.m @@ -23,8 +23,14 @@ @interface iNDSSettingsTableViewController () { @implementation iNDSSettingsTableViewController +- (void)configUI +{ + self.tableView.tableFooterView = [UIView new]; +} + - (void)viewDidLoad { [super viewDidLoad]; + [self configUI]; self.navigationController.delegate = self; } diff --git a/iNDS/roms/iNDSROMTableViewController.m b/iNDS/roms/iNDSROMTableViewController.m index 32c3d01..0eefda4 100644 --- a/iNDS/roms/iNDSROMTableViewController.m +++ b/iNDS/roms/iNDSROMTableViewController.m @@ -27,9 +27,15 @@ @interface iNDSROMTableViewController () { @implementation iNDSROMTableViewController +- (void)configUI +{ + self.tableView.tableFooterView = [UIView new]; +} + - (void)viewDidLoad { [super viewDidLoad]; + [self configUI]; [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; self.navigationItem.title = NSLocalizedString(@"ROM_LIST", nil); activeDownloads = [[iNDSRomDownloadManager sharedManager] activeDownloads]; diff --git a/iNDS/support/iNDS-Prefix.pch b/iNDS/support/iNDS-Prefix.pch index 662b95a..5029838 100755 --- a/iNDS/support/iNDS-Prefix.pch +++ b/iNDS/support/iNDS-Prefix.pch @@ -11,6 +11,7 @@ #ifdef __OBJC__ #import #import + #import "CommonMacro.h" #endif // needs refactor later. diff --git a/iNDS/iNDS-Info.plist b/iNDS/zh-Hans.lproj/iNDS-Info.plist similarity index 98% rename from iNDS/iNDS-Info.plist rename to iNDS/zh-Hans.lproj/iNDS-Info.plist index a04d5aa..9d04b37 100755 --- a/iNDS/iNDS-Info.plist +++ b/iNDS/zh-Hans.lproj/iNDS-Info.plist @@ -2,6 +2,8 @@ + NSPhotoLibraryUsageDescription + 需要权限来访问照片库 CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/iNDS/zh-Hant.lproj/iNDS-Info.plist b/iNDS/zh-Hant.lproj/iNDS-Info.plist new file mode 100755 index 0000000..4093c49 --- /dev/null +++ b/iNDS/zh-Hant.lproj/iNDS-Info.plist @@ -0,0 +1,241 @@ + + + + + NSPhotoLibraryUsageDescription + 需要權限來訪問照片庫 + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleDocumentTypes + + + CFBundleTypeName + All Files + LSItemContentTypes + + public.content + public.data + + + + CFBundleTypeIconFiles + + Document-molecules-320.png + Document-molecules-64.png + + CFBundleTypeName + iNDS Zip + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + com.pkware.zip-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + iNDS 7z + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + org.7-zip.7-zip-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + iNDS Rar + CFBundleTypeRole + Owner + LSHandlerRank + Viewer + LSItemContentTypes + + com.rarlab.rar-archive + + + + CFBundleTypeIconFiles + + CFBundleTypeName + iNDS nds + CFBundleTypeRole + Owner + LSHandlerRank + Viewer + LSItemContentTypes + + net.psychosity.nds + + + + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIcons + + CFBundleIcons~ipad + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER)${BUNDLE_ID_SUFFIX} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} ${BUNDLE_DISPLAY_NAME_SUFFIX} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.4.1 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleIdentifier + + CFBundleTypeRole + Viewer + CFBundleURLIconFile + ABXYPad + CFBundleURLSchemes + + db-ks1ulr086qvvy1k + + + + CFBundleVersion + 2 + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + UIFileSharingEnabled + + UILaunchStoryboardName + MainStoryboard + UIMainStoryboardFile + MainStoryboard + UIPrerenderedIcon + + UIRequiredDeviceCapabilities + + armv7 + + UIStatusBarHidden + + UIStatusBarStyle + UIStatusBarStyleLightContent + UIStatusBarTintParameters + + UINavigationBar + + Style + UIBarStyleDefault + Translucent + + + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown + + UIViewControllerBasedStatusBarAppearance + + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS ROM + UTTypeIdentifier + net.psychosity.nds + UTTypeTagSpecification + + public.filename-extension + iNDS + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS 7z + UTTypeIdentifier + org.7-zip.7-zip-archive + UTTypeTagSpecification + + public.filename-extension + 7z + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS Rar + UTTypeIdentifier + com.rarlab.rar-archive + UTTypeTagSpecification + + public.filename-extension + rar + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS nds + UTTypeIdentifier + net.psychosity.nds + UTTypeTagSpecification + + public.filename-extension + nds + + + + UTImportedTypeDeclarations + + + UTTypeConformsTo + + public.data + + UTTypeDescription + iNDS nds + UTTypeIdentifier + net.psychosity.nds + UTTypeTagSpecification + + public.filename-extension + nds + + + + +