merge 3.9.0

.prettierrc

@@ -1,8 +1,9 @@
 {
-  "tabWidth": 2,
-  "singleQuote": true,
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
   "jsxSingleQuote": true,
   "semi": false,
-  "arrowParens": "avoid",
+  "singleQuote": true,
+  "tabWidth": 2,
   "trailingComma": "none"
 }

CHANGELOG.MD

@@ -1,5 +1,52 @@
 # CHANGELOG
 
+v3.9.0 - 2020/07/15
+
+—— 新功能 ——
+
+- [x] [发现] 随便看看迭代成找番剧功能
+
+—— 优化 ——
+
+- [x] [条目] 在线搜索源头跳转前会自动复制跳转的网址
+
+v3.8.0 - 2020/07/12
+
+—— 新功能 ——
+
+- [x] [空间] 可以查询到用户的曾用名
+
+—— 优化 ——
+
+- [x] [条目] 在线搜索源头跳转前会自动复制跳转的网址
+- [x] [实验性] 自动更新登陆 cookie
+- [x] CDN 版本在线更新机制
+- [x] 重新设置 text selectable
+- [x] 富文本补上插入图片链接的按钮, xxx
+
+—— 修复 ——
+
+- [x] [人物] 修复了一个富文本导致闪退的问题
+- [x] [时光机] 修复了部分机型在看旁边的数字被隐藏的问题
+- [x] [条目] 修复了隐藏评分依然显示评分的问题
+- [x] [好友] 修复了部分好友名字后面出现奇怪文字的问题
+- [x] 修复了部分机型文字被截断的问题
+- [x] 把网格布局加回去
+
+—— 小圣杯助手 v2.5.0 ——
+
+- [x] [我的道具] 星光碎片
+
+v3.7.1 - 2020/06/30
+
+—— 修复 ——
+
+- [x] [设置] 修复了片假名默认开启的问题
+
+—— 小圣杯助手 v2.4.1 ——
+
+- [x] [我的道具] 交互优化
+
 v3.7.0 - 2020/06/27
 
 —— 新功能 ——

android/app/build.gradle

