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
28523091
Commit
28523091
authored
Dec 26, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move snackbar to the bottom
parent
62e2d636
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
14 deletions
+7
-14
src/main/res/layout/layout_global_settings.xml
src/main/res/layout/layout_global_settings.xml
+0
-4
src/main/res/layout/layout_main.xml
src/main/res/layout/layout_main.xml
+6
-1
src/main/res/layout/layout_profile_config.xml
src/main/res/layout/layout_profile_config.xml
+0
-4
src/main/res/layout/layout_profiles.xml
src/main/res/layout/layout_profiles.xml
+0
-4
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
+1
-1
No files found.
src/main/res/layout/layout_global_settings.xml
View file @
28523091
...
@@ -4,10 +4,6 @@
...
@@ -4,10 +4,6 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<include
layout=
"@layout/toolbar_light_dark"
/>
<include
layout=
"@layout/toolbar_light_dark"
/>
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/snackbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<fragment
android:id=
"@+id/content"
<fragment
android:id=
"@+id/content"
class=
"com.github.shadowsocks.GlobalConfigFragment"
class=
"com.github.shadowsocks.GlobalConfigFragment"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
src/main/res/layout/layout_main.xml
View file @
28523091
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
android:background=
"@drawable/background_stat"
android:background=
"@drawable/background_stat"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:nextFocusRight=
"@+id/fab"
android:nextFocusRight=
"@+id/fab"
android:layout_a
lignParentBottom=
"true
"
>
android:layout_a
bove=
"@+id/snackbar
"
>
<TextView
android:id=
"@+id/status"
<TextView
android:id=
"@+id/status"
android:textSize=
"16sp"
android:textSize=
"16sp"
android:textColor=
"?android:attr/textColorPrimary"
android:textColor=
"?android:attr/textColorPrimary"
...
@@ -81,4 +81,9 @@
...
@@ -81,4 +81,9 @@
app:srcCompat=
"@drawable/ic_start_idle"
app:srcCompat=
"@drawable/ic_start_idle"
app:pressedTranslationZ=
"6dp"
app:borderWidth=
"0dp"
/>
app:pressedTranslationZ=
"6dp"
app:borderWidth=
"0dp"
/>
</com.github.jorgecastilloprz.FABProgressCircle>
</com.github.jorgecastilloprz.FABProgressCircle>
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/snackbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
/>
</RelativeLayout>
</RelativeLayout>
src/main/res/layout/layout_profile_config.xml
View file @
28523091
...
@@ -4,10 +4,6 @@
...
@@ -4,10 +4,6 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<include
layout=
"@layout/toolbar_light_dark"
/>
<include
layout=
"@layout/toolbar_light_dark"
/>
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/snackbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<fragment
android:id=
"@+id/content"
<fragment
android:id=
"@+id/content"
class=
"com.github.shadowsocks.ProfileConfigFragment"
class=
"com.github.shadowsocks.ProfileConfigFragment"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
src/main/res/layout/layout_profiles.xml
View file @
28523091
...
@@ -4,10 +4,6 @@
...
@@ -4,10 +4,6 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<include
layout=
"@layout/toolbar_light_dark"
/>
<include
layout=
"@layout/toolbar_light_dark"
/>
<android.support.design.widget.CoordinatorLayout
android:id=
"@+id/snackbar"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<android.support.v7.widget.RecyclerView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.v7.widget.RecyclerView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/profilesList"
android:id=
"@+id/profilesList"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
View file @
28523091
...
@@ -252,7 +252,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
...
@@ -252,7 +252,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
layoutManager
.
scrollToPosition
(
profilesAdapter
.
profiles
.
zipWithIndex
.
collectFirst
{
layoutManager
.
scrollToPosition
(
profilesAdapter
.
profiles
.
zipWithIndex
.
collectFirst
{
case
(
profile
,
i
)
if
profile
.
id
==
app
.
profileId
=>
i
case
(
profile
,
i
)
if
profile
.
id
==
app
.
profileId
=>
i
}.
getOrElse
(-
1
))
}.
getOrElse
(-
1
))
undoManager
=
new
UndoSnackbarManager
[
Profile
](
view
.
findViewById
(
R
.
id
.
snackbar
),
profilesAdapter
.
undo
,
profilesAdapter
.
commit
)
undoManager
=
new
UndoSnackbarManager
[
Profile
](
getActivity
.
findViewById
(
R
.
id
.
snackbar
),
profilesAdapter
.
undo
,
profilesAdapter
.
commit
)
new
ItemTouchHelper
(
new
SimpleCallback
(
ItemTouchHelper
.
UP
|
ItemTouchHelper
.
DOWN
,
new
ItemTouchHelper
(
new
SimpleCallback
(
ItemTouchHelper
.
UP
|
ItemTouchHelper
.
DOWN
,
ItemTouchHelper
.
START
|
ItemTouchHelper
.
END
)
{
ItemTouchHelper
.
START
|
ItemTouchHelper
.
END
)
{
def
onSwiped
(
viewHolder
:
ViewHolder
,
direction
:
Int
)
{
def
onSwiped
(
viewHolder
:
ViewHolder
,
direction
:
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