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
5615d93a
Commit
5615d93a
authored
Jun 11, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine preferences to match Android P style
parent
1d49b2ff
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
99 additions
and
12 deletions
+99
-12
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
...om/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
+2
-2
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
...main/java/com/github/shadowsocks/ProfileConfigFragment.kt
+2
-2
mobile/src/main/res/drawable/ic_action_dns.xml
mobile/src/main/res/drawable/ic_action_dns.xml
+10
-0
mobile/src/main/res/drawable/ic_action_lock.xml
mobile/src/main/res/drawable/ic_action_lock.xml
+10
-0
mobile/src/main/res/drawable/ic_action_offline_bolt.xml
mobile/src/main/res/drawable/ic_action_offline_bolt.xml
+10
-0
mobile/src/main/res/drawable/ic_action_settings.xml
mobile/src/main/res/drawable/ic_action_settings.xml
+2
-1
mobile/src/main/res/drawable/ic_image_brightness_3.xml
mobile/src/main/res/drawable/ic_image_brightness_3.xml
+6
-0
mobile/src/main/res/drawable/ic_image_looks_6.xml
mobile/src/main/res/drawable/ic_image_looks_6.xml
+10
-0
mobile/src/main/res/drawable/ic_navigation_apps.xml
mobile/src/main/res/drawable/ic_navigation_apps.xml
+10
-0
mobile/src/main/res/drawable/ic_notification_enhanced_encryption.xml
...main/res/drawable/ic_notification_enhanced_encryption.xml
+10
-0
mobile/src/main/res/values/styles.xml
mobile/src/main/res/values/styles.xml
+9
-0
mobile/src/main/res/xml/pref_global.xml
mobile/src/main/res/xml/pref_global.xml
+12
-7
mobile/src/main/res/xml/pref_profile.xml
mobile/src/main/res/xml/pref_profile.xml
+6
-0
No files found.
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
View file @
5615d93a
...
@@ -31,9 +31,9 @@ import com.github.shadowsocks.preference.DataStore
...
@@ -31,9 +31,9 @@ import com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.TcpFastOpen
import
com.github.shadowsocks.utils.TcpFastOpen
import
com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat
Dividers
import
com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat
class
GlobalSettingsPreferenceFragment
:
PreferenceFragmentCompat
Dividers
()
{
class
GlobalSettingsPreferenceFragment
:
PreferenceFragmentCompat
()
{
override
fun
onCreatePreferencesFix
(
savedInstanceState
:
Bundle
?,
rootKey
:
String
?)
{
override
fun
onCreatePreferencesFix
(
savedInstanceState
:
Bundle
?,
rootKey
:
String
?)
{
preferenceManager
.
preferenceDataStore
=
DataStore
.
publicStore
preferenceManager
.
preferenceDataStore
=
DataStore
.
publicStore
DataStore
.
initGlobal
()
DataStore
.
initGlobal
()
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
View file @
5615d93a
...
@@ -48,9 +48,9 @@ import com.github.shadowsocks.utils.Action
...
@@ -48,9 +48,9 @@ import com.github.shadowsocks.utils.Action
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
import
com.takisoft.fix.support.v7.preference.EditTextPreference
import
com.takisoft.fix.support.v7.preference.EditTextPreference
import
com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat
Dividers
import
com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat
class
ProfileConfigFragment
:
PreferenceFragmentCompat
Dividers
(),
Toolbar
.
OnMenuItemClickListener
,
class
ProfileConfigFragment
:
PreferenceFragmentCompat
(),
Toolbar
.
OnMenuItemClickListener
,
Preference
.
OnPreferenceChangeListener
,
OnPreferenceDataStoreChangeListener
{
Preference
.
OnPreferenceChangeListener
,
OnPreferenceDataStoreChangeListener
{
companion
object
{
companion
object
{
private
const
val
REQUEST_CODE_PLUGIN_CONFIGURE
=
1
private
const
val
REQUEST_CODE_PLUGIN_CONFIGURE
=
1
...
...
mobile/src/main/res/drawable/ic_action_dns.xml
0 → 100644
View file @
5615d93a
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"
/>
</vector>
mobile/src/main/res/drawable/ic_action_lock.xml
0 → 100644
View file @
5615d93a
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"
/>
</vector>
mobile/src/main/res/drawable/ic_action_offline_bolt.xml
0 → 100644
View file @
5615d93a
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M12,2.02c-5.51,0 -9.98,4.47 -9.98,9.98s4.47,9.98 9.98,9.98 9.98,-4.47 9.98,-9.98S17.51,2.02 12,2.02zM11.48,20v-6.26H8L13,4v6.26h3.35L11.48,20z"
/>
</vector>
mobile/src/main/res/drawable/ic_action_settings.xml
View file @
5615d93a
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
android:width=
"24dp"
android:width=
"24dp"
android:height=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
android:viewportHeight=
"24.0"
android:tint=
"?attr/colorControlNormal"
>
<path
<path
android:fillColor=
"#FF000000"
android:fillColor=
"#FF000000"
android:pathData=
"M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
/>
android:pathData=
"M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
/>
...
...
mobile/src/main/res/drawable/ic_image_brightness_3.xml
0 → 100644
View file @
5615d93a
<vector
android:autoMirrored=
"true"
android:height=
"24dp"
android:viewportHeight=
"24.0"
android:viewportWidth=
"24.0"
android:width=
"24dp"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M9,2c-1.05,0 -2.05,0.16 -3,0.46 4.06,1.27 7,5.06 7,9.54 0,4.48 -2.94,8.27 -7,9.54 0.95,0.3 1.95,0.46 3,0.46 5.52,0 10,-4.48 10,-10S14.52,2 9,2z"
/>
</vector>
mobile/src/main/res/drawable/ic_image_looks_6.xml
0 → 100644
View file @
5615d93a
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M11,15h2v-2h-2v2zM19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM15,9h-4v2h2c1.1,0 2,0.89 2,2v2c0,1.11 -0.9,2 -2,2h-2c-1.1,0 -2,-0.89 -2,-2L9,9c0,-1.11 0.9,-2 2,-2h4v2z"
/>
</vector>
mobile/src/main/res/drawable/ic_navigation_apps.xml
0 → 100644
View file @
5615d93a
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"
/>
</vector>
mobile/src/main/res/drawable/ic_notification_enhanced_encryption.xml
0 → 100644
View file @
5615d93a
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2H8.9V6zM16,16h-3v3h-2v-3H8v-2h3v-3h2v3h3v2z"
/>
</vector>
mobile/src/main/res/values/styles.xml
View file @
5615d93a
...
@@ -14,6 +14,15 @@
...
@@ -14,6 +14,15 @@
<item
name=
"material_drawer_header_selection_text"
>
@color/drawer_header_selection_text
</item>
<item
name=
"material_drawer_header_selection_text"
>
@color/drawer_header_selection_text
</item>
</style>
</style>
<style
name=
"Theme.Design.DayNight.BottomSheetDialog"
parent=
"@style/Theme.Design.Light.BottomSheetDialog"
/>
<style
name=
"Theme.Design.DayNight.BottomSheetDialog"
parent=
"@style/Theme.Design.Light.BottomSheetDialog"
/>
<!-- https://github.com/Gericop/Android-Support-Preference-V7-Fix/issues/111 -->
<style
name=
"Preference.SimpleMenuPreference"
>
<item
name=
"android:layout"
>
@layout/preference_simplemenu
</item>
<item
name=
"allowDividerAbove"
>
false
</item>
<item
name=
"allowDividerBelow"
>
true
</item>
<item
name=
"iconSpaceReserved"
>
@bool/config_materialPreferenceIconSpaceReserved
</item>
<item
name=
"pref_popupStyle"
>
@style/Preference.SimpleMenuPreference.Popup
</item>
</style>
<style
name=
"StyledScrollerTextAppearance"
parent=
"@android:style/TextAppearance"
>
<style
name=
"StyledScrollerTextAppearance"
parent=
"@android:style/TextAppearance"
>
<item
name=
"android:textSize"
>
24sp
</item>
<item
name=
"android:textSize"
>
24sp
</item>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:textStyle"
>
bold
</item>
...
...
mobile/src/main/res/xml/pref_global.xml
View file @
5615d93a
...
@@ -5,15 +5,19 @@
...
@@ -5,15 +5,19 @@
android:persistent=
"false"
android:persistent=
"false"
android:summary=
"@string/auto_connect_summary"
android:summary=
"@string/auto_connect_summary"
android:title=
"@string/auto_connect"
/>
android:title=
"@string/auto_connect"
/>
<!-- Direct Boot Aware alone doesn't do anything without auto connect -->
<SwitchPreference
<SwitchPreference
android:key=
"directBootAware"
android:key=
"directBootAware"
android:summary=
"@string/direct_boot_aware_summary"
android:icon=
"@drawable/ic_action_lock"
android:title=
"@string/direct_boot_aware"
/>
android:summary=
"@string/direct_boot_aware_summary"
<SwitchPreference
android:key=
"tcp_fastopen"
android:title=
"@string/direct_boot_aware"
/>
android:summary=
"@string/tcp_fastopen_summary"
<SwitchPreference
android:title=
"TCP Fast Open"
/>
android:key=
"tcp_fastopen"
android:icon=
"@drawable/ic_action_offline_bolt"
android:summary=
"@string/tcp_fastopen_summary"
android:title=
"TCP Fast Open"
/>
<SimpleMenuPreference
<SimpleMenuPreference
android:key=
"nightMode"
android:key=
"nightMode"
android:icon=
"@drawable/ic_image_brightness_3"
android:entries=
"@array/night_modes"
android:entries=
"@array/night_modes"
android:entryValues=
"@array/night_mode_values"
android:entryValues=
"@array/night_mode_values"
android:defaultValue=
"system"
android:defaultValue=
"system"
...
@@ -36,6 +40,7 @@
...
@@ -36,6 +40,7 @@
android:title=
"@string/port_proxy"
/>
android:title=
"@string/port_proxy"
/>
<AutoSummaryEditTextPreference
<AutoSummaryEditTextPreference
android:key=
"portLocalDns"
android:key=
"portLocalDns"
android:icon=
"@drawable/ic_action_dns"
android:inputType=
"number"
android:inputType=
"number"
android:maxLength=
"5"
android:maxLength=
"5"
app:pref_summaryHasText=
"%s"
app:pref_summaryHasText=
"%s"
...
...
mobile/src/main/res/xml/pref_profile.xml
View file @
5615d93a
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
android:title=
"@string/sitekey"
/>
android:title=
"@string/sitekey"
/>
<SimpleMenuPreference
<SimpleMenuPreference
android:key=
"encMethod"
android:key=
"encMethod"
android:icon=
"@drawable/ic_notification_enhanced_encryption"
android:entries=
"@array/enc_method_entry"
android:entries=
"@array/enc_method_entry"
android:entryValues=
"@array/enc_method_value"
android:entryValues=
"@array/enc_method_value"
android:summary=
"%s"
android:summary=
"%s"
...
@@ -48,18 +49,22 @@
...
@@ -48,18 +49,22 @@
android:title=
"@string/route_list"
/>
android:title=
"@string/route_list"
/>
<AutoSummaryEditTextPreference
<AutoSummaryEditTextPreference
android:key=
"remoteDns"
android:key=
"remoteDns"
android:icon=
"@drawable/ic_action_dns"
android:title=
"@string/remote_dns"
android:title=
"@string/remote_dns"
app:pref_summaryHasText=
"%s"
/>
app:pref_summaryHasText=
"%s"
/>
<SwitchPreference
<SwitchPreference
android:key=
"isIpv6"
android:key=
"isIpv6"
android:icon=
"@drawable/ic_image_looks_6"
android:summary=
"@string/ipv6_summary"
android:summary=
"@string/ipv6_summary"
android:title=
"@string/ipv6"
/>
android:title=
"@string/ipv6"
/>
<SwitchPreference
<SwitchPreference
android:key=
"isProxyApps"
android:key=
"isProxyApps"
android:icon=
"@drawable/ic_navigation_apps"
android:summary=
"@string/proxied_apps_summary"
android:summary=
"@string/proxied_apps_summary"
android:title=
"@string/proxied_apps"
/>
android:title=
"@string/proxied_apps"
/>
<SwitchPreference
<SwitchPreference
android:key=
"isUdpDns"
android:key=
"isUdpDns"
android:icon=
"@drawable/ic_action_dns"
android:summary=
"@string/udp_dns_summary"
android:summary=
"@string/udp_dns_summary"
android:title=
"@string/udp_dns"
/>
android:title=
"@string/udp_dns"
/>
...
@@ -75,6 +80,7 @@
...
@@ -75,6 +80,7 @@
android:title=
"@string/plugin"
/>
android:title=
"@string/plugin"
/>
<AutoSummaryEditTextPreference
<AutoSummaryEditTextPreference
android:key=
"plugin.configure"
android:key=
"plugin.configure"
android:icon=
"@drawable/ic_action_settings"
android:persistent=
"false"
android:persistent=
"false"
app:pref_summaryHasText=
"%s"
app:pref_summaryHasText=
"%s"
android:title=
"@string/plugin_configure"
/>
android:title=
"@string/plugin_configure"
/>
...
...
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