Merge pull request #443 from penguin-statistics/dev

Release v3.5.1

ios/App/App.xcodeproj/project.pbxproj

@@ -30,7 +30,7 @@
 		3A33A3D925D3DA96001867F0 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 3A33A3DB25D3DA96001867F0 /* Intents.intentdefinition */; };
 		3A3F035B25C0B3D000DEED16 /* PersistenceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A3F035A25C0B3D000DEED16 /* PersistenceManager.swift */; };
 		3A4D4431259AC0BA000807F8 /* InitialLaunch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4D4430259AC0BA000807F8 /* InitialLaunch.swift */; };
-		3A5051A925965532004167D3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3A5051AC25965532004167D3 /* Localizable.strings */; };
+		3A4FAF192626B189001C9907 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3A4FAF1B2626B189001C9907 /* Localizable.strings */; };
 		3A5051AA25965532004167D3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3A5051AC25965532004167D3 /* Localizable.strings */; };
 		3A5051B82596575D004167D3 /* Bender.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3A5051B72596575D004167D3 /* Bender.ttf */; };
 		3A5051C1259666FB004167D3 /* ItemStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A5051C0259666FB004167D3 /* ItemStatsView.swift */; };
@@ -107,6 +107,8 @@
 		3A33A3DF25D3DAA2001867F0 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Intents.strings"; sourceTree = "<group>"; };
 		3A3F035A25C0B3D000DEED16 /* PersistenceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceManager.swift; sourceTree = "<group>"; };
 		3A4D4430259AC0BA000807F8 /* InitialLaunch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InitialLaunch.swift; sourceTree = "<group>"; };
+		3A4FAF1A2626B189001C9907 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A4FAF1E2626B192001C9907 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A5051AB25965532004167D3 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A5051B025965533004167D3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3A5051B72596575D004167D3 /* Bender.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Bender.ttf; path = ../../../src/assets/fonts/Bender.ttf; sourceTree = "<group>"; };
@@ -319,6 +321,7 @@
 				3A8EFFB1259AB67E00B6A788 /* Capacitor */,
 				3A8EFFB2259AB69200B6A788 /* Meta */,
 				3A885ACD25A443D600247AED /* EventBus.swift */,
+				3A4FAF1B2626B189001C9907 /* Localizable.strings */,
 			);
 			path = App;
 			sourceTree = "<group>";
@@ -443,14 +446,14 @@
 			files = (
 				3A8EFF992599BBC100B6A788 /* alert1.caf in Resources */,
 				50B271D11FEDC1A000F3C39B /* public in Resources */,
+				3A4FAF192626B189001C9907 /* Localizable.strings in Resources */,
 				504EC30F1FED79650016851F /* Assets.xcassets in Resources */,
 				3A65B09725C662EE00E1AE2A /* LaunchScreen.storyboard in Resources */,
 				3AA7E33725211FD500387971 /* InfoPlist.strings in Resources */,
 				50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
 				504EC30D1FED79650016851F /* Main.storyboard in Resources */,
 				2FAD9763203C412B000D30F8 /* config.xml in Resources */,
 				3A001AC62599230E0078A265 /* Settings.bundle in Resources */,
-				3A5051A925965532004167D3 /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -577,6 +580,15 @@
 			name = Intents.intentdefinition;
 			sourceTree = "<group>";
 		};
+		3A4FAF1B2626B189001C9907 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				3A4FAF1A2626B189001C9907 /* zh-Hans */,
+				3A4FAF1E2626B192001C9907 /* en */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
 		3A5051AC25965532004167D3 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -634,7 +646,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.5.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app.PenguinWidget;
@@ -666,7 +678,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.5.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app.PenguinWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -805,13 +817,13 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.5.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "App/App-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -837,12 +849,12 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.penguinstats.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "App/App-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/App/App/App.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:penguin-stats.io</string>

ios/App/App/AppDelegate.swift

@@ -68,12 +68,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 //        rootView?.addGestureRecognizer(fakedLongPress)
 
         // MARK: ask for notifications permission
-        let center = UNUserNotificationCenter.current()
-        center.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
-            if granted {
-                DispatchQueue.main.async(execute: UIApplication.shared.registerForRemoteNotifications)
-            }
-        }
+//        let center = UNUserNotificationCenter.current()
+//        center.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
+//            if granted {
+//                DispatchQueue.main.async(execute: UIApplication.shared.registerForRemoteNotifications)
+//            }
+//        }
 
 
         // MARK: save shortcut to process

