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.

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

Several layout improvements #2606

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

myxmaster
Copy link
Contributor

@myxmaster myxmaster commented Dec 8, 2024

Description

There is still work to do after this PR, but this is a step towards more consistent and cleaner layouting.

General:
Same overall padding/margin for Invoice, Payment, Privacy and Lightning Address Settings
 

Payment Settings/Invoices Settings/Privacy Settings/Lightning Address Settings/Receive:

  • improved styling to avoid problems in case of smaller screens/larger font size/longer locale strings (non english)
    -> switch cannot be pushed out of display view or overlap with text anymore
    -> switch is now correctly centered vertically in case text has more than 1 line
  • removed <Row> component in <Text> component to not break layout if explainer is used
     

Additionally:

  • Payment Settings: Lightning - Default Fee Limit: "sats" now has more space to the right
  • Lightning Address Settings: changed text color to themeColor('secondaryText') to align with other font colors in Settings
  • Invoices Settings: replaced outer View wrapper with ScrollView (in case scrolling is needed)

Before:
grafik
grafik
grafik

After:
grafik
grafik
grafik

-> This fixes #2546.

This pull request is categorized as a:

  • New feature
  • Bug fix
  • Code refactor
  • Configuration change
  • Locales update
  • Quality assurance
  • Other

Checklist

  • I’ve run yarn run tsc and made sure my code compiles correctly
  • I’ve run yarn run lint and made sure my code didn’t contain any problematic patterns
  • I’ve run yarn run prettier and made sure my code is formatted correctly
  • I’ve run yarn run test and made sure all of the tests pass

Testing

If you modified or added a utility file, did you add new unit tests?

  • No, I’m a fool
  • Yes
  • N/A

I have tested this PR on the following platforms (please specify OS version and phone model/VM):

  • Android
  • iOS

I have tested this PR with the following types of nodes (please specify node version and API version where appropriate):

  • Embedded LND
  • LND (REST)
  • LND (Lightning Node Connect)
  • Core Lightning (CLNRest)
  • LndHub
  • [DEPRECATED] Core Lightning (c-lightning-REST)
  • [DEPRECATED] Core Lightning (Spark)
  • [DEPRECATED] Eclair

Locales

  • I’ve added new locale text that requires translations
  • I’m aware that new translations should be made on the ZEUS Transfix page and not directly to this repo

Third Party Dependencies and Packages

  • Contributors will need to run yarn after this PR is merged in
  • 3rd party dependencies have been modified:
    • verify that package.json and yarn.lock have been properly updated
    • verify that dependencies are installed for both iOS and Android platforms

Other:

  • Changes were made that require an update to the README
  • Changes were made that require an update to onboarding

Copy link
Contributor

@shubhamkmr04 shubhamkmr04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot_1734594518
we can fix the extra spacing of switch here also

@myxmaster
Copy link
Contributor Author

Right, "Display" is also fixed now.

Before:
grafik

After:
grafik

@myxmaster
Copy link
Contributor Author

myxmaster commented Dec 23, 2024

Found another one... ChannelsSettings now also fixed.

Before:
grafik

After:
grafik

Copy link
Contributor

@shubhamkmr04 shubhamkmr04 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot_1734933819

This might be due to the Text component changes

@myxmaster
Copy link
Contributor Author

Good catch, fixed in views/Settings/LightningAddress/index.tsx by wrapping "@zeuspay.com" text in a Row component.

(Additionally removed nested View structures.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

minor UI bug in Settings -> Display
2 participants