Merge branch 'main' of http://git.izouma.com/panhui/zouma-short

android/app/build.gradle

@@ -1,6 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
+    signingConfigs {
+        debug {
+            storeFile file('../../zouma.jks')
+            keyAlias 'zouma'
+            storePassword 'zouma123'
+            keyPassword 'zouma123'
+        }
+    }
     namespace "com.hasiwl.shorts"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -9,7 +8,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
             android:name=".MainActivity"
@@ -17,12 +15,10 @@
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"
             android:exported="true">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
 
         <provider
@@ -30,9 +26,7 @@
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
         </provider>
     </application>
 

android/app/src/main/java/com/hasiwl/shorts/MainActivity.java

@@ -1,5 +1,19 @@
 package com.hasiwl.shorts;
 
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.View;
+
 import com.getcapacitor.BridgeActivity;
 
-public class MainActivity extends BridgeActivity {}
+public class MainActivity extends BridgeActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        View decorView = getWindow().getDecorView();
+        int uiOptions = decorView.getSystemUiVisibility();
+        uiOptions = uiOptions | View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+        decorView.setSystemUiVisibility(uiOptions);
+        getWindow().setStatusBarColor(Color.TRANSPARENT);
+    }
+}

android/app/src/main/res/drawable/splash_icon.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M199,381.8C199,309.5 257.5,251 329.6,251L695.4,251C767.5,251 826,309.5 826,381.8L826,643.3C826,677.9 812.2,711.2 787.7,735.7C763.2,760.2 730,774 695.4,774L329.6,774C295,774 261.8,760.2 237.3,735.7C212.8,711.2 199,677.9 199,643.3L199,381.8L199,381.8ZM434.1,398.5L434.1,626.5C434.1,639.6 448.4,647.6 459.6,640.8L629.9,536.6C638.3,531.5 643.4,522.3 643.4,512.5C643.4,502.7 638.3,493.5 629.9,488.4L459.5,384.3C454.4,381.1 447.9,381 442.7,384C437.4,386.9 434.1,392.5 434.1,398.5L434.1,398.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#7968FB"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M434.1,398.5L434.1,626.5C434.1,639.6 448.4,647.6 459.6,640.8L629.9,536.6C638.3,531.5 643.4,522.3 643.4,512.5C643.4,502.7 638.3,493.5 629.9,488.4L459.5,384.3C454.4,381.1 447.9,381 442.7,384C437.4,386.9 434.1,392.5 434.1,398.5L434.1,398.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowSplashScreenBackground">#11131E</item>
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
+    </style>
+
+
+    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
+        <item name="android:background">@drawable/splash</item>
+        <item name="android:windowSplashScreenBackground">#11131E</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
+    </style>
+</resources>

android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">xx短剧</string>
-    <string name="title_activity_main">xx短剧</string>
+    <string name="app_name">走马短剧</string>
+    <string name="title_activity_main">走马短剧</string>
     <string name="package_name">com.hasiwl.shorts</string>
     <string name="custom_url_scheme">com.hasiwl.shorts</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -7,16 +7,25 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:background">@null</item>
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
     </style>
 
 
     <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
         <item name="android:background">@drawable/splash</item>
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
     </style>
 </resources>

capacitor.config.ts

@@ -3,7 +3,7 @@ import { CapacitorConfig } from '@capacitor/cli'
 let config: CapacitorConfig
 const baseConfig: CapacitorConfig = {
     appId: 'com.hasiwl.shorts',
-    appName: 'xx短剧',
+    appName: '走马短剧',
     webDir: 'dist',
     bundledWebRuntime: true,
     backgroundColor: '#1C1C1C',
@@ -23,7 +23,9 @@ const baseConfig: CapacitorConfig = {
     plugins: {
         SplashScreen: {
             launchShowDuration: 2000,
-            androidScaleType: 'CENTER_CROP'
+            androidScaleType: 'CENTER_CROP',
+            splashFullScreen: true,
+            splashImmersive: true
         },
         CodePush: {
             IOS_DEPLOY_KEY: 'eAdEIJJkMhuRwBKVpDXvbay6Ay0yEJAbzi0Ur',

package.json

@@ -72,6 +72,7 @@
     "vue3-lottie": "^3.2.0"
   },
   "devDependencies": {
+    "@capacitor/assets": "^3.0.1",
     "@capacitor/cli": "^5.5.1",
     "@rushstack/eslint-patch": "^1.1.4",
     "@trapezedev/project": "^7.0.6",