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
f8ddea3f
Commit
f8ddea3f
authored
Aug 03, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build
parent
20a7fece
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
mobile/lint.xml
mobile/lint.xml
+2
-3
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+2
-2
mobile/src/main/java/com/github/shadowsocks/ToolbarFragment.kt
...e/src/main/java/com/github/shadowsocks/ToolbarFragment.kt
+2
-2
No files found.
mobile/lint.xml
View file @
f8ddea3f
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue
id=
"InvalidPackage"
>
<ignore
regexp=
"ormlite-core"
/>
</issue>
<!-- Check is buggy: https://issuetracker.google.com/issues/112159117 -->
<issue
id=
"AppCompatResource"
severity=
"ignore"
/>
<issue
id=
"ImpliedQuantity"
severity=
"warning"
/>
<issue
id=
"ExtraTranslation"
severity=
"warning"
/>
<issue
id=
"MissingDefaultResource"
severity=
"warning"
/>
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
f8ddea3f
...
...
@@ -34,7 +34,6 @@ import android.os.Bundle
import
android.os.SystemClock
import
android.text.format.Formatter
import
android.util.Log
import
android.view.Gravity
import
android.view.MenuItem
import
android.view.View
import
android.widget.TextView
...
...
@@ -45,6 +44,7 @@ import androidx.browser.customtabs.CustomTabsIntent
import
androidx.core.content.ContextCompat
import
androidx.core.content.getSystemService
import
androidx.core.net.toUri
import
androidx.core.view.GravityCompat
import
androidx.drawerlayout.widget.DrawerLayout
import
androidx.preference.PreferenceDataStore
import
com.crashlytics.android.Crashlytics
...
...
@@ -342,7 +342,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre
}
override
fun
onBackPressed
()
{
if
(
drawer
.
isDrawerOpen
(
Gravity
.
START
))
drawer
.
closeDrawers
()
else
{
if
(
drawer
.
isDrawerOpen
(
Gravity
Compat
.
START
))
drawer
.
closeDrawers
()
else
{
val
currentFragment
=
supportFragmentManager
.
findFragmentById
(
R
.
id
.
fragment_holder
)
as
ToolbarFragment
if
(!
currentFragment
.
onBackPressed
())
{
if
(
currentFragment
is
ProfilesFragment
)
super
.
onBackPressed
()
else
{
...
...
mobile/src/main/java/com/github/shadowsocks/ToolbarFragment.kt
View file @
f8ddea3f
...
...
@@ -21,9 +21,9 @@
package
com.github.shadowsocks
import
android.os.Bundle
import
android.view.Gravity
import
android.view.View
import
androidx.appcompat.widget.Toolbar
import
androidx.core.view.GravityCompat
import
androidx.fragment.app.Fragment
/**
...
...
@@ -36,7 +36,7 @@ open class ToolbarFragment : Fragment() {
super
.
onViewCreated
(
view
,
savedInstanceState
)
toolbar
=
view
.
findViewById
(
R
.
id
.
toolbar
)
toolbar
.
setNavigationIcon
(
R
.
drawable
.
ic_navigation_menu
)
toolbar
.
setNavigationOnClickListener
{
(
activity
as
MainActivity
).
drawer
.
openDrawer
(
Gravity
.
START
)
}
toolbar
.
setNavigationOnClickListener
{
(
activity
as
MainActivity
).
drawer
.
openDrawer
(
Gravity
Compat
.
START
)
}
}
open
fun
onTrafficUpdated
(
profileId
:
Long
,
txRate
:
Long
,
rxRate
:
Long
,
txTotal
:
Long
,
rxTotal
:
Long
)
{
}
...
...
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