acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

[Neue] Buttons (#5406)

Browse Source 
* Re-align button sizing

(cherry picked from commit bcec243bb59dfe468313d98ba61f464d9750feec)

* Use large, small, tiny

(cherry picked from commit 1dc333c2993ab7f2e0ac750c0670dcec9a7069d0)

* Tweaks
This commit is contained in:
Eric Bailey
2024-09-20 11:38:51 -05:00
committed by GitHub
parent 27cceb96f3
commit 0eed1cfec1
40 changed files with 273 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/screens/Deactivated.tsx
+3 -3
View File
@@ -142,7 +142,7 @@ export function Deactivated() {
<View style={[a.gap_sm]}>
<Button
label={_(msg`Reactivate your account`)}
size="medium"
size="large"
variant="solid"
color="primary"
onPress={handleActivate}>
@@ -153,7 +153,7 @@ export function Deactivated() {
</Button>
<Button
label={_(msg`Cancel reactivation and log out`)}
size="medium"
size="large"
variant="solid"
color="secondary"
onPress={onPressLogout}>
@@ -212,7 +212,7 @@ export function Deactivated() {
</Text>
<Button
label={_(msg`Log in or sign up`)}
size="medium"
size="large"
variant="solid"
color="secondary"
onPress={() => setShowLoggedOut(true)}>
src/screens/E2E/SharedPreferencesTesterScreen.tsx
+6 -6
View File
@@ -23,7 +23,7 @@ export function SharedPreferencesTesterScreen() {
style={[a.self_center]}
variant="solid"
color="primary"
size="xsmall"
size="small"
onPress={async () => {
SharedPrefs.removeValue('testerString')
SharedPrefs.setValue('testerString', 'Hello')
@@ -39,7 +39,7 @@ export function SharedPreferencesTesterScreen() {
style={[a.self_center]}
variant="solid"
color="primary"
size="xsmall"
size="small"
onPress={async () => {
SharedPrefs.removeValue('testerString')
const str = SharedPrefs.getString('testerString')
@@ -53,7 +53,7 @@ export function SharedPreferencesTesterScreen() {
style={[a.self_center]}
variant="solid"
color="primary"
size="xsmall"
size="small"
onPress={async () => {
SharedPrefs.removeValue('testerBool')
SharedPrefs.setValue('testerBool', true)
@@ -68,7 +68,7 @@ export function SharedPreferencesTesterScreen() {
style={[a.self_center]}
variant="solid"
color="primary"
size="xsmall"
size="small"
onPress={async () => {
SharedPrefs.removeValue('testerNumber')
SharedPrefs.setValue('testerNumber', 123)
@@ -83,7 +83,7 @@ export function SharedPreferencesTesterScreen() {
style={[a.self_center]}
variant="solid"
color="primary"
size="xsmall"
size="small"
onPress={async () => {
SharedPrefs.removeFromSet('testerSet', 'Hello!')
SharedPrefs.addToSet('testerSet', 'Hello!')
@@ -98,7 +98,7 @@ export function SharedPreferencesTesterScreen() {
style={[a.self_center]}
variant="solid"
color="primary"
size="xsmall"
size="small"
onPress={async () => {
SharedPrefs.removeFromSet('testerSet', 'Hello!')
const contains = SharedPrefs.setContains('testerSet', 'Hello!')
src/screens/Home/NoFeedsPinned.tsx
+2 -2
View File
@@ -91,7 +91,7 @@ export function NoFeedsPinned({
<Button
disabled={isPending}
label={_(msg`Apply default recommended feeds`)}
size="medium"
size="large"
variant="solid"
color="primary"
onPress={addRecommendedFeeds}>
@@ -102,7 +102,7 @@ export function NoFeedsPinned({
<Link
label={_(msg`Browse other feeds`)}
to="/feeds"
size="medium"
size="large"
variant="solid"
color="secondary">
<ButtonIcon icon={ListSparkle} position="left" />
src/screens/List/ListHiddenScreen.tsx
+4 -4
View File
@@ -152,7 +152,7 @@ export function ListHiddenScreen({
<Button
variant="solid"
color="secondary"
size="medium"
size="large"
label={_(msg`Remove from saved feeds`)}
onPress={onRemoveList}
disabled={isProcessing}>
@@ -168,7 +168,7 @@ export function ListHiddenScreen({
<Button
variant="solid"
color="secondary"
size="medium"
size="large"
label={_(msg`Show list anyway`)}
onPress={() => setIsContentVisible(true)}
disabled={isProcessing}>
@@ -180,7 +180,7 @@ export function ListHiddenScreen({
<Button
variant="solid"
color="secondary"
size="medium"
size="large"
label={_(msg`Unsubscribe from list`)}
onPress={() => {
if (isModList) {
@@ -204,7 +204,7 @@ export function ListHiddenScreen({
color="primary"
label={_(msg`Return to previous page`)}
onPress={goBack}
size="medium"
size="large"
disabled={isProcessing}>
<ButtonText>
<Trans>Go Back</Trans>
src/screens/Login/ChooseAccountForm.tsx
+1 -1
View File
@@ -98,7 +98,7 @@ export const ChooseAccountForm = ({
label={_(msg`Back`)}
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onPressBack}>
<ButtonText>{_(msg`Back`)}</ButtonText>
</Button>
src/screens/Login/ForgotPasswordForm.tsx
+3 -3
View File
@@ -129,7 +129,7 @@ export const ForgotPasswordForm = ({
label={_(msg`Back`)}
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onPressBack}>
<ButtonText>
<Trans>Back</Trans>
@@ -143,7 +143,7 @@ export const ForgotPasswordForm = ({
label={_(msg`Next`)}
variant="solid"
color={'primary'}
size="medium"
size="large"
onPress={onPressNext}>
<ButtonText>
<Trans>Next</Trans>
@@ -170,7 +170,7 @@ export const ForgotPasswordForm = ({
onPress={onEmailSent}
label={_(msg`Go to next`)}
accessibilityHint={_(msg`Navigates to the next screen`)}
size="medium"
size="large"
variant="ghost"
color="secondary">
<ButtonText>
src/screens/Login/LoginForm.tsx
+3 -3
View File
@@ -285,7 +285,7 @@ export const LoginForm = ({
label={_(msg`Back`)}
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onPressBack}>
<ButtonText>
<Trans>Back</Trans>
@@ -299,7 +299,7 @@ export const LoginForm = ({
accessibilityHint={_(msg`Retries login`)}
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onPressRetryConnect}>
<ButtonText>
<Trans>Retry</Trans>
@@ -319,7 +319,7 @@ export const LoginForm = ({
accessibilityHint={_(msg`Navigates to the next screen`)}
variant="solid"
color="primary"
size="medium"
size="large"
onPress={onPressNext}>
<ButtonText>
<Trans>Next</Trans>
src/screens/Login/PasswordUpdatedForm.tsx
+1 -1
View File
@@ -39,7 +39,7 @@ export const PasswordUpdatedForm = ({
accessibilityHint={_(msg`Closes password update alert`)}
variant="solid"
color="primary"
size="medium">
size="large">
<ButtonText>
<Trans>Okay</Trans>
</ButtonText>
src/screens/Login/SetNewPasswordForm.tsx
+2 -2
View File
@@ -160,7 +160,7 @@ export const SetNewPasswordForm = ({
label={_(msg`Back`)}
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onPressBack}>
<ButtonText>
<Trans>Back</Trans>
@@ -174,7 +174,7 @@ export const SetNewPasswordForm = ({
label={_(msg`Next`)}
variant="solid"
color="primary"
size="medium"
size="large"
onPress={onPressNext}>
<ButtonText>
<Trans>Next</Trans>
src/screens/Messages/Conversation/ChatDisabled.tsx
+2 -2
View File
@@ -128,7 +128,7 @@ function DialogInner() {
testID="backBtn"
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onBack}
label={_(msg`Back`)}>
<ButtonText>{_(msg`Back`)}</ButtonText>
@@ -137,7 +137,7 @@ function DialogInner() {
testID="submitBtn"
variant="solid"
color="primary"
size="medium"
size="large"
onPress={onSubmit}
label={_(msg`Submit`)}>
<ButtonText>{_(msg`Submit`)}</ButtonText>
src/screens/Messages/List/index.tsx
+1 -1
View File
@@ -198,7 +198,7 @@ export function MessagesScreen({navigation, route}: Props) {
<Button
label={_(msg`Reload conversations`)}
size="medium"
size="large"
color="secondary"
variant="solid"
onPress={() => refetch()}>
src/screens/Settings/components/DeactivateAccountDialog.tsx
+1 -1
View File
@@ -102,7 +102,7 @@ function DeactivateAccountDialogInner({
<Button
variant="solid"
color="negative"
size={gtMobile ? 'small' : 'medium'}
size={gtMobile ? 'small' : 'large'}
label={_(msg`Yes, deactivate`)}
onPress={handleDeactivate}>
<ButtonText>{_(msg`Yes, deactivate`)}</ButtonText>
src/screens/Signup/BackNextButtons.tsx
+3 -3
View File
@@ -34,7 +34,7 @@ export function BackNextButtons({
label={_(msg`Go back to previous step`)}
variant="solid"
color="secondary"
size="medium"
size="large"
onPress={onBackPress}>
<ButtonText>
<Trans>Back</Trans>
@@ -46,7 +46,7 @@ export function BackNextButtons({
label={_(msg`Press to retry`)}
variant="solid"
color="primary"
size="medium"
size="large"
onPress={onRetryPress}>
<ButtonText>
<Trans>Retry</Trans>
@@ -59,7 +59,7 @@ export function BackNextButtons({
label={_(msg`Continue to next step`)}
variant="solid"
color="primary"
size="medium"
size="large"
disabled={isLoading || isNextDisabled}
onPress={onNextPress}>
<ButtonText>
src/screens/StarterPack/StarterPackLandingScreen.tsx
+1 -1
View File
@@ -308,7 +308,7 @@ function LandingScreenLoaded({
label={_(msg`Signup without a starter pack`)}
variant="solid"
color="secondary"
size="medium"
size="large"
style={[a.py_lg]}
onPress={onJoinWithoutPress}>
<ButtonText>
src/screens/StarterPack/StarterPackScreen.tsx
+2 -2
View File
@@ -449,7 +449,7 @@ function Header({
}}
variant="solid"
color="primary"
size="medium">
size="large">
<ButtonText style={[a.text_lg]}>
<Trans>Join Bluesky</Trans>
</ButtonText>
@@ -645,7 +645,7 @@ function OverflowMenu({
<Button
variant="solid"
color="negative"
size={gtMobile ? 'small' : 'medium'}
size={gtMobile ? 'small' : 'large'}
label={_(msg`Yes, delete this starter pack`)}
onPress={onDeleteStarterPack}>
<ButtonText>
src/screens/StarterPack/Wizard/index.tsx
+1 -1
View File
@@ -358,7 +358,7 @@ function Container({children}: {children: React.ReactNode}) {
label={_(msg`Next`)}
variant="solid"
color="primary"
size="medium"
size="large"
style={[a.mx_xl, a.mb_lg, {marginTop: 35}]}
onPress={() => dispatch({type: 'Next'})}>
<ButtonText>