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
420397fd
Commit
420397fd
authored
Mar 16, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set hosts to be monospace
parent
a85c5c20
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
15 deletions
+26
-15
core/src/main/java/com/github/shadowsocks/preference/EditTextPreferenceModifiers.kt
...hub/shadowsocks/preference/EditTextPreferenceModifiers.kt
+15
-6
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
...om/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
+5
-4
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
...main/java/com/github/shadowsocks/ProfileConfigFragment.kt
+2
-1
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+4
-4
No files found.
core/src/main/java/com/github/shadowsocks/preference/
PortPreferenceListener
.kt
→
core/src/main/java/com/github/shadowsocks/preference/
EditTextPreferenceModifiers
.kt
View file @
420397fd
...
@@ -20,12 +20,20 @@
...
@@ -20,12 +20,20 @@
package
com.github.shadowsocks.preference
package
com.github.shadowsocks.preference
import
android.graphics.Typeface
import
android.text.InputFilter
import
android.text.InputFilter
import
android.view.inputmethod.EditorInfo
import
android.view.inputmethod.EditorInfo
import
android.widget.EditText
import
android.widget.EditText
import
androidx.preference.EditTextPreference
import
androidx.preference.EditTextPreference
object
PortPreferenceListener
:
EditTextPreference
.
OnBindEditTextListener
{
object
EditTextPreferenceModifiers
{
object
Monospace
:
EditTextPreference
.
OnBindEditTextListener
{
override
fun
onBindEditText
(
editText
:
EditText
)
{
editText
.
typeface
=
Typeface
.
MONOSPACE
}
}
object
Port
:
EditTextPreference
.
OnBindEditTextListener
{
private
val
portLengthFilter
=
arrayOf
(
InputFilter
.
LengthFilter
(
5
))
private
val
portLengthFilter
=
arrayOf
(
InputFilter
.
LengthFilter
(
5
))
override
fun
onBindEditText
(
editText
:
EditText
)
{
override
fun
onBindEditText
(
editText
:
EditText
)
{
...
@@ -33,4 +41,5 @@ object PortPreferenceListener : EditTextPreference.OnBindEditTextListener {
...
@@ -33,4 +41,5 @@ object PortPreferenceListener : EditTextPreference.OnBindEditTextListener {
editText
.
filters
=
portLengthFilter
editText
.
filters
=
portLengthFilter
editText
.
setSingleLine
()
editText
.
setSingleLine
()
}
}
}
}
}
mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt
View file @
420397fd
...
@@ -34,8 +34,8 @@ import com.github.shadowsocks.utils.DirectBoot
...
@@ -34,8 +34,8 @@ import com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.net.TcpFastOpen
import
com.github.shadowsocks.net.TcpFastOpen
import
com.github.shadowsocks.preference.BrowsableEditTextPreferenceDialogFragment
import
com.github.shadowsocks.preference.BrowsableEditTextPreferenceDialogFragment
import
com.github.shadowsocks.preference.EditTextPreferenceModifiers
import
com.github.shadowsocks.preference.HostsSummaryProvider
import
com.github.shadowsocks.preference.HostsSummaryProvider
import
com.github.shadowsocks.preference.PortPreferenceListener
import
com.github.shadowsocks.utils.remove
import
com.github.shadowsocks.utils.remove
class
GlobalSettingsPreferenceFragment
:
PreferenceFragmentCompat
()
{
class
GlobalSettingsPreferenceFragment
:
PreferenceFragmentCompat
()
{
...
@@ -80,14 +80,15 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
...
@@ -80,14 +80,15 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
tfo
.
summary
=
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
System
.
getProperty
(
"os.version"
))
tfo
.
summary
=
getString
(
R
.
string
.
tcp_fastopen_summary_unsupported
,
System
.
getProperty
(
"os.version"
))
}
}
hosts
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Monospace
hosts
.
summaryProvider
=
HostsSummaryProvider
hosts
.
summaryProvider
=
HostsSummaryProvider
val
serviceMode
=
findPreference
<
Preference
>(
Key
.
serviceMode
)
!!
val
serviceMode
=
findPreference
<
Preference
>(
Key
.
serviceMode
)
!!
val
portProxy
=
findPreference
<
EditTextPreference
>(
Key
.
portProxy
)
!!
val
portProxy
=
findPreference
<
EditTextPreference
>(
Key
.
portProxy
)
!!
portProxy
.
onBindEditTextListener
=
PortPreferenceListener
portProxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
val
portLocalDns
=
findPreference
<
EditTextPreference
>(
Key
.
portLocalDns
)
!!
val
portLocalDns
=
findPreference
<
EditTextPreference
>(
Key
.
portLocalDns
)
!!
portLocalDns
.
onBindEditTextListener
=
PortPreferenceListener
portLocalDns
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
val
portTransproxy
=
findPreference
<
EditTextPreference
>(
Key
.
portTransproxy
)
!!
val
portTransproxy
=
findPreference
<
EditTextPreference
>(
Key
.
portTransproxy
)
!!
portTransproxy
.
onBindEditTextListener
=
PortPreferenceListener
portTransproxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
val
onServiceModeChange
=
Preference
.
OnPreferenceChangeListener
{
_
,
newValue
->
val
onServiceModeChange
=
Preference
.
OnPreferenceChangeListener
{
_
,
newValue
->
val
(
enabledLocalDns
,
enabledTransproxy
)
=
when
(
newValue
as
String
?)
{
val
(
enabledLocalDns
,
enabledTransproxy
)
=
when
(
newValue
as
String
?)
{
Key
.
modeProxy
->
Pair
(
false
,
false
)
Key
.
modeProxy
->
Pair
(
false
,
false
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
View file @
420397fd
...
@@ -74,7 +74,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
...
@@ -74,7 +74,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
val
activity
=
requireActivity
()
val
activity
=
requireActivity
()
profileId
=
activity
.
intent
.
getLongExtra
(
Action
.
EXTRA_PROFILE_ID
,
-
1L
)
profileId
=
activity
.
intent
.
getLongExtra
(
Action
.
EXTRA_PROFILE_ID
,
-
1L
)
addPreferencesFromResource
(
R
.
xml
.
pref_profile
)
addPreferencesFromResource
(
R
.
xml
.
pref_profile
)
findPreference
<
EditTextPreference
>(
Key
.
remotePort
)
!!
.
onBindEditTextListener
=
PortPreferenceListener
findPreference
<
EditTextPreference
>(
Key
.
remotePort
)
!!
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
findPreference
<
EditTextPreference
>(
Key
.
password
)
!!
.
summaryProvider
=
PasswordSummaryProvider
findPreference
<
EditTextPreference
>(
Key
.
password
)
!!
.
summaryProvider
=
PasswordSummaryProvider
val
serviceMode
=
DataStore
.
serviceMode
val
serviceMode
=
DataStore
.
serviceMode
findPreference
<
Preference
>(
Key
.
remoteDns
)
!!
.
isEnabled
=
serviceMode
!=
Key
.
modeProxy
findPreference
<
Preference
>(
Key
.
remoteDns
)
!!
.
isEnabled
=
serviceMode
!=
Key
.
modeProxy
...
@@ -104,6 +104,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
...
@@ -104,6 +104,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
}
}
true
true
}
}
pluginConfigure
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Monospace
pluginConfigure
.
onPreferenceChangeListener
=
this
pluginConfigure
.
onPreferenceChangeListener
=
this
initPlugins
()
initPlugins
()
receiver
=
Core
.
listenForPackageChanges
(
false
)
{
initPlugins
()
}
receiver
=
Core
.
listenForPackageChanges
(
false
)
{
initPlugins
()
}
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
420397fd
...
@@ -47,8 +47,8 @@ import com.github.shadowsocks.database.ProfileManager
...
@@ -47,8 +47,8 @@ import com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.net.HttpsTest
import
com.github.shadowsocks.net.HttpsTest
import
com.github.shadowsocks.net.TcpFastOpen
import
com.github.shadowsocks.net.TcpFastOpen
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.EditTextPreferenceModifiers
import
com.github.shadowsocks.preference.OnPreferenceDataStoreChangeListener
import
com.github.shadowsocks.preference.OnPreferenceDataStoreChangeListener
import
com.github.shadowsocks.preference.PortPreferenceListener
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.datas
import
com.github.shadowsocks.utils.datas
import
com.github.shadowsocks.utils.printLog
import
com.github.shadowsocks.utils.printLog
...
@@ -186,11 +186,11 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
...
@@ -186,11 +186,11 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
serviceMode
=
findPreference
(
Key
.
serviceMode
)
!!
serviceMode
=
findPreference
(
Key
.
serviceMode
)
!!
shareOverLan
=
findPreference
(
Key
.
shareOverLan
)
!!
shareOverLan
=
findPreference
(
Key
.
shareOverLan
)
!!
portProxy
=
findPreference
(
Key
.
portProxy
)
!!
portProxy
=
findPreference
(
Key
.
portProxy
)
!!
portProxy
.
onBindEditTextListener
=
PortPreferenceListener
portProxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portLocalDns
=
findPreference
(
Key
.
portLocalDns
)
!!
portLocalDns
=
findPreference
(
Key
.
portLocalDns
)
!!
portLocalDns
.
onBindEditTextListener
=
PortPreferenceListener
portLocalDns
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
portTransproxy
=
findPreference
(
Key
.
portTransproxy
)
!!
portTransproxy
=
findPreference
(
Key
.
portTransproxy
)
!!
portTransproxy
.
onBindEditTextListener
=
PortPreferenceListener
portTransproxy
.
onBindEditTextListener
=
EditTextPreferenceModifiers
.
Port
serviceMode
.
onPreferenceChangeListener
=
onServiceModeChange
serviceMode
.
onPreferenceChangeListener
=
onServiceModeChange
findPreference
<
Preference
>(
Key
.
about
)
!!
.
apply
{
findPreference
<
Preference
>(
Key
.
about
)
!!
.
apply
{
summary
=
getString
(
R
.
string
.
about_title
,
BuildConfig
.
VERSION_NAME
)
summary
=
getString
(
R
.
string
.
about_title
,
BuildConfig
.
VERSION_NAME
)
...
...
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