diff options
Diffstat (limited to 'src/view')
-rw-r--r-- | src/view/com/auth/server-input/index.tsx | 2 | ||||
-rw-r--r-- | src/view/screens/Settings/ExportCarDialog.tsx | 4 | ||||
-rw-r--r-- | src/view/screens/Storybook/Buttons.tsx | 16 | ||||
-rw-r--r-- | src/view/screens/Storybook/Dialogs.tsx | 14 | ||||
-rw-r--r-- | src/view/screens/Storybook/Forms.tsx | 4 | ||||
-rw-r--r-- | src/view/screens/Storybook/index.tsx | 29 |
6 files changed, 35 insertions, 34 deletions
diff --git a/src/view/com/auth/server-input/index.tsx b/src/view/com/auth/server-input/index.tsx index 2380fffe2..0d64650dd 100644 --- a/src/view/com/auth/server-input/index.tsx +++ b/src/view/com/auth/server-input/index.tsx @@ -167,7 +167,7 @@ export function ServerInputDialog({ size="small" onPress={() => control.close()} label={_(msg`Done`)}> - {_(msg`Done`)} + <ButtonText>{_(msg`Done`)}</ButtonText> </Button> </View> </View> diff --git a/src/view/screens/Settings/ExportCarDialog.tsx b/src/view/screens/Settings/ExportCarDialog.tsx index 3ec37e85e..e901fb090 100644 --- a/src/view/screens/Settings/ExportCarDialog.tsx +++ b/src/view/screens/Settings/ExportCarDialog.tsx @@ -92,7 +92,9 @@ export function ExportCarDialog({ size={gtMobile ? 'small' : 'large'} onPress={() => control.close()} label={_(msg`Done`)}> - {_(msg`Done`)} + <ButtonText> + <Trans>Done</Trans> + </ButtonText> </Button> </View> diff --git a/src/view/screens/Storybook/Buttons.tsx b/src/view/screens/Storybook/Buttons.tsx index ad2fff3f4..cae8ec314 100644 --- a/src/view/screens/Storybook/Buttons.tsx +++ b/src/view/screens/Storybook/Buttons.tsx @@ -4,15 +4,15 @@ import {View} from 'react-native' import {atoms as a} from '#/alf' import { Button, - ButtonVariant, ButtonColor, ButtonIcon, ButtonText, + ButtonVariant, } from '#/components/Button' -import {H1} from '#/components/Typography' import {ArrowTopRight_Stroke2_Corner0_Rounded as ArrowTopRight} from '#/components/icons/ArrowTopRight' import {ChevronLeft_Stroke2_Corner0_Rounded as ChevronLeft} from '#/components/icons/Chevron' import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe' +import {H1} from '#/components/Typography' export function Buttons() { return ( @@ -29,7 +29,7 @@ export function Buttons() { color={color as ButtonColor} size="large" label="Click here"> - Button + <ButtonText>Button</ButtonText> </Button> <Button disabled @@ -37,7 +37,7 @@ export function Buttons() { color={color as ButtonColor} size="large" label="Click here"> - Button + <ButtonText>Button</ButtonText> </Button> </React.Fragment> ))} @@ -54,7 +54,7 @@ export function Buttons() { color={name as ButtonColor} size="large" label="Click here"> - Button + <ButtonText>Button</ButtonText> </Button> <Button disabled @@ -62,7 +62,7 @@ export function Buttons() { color={name as ButtonColor} size="large" label="Click here"> - Button + <ButtonText>Button</ButtonText> </Button> </React.Fragment> ), @@ -77,7 +77,7 @@ export function Buttons() { color={name as ButtonColor} size="large" label="Click here"> - Button + <ButtonText>Button</ButtonText> </Button> <Button disabled @@ -85,7 +85,7 @@ export function Buttons() { color={name as ButtonColor} size="large" label="Click here"> - Button + <ButtonText>Button</ButtonText> </Button> </React.Fragment> ), diff --git a/src/view/screens/Storybook/Dialogs.tsx b/src/view/screens/Storybook/Dialogs.tsx index 5c5e480fe..4722784ca 100644 --- a/src/view/screens/Storybook/Dialogs.tsx +++ b/src/view/screens/Storybook/Dialogs.tsx @@ -3,7 +3,7 @@ import {View} from 'react-native' import {useDialogStateControlContext} from '#/state/dialogs' import {atoms as a} from '#/alf' -import {Button} from '#/components/Button' +import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' import * as Prompt from '#/components/Prompt' import {H3, P} from '#/components/Typography' @@ -26,7 +26,7 @@ export function Dialogs() { basic.open() }} label="Open basic dialog"> - Open all dialogs + <ButtonText>Open all dialogs</ButtonText> </Button> <Button @@ -37,7 +37,7 @@ export function Dialogs() { scrollable.open() }} label="Open basic dialog"> - Open scrollable dialog + <ButtonText>Open scrollable dialog</ButtonText> </Button> <Button @@ -48,7 +48,7 @@ export function Dialogs() { basic.open() }} label="Open basic dialog"> - Open basic dialog + <ButtonText>Open basic dialog</ButtonText> </Button> <Button @@ -57,7 +57,7 @@ export function Dialogs() { size="small" onPress={() => prompt.open()} label="Open prompt"> - Open prompt + <ButtonText>Open prompt</ButtonText> </Button> <Prompt.Outer control={prompt}> @@ -102,7 +102,7 @@ export function Dialogs() { size="small" onPress={closeAllDialogs} label="Close all dialogs"> - Close all dialogs + <ButtonText>Close all dialogs</ButtonText> </Button> <View style={{height: 1000}} /> <View style={[a.flex_row, a.justify_end]}> @@ -116,7 +116,7 @@ export function Dialogs() { }) } label="Open basic dialog"> - Close dialog + <ButtonText>Close dialog</ButtonText> </Button> </View> </View> diff --git a/src/view/screens/Storybook/Forms.tsx b/src/view/screens/Storybook/Forms.tsx index b771ad5e0..1e4efdcc7 100644 --- a/src/view/screens/Storybook/Forms.tsx +++ b/src/view/screens/Storybook/Forms.tsx @@ -2,7 +2,7 @@ import React from 'react' import {View} from 'react-native' import {atoms as a} from '#/alf' -import {Button} from '#/components/Button' +import {Button, ButtonText} from '#/components/Button' import {DateField, LabelText} from '#/components/forms/DateField' import * as TextField from '#/components/forms/TextField' import * as Toggle from '#/components/forms/Toggle' @@ -191,7 +191,7 @@ export function Forms() { setToggleGroupBValues(['a', 'b']) setToggleGroupCValues(['a']) }}> - Reset all toggles + <ButtonText>Reset all toggles</ButtonText> </Button> <View style={[a.gap_md, a.align_start, a.w_full]}> diff --git a/src/view/screens/Storybook/index.tsx b/src/view/screens/Storybook/index.tsx index 3a2e2f369..35a666601 100644 --- a/src/view/screens/Storybook/index.tsx +++ b/src/view/screens/Storybook/index.tsx @@ -1,22 +1,21 @@ import React from 'react' import {View} from 'react-native' -import {CenteredView, ScrollView} from '#/view/com/util/Views' -import {atoms as a, useTheme, ThemeProvider} from '#/alf' import {useSetThemePrefs} from '#/state/shell' -import {Button} from '#/components/Button' - -import {Theming} from './Theming' -import {Typography} from './Typography' -import {Spacing} from './Spacing' +import {CenteredView, ScrollView} from '#/view/com/util/Views' +import {atoms as a, ThemeProvider, useTheme} from '#/alf' +import {Button, ButtonText} from '#/components/Button' +import {Breakpoints} from './Breakpoints' import {Buttons} from './Buttons' -import {Links} from './Links' -import {Forms} from './Forms' import {Dialogs} from './Dialogs' -import {Breakpoints} from './Breakpoints' -import {Shadows} from './Shadows' +import {Forms} from './Forms' import {Icons} from './Icons' +import {Links} from './Links' import {Menus} from './Menus' +import {Shadows} from './Shadows' +import {Spacing} from './Spacing' +import {Theming} from './Theming' +import {Typography} from './Typography' export function Storybook() { const t = useTheme() @@ -33,7 +32,7 @@ export function Storybook() { size="small" label='Set theme to "system"' onPress={() => setColorMode('system')}> - System + <ButtonText>System</ButtonText> </Button> <Button variant="solid" @@ -41,7 +40,7 @@ export function Storybook() { size="small" label='Set theme to "light"' onPress={() => setColorMode('light')}> - Light + <ButtonText>Light</ButtonText> </Button> <Button variant="solid" @@ -52,7 +51,7 @@ export function Storybook() { setColorMode('dark') setDarkTheme('dim') }}> - Dim + <ButtonText>Dim</ButtonText> </Button> <Button variant="solid" @@ -63,7 +62,7 @@ export function Storybook() { setColorMode('dark') setDarkTheme('dark') }}> - Dark + <ButtonText>Dark</ButtonText> </Button> </View> |