Merge pull request #437 from penguin-statistics/dev

Release v3.5.0

.eslintignore

@@ -1,2 +1,3 @@
 # aliyun edgescript
-*.edgescript
+*.edgescript
+src/vendors

.eslintrc

@@ -19,7 +19,13 @@
     "vuetify/no-legacy-grid": "error",
     "vue/no-v-html": "off",
     "vue/no-template-shadow": "off",
-    "vue/valid-template-root": "off"
+    "vue/valid-template-root": "off",
+    "no-tabs": [
+      "error",
+      {
+        "allowIndentationTabs": true
+      }
+    ]
   },
   "parserOptions": {
     "parser": "babel-eslint"

.gitignore

@@ -20,3 +20,7 @@ package-lock.json
 *.njsproj
 *.sln
 *.sw?
+tools/skeleton-html-generator/dist
+tools/skeleton-html-generator/.cache
+src/utils/vendors/
+src/vendors/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Penguin Statistics
+Copyright (c) 2021 Penguin Statistics
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

android/app/build.gradle

@@ -1,13 +1,15 @@
 apply plugin: 'com.android.application'
 
+apply plugin: 'com.google.gms.google-services'
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "io.penguinstats.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "3.4.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -32,6 +34,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
+    implementation platform('com.google.firebase:firebase-bom:26.3.0')
 }
 
 apply from: 'capacitor.build.gradle'

android/app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "200614453783",
+    "project_id": "penguin-statistics",
+    "storage_bucket": "penguin-statistics.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:200614453783:android:be9e2507cdfa945d147252",
+        "android_client_info": {
+          "package_name": "io.penguinstats.app"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "200614453783-q3q89lurq4nmm1mn9pnkf3qa1e0k16mi.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCA225z1ov8mJ-oRXOr96fh6jPg_aeI5T4"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "200614453783-q3q89lurq4nmm1mn9pnkf3qa1e0k16mi.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -22,13 +22,44 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="true">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="penguin-stats.io" />
-                <data android:scheme="https" android:host="penguin-stats.cn" />
-                <data android:scheme="@string/penguin" android:host="penguin-stats.cn" />
+
+                <data
+                    android:scheme="https"
+                    android:host="penguin-stats.io" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="https"
+                    android:host="penguin-stats.cn" />
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:name="io.penguinstats.app.SearchMetaActivity"
+            android:label="@string/title_activity_main"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
         </activity>
@@ -40,26 +71,26 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
+                android:resource="@xml/file_paths" />
         </provider>
     </application>
 
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Camera, Photos, input file -->
-<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
-<!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
+    <!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
+    <!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
     <!-- Geolocation API -->
-<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
-<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
-<!--    <uses-feature android:name="android.hardware.location.gps" />-->
+    <!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
+    <!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+    <!--    <uses-feature android:name="android.hardware.location.gps" />-->
     <!-- Network API -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- Navigator.getUserMedia -->
     <!-- Video -->
-<!--    <uses-permission android:name="android.permission.CAMERA" />-->
+    <!--    <uses-permission android:name="android.permission.CAMERA" />-->
     <!-- Audio -->
-<!--    <uses-permission android:name="android.permission.RECORD_AUDIO" />-->
-<!--    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>-->
+    <!--    <uses-permission android:name="android.permission.RECORD_AUDIO" />-->
+    <!--    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>-->
 </manifest>

android/app/src/main/assets/capacitor.config.json

@@ -1,15 +1,16 @@
 {
   "appId": "io.penguinstats.app",
   "appName": "企鹅物流",
-  "bundledWebRuntime": false,
+  "bundledWebRuntime": true,
   "npmClient": "yarn",
   "webDir": "dist",
   "plugins": {
     "SplashScreen": {
       "launchAutoHide": false,
       "backgroundColor": "#000000ff",
       "showSpinner": true,
-      "spinnerColor": "#fff"
+      "spinnerColor": "#fff",
+      "splashFullScreen": true
     },
     "PushNotifications": {
       "presentationOptions": ["badge", "sound", "alert"]

android/app/src/main/java/io/penguinstats/app/MainActivity.java

@@ -17,5 +17,7 @@ public void onCreate(Bundle savedInstanceState) {
       // Additional plugins you've installed go here
       // Ex: add(TotallyAwesomePlugin.class);
     }});
+
+    this.getBridge().logToJs("MainActivity--onCreate: launching app with savedInstanceState " + savedInstanceState);
   }
 }

android/app/src/main/java/io/penguinstats/app/SearchMetaActivity.java

@@ -0,0 +1,29 @@
+package io.penguinstats.app;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.getcapacitor.Plugin;
+
+import java.util.ArrayList;
+
+public class SearchMetaActivity extends MainActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (this.getBridge() == null) {
+            super.onCreate(savedInstanceState);
+
+            // Initializes the Bridge
+            this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
+                // Additional plugins you've installed go here
+                // Ex: add(TotallyAwesomePlugin.class);
+            }});
+        }
+
+        Uri uri = Uri.parse("https://penguin-stats.io/search");
+
+        this.getBridge().logToJs("onCreate: uri parsed as " + uri);
+
+        this.getBridge().launchIntent(uri);
+    }
+}

android/app/src/main/res/drawable-anydpi/search.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <group android:scaleX="0.71428573"
+      android:scaleY="0.71428573"
+      android:translateX="3.4285715"
+      android:translateY="3.4285715">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+  </group>
+</vector>