-
-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mobile: Implement plugin screen redesign (#10465)
- Loading branch information
1 parent
19f0b66
commit 06f42e8
Showing
39 changed files
with
1,459 additions
and
632 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,81 @@ | ||
| import * as React from 'react'; | ||
| import { ReactNode, useMemo } from 'react'; | ||
| import { themeStyle } from '../global-style'; | ||
| import { Button, ButtonProps } from 'react-native-paper'; | ||
| import { connect } from 'react-redux'; | ||
| import { AppState } from '../../utils/types'; | ||
|
|
||
| export enum ButtonType { | ||
| Primary, | ||
| Secondary, | ||
| Delete, | ||
| Link, | ||
| } | ||
|
|
||
| interface Props extends Omit<ButtonProps, 'item'|'onPress'|'children'> { | ||
| themeId: number; | ||
| type: ButtonType; | ||
| onPress: ()=> void; | ||
| children: ReactNode; | ||
| } | ||
|
|
||
| export type TextButtonProps = Omit<Props, 'themeId'>; | ||
|
|
||
| const useStyles = ({ themeId }: Props) => { | ||
| return useMemo(() => { | ||
| const theme = themeStyle(themeId); | ||
|
|
||
| const themeOverride = { | ||
| secondaryButton: { | ||
| colors: { | ||
| primary: theme.color4, | ||
| outline: theme.color4, | ||
| }, | ||
| }, | ||
| deleteButton: { | ||
| colors: { | ||
| primary: theme.destructiveColor, | ||
| outline: theme.destructiveColor, | ||
| }, | ||
| }, | ||
| primaryButton: { }, | ||
| }; | ||
|
|
||
| return { themeOverride }; | ||
| }, [themeId]); | ||
| }; | ||
|
|
||
| const TextButton: React.FC<Props> = props => { | ||
| const { themeOverride } = useStyles(props); | ||
|
|
||
| let mode: ButtonProps['mode']; | ||
| let theme: ButtonProps['theme']; | ||
|
|
||
| if (props.type === ButtonType.Primary) { | ||
| theme = themeOverride.primaryButton; | ||
| mode = 'contained'; | ||
| } else if (props.type === ButtonType.Secondary) { | ||
| theme = themeOverride.secondaryButton; | ||
| mode = 'outlined'; | ||
| } else if (props.type === ButtonType.Delete) { | ||
| theme = themeOverride.deleteButton; | ||
| mode = 'outlined'; | ||
| } else if (props.type === ButtonType.Link) { | ||
| theme = themeOverride.secondaryButton; | ||
| mode = 'text'; | ||
| } else { | ||
| const exhaustivenessCheck: never = props.type; | ||
| return exhaustivenessCheck; | ||
| } | ||
|
|
||
| return <Button | ||
| {...props} | ||
| theme={theme} | ||
| mode={mode} | ||
| onPress={props.onPress} | ||
| >{props.children}</Button>; | ||
| }; | ||
|
|
||
| export default connect((state: AppState) => { | ||
| return { themeId: state.settings.theme }; | ||
| })(TextButton); |
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,14 @@ | ||
| import * as React from 'react'; | ||
| import TextButton, { ButtonType, TextButtonProps } from './TextButton'; | ||
|
|
||
| type Props = Omit<TextButtonProps, 'type'>; | ||
|
|
||
| const makeTextButtonComponent = (type: ButtonType) => { | ||
| return (props: Props) => { | ||
| return <TextButton {...props} type={type} />; | ||
| }; | ||
| }; | ||
|
|
||
| export const PrimaryButton = makeTextButtonComponent(ButtonType.Primary); | ||
| export const SecondaryButton = makeTextButtonComponent(ButtonType.Secondary); | ||
| export const LinkButton = makeTextButtonComponent(ButtonType.Link); |
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
Oops, something went wrong.