Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support iPhone X #246

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Support iPhone X #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b5a97a2
Fix build error
Shvier Feb 26, 2018
cde7a96
Hide tableView sparatorLine
Shvier Feb 26, 2018
8d0765a
Hide tableView extra sparatorLine
Shvier Feb 26, 2018
7960a79
Enable autolayout for RomDownloader
Shvier Feb 26, 2018
118bd56
Hide sparatorLine for ReportRomTableViewController
Shvier Feb 26, 2018
4f6740b
Fix interaction for tableView
Shvier Feb 26, 2018
865c4d9
Fix navigationBackButton offset for iOS 11
Shvier Feb 27, 2018
6dddbbf
Disable autolayout
Shvier Feb 27, 2018
87fdff9
Update GamePanel for iPhoneX
Shvier Feb 28, 2018
c8f2b66
Hide extra cell for SettingTableViewController
Shvier Mar 1, 2018
849bcd3
Reduce offsetY for trigger
Shvier Mar 1, 2018
bf03918
Update gameScreenSize for iPhone X when landscape
Shvier Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions iNDS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 = "<group>"; };
C0521479204505F100B6C336 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = "Base.lproj/iNDS-Info.plist"; sourceTree = "<group>"; };
C052147B204505F800B6C336 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hans"; path = "zh-Hans.lproj/iNDS-Info.plist"; sourceTree = "<group>"; };
C052147C204505FE00B6C336 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hant"; path = "zh-Hant.lproj/iNDS-Info.plist"; sourceTree = "<group>"; };
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 = "<group>"; };
Expand Down Expand Up @@ -681,7 +687,6 @@
CAB2C40C1CB2033600ED22BB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
CAB2C40D1CB2033600ED22BB /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
CAB2C4251CB2039B00ED22BB /* iNDSEmulatorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iNDSEmulatorViewController.mm; sourceTree = "<group>"; };
CAB2C4291CB2041900ED22BB /* iNDS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iNDS-Info.plist"; sourceTree = "<group>"; };
CAB2C42B1CB21C2000ED22BB /* cheats.7z */ = {isa = PBXFileReference; lastKnownFileType = file; name = cheats.7z; path = Resources/cheats/cheats.7z; sourceTree = "<group>"; };
CAB2C42C1CB21D8E00ED22BB /* UnrarKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UnrarKit.framework; sourceTree = "<group>"; };
CAB2C42F1CB222AF00ED22BB /* cheats.rar */ = {isa = PBXFileReference; lastKnownFileType = file; name = cheats.rar; path = Resources/cheats/cheats.rar; sourceTree = "<group>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -1027,6 +1033,7 @@
BFCFE0F11764FBD3000A70CF /* Frameworks */,
BFCFE0F01764FBD3000A70CF /* Products */,
CA32245E1CCD4C2400C5BEA7 /* OptimizationProfiles */,
C053F72E20444EBF00927158 /* Recovered References */,
);
sourceTree = "<group>";
};
Expand All @@ -1041,6 +1048,7 @@
BFCFE0F11764FBD3000A70CF /* Frameworks */ = {
isa = PBXGroup;
children = (
C052147D20450E8100B6C336 /* Photos.framework */,
CA6E609B1CB0574B000B269D /* MobileCoreServices.framework */,
CA8EA1411C37C42E0082A3F8 /* MediaPlayer.framework */,
CABE38971C30FA9800BE8857 /* libsqlite3.tbd */,
Expand Down Expand Up @@ -1070,6 +1078,7 @@
BFCFE0F81764FBD3000A70CF /* Main */ = {
isa = PBXGroup;
children = (
C01A07F420446740003E5852 /* Global */,
9C8DDCCD19FDD8D500D03AB2 /* App Init */,
BFCFE12F17650ED0000A70CF /* DeSmuME */,
BF9D51751786A60E00B5864B /* Settings */,
Expand All @@ -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";
Expand Down Expand Up @@ -1291,6 +1300,22 @@
path = ../desmume/src/JIT;
sourceTree = "<group>";
};
C01A07F420446740003E5852 /* Global */ = {
isa = PBXGroup;
children = (
C01A07F520446752003E5852 /* CommonMacro.h */,
);
path = Global;
sourceTree = "<group>";
};
C053F72E20444EBF00927158 /* Recovered References */ = {
isa = PBXGroup;
children = (
8B28306A178DDC7F00E92785 /* iNDSDonationViewController.m */,
);
name = "Recovered References";
sourceTree = "<group>";
};
CA031CBB1BEBDC3500EDE98D /* Zip */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -2096,6 +2126,16 @@
name = Localizable.strings;
sourceTree = "<group>";
};
C052147A204505F100B6C336 /* iNDS-Info.plist */ = {
isa = PBXVariantGroup;
children = (
C0521479204505F100B6C336 /* Base */,
C052147B204505F800B6C336 /* zh-Hans */,
C052147C204505FE00B6C336 /* zh-Hant */,
);
name = "iNDS-Info.plist";
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -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)",
Expand All @@ -2238,6 +2279,7 @@
"\"$(SRCROOT)/iNDS/Reveal\"",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/iNDS/frameworks",
"\"$(SRCROOT)/\"",
);
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -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";
Expand All @@ -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)",
Expand All @@ -2292,6 +2335,7 @@
"\"$(SRCROOT)/iNDS/Reveal\"",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/iNDS/frameworks",
"\"$(SRCROOT)/\"",
);
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion iNDS/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];


Expand Down
Loading