Fix: detect correctly iPad & RWD improvement

Doyban · Jul 18, 2024 · b5aa7c7 · b5aa7c7
1 parent 63823f1
commit b5aa7c7
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 31 deletions.
diff --git a/cordova/config.xml b/cordova/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.doyban.flyingplane" version="1.2.3" xmlns="http://www.w3.org/ns/widgets"
+<widget id="com.doyban.flyingplane" version="1.2.4" xmlns="http://www.w3.org/ns/widgets"
 xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>FlyingPlane</name>

diff --git a/cordova/package-lock.json b/cordova/package-lock.json
diff --git a/cordova/package.json b/cordova/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.doyban.flyingplane",
   "displayName": "FlyingPlane",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Tap Plane Game",
   "main": "index.js",
   "scripts": {
@@ -79,4 +79,4 @@
     "cordova-plugin-inappbrowser": "5.0.0",
     "cordova-universal-links-plugin-fix": "1.2.1"
   }
-}
+}
diff --git a/cordova/platforms/android/app/src/main/AndroidManifest.xml b/cordova/platforms/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10203" android:versionName="1.2.3" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10204" android:versionName="1.2.4" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="com.android.vending.BILLING" />

diff --git a/cordova/platforms/android/app/src/main/assets/www/index.html b/cordova/platforms/android/app/src/main/assets/www/index.html
@@ -18,7 +18,7 @@
         content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width viewport-fit=cover">
     <link rel="stylesheet" href="">
     <style>
-        #content {
+        #content-game {
             width: 100%;
             height: 100%;
             float: left;
@@ -34,12 +34,12 @@
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-    <div id="content">
+    <div id="content-game">
         <!-- <img src="assets/images/background.png" /> -->
     </div>
     <script src="" defer></script>
     <div id="content"></div>
     <script src="cordova.js"></script>
-<script type="text/javascript" src="app.2d3cc6690c591f00a685.js?2d3cc6690c591f00a685"></script><script type="text/javascript" src="vendor.2d3cc6690c591f00a685.js?2d3cc6690c591f00a685"></script></body>
+<script type="text/javascript" src="app.4cc834a08fbdac646ff9.js?4cc834a08fbdac646ff9"></script><script type="text/javascript" src="vendor.4cc834a08fbdac646ff9.js?4cc834a08fbdac646ff9"></script></body>
 
 </html>
diff --git a/cordova/platforms/android/app/src/main/res/xml/config.xml b/cordova/platforms/android/app/src/main/res/xml/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.doyban.flyingplane" version="1.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.doyban.flyingplane" version="1.2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="FacebookConnectPlugin">
         <param name="android-package" value="org.apache.cordova.facebook.ConnectPlugin" />
         <param name="onload" value="true" />

diff --git a/cordova/platforms/ios/FlyingPlane.xcarchive/Info.plist b/cordova/platforms/ios/FlyingPlane.xcarchive/Info.plist
@@ -13,9 +13,9 @@
 		<key>CFBundleIdentifier</key>
 		<string>com.doyban.flyingplane</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.2.3</string>
+		<string>1.2.4</string>
 		<key>CFBundleVersion</key>
-		<string>1.2.3</string>
+		<string>1.2.4</string>
 		<key>SigningIdentity</key>
 		<string>Apple Development: Daniel Danielecki (9H98636TF9)</string>
 		<key>Team</key>

diff --git a/cordova/platforms/ios/FlyingPlane.xcarchive/Products/Applications/FlyingPlane.app/config.xml b/cordova/platforms/ios/FlyingPlane.xcarchive/Products/Applications/FlyingPlane.app/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.doyban.flyingplane" version="1.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.doyban.flyingplane" version="1.2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="CDVWebViewEngine">
         <param name="ios-package" value="CDVWebViewEngine" />
     </feature>

diff --git a/cordova/platforms/ios/FlyingPlane.xcodeproj/project.pbxproj b/cordova/platforms/ios/FlyingPlane.xcodeproj/project.pbxproj
@@ -595,6 +595,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 9D3QHQ7CMS;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -629,6 +630,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 9D3QHQ7CMS;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "FlyingPlane/FlyingPlane-Prefix.pch";

diff --git a/...gPlane.xcworkspace/xcuserdata/danieldanielecki.xcuserdatad/UserInterfaceState.xcuserstate b/...gPlane.xcworkspace/xcuserdata/danieldanielecki.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/cordova/platforms/ios/FlyingPlane/FlyingPlane-Info.plist b/cordova/platforms/ios/FlyingPlane/FlyingPlane-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -114,7 +114,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>FacebookAdvertiserIDCollectionEnabled</key>
 	<true/>
 	<key>FacebookAppID</key>

