Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Button: simplify style, fix Android NFC modal display #2079

Merged
merged 1 commit into from
Mar 27, 2024
Merged

Button: simplify style, fix Android NFC modal display #2079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions components/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ interface ButtonProps {
tertiary?: boolean;
quaternary?: boolean;
warning?: boolean;
quinary?: boolean;
iconOnly?: boolean;
adaptiveWidth?: boolean;
containerStyle?: any;
Expand All @@ -32,7 +31,6 @@ function Button(props: ButtonProps) {
tertiary,
quaternary,
warning,
quinary,
iconOnly,
adaptiveWidth,
containerStyle,
Expand Down Expand Up @@ -83,10 +81,8 @@ function Button(props: ButtonProps) {
buttonStyle={{
backgroundColor: iconOnly
? 'transparent'
: quinary
? themeColor('buttonBackground') || themeColor('secondary')
: quaternary
? themeColor('background')
? themeColor('buttonBackground') || themeColor('secondary')
: tertiary
? themeColor('highlight')
: secondary
Expand All @@ -104,10 +100,6 @@ function Button(props: ButtonProps) {
: {
color: iconOnly
? textColor
: quinary
? warning
? themeColor('warning')
: textColor
: quaternary
? warning
? themeColor('warning')
Expand Down
2 changes: 1 addition & 1 deletion components/Channels/SortButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default class SortButton extends React.Component<SortButtonProps, {}> {
}}
adaptiveWidth
buttonStyle={{ width: 50 }}
quinary
quaternary
onPress={() =>
ActionSheetIOS.showActionSheetWithOptions(
{
Expand Down
2 changes: 1 addition & 1 deletion components/UnitToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class UnitToggle extends React.Component<UnitToggleProps, {}> {
size: 25
}}
adaptiveWidth
quinary
quaternary
noUppercase
onPress={() => {
if (onToggle) onToggle();
Expand Down
2 changes: 1 addition & 1 deletion views/Channels/Channel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ export default class ChannelView extends React.Component<
forceCloseChannel
)
}
quinary
quaternary
warning
/>
</View>
Expand Down
14 changes: 7 additions & 7 deletions views/Wallet/KeypadPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ export default class KeypadPane extends React.PureComponent<
<View style={{ width: '25%' }}>
<Button
title={'50k'}
quinary
quaternary
noUppercase
onPress={() => {
UnitsStore.resetUnits();
Expand All @@ -379,7 +379,7 @@ export default class KeypadPane extends React.PureComponent<
<View style={{ width: '25%' }}>
<Button
title={'100k'}
quinary
quaternary
noUppercase
onPress={() => {
UnitsStore.resetUnits();
Expand All @@ -394,7 +394,7 @@ export default class KeypadPane extends React.PureComponent<
<View style={{ width: '25%' }}>
<Button
title={'1m'}
quinary
quaternary
noUppercase
onPress={() => {
UnitsStore.resetUnits();
Expand All @@ -409,7 +409,7 @@ export default class KeypadPane extends React.PureComponent<
<View style={{ width: '25%' }}>
<Button
title={localeString('general.other')}
quinary
quaternary
noUppercase
onPress={() => {
UnitsStore.resetUnits();
Expand All @@ -435,7 +435,7 @@ export default class KeypadPane extends React.PureComponent<
<View style={{ width: '40%' }}>
<Button
title={localeString('general.request')}
quinary
quaternary
noUppercase
onPress={() => {
navigation.navigate('Receive', {
Expand All @@ -456,7 +456,7 @@ export default class KeypadPane extends React.PureComponent<
themeColor('buttonText') ||
themeColor('text')
}}
quinary
quaternary
noUppercase
onPress={() => {
navigation.navigate('Receive', {
Expand All @@ -469,7 +469,7 @@ export default class KeypadPane extends React.PureComponent<
<View style={{ width: '40%' }}>
<Button
title={localeString('general.send')}
quinary
quaternary
noUppercase
onPress={() => {
navigation.navigate('Send', {
Expand Down
2 changes: 1 addition & 1 deletion views/Wallet/StandalonePosKeypadPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ export default class PosKeypadPane extends React.PureComponent<
title={localeString(
'general.request'
).toUpperCase()}
quinary
quaternary
noUppercase
onPress={() => {
this.addItemAndCheckout();
Expand Down
Loading