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
d23be09c
Commit
d23be09c
authored
Feb 04, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add snackbars everywhere
parent
4a97ff1d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
35 deletions
+45
-35
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
+6
-5
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
.../src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+5
-4
mobile/src/main/res/layout/layout_apps.xml
mobile/src/main/res/layout/layout_apps.xml
+34
-26
No files found.
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
View file @
d23be09c
...
...
@@ -34,6 +34,7 @@ import android.content.pm.PackageManager
import
android.graphics.drawable.Drawable
import
android.os.Bundle
import
android.os.Handler
import
android.support.design.widget.Snackbar
import
android.support.v4.app.TaskStackBuilder
import
android.support.v7.app.AppCompatActivity
import
android.support.v7.widget.DefaultItemAnimator
...
...
@@ -231,14 +232,14 @@ class AppManager : AppCompatActivity(), Toolbar.OnMenuItemClickListener {
ProfileManager
.
updateProfile
(
it
)
}
if
(
DataStore
.
directBootAware
)
DirectBoot
.
update
()
Toast
.
makeText
(
this
,
R
.
string
.
action_apply_all
,
Toast
.
LENGTH_SHORT
).
show
()
}
else
Toast
.
makeText
(
this
,
R
.
string
.
action_export_err
,
Toast
.
LENGTH_SHORT
).
show
()
Snackbar
.
make
(
appListView
,
R
.
string
.
action_apply_all
,
Snackbar
.
LENGTH_LONG
).
show
()
}
else
Snackbar
.
make
(
appListView
,
R
.
string
.
action_export_err
,
Snackbar
.
LENGTH_LONG
).
show
()
return
true
}
R
.
id
.
action_export
->
{
clipboard
.
primaryClip
=
ClipData
.
newPlainText
(
Key
.
individual
,
"${DataStore.bypass}\n${DataStore.individual}"
)
Toast
.
makeText
(
this
,
R
.
string
.
action_export_msg
,
Toast
.
LENGTH_SHORT
).
show
()
Snackbar
.
make
(
appListView
,
R
.
string
.
action_export_msg
,
Snackbar
.
LENGTH_LONG
).
show
()
return
true
}
R
.
id
.
action_import
->
{
...
...
@@ -251,13 +252,13 @@ class AppManager : AppCompatActivity(), Toolbar.OnMenuItemClickListener {
bypassSwitch
.
isChecked
=
enabled
.
toBoolean
()
DataStore
.
individual
=
apps
DataStore
.
dirty
=
true
Toast
.
makeText
(
this
,
R
.
string
.
action_import_msg
,
Toast
.
LENGTH_SHORT
).
show
()
Snackbar
.
make
(
appListView
,
R
.
string
.
action_import_msg
,
Snackbar
.
LENGTH_LONG
).
show
()
initProxiedApps
(
apps
)
reloadApps
()
return
true
}
catch
(
_
:
IllegalArgumentException
)
{
}
}
Toast
.
makeText
(
this
,
R
.
string
.
action_import_err
,
Toast
.
LENGTH_SHORT
).
show
()
Snackbar
.
make
(
appListView
,
R
.
string
.
action_import_err
,
Snackbar
.
LENGTH_LONG
).
show
()
}
}
return
false
...
...
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file @
d23be09c
...
...
@@ -370,7 +370,8 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
val
profiles
=
Profile
.
findAll
(
clipboard
.
primaryClip
.
getItemAt
(
0
).
text
).
toList
()
if
(
profiles
.
isNotEmpty
())
{
profiles
.
forEach
{
ProfileManager
.
createProfile
(
it
)
}
Toast
.
makeText
(
activity
,
R
.
string
.
action_import_msg
,
Toast
.
LENGTH_SHORT
).
show
()
Snackbar
.
make
(
activity
!!
.
findViewById
(
R
.
id
.
snackbar
),
R
.
string
.
action_import_msg
,
Snackbar
.
LENGTH_LONG
).
show
()
return
true
}
}
catch
(
exc
:
Exception
)
{
...
...
@@ -386,10 +387,10 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
}
R
.
id
.
action_export
->
{
val
profiles
=
ProfileManager
.
getAllProfiles
()
if
(
profiles
!=
null
)
{
Snackbar
.
make
(
activity
!!
.
findViewById
(
R
.
id
.
snackbar
),
if
(
profiles
!=
null
)
{
clipboard
.
primaryClip
=
ClipData
.
newPlainText
(
null
,
profiles
.
joinToString
(
"\n"
))
Toast
.
makeText
(
activity
,
R
.
string
.
action_export_msg
,
Toast
.
LENGTH_SHORT
).
show
()
}
else
Toast
.
makeText
(
activity
,
R
.
string
.
action_export_err
,
Toast
.
LENGTH_SHORT
).
show
()
R
.
string
.
action_export_msg
}
else
R
.
string
.
action_export_err
,
Snackbar
.
LENGTH_LONG
).
show
()
true
}
else
->
false
...
...
mobile/src/main/res/layout/layout_apps.xml
View file @
d23be09c
...
...
@@ -3,8 +3,8 @@
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"
fill
_parent"
android:layout_height=
"
fill
_parent"
android:layout_width=
"
match
_parent"
android:layout_height=
"
match
_parent"
android:orientation=
"vertical"
android:duplicateParentState=
"false"
>
<include
layout=
"@layout/toolbar_light_dark"
/>
...
...
@@ -41,28 +41,36 @@
android:textColor=
"?android:attr/textColorSecondary"
android:textSize=
"18sp"
/>
</LinearLayout>
<FrameLayout
android:layout_width=
"fill_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
>
<ProgressBar
android:id=
"@+id/loading"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
/>
<android.support.v7.widget.RecyclerView
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
android:id=
"@+id/list"
tools:listitem=
"@layout/layout_apps_item"
/>
<com.futuremind.recyclerviewfastscroll.FastScroller
android:id=
"@+id/fastscroller"
android:orientation=
"vertical"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_gravity=
"end"
android:layout_marginTop=
"8dp"
android:layout_marginBottom=
"8dp"
app:fastscroll__handleColor=
"@color/material_primary_500"
app:fastscroll__bubbleColor=
"@color/material_primary_500"
app:fastscroll__bubbleTextAppearance=
"@style/StyledScrollerTextAppearance"
/>
</FrameLayout>
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/snackbar"
android:background=
"@color/material_primary_700"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"?android:attr/windowBackground"
app:layout_behavior=
"com.github.shadowsocks.widget.ShrinkUpwardBehavior"
>
<ProgressBar
android:id=
"@+id/loading"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
/>
<android.support.v7.widget.RecyclerView
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
android:id=
"@+id/list"
tools:listitem=
"@layout/layout_apps_item"
/>
<com.futuremind.recyclerviewfastscroll.FastScroller
android:id=
"@+id/fastscroller"
android:orientation=
"vertical"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_gravity=
"end"
android:layout_marginTop=
"8dp"
android:layout_marginBottom=
"8dp"
app:fastscroll__handleColor=
"@color/material_primary_500"
app:fastscroll__bubbleColor=
"@color/material_primary_500"
app:fastscroll__bubbleTextAppearance=
"@style/StyledScrollerTextAppearance"
/>
</FrameLayout>
</android.support.design.widget.CoordinatorLayout>
</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