Skip to content

rework Onboardinginfo into informationpage#193

Merged
hebasto merged 5 commits into
bitcoin-core:mainfrom
jarolrod:onboardinginfo-to-informationpage
Dec 8, 2022
Merged

rework Onboardinginfo into informationpage#193
hebasto merged 5 commits into
bitcoin-core:mainfrom
jarolrod:onboardinginfo-to-informationpage

Conversation

@jarolrod
Copy link
Copy Markdown
Contributor

@jarolrod jarolrod commented Nov 23, 2022 •
edited
Loading

based on #192

This encapsulates the page logic for the onboarding pages into OnboardingInfo, which is then renamed to InformationPage; because now this can be used for reusable Settings pages and not just the onboarding views.

This has the benefit of removing a ton of duplicated code around page declaration, but also sets us up to introduce the ScrollView and have it be effective for all pages that use InformationPage, which in turn are all of the views aside from the node view.

Bundled in this change is an update to ensure that we are using the qml translator function for all strings that are a part of the onboarding views.

Desktop

Master

master-1 master-2 master-3 master-4 master-5
master-1 master-2 master-3 master-4 master-5
master-6 master-7 master-8 master-9 master-10
master-6 master-7 master-8 master-9 master-10

PR

pr-1 pr-2 pr-3 pr-4 pr-5
pr-1 pr-2 pr-3 pr-4 pr-5
pr-6 pr-7 pr-8 pr-9 pr-10
pr-6 pr-7 pr-8 pr-9 pr-10

Windows
Intel macOS
Apple Silicon macOS
ARM64 Android

@jarolrod jarolrod marked this pull request as draft November 23, 2022 23:09
@jarolrod
Copy link
Copy Markdown
Contributor Author

jarolrod commented Nov 23, 2022

Converting to draft until i fix the width issue on android

@jarolrod jarolrod force-pushed the onboardinginfo-to-informationpage branch from 7beeb7e to 90f46d3 Compare December 6, 2022 04:38
@jarolrod jarolrod marked this pull request as ready for review December 6, 2022 04:38
@jarolrod
Copy link
Copy Markdown
Contributor Author

jarolrod commented Dec 6, 2022

Updated from 7beeb7e to 90f46d3 (pr193.01 -> pr193.02, diff)

changes:

@hebasto
Copy link
Copy Markdown
Member

hebasto commented Dec 6, 2022

Suggesting to rebase to fix CI tasks.

@jarolrod
qml: make continueButton text optional in the OnboardingInfo control
325099d 
This allows for using the OnboardingInfo control with the onboarding
views that represent advanced setting customization.
@jarolrod
qml: use the OnboardingInfo control for onboarding settings views
b954e9f 
All onboarding views are now represented with the OnboardingInfo
control.
@jarolrod
qml: deduplicate onboarding code with encapsulation of page definition
ec0b524
@jarolrod
qml: ensure translation function for strings in use in onboarding views
8a57f61
@jarolrod
qml: ensure use of index decrement function instead of arithmetic
183be5c 
Ensure we are using the dedicated decrement/increment functions for a
swipview instead of manually performing arithmetic on the currentIndex.
@jarolrod jarolrod force-pushed the onboardinginfo-to-informationpage branch from 90f46d3 to 183be5c Compare December 7, 2022 01:15
@jarolrod
Copy link
Copy Markdown
Contributor Author

jarolrod commented Dec 7, 2022

updated from 90f46d3 to 183be5c (pr193.02 -> pr193.03, diff)

changes: rebased over master

This was referenced Dec 7, 2022
Merged
Merged
Merged
@hebasto
Copy link
Copy Markdown
Member

hebasto commented Dec 8, 2022

based on #192

#192 has been just merged. Rebase?

@mouxdesign mouxdesign mentioned this pull request Dec 8, 2022
Open
johnny9
johnny9 approved these changes Dec 8, 2022
View reviewed changes
Copy link
Copy Markdown
Collaborator

@johnny9 johnny9 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

ACK 183be5c

I think this is a significant improvement. The parameter list for the InformationPage is a little crazy but the onboarding page definitions are much easier to manage.

The views render as expected and no qml warnings.

