Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
d78e823c
Commit
d78e823c
authored
Dec 29, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow user to use any QR code scanner and remove unused resources
parent
8e46be59
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
22 deletions
+13
-22
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+0
-2
src/main/res/layout/layout_scanner.xml
src/main/res/layout/layout_scanner.xml
+0
-12
src/main/res/values-ja/strings.xml
src/main/res/values-ja/strings.xml
+0
-1
src/main/res/values-ru/strings.xml
src/main/res/values-ru/strings.xml
+0
-1
src/main/res/values-zh-rCN/strings.xml
src/main/res/values-zh-rCN/strings.xml
+1
-1
src/main/res/values-zh-rTW/strings.xml
src/main/res/values-zh-rTW/strings.xml
+1
-1
src/main/res/values/strings.xml
src/main/res/values/strings.xml
+1
-1
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
+10
-3
No files found.
src/main/AndroidManifest.xml
View file @
d78e823c
...
...
@@ -8,8 +8,6 @@
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.camera"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.nfc"
android:required=
"false"
/>
<uses-feature
android:name=
"android.software.leanback"
...
...
src/main/res/layout/layout_scanner.xml
deleted
100644 → 0
View file @
8e46be59
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<include
layout=
"@layout/toolbar_light_dark"
/>
<me.dm7.barcodescanner.zxing.ZXingScannerView
android:id=
"@+id/scanner"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
</LinearLayout>
src/main/res/values-ja/strings.xml
View file @
d78e823c
...
...
@@ -87,7 +87,6 @@
<string
name=
"add_profile_dialog"
>
シャドーソックスにプロファイルを追加しますか
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
QRコードを読み取る
</string>
<string
name=
"add_profile_methods_manual_settings"
>
手動でセットアップ
</string>
<string
name=
"add_profile_scanner_permission_required"
>
QRコードを読み取るにはカメラの使用権限が必要です。
</string>
<string-array
name=
"route_entry"
>
<item>
すべて
</item>
...
...
src/main/res/values-ru/strings.xml
View file @
d78e823c
...
...
@@ -108,7 +108,6 @@
<string
name=
"add_profile_dialog"
>
Добавить этот Профиль Shadowsocks?
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
Сканировать QR код
</string>
<string
name=
"add_profile_methods_manual_settings"
>
Настройка вручную
</string>
<string
name=
"add_profile_scanner_permission_required"
>
Разрешение камеры требуется для сканирования QR код.
</string>
<string
name=
"copy_url"
>
Копировать URL
</string>
<plurals
name=
"removed"
>
<item
quantity=
"one"
>
Удалён
</item>
...
...
src/main/res/values-zh-rCN/strings.xml
View file @
d78e823c
...
...
@@ -98,7 +98,7 @@
<string
name=
"add_profile_dialog"
>
为影梭添加此配置文件?
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
扫描二维码
</string>
<string
name=
"add_profile_methods_manual_settings"
>
手动设置
</string>
<string
name=
"add_profile_scanner_
permission_required"
>
扫描二维码需要相机权限
。
</string>
<string
name=
"add_profile_scanner_
not_installed"
>
请安装任意兼容 ZXing 的二维码扫描应用
。
</string>
<string-array
name=
"route_entry"
>
<item>
全局
</item>
...
...
src/main/res/values-zh-rTW/strings.xml
View file @
d78e823c
...
...
@@ -99,7 +99,7 @@
<string
name=
"add_profile_dialog"
>
為 Shadowsocks 新增此設定檔?
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
掃描 QR 碼
</string>
<string
name=
"add_profile_methods_manual_settings"
>
手動設定
</string>
<string
name=
"add_profile_scanner_
permission_required"
>
掃描 QR 碼需要相機權限
。
</string>
<string
name=
"add_profile_scanner_
not_installed"
>
請安裝任何兼容 ZXing 的 QR 碼掃描應用程式
。
</string>
<string-array
name=
"route_entry"
>
<item>
全域
</item>
...
...
src/main/res/values/strings.xml
View file @
d78e823c
...
...
@@ -127,7 +127,7 @@
<string
name=
"add_profile_dialog"
>
Add this Shadowsocks Profile?
</string>
<string
name=
"add_profile_methods_scan_qr_code"
>
Scan QR code
</string>
<string
name=
"add_profile_methods_manual_settings"
>
Manual Settings
</string>
<string
name=
"add_profile_scanner_
permission_required"
>
Camera permission is required for scanning QR code
.
</string>
<string
name=
"add_profile_scanner_
not_installed"
>
Please install any ZXing-compliant QR code scanning app
.
</string>
<string
name=
"copy_url"
>
Copy URL
</string>
<plurals
name=
"removed"
>
<item
quantity=
"one"
>
Removed
</item>
...
...
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
View file @
d78e823c
...
...
@@ -22,7 +22,9 @@ package com.github.shadowsocks
import
java.util.GregorianCalendar
import
android.app.Activity
import
android.content._
import
android.net.Uri
import
android.os.Bundle
import
android.support.v7.widget.RecyclerView.ViewHolder
import
android.support.v7.widget._
...
...
@@ -306,18 +308,23 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
}
override
def
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
)
:
Unit
=
requestCode
match
{
case
REQUEST_SCAN_QR_CODE
=>
case
REQUEST_SCAN_QR_CODE
=>
if
(
resultCode
==
Activity
.
RESULT_OK
)
{
val
contents
=
data
.
getStringExtra
(
"SCAN_RESULT"
)
if
(!
TextUtils
.
isEmpty
(
contents
))
Parser
.
findAll
(
contents
).
foreach
(
app
.
profileManager
.
createProfile
)
}
case
_
=>
super
.
onActivityResult
(
resultCode
,
resultCode
,
data
)
}
def
onMenuItemClick
(
item
:
MenuItem
)
:
Boolean
=
item
.
getItemId
match
{
case
R
.
id
.
action_scan_qr_code
=>
startActivityForResult
(
new
Intent
(
"com.google.zxing.client.android.SCAN"
)
try
startActivityForResult
(
new
Intent
(
"com.google.zxing.client.android.SCAN"
)
.
addCategory
(
Intent
.
CATEGORY_DEFAULT
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
|
Intent
.
FLAG_ACTIVITY_NEW_DOCUMENT
),
REQUEST_SCAN_QR_CODE
)
REQUEST_SCAN_QR_CODE
)
catch
{
case
_:
ActivityNotFoundException
=>
Toast
.
makeText
(
getActivity
,
R
.
string
.
add_profile_scanner_not_installed
,
Toast
.
LENGTH_LONG
).
show
()
startActivity
(
new
Intent
(
Intent
.
ACTION_VIEW
,
Uri
.
parse
(
"market://details?id=tw.com.quickmark"
)))
}
true
case
R
.
id
.
action_import
=>
if
(
clipboard
.
hasPrimaryClip
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment