-
Notifications
You must be signed in to change notification settings - Fork 369
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'add-wireguard-over-shadowsocks-to-gui-des-967'
- Loading branch information
Showing
21 changed files
with
634 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| import { useCallback } from 'react'; | ||
| import { sprintf } from 'sprintf-js'; | ||
| import styled from 'styled-components'; | ||
|
|
||
| import { wrapConstraint } from '../../shared/daemon-rpc-types'; | ||
| import { messages } from '../../shared/gettext'; | ||
| import { removeNonNumericCharacters } from '../../shared/string-helpers'; | ||
| import { useAppContext } from '../context'; | ||
| import { useHistory } from '../lib/history'; | ||
| import { useSelector } from '../redux/store'; | ||
| import { AriaDescription, AriaInputGroup } from './AriaGroup'; | ||
| import * as Cell from './cell'; | ||
| import { SelectorItem, SelectorWithCustomItem } from './cell/Selector'; | ||
| import { BackAction } from './KeyboardNavigation'; | ||
| import { Layout, SettingsContainer } from './Layout'; | ||
| import { | ||
| NavigationBar, | ||
| NavigationContainer, | ||
| NavigationItems, | ||
| NavigationScrollbars, | ||
| TitleBarItem, | ||
| } from './NavigationBar'; | ||
| import SettingsHeader, { HeaderTitle } from './SettingsHeader'; | ||
|
|
||
| const PORTS: Array<SelectorItem<number>> = []; | ||
| const ALLOWED_RANGE = [1, 65000]; | ||
|
|
||
| const StyledContent = styled.div({ | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| flex: 1, | ||
| marginBottom: '2px', | ||
| }); | ||
|
|
||
| const StyledSelectorContainer = styled.div({ | ||
| flex: 0, | ||
| }); | ||
|
|
||
| export default function Shadowsocks() { | ||
| const { pop } = useHistory(); | ||
|
|
||
| return ( | ||
| <BackAction action={pop}> | ||
| <Layout> | ||
| <SettingsContainer> | ||
| <NavigationContainer> | ||
| <NavigationBar> | ||
| <NavigationItems> | ||
| <TitleBarItem> | ||
| { | ||
| // TRANSLATORS: Title label in navigation bar | ||
| messages.pgettext('wireguard-settings-nav', 'Shadowsocks') | ||
| } | ||
| </TitleBarItem> | ||
| </NavigationItems> | ||
| </NavigationBar> | ||
|
|
||
| <NavigationScrollbars> | ||
| <SettingsHeader> | ||
| <HeaderTitle> | ||
| {messages.pgettext('wireguard-settings-view', 'Shadowsocks')} | ||
| </HeaderTitle> | ||
| </SettingsHeader> | ||
|
|
||
| <StyledContent> | ||
| <Cell.Group> | ||
| <ShadowsocksPortSelector /> | ||
| </Cell.Group> | ||
| </StyledContent> | ||
| </NavigationScrollbars> | ||
| </NavigationContainer> | ||
| </SettingsContainer> | ||
| </Layout> | ||
| </BackAction> | ||
| ); | ||
| } | ||
|
|
||
| function ShadowsocksPortSelector() { | ||
| const { setObfuscationSettings } = useAppContext(); | ||
| const obfuscationSettings = useSelector((state) => state.settings.obfuscationSettings); | ||
|
|
||
| const port = | ||
| obfuscationSettings.shadowsocksSettings.port === 'any' | ||
| ? null | ||
| : obfuscationSettings.shadowsocksSettings.port.only; | ||
|
|
||
| const setShadowsocksPort = useCallback( | ||
| async (port: number | null) => { | ||
| await setObfuscationSettings({ | ||
| ...obfuscationSettings, | ||
| shadowsocksSettings: { | ||
| ...obfuscationSettings.shadowsocksSettings, | ||
| port: wrapConstraint(port), | ||
| }, | ||
| }); | ||
| }, | ||
| [setObfuscationSettings, obfuscationSettings], | ||
| ); | ||
|
|
||
| const parseValue = useCallback((port: string) => parseInt(port), []); | ||
|
|
||
| const validateValue = useCallback( | ||
| (value: number) => value >= ALLOWED_RANGE[0] && value <= ALLOWED_RANGE[1], | ||
| [], | ||
| ); | ||
|
|
||
| return ( | ||
| <AriaInputGroup> | ||
| <StyledSelectorContainer> | ||
| <SelectorWithCustomItem | ||
| // TRANSLATORS: The title for the WireGuard port selector. | ||
| title={messages.pgettext('wireguard-settings-view', 'Port')} | ||
| items={PORTS} | ||
| value={port} | ||
| onSelect={setShadowsocksPort} | ||
| inputPlaceholder={messages.pgettext('wireguard-settings-view', 'Port')} | ||
| automaticValue={null} | ||
| parseValue={parseValue} | ||
| modifyValue={removeNonNumericCharacters} | ||
| validateValue={validateValue} | ||
| maxLength={`${ALLOWED_RANGE[1]}`.length} | ||
| /> | ||
| </StyledSelectorContainer> | ||
| <Cell.CellFooter> | ||
| <AriaDescription> | ||
| <Cell.CellFooterText> | ||
| {sprintf( | ||
| // TRANSLATORS: Text describing the valid port range for a port selector. | ||
| messages.pgettext('wireguard-settings-view', 'Valid range: %(min)s - %(max)s'), | ||
| { min: ALLOWED_RANGE[0], max: ALLOWED_RANGE[1] }, | ||
| )} | ||
| </Cell.CellFooterText> | ||
| </AriaDescription> | ||
| </Cell.CellFooter> | ||
| </AriaInputGroup> | ||
| ); | ||
| } |
Oops, something went wrong.