From e6f8ae265ee2054f6ab037123756ffcf0da85f5e Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Thu, 19 Mar 2020 18:53:05 +0800
Subject: [PATCH 1/7] Add issue templates
---
.github/ISSUE_TEMPLATE/-------------.md | 33 ++++++++++++++++
.github/ISSUE_TEMPLATE/-----------.md | 17 +++++++++
.../ISSUE_TEMPLATE/-english--bug-report.md | 33 ++++++++++++++++
.../-english--feature-request.md | 20 ++++++++++
.github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++++++++++++
.github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++
6 files changed, 161 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/-------------.md
create mode 100644 .github/ISSUE_TEMPLATE/-----------.md
create mode 100644 .github/ISSUE_TEMPLATE/-english--bug-report.md
create mode 100644 .github/ISSUE_TEMPLATE/-english--feature-request.md
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/-------------.md b/.github/ISSUE_TEMPLATE/-------------.md
new file mode 100644
index 0000000..b19a554
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/-------------.md
@@ -0,0 +1,33 @@
+---
+name: "[简体中文] 创建错误报告"
+about: 创建错误报告以帮助我们改进应用
+title: "[BUG] "
+labels: ''
+assignees: ''
+
+---
+
+**描述出现的错误**
+请简洁的描述你遇到的错误
+
+**如何复现该错误**
+复现步骤:
+1. ...
+2. ...
+3. ...
+4. ...
+
+**预期行为**
+清晰简单的描述你预期的应用应该表现的行为
+
+**屏幕截图**
+如果适用, 上传屏幕截图以帮助描述错误
+
+**设备信息 (请完成一下信息):**
+ - 机型: [例如: Pixel 4]
+ - 系统/ROM: [例如: MIUI 11]
+ - Android 版本 [例如: Oreo]
+ - ROM版本 [例如: 20.3.19]
+
+**附加信息**
+其他的可能与改错误相关的信息
diff --git a/.github/ISSUE_TEMPLATE/-----------.md b/.github/ISSUE_TEMPLATE/-----------.md
new file mode 100644
index 0000000..4c1ea83
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/-----------.md
@@ -0,0 +1,17 @@
+---
+name: "[简体中文] 功能请求"
+about: 你希望的能够在应用中增加的功能
+title: "[Feature Request] "
+labels: ''
+assignees: ''
+
+---
+
+**功能描述**
+请清晰的描述你想要的功能
+
+**描述你希望的实现方式**
+清晰的描述应用应该如何实现该功能
+
+**附加信息**
+其他的与改功能相关的附加信息
diff --git a/.github/ISSUE_TEMPLATE/-english--bug-report.md b/.github/ISSUE_TEMPLATE/-english--bug-report.md
new file mode 100644
index 0000000..a29a6fd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/-english--bug-report.md
@@ -0,0 +1,33 @@
+---
+name: "[English] Bug report"
+about: Create a report to help us improve
+title: "[BUG] "
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Device Info (please complete the following information):**
+ - Device: [e.g. Pixel 4]
+ - ROM: [e.g: AOSP]
+ - ROM Version:
+ - Android Version [e.g. Oreo]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/-english--feature-request.md b/.github/ISSUE_TEMPLATE/-english--feature-request.md
new file mode 100644
index 0000000..2eb11d2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/-english--feature-request.md
@@ -0,0 +1,20 @@
+---
+name: "[English] Feature request"
+about: Suggest an idea for this app
+title: "[Feature Request] "
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..dd84ea7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
From 05fa36497bee8848fa50492bcd51212f513ef494 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Thu, 19 Mar 2020 18:56:41 +0800
Subject: [PATCH 2/7] rename issues template file
---
...nglish--bug-report.md => bug-report-en.md} | 0
.../{-------------.md => bug-report-zh-cn.md} | 0
.github/ISSUE_TEMPLATE/bug_report.md | 38 -------------------
...ature-request.md => feature-request-en.md} | 0
...----------.md => feature-request-zh-cn.md} | 0
.github/ISSUE_TEMPLATE/feature_request.md | 20 ----------
6 files changed, 58 deletions(-)
rename .github/ISSUE_TEMPLATE/{-english--bug-report.md => bug-report-en.md} (100%)
rename .github/ISSUE_TEMPLATE/{-------------.md => bug-report-zh-cn.md} (100%)
delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
rename .github/ISSUE_TEMPLATE/{-english--feature-request.md => feature-request-en.md} (100%)
rename .github/ISSUE_TEMPLATE/{-----------.md => feature-request-zh-cn.md} (100%)
delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/-english--bug-report.md b/.github/ISSUE_TEMPLATE/bug-report-en.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/-english--bug-report.md
rename to .github/ISSUE_TEMPLATE/bug-report-en.md
diff --git a/.github/ISSUE_TEMPLATE/-------------.md b/.github/ISSUE_TEMPLATE/bug-report-zh-cn.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/-------------.md
rename to .github/ISSUE_TEMPLATE/bug-report-zh-cn.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dd84ea7..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/-english--feature-request.md b/.github/ISSUE_TEMPLATE/feature-request-en.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/-english--feature-request.md
rename to .github/ISSUE_TEMPLATE/feature-request-en.md
diff --git a/.github/ISSUE_TEMPLATE/-----------.md b/.github/ISSUE_TEMPLATE/feature-request-zh-cn.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/-----------.md
rename to .github/ISSUE_TEMPLATE/feature-request-zh-cn.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
From a7c3a05c23f864afef4e814842babed644f860a7 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Thu, 19 Mar 2020 19:09:20 +0800
Subject: [PATCH 3/7] add application info request
---
.github/ISSUE_TEMPLATE/bug-report-en.md | 9 ++++++++-
.github/ISSUE_TEMPLATE/bug-report-zh-cn.md | 5 +++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/bug-report-en.md b/.github/ISSUE_TEMPLATE/bug-report-en.md
index a29a6fd..1674024 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-en.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-en.md
@@ -24,10 +24,17 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.
**Device Info (please complete the following information):**
+
- Device: [e.g. Pixel 4]
- ROM: [e.g: AOSP]
- ROM Version:
- Android Version [e.g. Oreo]
+**Application Info (please complete the following information):**
+
+ - Version: [e.g. 1.1.10]
+ - Apk File Name: [e.g. app-release-arm64-v8a.apk]
+ - Distribution Channel: [e.g. Google Play]
+
**Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug-report-zh-cn.md b/.github/ISSUE_TEMPLATE/bug-report-zh-cn.md
index b19a554..efc4675 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-zh-cn.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-zh-cn.md
@@ -29,5 +29,10 @@ assignees: ''
- Android 版本 [例如: Oreo]
- ROM版本 [例如: 20.3.19]
+**应用信息**
+ - 版本: [例如: 1.1.10]
+ - 安装包文件名: [例如: app-release-arm64-v8a.apk]
+ - 应用来源: [例如: Google Play]
+
**附加信息**
其他的可能与改错误相关的信息
From 4e44298e98a5de1d0447b5b6cab7ef5bd6744030 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Thu, 19 Mar 2020 19:46:12 +0800
Subject: [PATCH 4/7] sorted github issue
---
.github/ISSUE_TEMPLATE/{bug-report-en.md => 01-bug-report-en.md} | 0
.../{feature-request-en.md => 02-feature-request-en.md} | 0
.../{bug-report-zh-cn.md => 03-bug-report-zh-cn.md} | 0
.../{feature-request-zh-cn.md => 04-feature-request-zh-cn.md} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename .github/ISSUE_TEMPLATE/{bug-report-en.md => 01-bug-report-en.md} (100%)
rename .github/ISSUE_TEMPLATE/{feature-request-en.md => 02-feature-request-en.md} (100%)
rename .github/ISSUE_TEMPLATE/{bug-report-zh-cn.md => 03-bug-report-zh-cn.md} (100%)
rename .github/ISSUE_TEMPLATE/{feature-request-zh-cn.md => 04-feature-request-zh-cn.md} (100%)
diff --git a/.github/ISSUE_TEMPLATE/bug-report-en.md b/.github/ISSUE_TEMPLATE/01-bug-report-en.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug-report-en.md
rename to .github/ISSUE_TEMPLATE/01-bug-report-en.md
diff --git a/.github/ISSUE_TEMPLATE/feature-request-en.md b/.github/ISSUE_TEMPLATE/02-feature-request-en.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature-request-en.md
rename to .github/ISSUE_TEMPLATE/02-feature-request-en.md
diff --git a/.github/ISSUE_TEMPLATE/bug-report-zh-cn.md b/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug-report-zh-cn.md
rename to .github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
diff --git a/.github/ISSUE_TEMPLATE/feature-request-zh-cn.md b/.github/ISSUE_TEMPLATE/04-feature-request-zh-cn.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature-request-zh-cn.md
rename to .github/ISSUE_TEMPLATE/04-feature-request-zh-cn.md
From 01fe9deb203fad307eb71a26f13697c1202bff29 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Fri, 20 Mar 2020 13:16:43 +0800
Subject: [PATCH 5/7] update issue template
---
.github/ISSUE_TEMPLATE/01-bug-report-en.md | 3 +++
.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/01-bug-report-en.md b/.github/ISSUE_TEMPLATE/01-bug-report-en.md
index 1674024..ef23fc9 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-report-en.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-report-en.md
@@ -23,6 +23,9 @@ A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
+**Logs**
+if applicable, add logs to help detect problem
+
**Device Info (please complete the following information):**
- Device: [e.g. Pixel 4]
diff --git a/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md b/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
index efc4675..d3b8624 100644
--- a/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
+++ b/.github/ISSUE_TEMPLATE/03-bug-report-zh-cn.md
@@ -23,6 +23,10 @@ assignees: ''
**屏幕截图**
如果适用, 上传屏幕截图以帮助描述错误
+**日志**
+
+如果适用, 上传日志以帮助侦测错误
+
**设备信息 (请完成一下信息):**
- 机型: [例如: Pixel 4]
- 系统/ROM: [例如: MIUI 11]
From df5bafd0bb14606a74b082f6b61db5af6b7ecddf Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Sat, 21 Mar 2020 16:01:35 +0800
Subject: [PATCH 6/7] update README.md
---
README.md | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 1a126d3..7f2a480 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,7 @@
A GUI for [clash](https://github.com/Dreamacro/clash) on Android
-> NOTICE: Early testing currently
-
-
+
or [Releases](https://github.com/Kr328/ClashForAndroid/releases)
### Feature
@@ -15,9 +13,7 @@ Fully feature of [clash](https://github.com/Dreamacro/clash) ~~(Exclude `externa
### Requirement
* Android 7.0+
-* `arm64` or `x86_64` architecture
-
-
+* `armeabi-v7a` , `arm64-v8a`, `x86` or `x86_64` Architecture
### License
@@ -39,7 +35,7 @@ See also [PRIVACY_POLICY.md](./PRIVACY_POLICY.md)
git submodule update --init --recursive
```
-2. Install `Android SDK (include JDK)` ,`Android NDK` and `Golang`
+2. Install `JDK 1.8`, `Android SDK` ,`Android NDK` and `Golang`
3. Configure `local.properties`
From f500596621ca9be5f669ffa966ada32b3ca85dd2 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Sat, 21 Mar 2020 16:11:03 +0800
Subject: [PATCH 7/7] update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7f2a480..cead363 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
## Clash for Android
-A GUI for [clash](https://github.com/Dreamacro/clash) on Android
+A Graphical user interface of [clash](https://github.com/Dreamacro/clash) for Android
or [Releases](https://github.com/Kr328/ClashForAndroid/releases)