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
b14ff708
Commit
b14ff708
authored
Jul 13, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove camera requirement
parent
0e4cfb7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
18 deletions
+13
-18
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+7
-6
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
...scala/com/github/shadowsocks/ProfileManagerActivity.scala
+3
-0
src/main/scala/com/github/shadowsocks/ScannerActivity.scala
src/main/scala/com/github/shadowsocks/ScannerActivity.scala
+3
-12
No files found.
src/main/AndroidManifest.xml
View file @
b14ff708
...
...
@@ -9,13 +9,14 @@
<uses-permission
android:name=
"android.permission.NFC"
/>
<uses-permission
android:name=
"android.permission.CAMERA"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
<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"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.nfc"
android:required=
"false"
/>
android:required=
"false"
/>
<uses-sdk
android:minSdkVersion=
"16"
...
...
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
View file @
b14ff708
...
...
@@ -4,6 +4,7 @@ import java.nio.charset.Charset
import
android.app.Activity
import
android.content._
import
android.content.pm.PackageManager
import
android.nfc.NfcAdapter.CreateNdefMessageCallback
import
android.nfc.
{
NdefMessage
,
NdefRecord
,
NfcAdapter
,
NfcEvent
}
import
android.os.
{
Bundle
,
Handler
}
...
...
@@ -263,6 +264,8 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
val
importAddFAB
=
findViewById
(
R
.
id
.
fab_import_add
).
asInstanceOf
[
FloatingActionButton
]
importAddFAB
.
setImageDrawable
(
dm
.
getDrawable
(
this
,
R
.
drawable
.
ic_content_paste
))
importAddFAB
.
setOnClickListener
(
this
)
menu
.
setOnMenuToggleListener
(
opened
=>
if
(
opened
)
qrcodeAddFAB
.
setVisibility
(
if
(
getPackageManager
.
hasSystemFeature
(
PackageManager
.
FEATURE_CAMERA
))
View
.
VISIBLE
else
View
.
GONE
))
}
...
...
src/main/scala/com/github/shadowsocks/ScannerActivity.scala
View file @
b14ff708
package
com.github.shadowsocks
import
android.Manifest
import
android.app.Activity
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.Manifest
import
android.os.Bundle
import
android.os.Handler
import
android.support.v4.app.ActivityCompat
import
android.support.v4.app.NavUtils
import
android.support.v4.content.ContextCompat
import
android.support.v7.app.ActionBar
import
android.support.v7.app.AppCompatActivity
import
android.support.v7.widget.Toolbar
import
android.view.MenuItem
import
android.view.View
import
android.view.ViewGroup
import
android.view.
{
MenuItem
,
ViewGroup
}
import
android.widget.Toast
import
com.google.zxing.Result
import
me.dm7.barcodescanner.core.IViewFinder
import
me.dm7.barcodescanner.core.ViewFinderView
import
me.dm7.barcodescanner.zxing.ZXingScannerView
class
ScannerActivity
extends
AppCompatActivity
with
ZXingScannerView
.
ResultHandler
{
val
MY_PERMISSIONS_REQUEST_CAMERA
=
1
var
scannerView
:
ZXingScannerView
=
null
var
scannerView
:
ZXingScannerView
=
_
override
def
onRequestPermissionsResult
(
requestCode
:
Int
,
permissions
:
Array
[
String
],
grantResults
:
Array
[
Int
])
{
...
...
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