self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Mobile: Fixed proxy timeout setting UI

Browse Source
This commit is contained in:
Laurent Cozic
2023-01-03 20:22:44 +00:00
parent 00bc25ed5c
commit 275c80ade5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/app-mobile/components/screens/ConfigScreen.tsx
View File

@@ -495,6 +495,9 @@ class ConfigScreenComponent extends BaseScreenComponent {
// ); // );
} else if (md.type === Setting.TYPE_INT) { } else if (md.type === Setting.TYPE_INT) {
const unitLabel = md.unitLabel ? md.unitLabel(value) : value; const unitLabel = md.unitLabel ? md.unitLabel(value) : value;
const minimum = 'minimum' in md ? md.minimum : 0;
const maximum = 'maximum' in md ? md.maximum : 10;
// Note: Do NOT add the minimumTrackTintColor and maximumTrackTintColor props // Note: Do NOT add the minimumTrackTintColor and maximumTrackTintColor props
// on the Slider as they are buggy and can crash the app on certain devices. // on the Slider as they are buggy and can crash the app on certain devices.
// https://github.com/laurent22/joplin/issues/2733 // https://github.com/laurent22/joplin/issues/2733
@@ -506,7 +509,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
</Text> </Text>
<View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', flex: 1 }}> <View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', flex: 1 }}>
<Text style={this.styles().sliderUnits}>{unitLabel}</Text> <Text style={this.styles().sliderUnits}>{unitLabel}</Text>
<Slider key="control" style={{ flex: 1 }} step={md.step} minimumValue={md.minimum} maximumValue={md.maximum} value={value} onValueChange={value => updateSettingValue(key, value)} /> <Slider key="control" style={{ flex: 1 }} step={md.step} minimumValue={minimum} maximumValue={maximum} value={value} onValueChange={value => updateSettingValue(key, value)} />
</View> </View>
</View> </View>
); );

1
packages/lib/models/Setting.ts
View File

@@ -1464,6 +1464,7 @@ class Setting extends BaseModel {
'net.proxyTimeout': { 'net.proxyTimeout': {
value: 1, value: 1,
type: SettingItemType.Int, type: SettingItemType.Int,
maximum: 60,
advanced: true, advanced: true,
section: 'sync', section: 'sync',
isGlobal: true, isGlobal: true,