Skip to content

Commit 809a032

Browse files
committed
支持局域网分享
1 parent e869e9e commit 809a032

3 files changed

Lines changed: 18 additions & 0 deletions

File tree

mobile/src/main/java/com/github/shadowsocks/GlobalSettingsPreferenceFragment.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
8282
hosts.setOnBindEditTextListener(EditTextPreferenceModifiers.Monospace)
8383
hosts.summaryProvider = HostsSummaryProvider
8484
val serviceMode = findPreference<Preference>(Key.serviceMode)!!
85+
val shareOverLan = findPreference<SwitchPreference>(Key.shareOverLan)!!
8586
val portProxy = findPreference<EditTextPreference>(Key.portProxy)!!
8687
portProxy.setOnBindEditTextListener(EditTextPreferenceModifiers.Port)
8788
val portLocalDns = findPreference<EditTextPreference>(Key.portLocalDns)!!
@@ -104,6 +105,7 @@ class GlobalSettingsPreferenceFragment : PreferenceFragmentCompat() {
104105
val stopped = it == BaseService.State.Stopped
105106
tfo.isEnabled = stopped
106107
serviceMode.isEnabled = stopped
108+
shareOverLan.isEnabled = stopped
107109
portProxy.isEnabled = stopped
108110
if (stopped) onServiceModeChange.onPreferenceChange(null, DataStore.serviceMode) else {
109111
hosts.isEnabled = false
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector
2+
xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="24dp"
4+
android:height="24dp"
5+
android:autoMirrored="true"
6+
android:tint="?attr/colorControlNormal"
7+
android:viewportWidth="24"
8+
android:viewportHeight="24">
9+
<path
10+
android:fillColor="@android:color/black"
11+
android:pathData="M15,9L9,9c-0.55,0 -1,0.45 -1,1v12c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L16,10c0,-0.55 -0.45,-1 -1,-1zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM7.05,6.05l1.41,1.41C9.37,6.56 10.62,6 12,6s2.63,0.56 3.54,1.46l1.41,-1.41C15.68,4.78 13.93,4 12,4s-3.68,0.78 -4.95,2.05zM12,0C8.96,0 6.21,1.23 4.22,3.22l1.41,1.41C7.26,3.01 9.51,2 12,2s4.74,1.01 6.36,2.64l1.41,-1.41C17.79,1.23 15.04,0 12,0z" />
12+
</vector>

mobile/src/main/res/xml/pref_global.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
app:key="serviceMode"
3535
app:title="@string/service_mode"
3636
app:useSimpleSummaryProvider="true" />
37+
<SwitchPreference
38+
app:icon="@drawable/ic_baseline_settings_remote_24"
39+
app:key="shareOverLan"
40+
app:title="@string/share_over_lan"/>
3741
<EditTextPreference
3842
app:icon="@drawable/ic_maps_directions_boat"
3943
app:key="portProxy"

0 commit comments

Comments
 (0)