@hebasto hebasto merged commit 9877b49 into bitcoin-core:main Dec 8, 2022
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 8, 2025
@jarolrod @hebasto
qml: deduplicate onboarding code with encapsulation of page definition
780c73b 
Github-Pull: bitcoin-core#193
Rebased-From: ec0b524
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 8, 2025
@jarolrod @hebasto
qml: ensure translation function for strings in use in onboarding views
604b21a 
Github-Pull: bitcoin-core#193
Rebased-From: 8a57f61
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 8, 2025
@jarolrod @hebasto
qml: ensure use of index decrement function instead of arithmetic
ac8f1be 
Ensure we are using the dedicated decrement/increment functions for a
swipview instead of manually performing arithmetic on the currentIndex.

Github-Pull: bitcoin-core#193
Rebased-From: 183be5c
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @hebasto
qml: deduplicate onboarding code with encapsulation of page definition
393308d 
Github-Pull: bitcoin-core#193
Rebased-From: ec0b524
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @hebasto
qml: ensure translation function for strings in use in onboarding views
0a4fc58 
Github-Pull: bitcoin-core#193
Rebased-From: 8a57f61
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @hebasto
qml: ensure use of index decrement function instead of arithmetic
1b1373f 
Ensure we are using the dedicated decrement/increment functions for a
swipview instead of manually performing arithmetic on the currentIndex.

Github-Pull: bitcoin-core#193
Rebased-From: 183be5c
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @hebasto
qml: deduplicate onboarding code with encapsulation of page definition
e7d1f45 
Github-Pull: bitcoin-core#193
Rebased-From: ec0b524
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @hebasto
qml: ensure translation function for strings in use in onboarding views
84ce648 
Github-Pull: bitcoin-core#193
Rebased-From: 8a57f61
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @hebasto
qml: ensure use of index decrement function instead of arithmetic
f70bb66 
Ensure we are using the dedicated decrement/increment functions for a
swipview instead of manually performing arithmetic on the currentIndex.

Github-Pull: bitcoin-core#193
Rebased-From: 183be5c
johnny9 pushed a commit to johnny9/bitcoin-core-app that referenced this pull request Jul 4, 2025
@hebasto
Merge bitcoin-core/gui-qml#193: rework Onboardinginfo into informatio…
4bfe20f 
…npage

6f82beb qml: ensure use of index decrement function instead of arithmetic (Jarol Rodriguez)
1cb2bcb qml: ensure translation function for strings in use in onboarding views (jarolrod)
14225fc qml: deduplicate onboarding code with encapsulation of page definition (jarolrod)