ios/App/App/Views/WelcomeView.swift

@@ -14,23 +14,27 @@ struct WelcomeView: View {
     @Binding var notificationPreferences: NotificationPreferences
 
     let features = [
-        WhatsNew(icon: "apps.iphone.badge.plus", title: "Widgets", subtitle: "Add widgets to your home screen to get instant overview of statistics"),
-        WhatsNew(icon: "hand.tap", title: "Haptics Feedback", subtitle: "Interact with components and get haptical feedback"),
-        WhatsNew(icon: "bolt", title: "Performance", subtitle: "Get your desired data without the frustration of page buffering")
+        WhatsNew(
+            icon: "apps.iphone.badge.plus",
+            title: NSLocalizedString("feature.widget.title", comment: ""),
+            subtitle: NSLocalizedString("feature.widget.subtitle", comment: "")),
+        WhatsNew(icon: "hand.tap", title: NSLocalizedString("feature.haptics.title", comment: ""), subtitle: NSLocalizedString("feature.haptics.subtitle", comment: "")),
+        WhatsNew(icon: "bolt", title: NSLocalizedString("feature.performance.title", comment: ""), subtitle: NSLocalizedString("feature.performance.subtitle", comment: ""))
     ]
 
     var body: some View {
         VStack {
             Spacer()
             VStack(alignment: .leading) {
-                Text("Welcome to")
-                    .font(.system(size: 32, weight: .black))
+                Text(NSLocalizedString("welcome.title", comment: ""))
+                    .font(.system(size: 28, weight: .black))
+                    .padding(.bottom, 0)
 
-                Text("Penguin Statistics")
+                Text(NSLocalizedString("welcome.subtitle", comment: ""))
                     .font(.system(size: 32, weight: .black))
                     .foregroundColor(.blue)
             }
-                .padding()
+            .padding()
 
             ForEach(features, id: \.self) { feature in
                 WhatsNewView(info: feature)
@@ -68,7 +72,7 @@ struct WelcomeView: View {
 
             HapticButton(action: {
                 withAnimation {
-                    self.route = "consent"
+                    self.delegate.dismiss()
                 }
             }) {
                 HStack {

ios/App/App/Views/WhatsNew.swift

@@ -26,6 +26,7 @@ struct WhatsNewView: View {
             VStack(alignment: .leading) {
                 Text(info.title)
                     .bold()
+                    .padding(.bottom, 0)
 
                 Text(info.subtitle)
                     .foregroundColor(.secondary)

ios/App/App/config.xml

@@ -1,4 +1,4 @@
-  <?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
 

ios/App/App/en.lproj/Localizable.strings

@@ -0,0 +1,16 @@
+/* 
+  Localizable.strings
+  App
+
+  Created by Galvin Gao on 2021/4/14.
+
+*/
+
+"feature.widget.title" = "Widget";
+"feature.widget.subtitle" = "Add widgets to your home screen to get instant overview of statistics";
+"feature.haptics.title" = "Haptics Feedback";
+"feature.haptics.subtitle" = "Interact with components and get haptical feedback";
+"feature.performance.title" = "Performance";
+"feature.performance.subtitle" = "Get your desired data without the frustration of page buffering";
+"welcome.title" = "Welcome to";
+"welcome.subtitle" = "Penguin Statistics";

ios/App/App/zh-Hans.lproj/Localizable.strings

@@ -0,0 +1,16 @@
+/* 
+  Localizable.strings
+  App
+
+  Created by Galvin Gao on 2021/4/14.
+
+*/
+
+"feature.widget.title" = "小组件";
+"feature.widget.subtitle" = "将小组件添加至主屏幕以获取即时全服掉落概览";
+"feature.haptics.title" = "触感反馈";
+"feature.haptics.subtitle" = "与应用组件交互时将附有触感反馈";
+"feature.performance.title" = "快速响应";
+"feature.performance.subtitle" = "快速获得所需数据而无需等待网页缓冲";
+"welcome.title" = "欢迎使用";
+"welcome.subtitle" = "企鹅物流 App";

ios/App/Settings.bundle/Root.plist

@@ -6,17 +6,7 @@
 	<array>
 		<dict>
 			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>alwaysShowWhatsNew</string>
-			<key>Title</key>
-			<string>Always show "What's New" on launch</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<string>3.4.2 (3)</string>
+			<string>3.5.0 (1)</string>
 			<key>Key</key>
 			<string>version</string>
 			<key>Title</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "penguin-stats-frontend",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "private": true,
   "author": "Penguin Statistics Contributors <contributors@penguin-stats.io> (https://github.com/orgs/penguin-statistics/people)",
   "scripts": {
@@ -46,6 +46,7 @@
     "katex": "^0.12.0",
     "lodash": "^4.17.20",
     "marked": "^1.0.0",
+    "node-forge": "^0.10.0",
     "protobufjs": "^6.10.2",
     "qs": "^6.9.4",
     "regenerator-runtime": "^0.13.5",

src/components/drawer/SettingsDialog.vue

@@ -83,6 +83,18 @@
               v-if="active"
               class="mt-2"
             />
+
+            <template v-if="$env.isApp">
+              <Subheader>
+                {{ $t('settings.category.about') }}
+              </Subheader>
+              <div class="ml-4">
+                <strong>Penguin Statistics</strong>
+                —
+                <strong>{{ version.VERSION }}</strong>
+                <span class="overline monospace condensed ml-1">{{ version.GIT_COMMIT }}</span>
+              </div>
+            </template>
           </v-row>
         </v-container>
       </v-card-text>
@@ -112,6 +124,7 @@ import DataManager from '@/components/drawer/DataManager'
 import Subheader from '@/components/global/Subheader'
 import penguin from '@/utils/native/penguin'
 import PushNotificationSettings from '@/components/drawer/PushNotificationSettings'
+import config from "@/config";
 export default {
   name: 'SettingsDialog',
   components: { PushNotificationSettings, Subheader, DataManager, OptimizationSwitcher, LocaleSwitcher, ThemeSwitcher },
@@ -121,6 +134,14 @@ export default {
       active: false
     }
   },
+  computed: {
+    version () {
+      return {
+        VERSION: config.version || 'v0.0.0',
+        GIT_COMMIT: GIT_COMMIT.trim() || 'unknown'
+      }
+    }
+  },
   methods: {
     openBundleSettings: penguin.openBundleSettings
   }

src/components/global/Footer.vue

@@ -18,17 +18,6 @@
         <span class="overline monospace condensed ml-1">{{ version.GIT_COMMIT }}</span>
       </v-card-text>
 
-      <v-expand-transition>
-        <v-card-text
-          v-if="isInSpecialUI"
-          class="white--text d-block pt-2 pb-0 overline"
-        >
-          <span>
-            致敬英雄，逝者安息
-          </span>
-        </v-card-text>
-      </v-expand-transition>
-
       <v-card-text
         v-if="isCNMirror"
         class="white--text d-block pt-2 pb-0 overline condensed"

src/config/index.js

@@ -1,4 +1,4 @@
-const version = 'v3.5.0'
+const version = 'v3.5.1'
 const project = 'frontend-v2'
 
 module.exports = {

src/locales/en.yml

@@ -383,6 +383,7 @@ settings:
   category:
     appearance: Appearance
     data: Data
+    about: About
   optimization:
     lowData:
       title: Low Data Mode

src/locales/ja.yml

@@ -344,6 +344,7 @@ settings:
   category:
     appearance: スタイル
     data: 設定とデータ
+    about: 当サイトについて
   optimization:
     lowData:
       title: 軽量モード

src/locales/zh.yml

@@ -371,6 +371,7 @@ settings:
   category:
     appearance: 外观
     data: 设置与数据
+    about: 关于
   optimization:
     lowData:
       title: 低数据模式

src/router.js

@@ -114,7 +114,7 @@ const router = new Router({
           async: true,
           icon: 'mdi-image-filter-center-focus',
           i18n: 'menu.report.recognition',
-          beta: true
+          // beta: true
         }
       },
       {

src/views/About/Changelog.vue

@@ -133,6 +133,16 @@ export default {
     return {
       index: null,
       logs: [
+        {
+          version: 'v3.5.1',
+          date: '2021-04-15T16:00:00+0800',
+          changes: `## 修复
+1. 截图识别掉落汇报可能存在无法上传的问题
+
+## 优化
+1. iOS 客户端体验
+          `
+        },
         {
           version: 'v3.5.0',
           date: '2021-03-26T00:00:00+0800',