Skip to content

Reduce usage of ternaries in Theme file#168

Merged
hebasto merged 1 commit into
bitcoin-core:mainfrom
jarolrod:theme-avoid-ternaries
Aug 29, 2022
Merged

Reduce usage of ternaries in Theme file#168
hebasto merged 1 commit into
bitcoin-core:mainfrom
jarolrod:theme-avoid-ternaries

Conversation

@jarolrod
Copy link
Copy Markdown
Contributor

@jarolrod jarolrod commented Aug 21, 2022 •
edited by hebasto
Loading

Reduces usage of ternaries in Theme.qml by abstracting definitions of colors and image urls into "Sets" and using the definitions from the appropriate set for the current dark mode setting.

This is a late follow-up to this review by promag: #109 (comment)

Windows
Intel macOS
Apple Silicon macOS
ARM64 Android

@jarolrod jarolrod mentioned this pull request Aug 21, 2022
Closed
shaavan
shaavan approved these changes Aug 22, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@shaavan shaavan left a comment

Choose a reason for hiding this comment

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

ACK 9ff8924

  1. Verified that the colorSet is correctly created with the correct values for light and dark themes.
  2. Verified the proper working of the PR on Ubuntu 22.04

hebasto
hebasto reviewed Aug 23, 2022
View reviewed changes
Comment thread src/qml/controls/Theme.qml Outdated
@jarolrod @promag
qml: reduce usage of ternaries in Theme file
6e0ee80 
Reduces usage of ternaries in Theme.qml by abstracting definitions of
colors and images into "Sets" and using the definitions from the
appropriate set for the current dark mode setting.

Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
@jarolrod jarolrod force-pushed the theme-avoid-ternaries branch from 9ff8924 to 6e0ee80 Compare August 24, 2022 20:16
@jarolrod
Copy link
Copy Markdown
Contributor Author

jarolrod commented Aug 24, 2022

updated from 9ff8924 to 6e0ee80 Compare

changes: fix leading whitespace issue

hebasto
hebasto approved these changes Aug 29, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 6e0ee80, I have reviewed the code and it looks OK, I agree it can be merged.

@hebasto hebasto merged commit 010b734 into bitcoin-core:main Aug 29, 2022
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 8, 2025
@jarolrod @promag @hebasto
qml: reduce usage of ternaries in Theme file
e032bf3 
Reduces usage of ternaries in Theme.qml by abstracting definitions of
colors and images into "Sets" and using the definitions from the
appropriate set for the current dark mode setting.

Github-Pull: bitcoin-core#168
Rebased-From: 6e0ee80

Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 8, 2025
@jarolrod @promag @hebasto
qml: reduce usage of ternaries in Theme file
6d3271f 
Reduces usage of ternaries in Theme.qml by abstracting definitions of
colors and images into "Sets" and using the definitions from the
appropriate set for the current dark mode setting.

Github-Pull: bitcoin-core#168
Rebased-From: 6e0ee80

Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @promag @hebasto
qml: reduce usage of ternaries in Theme file
70b75d0 
Reduces usage of ternaries in Theme.qml by abstracting definitions of
colors and images into "Sets" and using the definitions from the
appropriate set for the current dark mode setting.

Github-Pull: bitcoin-core#168
Rebased-From: 6e0ee80

Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
hebasto pushed a commit to hebasto/gui-qml that referenced this pull request Jun 9, 2025
@jarolrod @promag @hebasto
qml: reduce usage of ternaries in Theme file
c9961a3 
Reduces usage of ternaries in Theme.qml by abstracting definitions of
colors and images into "Sets" and using the definitions from the
appropriate set for the current dark mode setting.

Github-Pull: bitcoin-core#168
Rebased-From: 6e0ee80

Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com>
johnny9 pushed a commit to johnny9/bitcoin-core-app that referenced this pull request Jul 4, 2025
@hebasto
Merge bitcoin-core/gui-qml#168: Reduce usage of ternaries in Theme file
26697f6 
23743d9 qml: reduce usage of ternaries in Theme file (Jarol Rodriguez)

Pull request description:

  Reduces usage of ternaries in Theme.qml by abstracting definitions of colors and image urls into "Sets" and using the definitions from the appropriate set for the current dark mode setting.

  This is a late follow-up to this review by **promag**: bitcoin-core/gui-qml#109 (comment)

  [![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/168)
  [![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/168)
  [![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/168)
  [![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/168)

ACKs for top commit:
  hebasto:
    ACK 23743d9, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 7ab4e6bd34386da2086aeb40c5520ffb401cbefa7be4510ce9654cf939ef0569661ba4a8a22752f16b8ce053ab07dbdd2a1d01dc62d159f808436ef070e94d02
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#168: Reduce usage of ternaries in Theme file
a1caef7 
23743d9e82bedcc65927fd96158e9758b49072fe qml: reduce usage of ternaries in Theme file (Jarol Rodriguez)

Pull request description:

  Reduces usage of ternaries in Theme.qml by abstracting definitions of colors and image urls into "Sets" and using the definitions from the appropriate set for the current dark mode setting.

  This is a late follow-up to this review by **promag**: bitcoin-core/gui-qml#109 (comment)

  [![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/168)
  [![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/168)
  [![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/168)
  [![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/168)

ACKs for top commit:
  hebasto:
    ACK 23743d9e82bedcc65927fd96158e9758b49072fe, I have reviewed the code and it looks OK, I agree it can be merged.

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

Reviewers

@hebasto hebasto hebasto approved these changes

+1 more reviewer

@shaavan shaavan shaavan 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 @shaavan