diff --git a/src/app/global/feature_flags.nim b/src/app/global/feature_flags.nim index 83b469001f4..95d59fa0c4b 100644 --- a/src/app/global/feature_flags.nim +++ b/src/app/global/feature_flags.nim @@ -23,7 +23,7 @@ const DEFAULT_FLAG_SIMPLE_SEND_ENABLED = true const DEFAULT_FLAG_MARKET_ENABLED = true const DEFAULT_FLAG_HOMEPAGE_ENABLED = true const DEFAULT_FLAG_LOCAL_BACKUP_ENABLED = true -const DEFAULT_FLAG_PRIVACY_MODE_FEATURE_ENABLED = false +const DEFAULT_FLAG_PRIVACY_MODE_FEATURE_ENABLED = true # Compile time feature flags const DEFAULT_FLAG_DAPPS_ENABLED = true diff --git a/ui/StatusQ/src/assets/png/market/swap-dark-small.png b/ui/StatusQ/src/assets/png/market/swap-dark-small.png new file mode 100644 index 00000000000..61bd764b6dd Binary files /dev/null and b/ui/StatusQ/src/assets/png/market/swap-dark-small.png differ diff --git a/ui/StatusQ/src/assets/png/market/swap-dark.png b/ui/StatusQ/src/assets/png/market/swap-dark.png new file mode 100644 index 00000000000..c1f2b151de8 Binary files /dev/null and b/ui/StatusQ/src/assets/png/market/swap-dark.png differ diff --git a/ui/StatusQ/src/assets/png/market/swap-light-small.png b/ui/StatusQ/src/assets/png/market/swap-light-small.png new file mode 100644 index 00000000000..deccb05bbdf Binary files /dev/null and b/ui/StatusQ/src/assets/png/market/swap-light-small.png differ diff --git a/ui/StatusQ/src/assets/png/market/swap.png b/ui/StatusQ/src/assets/png/market/swap-light.png similarity index 100% rename from ui/StatusQ/src/assets/png/market/swap.png rename to ui/StatusQ/src/assets/png/market/swap-light.png diff --git a/ui/StatusQ/src/assets/png/market/tradeCenter-dark-small.png b/ui/StatusQ/src/assets/png/market/tradeCenter-dark-small.png new file mode 100644 index 00000000000..916a147b5a2 Binary files /dev/null and b/ui/StatusQ/src/assets/png/market/tradeCenter-dark-small.png differ diff --git a/ui/StatusQ/src/assets/png/market/tradeCenter-dark.png b/ui/StatusQ/src/assets/png/market/tradeCenter-dark.png new file mode 100644 index 00000000000..0f8b8ff747a Binary files /dev/null and b/ui/StatusQ/src/assets/png/market/tradeCenter-dark.png differ diff --git a/ui/StatusQ/src/assets/png/market/tradeCenter-light-small.png b/ui/StatusQ/src/assets/png/market/tradeCenter-light-small.png new file mode 100644 index 00000000000..035b113bb8c Binary files /dev/null and b/ui/StatusQ/src/assets/png/market/tradeCenter-light-small.png differ diff --git a/ui/StatusQ/src/assets/png/market/tradeCenter.png b/ui/StatusQ/src/assets/png/market/tradeCenter-light.png similarity index 100% rename from ui/StatusQ/src/assets/png/market/tradeCenter.png rename to ui/StatusQ/src/assets/png/market/tradeCenter-light.png diff --git a/ui/StatusQ/src/assets/png/png.qrc b/ui/StatusQ/src/assets/png/png.qrc index 00d4161f611..a49e9247392 100644 --- a/ui/StatusQ/src/assets/png/png.qrc +++ b/ui/StatusQ/src/assets/png/png.qrc @@ -924,11 +924,29 @@ status-logo-icon.png status-preparing.png unfurling-image.png - wallet/placeholders/buyView.png - wallet/placeholders/swapView.png - wallet/placeholders/collectiblesView.png - wallet/placeholders/mainView.png - market/tradeCenter.png - market/swap.png + market/tradeCenter-light.png + market/swap-light.png + market/tradeCenter-dark.png + market/swap-dark.png + market/tradeCenter-light-small.png + market/swap-light-small.png + market/tradeCenter-dark-small.png + market/swap-dark-small.png + wallet/placeholders/mainView-light-small.png + wallet/placeholders/collectiblesView-light-small.png + wallet/placeholders/buyView-light-small.png + wallet/placeholders/swapView-light-small.png + wallet/placeholders/mainView-dark-small.png + wallet/placeholders/collectiblesView-dark-small.png + wallet/placeholders/buyView-dark-small.png + wallet/placeholders/swapView-dark-small.png + wallet/placeholders/buyView-dark.png + wallet/placeholders/collectiblesView-dark.png + wallet/placeholders/swapView-dark.png + wallet/placeholders/mainView-dark.png + wallet/placeholders/swapView-light.png + wallet/placeholders/mainView-light.png + wallet/placeholders/collectiblesView-light.png + wallet/placeholders/buyView-light.png diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-dark-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-dark-small.png new file mode 100644 index 00000000000..fd706cec533 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-dark-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-dark.png b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-dark.png new file mode 100644 index 00000000000..67bc04149a9 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-dark.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-light-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-light-small.png new file mode 100644 index 00000000000..1468fd20fc3 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-light-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/buyView.png b/ui/StatusQ/src/assets/png/wallet/placeholders/buyView-light.png similarity index 100% rename from ui/StatusQ/src/assets/png/wallet/placeholders/buyView.png rename to ui/StatusQ/src/assets/png/wallet/placeholders/buyView-light.png diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-dark-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-dark-small.png new file mode 100644 index 00000000000..1714fe5be62 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-dark-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-dark.png b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-dark.png new file mode 100644 index 00000000000..b8ade434c7f Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-dark.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-light-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-light-small.png new file mode 100644 index 00000000000..433f5e790ae Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-light-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView.png b/ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-light.png similarity index 100% rename from ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView.png rename to ui/StatusQ/src/assets/png/wallet/placeholders/collectiblesView-light.png diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-dark-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-dark-small.png new file mode 100644 index 00000000000..93eb6a5253f Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-dark-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-dark.png b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-dark.png new file mode 100644 index 00000000000..65b04199fa9 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-dark.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-light-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-light-small.png new file mode 100644 index 00000000000..ee16be093e9 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-light-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/mainView.png b/ui/StatusQ/src/assets/png/wallet/placeholders/mainView-light.png similarity index 100% rename from ui/StatusQ/src/assets/png/wallet/placeholders/mainView.png rename to ui/StatusQ/src/assets/png/wallet/placeholders/mainView-light.png diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-dark-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-dark-small.png new file mode 100644 index 00000000000..10c72829c16 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-dark-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-dark.png b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-dark.png new file mode 100644 index 00000000000..18f62db615a Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-dark.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-light-small.png b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-light-small.png new file mode 100644 index 00000000000..dc686844923 Binary files /dev/null and b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-light-small.png differ diff --git a/ui/StatusQ/src/assets/png/wallet/placeholders/swapView.png b/ui/StatusQ/src/assets/png/wallet/placeholders/swapView-light.png similarity index 100% rename from ui/StatusQ/src/assets/png/wallet/placeholders/swapView.png rename to ui/StatusQ/src/assets/png/wallet/placeholders/swapView-light.png diff --git a/ui/imports/shared/panels/PrivacyWallCarousel.qml b/ui/imports/shared/panels/PrivacyWallCarousel.qml index 4c070a888f6..5c5d425b536 100644 --- a/ui/imports/shared/panels/PrivacyWallCarousel.qml +++ b/ui/imports/shared/panels/PrivacyWallCarousel.qml @@ -20,6 +20,22 @@ Control { signal openDiscussPageRequested() signal enableThirdpartyServicesRequested() + QtObject { + id: d + readonly property var window: root.contentItem.Window.window + readonly property int windowWidth: window ? window.width: Screen.width + readonly property int windowHeight: window ? window.height: Screen.height + readonly property bool isSmallPortraitScreen: windowHeight > windowWidth + // The max width of a phone in portrait mode + && windowWidth <= Theme.portraitBreakpoint.width + function getImagePath(currentIndex) { + const imageName = root.model.get(currentIndex).image + const platformPostfix = isSmallPortraitScreen ? "-small": "" + const imagePath = "%1-%2%3".arg(imageName).arg(Theme.palette.name).arg(platformPostfix) + return Theme.png(imagePath) + } + } + verticalPadding: Theme.xlPadding horizontalPadding: Theme.xlPadding * 2 @@ -74,7 +90,7 @@ Control { id: fadeSwap OpacityAnimator { target: placeholderImage; from: 1; to: 0; duration: 500;} PropertyAction { target: placeholderImage; property: "source"; - value: Theme.png(root.model.get(pageIndicator.currentIndex).image) } + value: d.getImagePath(pageIndicator.currentIndex) } OpacityAnimator { target: placeholderImage; from: 0; to: 1; duration: 500; } } @@ -89,7 +105,7 @@ Control { } Component.onCompleted: { - placeholderImage.source = Theme.png(root.model.get(pageIndicator.currentIndex).image) + placeholderImage.source = d.getImagePath(pageIndicator.currentIndex) initialized = true } }