Commit 3a48c9e

committed

Add iPhone 15/Plus, move more devices to 'Older Devices' toggle

(Pro/Max needs tsschecker update)

1 parent d5a747f commit 3a48c9eCopy full SHA for 3a48c9e

File tree

+15

-11

lines changed

+15

-11

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,8 @@ application {`
`77`	`77`	`applicationDefaultJvmArgs.add addExports`
`78`	`78`	`}`
`79`	`79`
`80`		`-private String getJarDirectory() {`
`81`		`- var dir = ''`
`82`		`- if (DefaultNativePlatform.currentOperatingSystem.isMacOsX()) dir = 'macos/Contents'`
`83`		`- else if (DefaultNativePlatform.currentOperatingSystem.isWindows()) dir = 'windows/files'`
`84`		`- else if (DefaultNativePlatform.currentOperatingSystem.isLinux()) dir = 'linux'`
`85`		`- return "${projectDir}/dist/${dir}"`
`86`		`-}`
	`80`	`+var jarDirectory = os.isMacOsX() ? 'macos/Contents' : os.isWindows() ? 'windows/files' : 'linux'`
	`81`	`+jarDirectory = "${projectDir}/dist/${jarDirectory}"`
`87`	`82`
`88`	`83`	`run {`
`89`	`84`	`systemProperty 'jar.directory', jarDirectory`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ private void useMacOSMenuBar() {`
`392`	`392`	`new SeparatorMenuItem(), tk.createBringAllToFrontItem());`
`393`	`393`	`tk.autoAddWindowMenuItems(menuBar.getMenus().get(3));`
`394`	`394`
`395`		`- menuBar.getMenus().get(4).getItems().remove(11); // remove about`
	`395`	`+ menuBar.getMenus().get(4).getItems().removeLast(); // remove about`
`396`	`396`
`397`	`397`	`tk.setApplicationMenu(applicationMenu);`
`398`	`398`	`tk.setGlobalMenuBar(menuBar);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ public static void updateLists() {`
`73`	`73`	`if (Prefs.getShowOldDevices()) {`
`74`	`74`	`iPhoneList.setAll(iPhones);`
`75`	`75`	`iPadList.setAll(iPads);`
`76`		`- } else if (!iPhoneList.get(0).equals("iPhone 6s")) {`
`77`		`- iPhoneList.remove(0, iPhoneList.indexOf("iPhone 6s"));`
`78`		`- iPadList.remove(0, iPadList.indexOf("iPad Mini 4 (Wifi)"));`
	`76`	`+ } else if (!iPhoneList.get(0).equals("iPhone 8 (iPhone10,1)")) {`
	`77`	`+ iPhoneList.remove(0, iPhoneList.indexOf("iPhone 8 (iPhone10,1)"));`
	`78`	`+ iPadList.remove(0, iPadList.indexOf("iPad Pro 9.7 (Wifi)"));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`

Lines changed: 4 additions & 0 deletions

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,3 +46,8 @@ iPhone\ 14\ (iPhone14,7)=iPhone14,7`
`46`	`46`	`iPhone\ 14+\ (iPhone14,8)=iPhone14,8`
`47`	`47`	`iPhone\ 14\ Pro\ (iPhone15,2)=iPhone15,2`
`48`	`48`	`iPhone\ 14\ Pro\ Max\ (iPhone15,3)=iPhone15,3`
	`49`	`+iPhone\ 15\ (iPhone15,4)=iPhone15,4`
	`50`	`+iPhone\ 15\ Plus\ (iPhone15,5)=iPhone15,5`
	`51`	`+# TODO needs tsschecker update:`
	`52`	`+# iPhone\ 15\ Pro\ (iPhone16,1)=iPhone16,1`
	`53`	`+# iPhone\ 15\ Pro\ Max\ (iPhone16,2)=iPhone16,2`

Comments

(0)