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
9041404f
Commit
9041404f
authored
Apr 30, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add partial material design
parent
5aae822c
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
94 additions
and
6 deletions
+94
-6
build.sbt
build.sbt
+1
-3
src/main/res/drawable-hdpi-v21/ic_drawer.png
src/main/res/drawable-hdpi-v21/ic_drawer.png
+0
-0
src/main/res/drawable-mdpi-v21/ic_drawer.png
src/main/res/drawable-mdpi-v21/ic_drawer.png
+0
-0
src/main/res/drawable-xhdpi-v21/ic_drawer.png
src/main/res/drawable-xhdpi-v21/ic_drawer.png
+0
-0
src/main/res/drawable-xxhdpi-v21/ic_drawer.png
src/main/res/drawable-xxhdpi-v21/ic_drawer.png
+0
-0
src/main/res/layout/layout_switch.xml
src/main/res/layout/layout_switch.xml
+1
-1
src/main/res/values-v21/styles_shadow.xml
src/main/res/values-v21/styles_shadow.xml
+82
-0
src/main/res/values/styles_shadow.xml
src/main/res/values/styles_shadow.xml
+1
-1
src/main/scala/com/github/shadowsocks/AppManager.scala
src/main/scala/com/github/shadowsocks/AppManager.scala
+1
-0
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+8
-1
No files found.
build.sbt
View file @
9041404f
...
...
@@ -18,10 +18,8 @@ typedResources in Android := false
resolvers
+=
"JRAF"
at
"http://JRAF.org/static/maven/2"
resolvers
+=
"madeye private releases"
at
"http://madeye-maven-repository.googlecode.com/git/"
libraryDependencies
++=
Seq
(
"dnsjava"
%
"dnsjava"
%
"2.1.
5
"
,
"dnsjava"
%
"dnsjava"
%
"2.1.
7
"
,
"com.github.kevinsawicki"
%
"http-request"
%
"5.6"
,
"commons-net"
%
"commons-net"
%
"3.3"
,
"com.google.zxing"
%
"android-integration"
%
"3.1.0"
...
...
src/main/res/drawable-hdpi-v21/ic_drawer.png
0 → 100755
View file @
9041404f
2.8 KB
src/main/res/drawable-mdpi-v21/ic_drawer.png
0 → 100755
View file @
9041404f
2.79 KB
src/main/res/drawable-xhdpi-v21/ic_drawer.png
0 → 100755
View file @
9041404f
2.84 KB
src/main/res/drawable-xxhdpi-v21/ic_drawer.png
0 → 100755
View file @
9041404f
2.89 KB
src/main/res/layout/layout_switch.xml
View file @
9041404f
...
...
@@ -9,7 +9,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center_vertical"
android:textSize=
"2
4
sp"
android:textSize=
"2
6
sp"
android:textColor=
"@color/title"
android:text=
"@string/screen_name"
android:layout_alignParentLeft=
"true"
...
...
src/main/res/values-v21/styles_shadow.xml
0 → 100644
View file @
9041404f
<?xml version="1.0" encoding="utf-8"?>
<!-- File created by the Android Action Bar Style Generator
Copyright (C) 2011 The Android Open Source Project
Copyright (C) 2012 readyState Software Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<style
name=
"Theme.Shadow"
parent=
"@android:style/Theme.Material.Light.DarkActionBar"
>
<item
name=
"android:actionBarItemBackground"
>
@drawable/selectable_background_shadow
</item>
<item
name=
"android:popupMenuStyle"
>
@style/PopupMenu.Shadow
</item>
<item
name=
"android:dropDownListViewStyle"
>
@style/DropDownListView.Shadow
</item>
<item
name=
"android:actionBarTabStyle"
>
@style/ActionBarTabStyle.Shadow
</item>
<item
name=
"android:actionDropDownStyle"
>
@style/DropDownNav.Shadow
</item>
<item
name=
"android:actionBarStyle"
>
@style/ActionBar.Solid.Shadow
</item>
<item
name=
"android:actionModeBackground"
>
@drawable/cab_background_top_shadow
</item>
<item
name=
"android:actionModeSplitBackground"
>
@drawable/cab_background_bottom_shadow
</item>
<!-- Light.DarkActionBar specific -->
<item
name=
"android:actionBarWidgetTheme"
>
@style/Theme.Shadow.Widget
</item>
<item
name=
"android:textAppearanceLargePopupMenu"
>
@style/m_textAppearanceLargePopupMenu
</item>
<item
name=
"android:textAppearanceSmallPopupMenu"
>
@style/m_textAppearanceSmallPopupMenu
</item>
</style>
<style
name=
"ActionBar.Solid.Shadow"
parent=
"@android:style/Widget.Material.ActionBar"
>
<item
name=
"android:background"
>
@drawable/ab_background_textured_shadow
</item>
<item
name=
"android:backgroundStacked"
>
@drawable/ab_stacked_solid_shadow
</item>
<item
name=
"android:backgroundSplit"
>
@drawable/ab_background_textured_shadow
</item>
</style>
<style
name=
"ActionBar.Transparent.Shadow"
parent=
"@android:style/Widget.Material.ActionBar"
>
<item
name=
"android:background"
>
@drawable/ab_transparent_shadow
</item>
</style>
<style
name=
"PopupMenu.Shadow"
parent=
"@android:style/Widget.Material.ListPopupWindow"
>
<item
name=
"android:popupBackground"
>
@drawable/menu_dropdown_panel_shadow
</item>
</style>
<style
name=
"m_textAppearanceSmallPopupMenu"
parent=
"@android:style/TextAppearance.Material.Widget.PopupMenu.Small"
>
<item
name=
"android:textColor"
>
@android:color/white
</item>
</style>
<style
name=
"m_textAppearanceLargePopupMenu"
parent=
"@android:style/TextAppearance.Material.Widget.PopupMenu.Large"
>
<item
name=
"android:textColor"
>
@android:color/white
</item>
</style>
<style
name=
"DropDownListView.Shadow"
parent=
"@android:style/Widget.Material.ListView.DropDown"
>
<item
name=
"android:listSelector"
>
@drawable/selectable_background_shadow
</item>
</style>
<style
name=
"ActionBarTabStyle.Shadow"
parent=
"@android:style/Widget.Material.ActionBar.TabView"
>
<item
name=
"android:background"
>
@drawable/tab_indicator_ab_shadow
</item>
</style>
<style
name=
"DropDownNav.Shadow"
parent=
"@android:style/Widget.Material.Spinner"
>
<item
name=
"android:background"
>
@drawable/spinner_background_ab_shadow
</item>
<item
name=
"android:popupBackground"
>
@drawable/menu_dropdown_panel_shadow
</item>
<item
name=
"android:dropDownSelector"
>
@drawable/selectable_background_shadow
</item>
</style>
<!-- this style is only referenced in a Light.DarkActionBar based theme -->
<style
name=
"Theme.Shadow.Widget"
parent=
"@android:style/Theme.Material"
>
<item
name=
"android:popupMenuStyle"
>
@style/PopupMenu.Shadow
</item>
<item
name=
"android:dropDownListViewStyle"
>
@style/DropDownListView.Shadow
</item>
<item
name=
"android:textColor"
>
@android:color/white
</item>
<item
name=
"android:textAppearanceLargePopupMenu"
>
@style/m_textAppearanceLargePopupMenu
</item>
<item
name=
"android:textAppearanceSmallPopupMenu"
>
@style/m_textAppearanceSmallPopupMenu
</item>
</style>
</resources>
src/main/res/values/styles_shadow.xml
View file @
9041404f
...
...
@@ -35,7 +35,7 @@
<item
name=
"android:textAppearanceSmallPopupMenu"
>
@style/m_textAppearanceSmallPopupMenu
</item>
</style>
<style
name=
"ActionBar.Solid.Shadow"
parent=
"@android:style/Widget.Holo.
Light.ActionBar.Solid.Inverse
"
>
<style
name=
"ActionBar.Solid.Shadow"
parent=
"@android:style/Widget.Holo.
ActionBar
"
>
<item
name=
"android:background"
>
@drawable/ab_background_textured_shadow
</item>
<item
name=
"android:backgroundStacked"
>
@drawable/ab_stacked_solid_shadow
</item>
<item
name=
"android:backgroundSplit"
>
@drawable/ab_background_textured_shadow
</item>
...
...
src/main/scala/com/github/shadowsocks/AppManager.scala
View file @
9041404f
...
...
@@ -280,6 +280,7 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe
val
actionBar
=
getActionBar
()
actionBar
.
setTitle
(
R
.
string
.
proxied_help
)
actionBar
.
setDisplayHomeAsUpEnabled
(
true
)
actionBar
.
setDisplayShowHomeEnabled
(
false
)
this
.
setContentView
(
R
.
layout
.
layout_apps
)
this
.
overlay
=
View
.
inflate
(
this
,
R
.
layout
.
overlay
,
null
).
asInstanceOf
[
TextView
]
getWindowManager
.
addView
(
overlay
,
new
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
9041404f
...
...
@@ -514,7 +514,14 @@ class Shadowsocks
getActionBar
.
setCustomView
(
switchLayout
)
getActionBar
.
setDisplayShowTitleEnabled
(
false
)
getActionBar
.
setDisplayShowCustomEnabled
(
true
)
getActionBar
.
setIcon
(
R
.
drawable
.
ic_stat_shadowsocks
)
if
(
Utils
.
isLollipopOrAbove
)
{
getWindow
.
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
);
getWindow
.
setStatusBarColor
(
getResources
().
getColor
(
R
.
color
.
grey3
));
getActionBar
.
setDisplayHomeAsUpEnabled
(
true
)
getActionBar
.
setDisplayShowHomeEnabled
(
false
)
}
else
{
getActionBar
.
setIcon
(
R
.
drawable
.
ic_stat_shadowsocks
)
}
title
.
setOnLongClickListener
(
new
OnLongClickListener
{
override
def
onLongClick
(
v
:
View
)
:
Boolean
=
{
if
(
Utils
.
isLollipopOrAbove
&&
bgService
!=
null
...
...
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