diff --git a/src/app/global/feature_flags.nim b/src/app/global/feature_flags.nim index cefaff6487..6fb2ddb9dc 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/CMakeLists.txt b/ui/StatusQ/CMakeLists.txt index bdcbb783f3..5be27b8d47 100644 --- a/ui/StatusQ/CMakeLists.txt +++ b/ui/StatusQ/CMakeLists.txt @@ -140,6 +140,18 @@ if (${STATUSQ_SHADOW_BUILD}) src/assets/png/png.qrc src/assets/twemoji/twemoji.qrc src/assets/twemoji/twemoji-svg.qrc) + + # Platform-specific PNG bundles + if(ANDROID OR IOS) + list(APPEND STATUSQ_QRC_FILES + src/assets/png/png-mobile.qrc + ) + else() + list(APPEND STATUSQ_QRC_FILES + src/assets/png/png-desktop.qrc + ) + endif() + if (${STATUSQ_STATIC_LIB}) # randlib would complain about the generated .o files. Generate cpp files instead. qt_add_resources(STATUSQ_QRC_COMPILED ${STATUSQ_QRC_FILES}) 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 0000000000..61bd764b6d 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 0000000000..c1f2b151de 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 0000000000..deccb05bbd 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 0000000000..916a147b5a 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 0000000000..0f8b8ff747 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 0000000000..035b113bb8 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-desktop.qrc b/ui/StatusQ/src/assets/png/png-desktop.qrc new file mode 100644 index 0000000000..e5d10067a7 --- /dev/null +++ b/ui/StatusQ/src/assets/png/png-desktop.qrc @@ -0,0 +1,16 @@ + + + market/tradeCenter-light.png + market/swap-light.png + market/tradeCenter-dark.png + market/swap-dark.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/png-mobile.qrc b/ui/StatusQ/src/assets/png/png-mobile.qrc new file mode 100644 index 0000000000..a996cd3657 --- /dev/null +++ b/ui/StatusQ/src/assets/png/png-mobile.qrc @@ -0,0 +1,16 @@ + + + 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 + + diff --git a/ui/StatusQ/src/assets/png/png.qrc b/ui/StatusQ/src/assets/png/png.qrc index 78ee056d3d..38b1cc2ac9 100644 --- a/ui/StatusQ/src/assets/png/png.qrc +++ b/ui/StatusQ/src/assets/png/png.qrc @@ -924,11 +924,5 @@ 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 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 0000000000..fd706cec53 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 0000000000..67bc04149a 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 0000000000..1468fd20fc 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 0000000000..1714fe5be6 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 0000000000..b8ade434c7 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 0000000000..433f5e790a 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 0000000000..93eb6a5253 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 0000000000..65b04199fa 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 0000000000..ee16be093e 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 0000000000..10c72829c1 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 0000000000..18f62db615 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 0000000000..dc68684492 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/StatusQ/src/typesregistration.cpp b/ui/StatusQ/src/typesregistration.cpp index 2105eb215f..3678686f4d 100644 --- a/ui/StatusQ/src/typesregistration.cpp +++ b/ui/StatusQ/src/typesregistration.cpp @@ -103,6 +103,11 @@ void registerStatusQTypes() { Q_INIT_RESOURCE(fonts); Q_INIT_RESOURCE(img); Q_INIT_RESOURCE(png); +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) + Q_INIT_RESOURCE(png_mobile); +#else + Q_INIT_RESOURCE(png_desktop); +#endif Q_INIT_RESOURCE(twemoji); Q_INIT_RESOURCE(twemoji_svg); #endif diff --git a/ui/imports/shared/panels/PrivacyWallCarousel.qml b/ui/imports/shared/panels/PrivacyWallCarousel.qml index 6d05dc4e84..492b563845 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 @@ -28,30 +44,49 @@ Control { Item { Layout.fillHeight: true } - StatusBaseText { + ColumnLayout { + readonly property int maxChildrenHeight: (primaryText.maximumLineCount * primaryText.lineHeight) + + (secondaryText.maximumLineCount * secondaryText.lineHeight) + Layout.fillWidth: true + Layout.preferredHeight: maxChildrenHeight + Layout.maximumHeight: maxChildrenHeight + spacing: 0 - horizontalAlignment: Text.AlignHCenter - font.weight: Font.Bold - font.pixelSize: 22 - lineHeightMode: Text.FixedHeight - lineHeight: 30 - wrapMode: Text.WordWrap + Item { Layout.fillHeight: true } - text: root.model.get(pageIndicator.currentIndex).primary - } + StatusBaseText { + id: primaryText - StatusBaseText { - Layout.topMargin: -parent.spacing - Layout.fillWidth: true + Layout.fillWidth: true + Layout.alignment: Qt.AlignBottom - horizontalAlignment: Text.AlignHCenter - font.pixelSize: Theme.additionalTextSize - lineHeightMode: Text.FixedHeight - lineHeight: 18 - wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignHCenter + font.weight: Font.Bold + font.pixelSize: 22 + wrapMode: Text.WordWrap + lineHeightMode: Text.FixedHeight + lineHeight: 30 + maximumLineCount: 2 - text: root.model.get(pageIndicator.currentIndex).secondary + text: root.model.get(pageIndicator.currentIndex).primary + } + + StatusBaseText { + id: secondaryText + + Layout.fillWidth: true + Layout.alignment: Qt.AlignBottom + + horizontalAlignment: Text.AlignHCenter + font.pixelSize: Theme.additionalTextSize + lineHeightMode: Text.FixedHeight + lineHeight: 18 + wrapMode: Text.WordWrap + maximumLineCount: 2 + + text: root.model.get(pageIndicator.currentIndex).secondary + } } Image { @@ -74,7 +109,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 +124,7 @@ Control { } Component.onCompleted: { - placeholderImage.source = Theme.png(root.model.get(pageIndicator.currentIndex).image) + placeholderImage.source = d.getImagePath(pageIndicator.currentIndex) initialized = true } } @@ -101,6 +136,7 @@ Control { Layout.maximumWidth: parent.width count: root.model.count + visible: count > 1 } StatusBaseText { diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro index fc2d995611..59c74911b4 100644 --- a/ui/nim-status-client.pro +++ b/ui/nim-status-client.pro @@ -42,6 +42,8 @@ RESOURCES += resources.qrc \ StatusQ/src/assets/fonts/fonts.qrc \ StatusQ/src/assets/img/img.qrc \ StatusQ/src/assets/png/png.qrc \ + StatusQ/src/assets/png/png-desktop.qrc \ + StatusQ/src/assets/png/png-mobile.qrc \ StatusQ/src/assets/twemoji/twemoji.qrc \ StatusQ/src/assets/twemoji/twemoji-big.qrc \ StatusQ/src/assets/twemoji/twemoji-svg.qrc \