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
b61e3d3b
Unverified
Commit
b61e3d3b
authored
Dec 11, 2019
by
Mygod
Committed by
GitHub
Dec 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate to @zhanghai's AndroidFastScroll (#2382)
parent
09e2948d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
32 deletions
+9
-32
mobile/build.gradle
mobile/build.gradle
+1
-0
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
+6
-1
mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
...in/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
+2
-0
mobile/src/main/res/drawable/fastscroll_thumb.xml
mobile/src/main/res/drawable/fastscroll_thumb.xml
+0
-19
mobile/src/main/res/drawable/transparent.xml
mobile/src/main/res/drawable/transparent.xml
+0
-2
mobile/src/main/res/layout/layout_apps.xml
mobile/src/main/res/layout/layout_apps.xml
+0
-5
mobile/src/main/res/layout/layout_custom_rules.xml
mobile/src/main/res/layout/layout_custom_rules.xml
+0
-5
No files found.
mobile/build.gradle
View file @
b61e3d3b
...
...
@@ -68,6 +68,7 @@ dependencies {
implementation
'com.google.zxing:core:3.4.0'
implementation
'com.takisoft.preferencex:preferencex-simplemenu:1.1.0'
implementation
'com.twofortyfouram:android-plugin-api-for-locale:1.0.4'
implementation
'me.zhanghai.android.fastscroll:library:1.1.0'
implementation
'xyz.belvi.mobilevision:barcodescanner:2.0.3'
testImplementation
"junit:junit:$junitVersion"
androidTestImplementation
"androidx.test:runner:$androidTestVersion"
...
...
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
View file @
b61e3d3b
...
...
@@ -59,6 +59,8 @@ import com.google.android.material.snackbar.Snackbar
import
kotlinx.android.synthetic.main.layout_apps.*
import
kotlinx.android.synthetic.main.layout_apps_item.view.*
import
kotlinx.coroutines.*
import
me.zhanghai.android.fastscroll.FastScrollerBuilder
import
me.zhanghai.android.fastscroll.PopupTextProvider
import
kotlin.coroutines.coroutineContext
class
AppManager
:
AppCompatActivity
()
{
...
...
@@ -128,7 +130,7 @@ class AppManager : AppCompatActivity() {
}
}
private
inner
class
AppsAdapter
:
RecyclerView
.
Adapter
<
AppViewHolder
>(),
Filterable
{
private
inner
class
AppsAdapter
:
RecyclerView
.
Adapter
<
AppViewHolder
>(),
Filterable
,
PopupTextProvider
{
private
var
filteredApps
=
apps
suspend
fun
reload
()
{
...
...
@@ -170,6 +172,8 @@ class AppManager : AppCompatActivity() {
}
}
override
fun
getFilter
():
Filter
=
filterImpl
override
fun
getPopupText
(
position
:
Int
)
=
filteredApps
[
position
].
name
.
firstOrNull
()
?.
toString
()
?:
""
}
private
val
proxiedUids
=
SparseBooleanArray
()
...
...
@@ -244,6 +248,7 @@ class AppManager : AppCompatActivity() {
list
.
layoutManager
=
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
)
list
.
itemAnimator
=
DefaultItemAnimator
()
list
.
adapter
=
appsAdapter
FastScrollerBuilder
(
list
).
useMd2Style
().
build
()
search
.
setOnQueryTextListener
(
object
:
SearchView
.
OnQueryTextListener
{
override
fun
onQueryTextSubmit
(
query
:
String
?)
=
false
...
...
mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
View file @
b61e3d3b
...
...
@@ -56,6 +56,7 @@ import com.github.shadowsocks.widget.MainListListener
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.google.android.material.textfield.TextInputLayout
import
kotlinx.android.parcel.Parcelize
import
me.zhanghai.android.fastscroll.FastScrollerBuilder
import
java.net.IDN
import
java.net.MalformedURLException
import
java.net.URL
...
...
@@ -396,6 +397,7 @@ class CustomRulesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener,
list
.
layoutManager
=
LinearLayoutManager
(
activity
,
RecyclerView
.
VERTICAL
,
false
)
list
.
itemAnimator
=
DefaultItemAnimator
()
list
.
adapter
=
adapter
FastScrollerBuilder
(
list
).
useMd2Style
().
build
()
undoManager
=
UndoSnackbarManager
(
activity
,
adapter
::
undo
)
ItemTouchHelper
(
object
:
ItemTouchHelper
.
SimpleCallback
(
0
,
ItemTouchHelper
.
START
or
ItemTouchHelper
.
END
)
{
override
fun
getSwipeDirs
(
recyclerView
:
RecyclerView
,
viewHolder
:
RecyclerView
.
ViewHolder
):
Int
=
...
...
mobile/src/main/res/drawable/fastscroll_thumb.xml
deleted
100644 → 0
View file @
09e2948d
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item>
<shape
android:shape=
"rectangle"
>
<corners
android:topLeftRadius=
"44dp"
android:topRightRadius=
"44dp"
android:bottomLeftRadius=
"44dp"
/>
<padding
android:paddingLeft=
"22dp"
android:paddingRight=
"22dp"
/>
<solid
android:color=
"@color/color_primary_dark"
/>
</shape>
</item>
</selector>
mobile/src/main/res/drawable/transparent.xml
deleted
100644 → 0
View file @
09e2948d
<?xml version="1.0" encoding="utf-8"?>
<shape/>
mobile/src/main/res/layout/layout_apps.xml
View file @
b61e3d3b
...
...
@@ -96,11 +96,6 @@
android:id=
"@+id/list"
android:clipToPadding=
"false"
android:visibility=
"gone"
app:fastScrollEnabled=
"true"
app:fastScrollHorizontalThumbDrawable=
"@drawable/fastscroll_thumb"
app:fastScrollHorizontalTrackDrawable=
"@drawable/transparent"
app:fastScrollVerticalThumbDrawable=
"@drawable/fastscroll_thumb"
app:fastScrollVerticalTrackDrawable=
"@drawable/transparent"
tools:listitem=
"@layout/layout_apps_item"
tools:visibility=
"visible"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
...
...
mobile/src/main/res/layout/layout_custom_rules.xml
View file @
b61e3d3b
...
...
@@ -15,11 +15,6 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
app:fastScrollEnabled=
"true"
app:fastScrollHorizontalThumbDrawable=
"@drawable/fastscroll_thumb"
app:fastScrollHorizontalTrackDrawable=
"@drawable/transparent"
app:fastScrollVerticalThumbDrawable=
"@drawable/fastscroll_thumb"
app:fastScrollVerticalTrackDrawable=
"@drawable/transparent"
tools:listitem=
"@android:layout/simple_list_item_1"
/>
</FrameLayout>
</LinearLayout>
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