@@ -125,12 +125,10 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-def cmd = "git rev-list HEAD --count"
-def gitVersion = cmd.execute().text.trim().toInteger()
-
-static def getAlphaVersionName() {
-  "alpha" + new Date().format("yyyyMMdd")
-}
+def gitVersion = "git rev-list HEAD --count".execute().text.trim().toInteger()
+println "VersionCode: " + gitVersion
+def expoVersionName = "node -p require('../app.json').expo.version".execute().text.trim()
+println "VersionName: " + expoVersionName
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -145,7 +143,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode gitVersion
-        versionName getAlphaVersionName()
+        versionName expoVersionName
     }
     splits {
         abi {

android/app/src/main/java/soko/ekibun/bangumi/plugin/tinygrail/MainActivity.java

@@ -16,7 +16,7 @@ public class MainActivity extends ReactActivity {
      */
     @Override
     protected String getMainComponentName() {
-        return "main";
+        return "czy0729.bangumi";
     }
 
     @Override

app.json

@@ -1,41 +1,38 @@
 {
   "expo": {
+    "version": "3.9.0",
+    "versionTinygrail": "2.5.0",
+    "android": {
+      "versionCode": 390,
+      "versionName": "3.9.0",
+      "package": "com.czy0729.bangumi",
+      "adaptiveIcon": {
+        "foregroundImage": "./src/assets/images/foreground.png",
+        "backgroundColor": "#000000"
+      }
+    },
+    "sdkVersion": "37.0.0",
     "name": "bangumi",
     "slug": "bangumi",
     "privacy": "public",
-    "sdkVersion": "37.0.0",
-    "platforms": [
-      "ios",
-      "android"
-    ],
-    "version": "3.7.1",
+    "platforms": ["ios", "android"],
     "orientation": "portrait",
     "scheme": "bangumi",
-    "icon": "./src/assets/images/icon.png",
     "splash": {
       "image": "./src/assets/images/splash.png",
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
+    "icon": "./src/assets/images/icon.png",
     "updates": {
       "enabled": false,
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": [
-      "**/*"
-    ],
+    "assetBundlePatterns": ["**/*"],
     "ios": {
       "bundleIdentifier": "com.czy0729.bangumi",
       "supportsTablet": true
     },
-    "android": {
-      "package": "com.czy0729.bangumi",
-      "versionCode": 371,
-      "adaptiveIcon": {
-        "foregroundImage": "./src/assets/images/foreground.png",
-        "backgroundColor": "#000000"
-      }
-    },
     "androidStatusBar": {
       "barStyle": "dark-content",
       "backgroundColor": "#ffffff"
@@ -46,4 +43,4 @@
   },
   "displayName": "bangumi",
   "name": "czy0729.bangumi"
-}
+}

navigations.js → config.js

@@ -2,31 +2,31 @@
  * @Author: czy0729
  * @Date: 2019-06-02 14:42:28
  * @Last Modified by: ekibun
- * @Last Modified time: 2020-06-30 20:38:50
+ * @Last Modified time: 2020-07-17 11:19:36
  */
+export const initialDevDark = '' // '' 不控制 | true 强制黑暗 | false 强制白天
+export const initialHomeTabName = 'Home'
+
 export default {
-  initialRouteName: 'Tinygrail', // HomeTab TinygrailCharaAssets
+  initialRouteName: 'Tinygrail', // HomeTab Discovery TinygrailCharaAssets
   initialRouteParams: {
     // id: 240929
     // blogId: 295843 // 294448
     // catalogId: 29811,
     // groupId: 'tinygrail',
-    // monoId: 'person/5745' // 20391 character/70323 person/5745
-    // subjectId: 260680 // 103824 238923 279457 100444 204135
+    // monoId: 'person/7498' // 20391 character/70323 person/5745
+    // subjectId: 148726 // 103824 238923 279457 100444 204135
     // jp: 'ようこそ実力至上主義の教室へ',
     // cn: '欢迎来到实力至上主义的教室',
     // topicId: 'subject/17618' // group/357093, ep/768491
-    // userId: 'sukaretto' // 456208, 419012
-    // userName: 'ekibun',
+    // userId: '486811' // 456208, 419012
+    // userName: 'ekibun'
     // from: 'tinygrail',
     // form: 'lottery', // lottery
     // message: '彩票刮刮乐共获得： #20391「双叶杏」64股 #70900「神原骏河」36股',
     // name: 'とある科学の超電磁砲T'
     // tag: '水树奈奈',
-    // type: 'anime'
+    // type: 'asks' // 'anime'
     // uri: 'https://bgm.tv/award/2019',
   }
 }
-
-export const initialDevDark = '' // '' 不控制 | true 强制黑暗 | false 强制白天
-export const initialHomeTabName = 'Home'

index.js

@@ -1,8 +1,11 @@
-import { registerRootComponent } from 'expo';
+/*
+ * @Author: czy0729
+ * @Date: 2019-11-29 22:13:54
+ * @Last Modified by: czy0729
+ * @Last Modified time: 2020-05-27 11:24:50
+ */
+import { AppRegistry } from 'react-native'
+import { BUNDLE_IDENTIFIER } from '@constants'
+import App from './App'
 
-import App from './App';
-
-// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
-// It also ensures that whether you load the app in the Expo client or in a native build,
-// the environment is set up appropriately
-registerRootComponent(App);
+AppRegistry.registerComponent(BUNDLE_IDENTIFIER, () => App)

src/components/count-down.js

@@ -3,25 +3,25 @@
  * @Author: czy0729
  * @Date: 2019-12-11 14:50:17
  * @Last Modified by: czy0729
- * @Last Modified time: 2020-07-06 15:18:31
+ * @Last Modified time: 2020-07-13 15:12:57
  */
 import React, { useState, useEffect } from 'react'
 import { getTimestamp } from '@utils'
 import Text from './text'
 
 function CountDown({ end, ...other }) {
   const [now, setNow] = useState(getTimestamp())
-  const distance = end - now
-  if (!distance) {
-    return null
-  }
-
   useEffect(() => {
     const interval = setInterval(() => {
       setNow(getTimestamp())
     }, 1000)
     return () => clearInterval(interval)
   }, [])
+
+  const distance = end - now
+  if (!distance) {
+    return null
+  }
   const d = (distance / 86400) | 0
   const h = ((distance - d * 86400) / 3600) | 0
   const m = ((distance - d * 86400 - h * 3600) / 60) | 0

src/components/fade-in.js

@@ -2,7 +2,7 @@
  * @Author: czy0729
  * @Date: 2020-06-12 15:48:53
  * @Last Modified by: czy0729
- * @Last Modified time: 2020-06-15 17:36:12
+ * @Last Modified time: 2020-07-17 11:02:15
  */
 import React, { Component } from 'react'
 import { Animated } from 'react-native'
@@ -16,7 +16,7 @@ export default class FadeIn extends Component {
     opacity: new Animated.Value(0)
   }
 
-  componentWillReceiveProps({ show }) {
+  UNSAFE_componentWillReceiveProps({ show }) {
     if (show) {
       this.show()
     } else {

src/components/katakana.js

@@ -10,7 +10,7 @@
  * @Author: czy0729
  * @Date: 2020-06-16 13:53:11
  * @Last Modified by: czy0729
- * @Last Modified time: 2020-07-07 20:56:58
+ * @Last Modified time: 2020-07-17 11:02:17
  */
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
@@ -373,7 +373,7 @@ class Katakana extends React.Component {
     this.init()
   }
 
-  componentWillReceiveProps() {
+  UNSAFE_componentWillReceiveProps() {
     this.init()
   }
 

src/components/switch-pro.js

@@ -6,7 +6,7 @@
  * @Author: czy0729
  * @Date: 2020-06-24 22:32:09
  * @Last Modified by: czy0729
- * @Last Modified time: 2020-06-24 23:13:30
+ * @Last Modified time: 2020-07-17 11:01:24
  */
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
@@ -69,7 +69,7 @@ class SwitchPro extends Component {
     }
   }
 
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     // unify inner state and outer props
     if (nextProps.value === this.state.value) {
       return
@@ -91,7 +91,7 @@ class SwitchPro extends Component {
     }
   }
 
-  componentWillMount() {
+  UNSAFE_componentWillMount() {
     this._panResponder = PanResponder.create({
       onStartShouldSetPanResponder: (evt, gestureState) => true,
       onStartShouldSetPanResponderCapture: (evt, gestureState) => true,

src/components/text.js

@@ -2,7 +2,7 @@
  * 支持各种属性设置的文本
  * @Author: czy0729
  * @Date: 2019-03-15 06:11:55
- * @Last Modified by: czy0729
+ * @Last Modified by: ekibun
  * @Last Modified time: 2020-07-09 13:50:30
  */
 import React from 'react'

src/components/touchable.js

@@ -3,7 +3,7 @@
  * @Author: czy0729
  * @Date: 2019-03-28 15:35:04
  * @Last Modified by: czy0729
- * @Last Modified time: 2020-05-08 09:47:17
+ * @Last Modified time: 2020-07-16 22:33:09
  */
 import React from 'react'
 import {
@@ -19,7 +19,7 @@ import { IOS } from '@constants'
 
 let isCalled = false
 let timer
-function callOnceInInterval(functionTobeCalled, interval = 320) {
+function callOnceInInterval(functionTobeCalled, interval = 160) {
   if (!isCalled) {
     isCalled = true
     clearTimeout(timer)