diff --git a/cordova/platforms/ios/FlyingPlane/config.xml b/cordova/platforms/ios/FlyingPlane/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.doyban.flyingplane" version="1.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.doyban.flyingplane" version="1.2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="CDVWebViewEngine">
         <param name="ios-package" value="CDVWebViewEngine" />
     </feature>

diff --git a/cordova/platforms/ios/www/index.html b/cordova/platforms/ios/www/index.html
@@ -18,7 +18,7 @@
         content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width viewport-fit=cover">
     <link rel="stylesheet" href="">
     <style>
-        #content {
+        #content-game {
             width: 100%;
             height: 100%;
             float: left;
@@ -34,12 +34,12 @@
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-    <div id="content">
+    <div id="content-game">
         <!-- <img src="assets/images/background.png" /> -->
     </div>
     <script src="" defer></script>
     <div id="content"></div>
     <script src="cordova.js"></script>
-<script type="text/javascript" src="app.2d3cc6690c591f00a685.js?2d3cc6690c591f00a685"></script><script type="text/javascript" src="vendor.2d3cc6690c591f00a685.js?2d3cc6690c591f00a685"></script></body>
+<script type="text/javascript" src="app.4cc834a08fbdac646ff9.js?4cc834a08fbdac646ff9"></script><script type="text/javascript" src="vendor.4cc834a08fbdac646ff9.js?4cc834a08fbdac646ff9"></script></body>
 
 </html>
diff --git a/cordova/www/index.html b/cordova/www/index.html
@@ -18,7 +18,7 @@
         content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width viewport-fit=cover">
     <link rel="stylesheet" href="">
     <style>
-        #content {
+        #content-game {
             width: 100%;
             height: 100%;
             float: left;
@@ -34,12 +34,12 @@
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-    <div id="content">
+    <div id="content-game">
         <!-- <img src="assets/images/background.png" /> -->
     </div>
     <script src="" defer></script>
     <div id="content"></div>
     <script src="cordova.js"></script>
-<script type="text/javascript" src="app.2d3cc6690c591f00a685.js?2d3cc6690c591f00a685"></script><script type="text/javascript" src="vendor.2d3cc6690c591f00a685.js?2d3cc6690c591f00a685"></script></body>
+<script type="text/javascript" src="app.4cc834a08fbdac646ff9.js?4cc834a08fbdac646ff9"></script><script type="text/javascript" src="vendor.4cc834a08fbdac646ff9.js?4cc834a08fbdac646ff9"></script></body>
 
 </html>
diff --git a/index.html b/index.html
@@ -18,7 +18,7 @@
         content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width viewport-fit=cover">
     <link rel="stylesheet" href="">
     <style>
-        #content {
+        #content-game {
             width: 100%;
             height: 100%;
             float: left;
@@ -34,7 +34,7 @@
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-    <div id="content">
+    <div id="content-game">
         <!-- <img src="assets/images/background.png" /> -->
     </div>
     <script src="" defer></script>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.doyban.flyingplane",
   "displayName": "FlyingPlane",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Tap Plane Game",
   "main": "index.ts",
   "scripts": {

diff --git a/src/scripts/Index.ts b/src/scripts/Index.ts
@@ -19,11 +19,11 @@ class Game extends Phaser.Game {
       type: Phaser.WEBGL, // Use Renderer WebGL.
       width: 800,
       height: 480,
-      parent: "content", // Use custom div element as parent.
+      parent: "content-game", // Use custom div element as parent.
       scene: [SplashScreen, GamePlay, Shop], // Scenes.
       // Add ScaleManager for responsiveness.
       scale: {
-        mode: Phaser.Scale.ScaleModes.FIT,
+        mode: Phaser.Scale.ScaleModes.WIDTH_CONTROLS_HEIGHT,
       },
       // Add matter physics.
       physics: {

diff --git a/src/scripts/scenes/gameplay/Gui.ts b/src/scripts/scenes/gameplay/Gui.ts
@@ -48,8 +48,8 @@ export class Gui extends Phaser.GameObjects.Group {
     this.createShareButton();
     this.createShopButton();
 
-    // Hide the close button on iOS in main menu.
-    if (!/(iPad|iPhone|iPod)/g.test(navigator.userAgent)) {
+    // Hide the close button on iOS (incl. iPad iOS 13+, see "maxTouchPoints" part) in main menu.
+    if (!/(iPad|iPhone|iPod)/g.test(navigator.userAgent) && !navigator.maxTouchPoints) {
       this.createCloseButton();
     }