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
015fefe3
Commit
015fefe3
authored
Dec 24, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix corner radius for background
parent
5e9be12d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
22 deletions
+21
-22
src/main/res/drawable/background_selectable.xml
src/main/res/drawable/background_selectable.xml
+2
-0
src/main/res/drawable/background_selected.xml
src/main/res/drawable/background_selected.xml
+2
-0
src/main/res/layout/layout_profiles_item.xml
src/main/res/layout/layout_profiles_item.xml
+15
-17
src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
...n/scala/com/github/shadowsocks/GlobalConfigFragment.scala
+0
-1
src/main/scala/com/github/shadowsocks/MainActivity.scala
src/main/scala/com/github/shadowsocks/MainActivity.scala
+2
-4
No files found.
src/main/res/drawable/background_selectable.xml
View file @
015fefe3
...
@@ -3,11 +3,13 @@
...
@@ -3,11 +3,13 @@
<item>
<item>
<shape
android:shape=
"rectangle"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@color/material_blue_grey_300"
/>
<solid
android:color=
"@color/material_blue_grey_300"
/>
<corners
android:radius=
"4dp"
/>
</shape>
</shape>
</item>
</item>
<item
android:left=
"8dp"
>
<item
android:left=
"8dp"
>
<shape
android:shape=
"rectangle"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@android:color/white"
/>
<solid
android:color=
"@android:color/white"
/>
<corners
android:bottomRightRadius=
"4dp"
android:topRightRadius=
"4dp"
/>
</shape>
</shape>
</item>
</item>
</layer-list>
</layer-list>
src/main/res/drawable/background_selected.xml
View file @
015fefe3
...
@@ -3,11 +3,13 @@
...
@@ -3,11 +3,13 @@
<item>
<item>
<shape
android:shape=
"rectangle"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@color/material_green_700"
/>
<solid
android:color=
"@color/material_green_700"
/>
<corners
android:radius=
"4dp"
/>
</shape>
</shape>
</item>
</item>
<item
android:left=
"8dp"
>
<item
android:left=
"8dp"
>
<shape
android:shape=
"rectangle"
>
<shape
android:shape=
"rectangle"
>
<solid
android:color=
"@android:color/white"
/>
<solid
android:color=
"@android:color/white"
/>
<corners
android:bottomRightRadius=
"4dp"
android:topRightRadius=
"4dp"
/>
</shape>
</shape>
</item>
</item>
</layer-list>
</layer-list>
src/main/res/layout/layout_profiles_item.xml
View file @
015fefe3
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Based on: https://github.com/android/platform_frameworks_base/blob/505e3ab/core/res/res/layout/simple_list_item_2.xml -->
<!-- Based on: https://github.com/android/platform_frameworks_base/blob/505e3ab/core/res/res/layout/simple_list_item_2.xml -->
<android.support.v7.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.v7.widget.CardView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:ads=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/background_selectable"
android:background=
"@drawable/background_selectable"
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:layout_marginStart=
"8dp"
android:layout_marginStart=
"8dp"
android:layout_marginEnd=
"8dp"
android:layout_marginEnd=
"8dp"
android:id=
"@+id/indicator"
>
android:id=
"@+id/indicator"
>
<LinearLayout
android:layout_width=
"match_parent"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:orientation=
"vertical"
...
@@ -51,8 +50,8 @@
...
@@ -51,8 +50,8 @@
<TextView
android:id=
"@+id/address"
<TextView
android:id=
"@+id/address"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical|
lef
t"
android:layout_gravity=
"center_vertical|
star
t"
android:gravity=
"center_vertical|
lef
t"
android:gravity=
"center_vertical|
star
t"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:maxLines=
"1"
android:maxLines=
"1"
android:ellipsize=
"end"
android:ellipsize=
"end"
...
@@ -61,8 +60,8 @@
...
@@ -61,8 +60,8 @@
<TextView
android:id=
"@+id/traffic"
<TextView
android:id=
"@+id/traffic"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical|
right
"
android:layout_gravity=
"center_vertical|
end
"
android:gravity=
"center_vertical|
right
"
android:gravity=
"center_vertical|
end
"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:maxLines=
"1"
android:maxLines=
"1"
android:ellipsize=
"end"
android:ellipsize=
"end"
...
@@ -75,10 +74,9 @@
...
@@ -75,10 +74,9 @@
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:layout_width=
"fill_parent"
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_gravity=
"center_horizontal"
android:layout_alignParentBottom=
"true"
android:visibility=
"gone"
android:visibility=
"gone"
a
ds
:adSize=
"320x132"
a
pp
:adSize=
"320x132"
a
ds
:adUnitId=
"ca-app-pub-9097031975646651/5224027521"
/>
a
pp
:adUnitId=
"ca-app-pub-9097031975646651/5224027521"
/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</android.support.v7.widget.CardView>
src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
View file @
015fefe3
...
@@ -66,5 +66,4 @@ class GlobalConfigFragment extends PreferenceFragment {
...
@@ -66,5 +66,4 @@ class GlobalConfigFragment extends PreferenceFragment {
progressDialog
=
null
progressDialog
=
null
}
}
}
}
}
}
src/main/scala/com/github/shadowsocks/MainActivity.scala
View file @
015fefe3
...
@@ -365,10 +365,8 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
...
@@ -365,10 +365,8 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
private
def
displayFragment
(
fragment
:
ToolbarFragment
)
{
private
def
displayFragment
(
fragment
:
ToolbarFragment
)
{
val
transaction
=
getFragmentManager
.
beginTransaction
().
replace
(
R
.
id
.
content
,
fragment
)
val
transaction
=
getFragmentManager
.
beginTransaction
().
replace
(
R
.
id
.
content
,
fragment
)
if
(
fragment
!=
profilesFragment
)
if
(
fragment
!=
profilesFragment
)
transaction
.
addToBackStack
(
null
)
transaction
.
addToBackStack
(
null
).
commitAllowingStateLoss
()
transaction
.
commitAllowingStateLoss
()
else
transaction
.
commitAllowingStateLoss
()
drawer
.
closeDrawer
()
drawer
.
closeDrawer
()
}
}
...
...
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