Merge upstream

NoCrypt · Aug 4, 2024 · c9617a1 · c9617a1
1 parent 5620a99
commit c9617a1
Show file tree

Hide file tree

Showing 9 changed files with 1,119 additions and 5,667 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-  "npm.exclude": "**/git_modules/**"
+  "npm.exclude": "**/git_modules/**",
+  "java.configuration.updateBuildConfiguration": "interactive"
 }
diff --git a/capacitor/android/app/build.gradle b/capacitor/android/app/build.gradle
@@ -13,7 +13,7 @@ versions.each (code) -> {
 
 android {
     namespace "watch.migu"
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "watch.migu"
         minSdkVersion rootProject.ext.minSdkVersion

diff --git a/capacitor/android/app/src/main/AndroidManifest.xml b/capacitor/android/app/src/main/AndroidManifest.xml
@@ -52,6 +52,7 @@
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 </manifest>
diff --git a/capacitor/android/app/src/main/java/watch/migu/MainActivity.java b/capacitor/android/app/src/main/java/watch/migu/MainActivity.java
@@ -1,5 +1,30 @@
 package watch.migu;
 
+import android.os.Bundle;
+import android.webkit.ServiceWorkerClient;
+import android.webkit.ServiceWorkerController;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import com.getcapacitor.BridgeActivity;
 
-public class MainActivity extends BridgeActivity {}
+public class MainActivity extends BridgeActivity {
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+      ServiceWorkerController swController = null;
+      swController = ServiceWorkerController.getInstance();
+
+      swController.setServiceWorkerClient(new ServiceWorkerClient() {
+        @Override
+        public WebResourceResponse shouldInterceptRequest(WebResourceRequest request) {
+          if (request.getUrl().toString().contains("index.html")) {
+            request.getRequestHeaders().put("Accept", "text/html");
+          }
+          return bridge.getLocalServer().shouldInterceptRequest(request);
+        }
+      });
+    }
+  }
diff --git a/capacitor/android/variables.gradle b/capacitor/android/variables.gradle
@@ -2,13 +2,13 @@ ext {
     minSdkVersion = 22
     compileSdkVersion = 34
     targetSdkVersion = 34
-    androidxActivityVersion = '1.7.0'
+    androidxActivityVersion = '1.8.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.10.0'
-    androidxFragmentVersion = '1.5.6'
-    coreSplashScreenVersion = '1.0.0'
-    androidxWebkitVersion = '1.6.1'
+    androidxCoreVersion = '1.12.0'
+    androidxFragmentVersion = '1.6.2'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.9.0'
     junitVersion = '4.13.2'
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'

diff --git a/capacitor/capacitor.config.js b/capacitor/capacitor.config.js
@@ -9,7 +9,8 @@ const config = {
       keystorePath: './watch.migu',
       keystorePassword: '',
       keystoreAlias: 'watch.migu'
-    }
+    },
+    webContentsDebuggingEnabled: true
   },
   plugins: {
     SplashScreen: { launchShowDuration: 0 },

diff --git a/capacitor/package.json b/capacitor/package.json
@@ -19,23 +19,23 @@
   },
   "devDependencies": {
     "@capacitor/assets": "github:thaunknown/capacitor-assets",
+    "@capacitor/cli": "^6.1.1",
     "cordova-res": "^0.15.4",
     "nodejs-mobile-gyp": "^0.3.1",
     "npm-run-all": "^4.1.5",
     "webpack-cli": "^5.1.4",
     "webpack-merge": "^5.10.0"
   },
   "dependencies": {
-    "@capacitor/android": "^5.5.1",
-    "@capacitor/app": "^5.0.6",
-    "@capacitor/browser": "^5.1.0",
-    "@capacitor/cli": "^5.5.1",
-    "@capacitor/core": "^5.5.1",
-    "@capacitor/ios": "^5.5.1",
-    "@capacitor/local-notifications": "5.0.8",
-    "@capacitor/status-bar": "^5.0.6",
+    "@capacitor/android": "^6.1.1",
+    "@capacitor/app": "^6.0.0",
+    "@capacitor/browser": "^6.0.1",
+    "@capacitor/core": "^6.1.1",
+    "@capacitor/ios": "^6.1.1",
+    "@capacitor/local-notifications": "^6.0.0",
+    "@capacitor/status-bar": "^6.0.0",
     "capacitor-nodejs": "https://github.com/funniray/Capacitor-NodeJS/releases/download/nodejs-18/capacitor-nodejs-1.0.0-beta.6.tgz",
-    "capacitor-plugin-safe-area": "^2.0.5",
+    "capacitor-plugin-safe-area": "^2.0.6",
     "common": "workspace:*",
     "cordova-plugin-navigationbar-color": "^0.1.0",
     "cordova-plugin-pip": "^0.0.2",

diff --git a/common/views/Player/Player.svelte b/common/views/Player/Player.svelte
@@ -1531,6 +1531,12 @@
   .seekbar {
     font-size: 2rem !important;
   }
+  .miniplayer .mobile-focus-target {
+    display: block !important;
+  }
+  .miniplayer .mobile-focus-target:focus-visible {
+    background: hsla(209, 100%, 55%, 0.3);
+  }
 
   @media (pointer: none), (pointer: coarse) {
     .bottom .ctrl[data-name='playPause'],
@@ -1555,12 +1561,6 @@
     .toggle-fullscreen {
       display: none !important;
     }
-    .miniplayer .mobile-focus-target {
-      display: block !important;
-    }
-    .miniplayer .mobile-focus-target:focus-visible {
-      background: hsla(209, 100%, 55%, 0.3);
-    }
   }
 
 </style>