Merge pull request #51 from fa0311/pre

v3.0.0

.github/ISSUE_TEMPLATE/en-feature-request.yml

@@ -1,18 +1,37 @@
-name: "[en] 💡 Request a feature"
-description: Please suggest features you would like to see in vrchat_mobile_client
-labels: ["enhancement"]
-body:
-
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Describe the feature
-    validations:
-      required: true
-
-  - type: textarea
-    id: feature-reasoning
-    attributes:
-      label: How is this feature useful to users?
-    validations:
-      required: true
+name: "[en] 💡 Request a feature"
+description: Please suggest features you would like to see in vrchat_mobile_client
+labels: ["enhancement"]
+body:
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe the feature
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-reasoning
+    attributes:
+      label: How is this feature useful to users?
+    validations:
+      required: true
+
+name: "[en] 💡 Request a feature"
+description: Please suggest features you would like to see in vrchat_mobile_client
+labels: ["enhancement"]
+body:
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Describe the feature
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-reasoning
+    attributes:
+      label: How is this feature useful to users?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/ja-feature-request.yml

@@ -1,18 +1,37 @@
-name: "[ja] 💡 機能を提案する"
-description: vrchat_mobile_clientに欲しい機能を提案して下さい
-labels: ["enhancement"]
-body:
-
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: 機能を説明する
-    validations:
-      required: true
-
-  - type: textarea
-    id: feature-reasoning
-    attributes:
-      label: この機能はユーザーにとってどのように役に立つのでしょうか？
-    validations:
+name: "[ja] 💡 機能を提案する"
+description: vrchat_mobile_clientに欲しい機能を提案して下さい
+labels: ["enhancement"]
+body:
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: 機能を説明する
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-reasoning
+    attributes:
+      label: この機能はユーザーにとってどのように役に立つのでしょうか？
+    validations:
+      required: true
+
+name: "[ja] 💡 機能を提案する"
+description: vrchat_mobile_clientに欲しい機能を提案して下さい
+labels: ["enhancement"]
+body:
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: 機能を説明する
+    validations:
+      required: true
+
+  - type: textarea
+    id: feature-reasoning
+    attributes:
+      label: この機能はユーザーにとってどのように役に立つのでしょうか？
+    validations:
       required: true

README.md

@@ -1,10 +1,11 @@
 # VRChatMC
 
-VRChatの非公式なAPIを利用したVRChatのモバイルクライアント<br>
-Flutterで作成されたシンプルなUIが特徴的です<br>
+VRChat の非公式な API を利用した VRChat のモバイルクライアント<br>
+Flutter で作成されたシンプルな UI が特徴的です<br>
 
 ## 特徴
-- **マルチプラットフォーム**  Android Windows(iOS用のPullRequest Buildは歓迎します)
+
+- **マルチプラットフォーム** Android Windows(iOS 用の PullRequest Build は歓迎します)
 - **多言語対応**
 - **広告無し**
 - **完全無料**
@@ -13,17 +14,47 @@ Flutterで作成されたシンプルなUIが特徴的です<br>
 <img width="20%" src="docs/img/screenshots1.jpg"><img width="20%" src="docs/img/screenshots2.jpg"><img width="20%" src="docs/img/screenshots3.jpg"><img width="20%" src="docs/img/screenshots4.jpg"><img width="20%" src="docs/img/screenshots5.jpg">
 
 ## インストール
+
 ### Android
+
 [**play.google.com**](https://play.google.com/store/apps/details?id=com.yuki0311.vrchat_mobile_client)からダウンロード<br>
 もしくは
 [**Releases**](https://github.com/fa0311/vrchat_mobile_client/releases)の**app-release.apk**をクリックしてダウンロード
+
 ### Windows
+
 [**Releases**](https://github.com/fa0311/vrchat_mobile_client/releases)の**VRChatMC-Setup.exe**をクリックしてダウンロード
 
+## 貢献
+
+### ブランチについて
+
+- **master** プロダクトリリース GooglePlay と同じ
+- **pre** プレリリース 大きな機能追加もしくは GooglePlay の審査
+- **develop** 開発バージョン PullRequest はここへ
+
+### 翻訳
+
+[lib/l10n](https://github.com/fa0311/vrchat_mobile_client/tree/develop/lib/l10n)
+
+### セットアップ
+
+```
+flutter pub get
+```
+
+### ビルド
+
+```
+flutter run
+```
+
 ## 免責事項
-VRChat APIの使用に関するVRChatチーム(Tupper氏)の公式な回答です。
+
+VRChat API の使用に関する VRChat チーム(Tupper 氏)の公式な回答です。
 
 > Use of the API using applications other than the approved methods (website, VRChat application) are not officially supported. You may use the API for your own application, but keep these guidelines in mind:
+>
 > - We do not provide documentation or support for the API.
 > - Do not make queries to the API more than once per 60 seconds.
 > - Abuse of the API may result in account termination.

android/app/build.gradle

@@ -63,6 +63,7 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        multiDexEnabled true
     }
 
     buildTypes {

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Sat Jul 23 15:47:42 JST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+zipStoreBase=GRADLE_USER_HOME

assets/tools/error.py

@@ -0,0 +1,27 @@
+import json
+import glob
+
+
+def in_dart(key1,key2):
+    for file in glob.glob("lib/*.dart"):
+        with open(file,'r',encoding="utf-8") as f:
+            code = f.read()
+            count = code.count(key1) - code.count(key2)
+            if count != 0:
+                print(f"{key1} is {count} more in {file}")
+
+    for file in glob.glob("lib/*/*.dart"):
+        with open(file,'r',encoding="utf-8") as f:
+            code = f.read()
+            count = code.count(key1) - code.count(key2)
+            if count != 0:
+                print(f"{key1} is {count} more in {file}")
+
+    for file in glob.glob("lib/*/*/*.dart"):
+        with open(file,'r',encoding="utf-8") as f:
+            code = f.read()
+            count = code.count(key1) - code.count(key2)
+            if count != 0:
+                print(f"{key1} is {count} more in {file}")
+
+in_dart("VRChatAPI(cookie","apiError")

assets/tools/l10n.py

@@ -0,0 +1,28 @@
+import json
+import glob
+
+with open('lib/l10n/app_en.arb','r',encoding="utf-8") as f:
+    json_load = json.load(f)
+
+
+def in_dart(key):
+    for file in glob.glob("lib/*.dart"):
+        with open(file,'r',encoding="utf-8") as f:
+            if(f"AppLocalizations.of(context)!.{key}" in f.read()):
+                return False
+    for file in glob.glob("lib/*/*.dart"):
+        with open(file,'r',encoding="utf-8") as f:
+            if(f"AppLocalizations.of(context)!.{key}" in f.read()):
+                return False
+    for file in glob.glob("lib/*/*/*.dart"):
+        with open(file,'r',encoding="utf-8") as f:
+            if(f"AppLocalizations.of(context)!.{key}" in f.read()):
+                return False
+    return True
+
+for key in json_load:
+    if key[0] == "@":
+        continue
+
+    if in_dart(key):
+        print(f"{key} is not found")

lib/api/.gitignore

@@ -0,0 +1 @@
+*.json