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

(Pro/Max needs tsschecker update)
airsquared · Oct 1, 2023 · 3a48c9e · 3a48c9e
1 parent d5a747f
commit 3a48c9e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -77,13 +77,8 @@ application {
     applicationDefaultJvmArgs.add addExports
 }
 
-private String getJarDirectory() {
-    var dir = ''
-    if (DefaultNativePlatform.currentOperatingSystem.isMacOsX()) dir = 'macos/Contents'
-    else if (DefaultNativePlatform.currentOperatingSystem.isWindows()) dir = 'windows/files'
-    else if (DefaultNativePlatform.currentOperatingSystem.isLinux()) dir = 'linux'
-    return "${projectDir}/dist/${dir}"
-}
+var jarDirectory = os.isMacOsX() ? 'macos/Contents' : os.isWindows() ? 'windows/files' : 'linux'
+jarDirectory =  "${projectDir}/dist/${jarDirectory}"
 
 run {
     systemProperty 'jar.directory', jarDirectory

diff --git a/src/main/java/airsquared/blobsaver/app/Controller.java b/src/main/java/airsquared/blobsaver/app/Controller.java
@@ -392,7 +392,7 @@ private void useMacOSMenuBar() {
                 new SeparatorMenuItem(), tk.createBringAllToFrontItem());
         tk.autoAddWindowMenuItems(menuBar.getMenus().get(3));
 
-        menuBar.getMenus().get(4).getItems().remove(11); // remove about
+        menuBar.getMenus().get(4).getItems().removeLast(); // remove about
 
         tk.setApplicationMenu(applicationMenu);
         tk.setGlobalMenuBar(menuBar);

diff --git a/src/main/java/airsquared/blobsaver/app/Devices.java b/src/main/java/airsquared/blobsaver/app/Devices.java
@@ -73,9 +73,9 @@ public static void updateLists() {
         if (Prefs.getShowOldDevices()) {
             iPhoneList.setAll(iPhones);
             iPadList.setAll(iPads);
-        } else if (!iPhoneList.get(0).equals("iPhone 6s")) {
-            iPhoneList.remove(0, iPhoneList.indexOf("iPhone 6s"));
-            iPadList.remove(0, iPadList.indexOf("iPad Mini 4 (Wifi)"));
+        } else if (!iPhoneList.get(0).equals("iPhone 8 (iPhone10,1)")) {
+            iPhoneList.remove(0, iPhoneList.indexOf("iPhone 8 (iPhone10,1)"));
+            iPadList.remove(0, iPadList.indexOf("iPad Pro 9.7 (Wifi)"));
         }
     }
 

diff --git a/src/main/resources/airsquared/blobsaver/app/boardconfigs.properties b/src/main/resources/airsquared/blobsaver/app/boardconfigs.properties
@@ -63,6 +63,10 @@ iPhone14,7=d27ap
 iPhone14,8=d28ap
 iPhone15,2=d73ap
 iPhone15,3=d74ap
+iPhone15,4=d37ap
+iPhone15,5=d38ap
+iPhone16,1=d83ap
+iPhone16,2=d84ap
 iPod3,1=n18ap
 iPod4,1=n81ap
 iPod5,1=n78ap

diff --git a/src/main/resources/airsquared/blobsaver/app/devicemodels/iPhones.properties b/src/main/resources/airsquared/blobsaver/app/devicemodels/iPhones.properties
@@ -46,3 +46,8 @@ iPhone\ 14\ (iPhone14,7)=iPhone14,7
 iPhone\ 14+\ (iPhone14,8)=iPhone14,8
 iPhone\ 14\ Pro\ (iPhone15,2)=iPhone15,2
 iPhone\ 14\ Pro\ Max\ (iPhone15,3)=iPhone15,3
+iPhone\ 15\ (iPhone15,4)=iPhone15,4
+iPhone\ 15\ Plus\ (iPhone15,5)=iPhone15,5
+# TODO needs tsschecker update:
+# iPhone\ 15\ Pro\ (iPhone16,1)=iPhone16,1
+# iPhone\ 15\ Pro\ Max\ (iPhone16,2)=iPhone16,2