Pull request description:

  based on bitcoin-core/gui-qml#192

  This encapsulates the page logic for the onboarding pages into OnboardingInfo, which is then renamed to InformationPage; because now this can be used for reusable `Settings` pages and not just the onboarding views.

  This has the benefit of removing a ton of duplicated code around page declaration, but also sets us up to introduce the ScrollView and have it be effective for all pages that use InformationPage, which in turn are all of the views aside from the node view.

  Bundled in this change is an update to ensure that we are using the qml translator function for all strings that are a part of the onboarding views.

  ## Desktop
  ### Master

  | master-1 | master-2 | master-3 | master-4 | master-5 |
  | -------- | -------- | -------- | -------- | -------- |
  | <img width="708" alt="master-1" src="https://user-images.githubusercontent.com/23396902/206313556-a2f9b720-368b-41c5-bc13-bb695c83c807.png"> | <img width="752" alt="master-2" src="https://user-images.githubusercontent.com/23396902/206313569-9a90d545-a243-484e-975d-87b5192e7637.png"> | <img width="752" alt="master-3" src="https://user-images.githubusercontent.com/23396902/206313586-fa967658-cb38-47cb-8c25-1d1cc79e244b.png"> | <img width="752" alt="master-4" src="https://user-images.githubusercontent.com/23396902/206313603-da9849eb-8f40-4bdd-a231-de7843e8bd6f.png"> | <img width="752" alt="master-5" src="https://user-images.githubusercontent.com/23396902/206313630-7429fc73-4505-4888-9a00-f03ac7b8a66f.png"> |

  | master-6 | master-7 | master-8 | master-9 | master-10 |
  | -------- | -------- | -------- | -------- | --------- |
  | <img width="752" alt="master-6" src="https://user-images.githubusercontent.com/23396902/206313704-99e33b2a-a7b5-498b-9ae1-b4b77aa343a4.png"> | <img width="752" alt="master-7" src="https://user-images.githubusercontent.com/23396902/206313719-2f5efacf-85c1-436a-8782-0fad0c9d7193.png"> | <img width="752" alt="master-8" src="https://user-images.githubusercontent.com/23396902/206313739-1f02173a-0fac-45ba-af37-338c18e765f7.png"> | <img width="752" alt="master-9" src="https://user-images.githubusercontent.com/23396902/206313756-79072fc9-5af1-43be-b6f3-99dcb402f98f.png"> | <img width="752" alt="master-10" src="https://user-images.githubusercontent.com/23396902/206313767-33b8a2ad-eafc-47b3-a0eb-8a578a55597f.png"> |

  ### PR

  | pr-1 | pr-2 | pr-3 | pr-4 | pr-5 |
  | ---- | ---- | ---- | ---- | ---- |
  | <img width="708" alt="pr-1" src="https://user-images.githubusercontent.com/23396902/206313989-bdb396c2-080a-4635-b46d-40b14cd70cc2.png"> | <img width="752" alt="pr-2" src="https://user-images.githubusercontent.com/23396902/206313996-e2f7ccc4-6d6e-4d4a-9afd-10b765db37db.png"> | <img width="752" alt="pr-3" src="https://user-images.githubusercontent.com/23396902/206314014-2ea1d4e0-4993-41f8-88c5-fe237ef33019.png"> | <img width="752" alt="pr-4" src="https://user-images.githubusercontent.com/23396902/206314034-72fc7a11-8430-4067-874c-5a76224560cc.png"> | <img width="752" alt="pr-5" src="https://user-images.githubusercontent.com/23396902/206314053-02cfd0c3-dad9-4801-a223-82e909ea0918.png"> |

  | pr-6 | pr-7 | pr-8 | pr-9 | pr-10 |
  | ---- | ---- | ---- | ---- | ----- |
  | <img width="752" alt="pr-6" src="https://user-images.githubusercontent.com/23396902/206314169-b40cb04d-40e7-4ce0-8066-df2435ba1c76.png"> | <img width="752" alt="pr-7" src="https://user-images.githubusercontent.com/23396902/206314185-98201cb2-cff9-4d7d-9da9-2b55ac64a8eb.png"> | <img width="752" alt="pr-8" src="https://user-images.githubusercontent.com/23396902/206314200-cd378c86-2306-4984-b53a-359463101f8a.png"> | <img width="752" alt="pr-9" src="https://user-images.githubusercontent.com/23396902/206314220-980af335-a335-4a09-b84d-c993e914a9d6.png"> | <img width="752" alt="pr-10" src="https://user-images.githubusercontent.com/23396902/206314239-3aae7e40-4372-4566-b947-e96114c959aa.png"> |

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/193)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/193)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/193)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/193)

ACKs for top commit:
  johnny9:
    ACK 6f82beb

Tree-SHA512: bb935791134a9dc6e9deb95b7d3640249150ec3744ce3a941f9c41f39946bdf38510dfe6ed5992ab5acf61f3e916aad97171bb19f8487ef1d819e6a4300a91ce
tx-signer450 added a commit to tx-signer450/gui-qml that referenced this pull request Oct 20, 2025
@tx-signer450
Merge bitcoin-core/gui-qml#193: rework Onboardinginfo into informatio…
3e190fa 
…npage

6f82beb6f8d1313495d266a535ab2e0d0dffc989 qml: ensure use of index decrement function instead of arithmetic (Jarol Rodriguez)
1cb2bcb685f29186238d8e0fe721c4628249e011 qml: ensure translation function for strings in use in onboarding views (jarolrod)
14225fca6d4a2172928ccde0e8f520441cc51694 qml: deduplicate onboarding code with encapsulation of page definition (jarolrod)

Pull request description:

  based on bitcoin-core/gui-qml#192

  This encapsulates the page logic for the onboarding pages into OnboardingInfo, which is then renamed to InformationPage; because now this can be used for reusable `Settings` pages and not just the onboarding views.

  This has the benefit of removing a ton of duplicated code around page declaration, but also sets us up to introduce the ScrollView and have it be effective for all pages that use InformationPage, which in turn are all of the views aside from the node view.

  Bundled in this change is an update to ensure that we are using the qml translator function for all strings that are a part of the onboarding views.

  ## Desktop
  ### Master

  | master-1 | master-2 | master-3 | master-4 | master-5 |
  | -------- | -------- | -------- | -------- | -------- |
  | <img width="708" alt="master-1" src="https://user-images.githubusercontent.com/23396902/206313556-a2f9b720-368b-41c5-bc13-bb695c83c807.png"> | <img width="752" alt="master-2" src="https://user-images.githubusercontent.com/23396902/206313569-9a90d545-a243-484e-975d-87b5192e7637.png"> | <img width="752" alt="master-3" src="https://user-images.githubusercontent.com/23396902/206313586-fa967658-cb38-47cb-8c25-1d1cc79e244b.png"> | <img width="752" alt="master-4" src="https://user-images.githubusercontent.com/23396902/206313603-da9849eb-8f40-4bdd-a231-de7843e8bd6f.png"> | <img width="752" alt="master-5" src="https://user-images.githubusercontent.com/23396902/206313630-7429fc73-4505-4888-9a00-f03ac7b8a66f.png"> |

  | master-6 | master-7 | master-8 | master-9 | master-10 |
  | -------- | -------- | -------- | -------- | --------- |
  | <img width="752" alt="master-6" src="https://user-images.githubusercontent.com/23396902/206313704-99e33b2a-a7b5-498b-9ae1-b4b77aa343a4.png"> | <img width="752" alt="master-7" src="https://user-images.githubusercontent.com/23396902/206313719-2f5efacf-85c1-436a-8782-0fad0c9d7193.png"> | <img width="752" alt="master-8" src="https://user-images.githubusercontent.com/23396902/206313739-1f02173a-0fac-45ba-af37-338c18e765f7.png"> | <img width="752" alt="master-9" src="https://user-images.githubusercontent.com/23396902/206313756-79072fc9-5af1-43be-b6f3-99dcb402f98f.png"> | <img width="752" alt="master-10" src="https://user-images.githubusercontent.com/23396902/206313767-33b8a2ad-eafc-47b3-a0eb-8a578a55597f.png"> |

  ### PR

  | pr-1 | pr-2 | pr-3 | pr-4 | pr-5 |
  | ---- | ---- | ---- | ---- | ---- |
  | <img width="708" alt="pr-1" src="https://user-images.githubusercontent.com/23396902/206313989-bdb396c2-080a-4635-b46d-40b14cd70cc2.png"> | <img width="752" alt="pr-2" src="https://user-images.githubusercontent.com/23396902/206313996-e2f7ccc4-6d6e-4d4a-9afd-10b765db37db.png"> | <img width="752" alt="pr-3" src="https://user-images.githubusercontent.com/23396902/206314014-2ea1d4e0-4993-41f8-88c5-fe237ef33019.png"> | <img width="752" alt="pr-4" src="https://user-images.githubusercontent.com/23396902/206314034-72fc7a11-8430-4067-874c-5a76224560cc.png"> | <img width="752" alt="pr-5" src="https://user-images.githubusercontent.com/23396902/206314053-02cfd0c3-dad9-4801-a223-82e909ea0918.png"> |

  | pr-6 | pr-7 | pr-8 | pr-9 | pr-10 |
  | ---- | ---- | ---- | ---- | ----- |
  | <img width="752" alt="pr-6" src="https://user-images.githubusercontent.com/23396902/206314169-b40cb04d-40e7-4ce0-8066-df2435ba1c76.png"> | <img width="752" alt="pr-7" src="https://user-images.githubusercontent.com/23396902/206314185-98201cb2-cff9-4d7d-9da9-2b55ac64a8eb.png"> | <img width="752" alt="pr-8" src="https://user-images.githubusercontent.com/23396902/206314200-cd378c86-2306-4984-b53a-359463101f8a.png"> | <img width="752" alt="pr-9" src="https://user-images.githubusercontent.com/23396902/206314220-980af335-a335-4a09-b84d-c993e914a9d6.png"> | <img width="752" alt="pr-10" src="https://user-images.githubusercontent.com/23396902/206314239-3aae7e40-4372-4566-b947-e96114c959aa.png"> |

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/193)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/193)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/193)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/193)

ACKs for top commit:
  johnny9:
    ACK 6f82beb6f8d1313495d266a535ab2e0d0dffc989

Tree-SHA512: bb935791134a9dc6e9deb95b7d3640249150ec3744ce3a941f9c41f39946bdf38510dfe6ed5992ab5acf61f3e916aad97171bb19f8487ef1d819e6a4300a91ce
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@johnny9 johnny9 johnny9 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jarolrod @hebasto @johnny9