diff options
author | Doris Verria <doris.verria@qt.io> | 2022-12-01 11:26:03 +0100 |
---|---|---|
committer | Doris Verria <doris.verria@qt.io> | 2022-12-02 16:55:21 +0100 |
commit | e8375ec9b369beaba5c91679fee4c52034ce5b2b (patch) | |
tree | 71db0f2d58cc8bd176ff6352eff48310ab4816b4 | |
parent | 9969bd2aa782773df65b7df07cc253028d4f98d2 (diff) |
iOS Style: Add BusyIndicator control
Change-Id: I18cc7645cc49237475886dba9a73c686470084f6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
50 files changed, 42 insertions, 0 deletions
diff --git a/src/quickcontrols/ios/BusyIndicator.qml b/src/quickcontrols/ios/BusyIndicator.qml new file mode 100644 index 0000000000..e9c874d904 --- /dev/null +++ b/src/quickcontrols/ios/BusyIndicator.qml @@ -0,0 +1,41 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.iOS.impl +import QtQuick.Controls.impl + +T.BusyIndicator { + id: control + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding) + + topPadding: background ? background.topPadding : 0 + leftPadding: background ? background.leftPadding : 0 + rightPadding: background ? background.rightPadding : 0 + bottomPadding: background ? background.bottomPadding : 0 + + topInset: background ? -background.topInset || 0 : 0 + leftInset: background ? -background.leftInset || 0 : 0 + rightInset: background ? -background.rightInset || 0 : 0 + bottomInset: background ? -background.bottomInset || 0 : 0 + + contentItem: Image { + property int currentImage: 8 + source: IOS.url + "busyindicator-frame-0" + currentImage + + (Qt.styleHints.appearance === Qt.Light ? "-light.png" : "-dark.png") + fillMode: Image.PreserveAspectFit + NumberAnimation on currentImage { + running: control.running + loops: -1 + from: 8 + to: 1 + duration: 800 + } + } +} + diff --git a/src/quickcontrols/ios/CMakeLists.txt b/src/quickcontrols/ios/CMakeLists.txt index 83faad5315..30656e0828 100644 --- a/src/quickcontrols/ios/CMakeLists.txt +++ b/src/quickcontrols/ios/CMakeLists.txt @@ -41,6 +41,7 @@ set(qml_files "Menu.qml" "MenuItem.qml" "MenuSeparator.qml" + "BusyIndicator.qml" ) set_source_files_properties(Slider.qml PROPERTIES diff --git a/src/quickcontrols/ios/images/busyindicator-frame-01-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-01-dark.png Binary files differnew file mode 100644 index 0000000000..26243fa3cd --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-01-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-01-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-01-dark@2x.png Binary files differnew file mode 100644 index 0000000000..c8243c635a --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-01-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-01-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-01-dark@3x.png Binary files differnew file mode 100644 index 0000000000..ef0cda0f58 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-01-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-01-light.png b/src/quickcontrols/ios/images/busyindicator-frame-01-light.png Binary files differnew file mode 100644 index 0000000000..dc499c7c1f --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-01-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-01-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-01-light@2x.png Binary files differnew file mode 100644 index 0000000000..04f216e14c --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-01-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-01-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-01-light@3x.png Binary files differnew file mode 100644 index 0000000000..617cad8275 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-01-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-02-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-02-dark.png Binary files differnew file mode 100644 index 0000000000..8d8644c636 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-02-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-02-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-02-dark@2x.png Binary files differnew file mode 100644 index 0000000000..16ddca3b2d --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-02-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-02-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-02-dark@3x.png Binary files differnew file mode 100644 index 0000000000..db01a3dea0 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-02-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-02-light.png b/src/quickcontrols/ios/images/busyindicator-frame-02-light.png Binary files differnew file mode 100644 index 0000000000..55d916b6d9 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-02-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-02-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-02-light@2x.png Binary files differnew file mode 100644 index 0000000000..d85b621e61 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-02-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-02-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-02-light@3x.png Binary files differnew file mode 100644 index 0000000000..a4a8a1076b --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-02-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-03-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-03-dark.png Binary files differnew file mode 100644 index 0000000000..65b713138d --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-03-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-03-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-03-dark@2x.png Binary files differnew file mode 100644 index 0000000000..b8a6597b44 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-03-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-03-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-03-dark@3x.png Binary files differnew file mode 100644 index 0000000000..ad84c65e13 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-03-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-03-light.png b/src/quickcontrols/ios/images/busyindicator-frame-03-light.png Binary files differnew file mode 100644 index 0000000000..8f3c619781 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-03-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-03-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-03-light@2x.png Binary files differnew file mode 100644 index 0000000000..3e1511443a --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-03-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-03-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-03-light@3x.png Binary files differnew file mode 100644 index 0000000000..aef50892f5 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-03-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-04-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-04-dark.png Binary files differnew file mode 100644 index 0000000000..e1115cf719 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-04-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-04-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-04-dark@2x.png Binary files differnew file mode 100644 index 0000000000..7070bbffac --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-04-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-04-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-04-dark@3x.png Binary files differnew file mode 100644 index 0000000000..e5f8e00cdb --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-04-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-04-light.png b/src/quickcontrols/ios/images/busyindicator-frame-04-light.png Binary files differnew file mode 100644 index 0000000000..df6463dcc3 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-04-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-04-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-04-light@2x.png Binary files differnew file mode 100644 index 0000000000..c382dfdbaa --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-04-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-04-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-04-light@3x.png Binary files differnew file mode 100644 index 0000000000..7b128a1305 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-04-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-05-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-05-dark.png Binary files differnew file mode 100644 index 0000000000..94f2085f2e --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-05-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-05-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-05-dark@2x.png Binary files differnew file mode 100644 index 0000000000..553d55b5bd --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-05-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-05-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-05-dark@3x.png Binary files differnew file mode 100644 index 0000000000..c6183ba5bf --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-05-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-05-light.png b/src/quickcontrols/ios/images/busyindicator-frame-05-light.png Binary files differnew file mode 100644 index 0000000000..9d997adde3 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-05-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-05-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-05-light@2x.png Binary files differnew file mode 100644 index 0000000000..5412be1964 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-05-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-05-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-05-light@3x.png Binary files differnew file mode 100644 index 0000000000..9d776e3839 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-05-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-06-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-06-dark.png Binary files differnew file mode 100644 index 0000000000..24895ad793 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-06-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-06-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-06-dark@2x.png Binary files differnew file mode 100644 index 0000000000..127e4e732b --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-06-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-06-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-06-dark@3x.png Binary files differnew file mode 100644 index 0000000000..42a06f3055 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-06-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-06-light.png b/src/quickcontrols/ios/images/busyindicator-frame-06-light.png Binary files differnew file mode 100644 index 0000000000..1fd5c1ad2f --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-06-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-06-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-06-light@2x.png Binary files differnew file mode 100644 index 0000000000..1900d7ad58 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-06-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-06-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-06-light@3x.png Binary files differnew file mode 100644 index 0000000000..08618b04cb --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-06-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-07-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-07-dark.png Binary files differnew file mode 100644 index 0000000000..c867caeb2b --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-07-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-07-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-07-dark@2x.png Binary files differnew file mode 100644 index 0000000000..6e67fa3761 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-07-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-07-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-07-dark@3x.png Binary files differnew file mode 100644 index 0000000000..a4fcfb49af --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-07-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-07-light.png b/src/quickcontrols/ios/images/busyindicator-frame-07-light.png Binary files differnew file mode 100644 index 0000000000..a26f822932 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-07-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-07-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-07-light@2x.png Binary files differnew file mode 100644 index 0000000000..f69b496ffa --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-07-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-07-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-07-light@3x.png Binary files differnew file mode 100644 index 0000000000..7e0de7dcb8 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-07-light@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-08-dark.png b/src/quickcontrols/ios/images/busyindicator-frame-08-dark.png Binary files differnew file mode 100644 index 0000000000..b5607272b4 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-08-dark.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-08-dark@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-08-dark@2x.png Binary files differnew file mode 100644 index 0000000000..102e4ee930 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-08-dark@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-08-dark@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-08-dark@3x.png Binary files differnew file mode 100644 index 0000000000..52254ec640 --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-08-dark@3x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-08-light.png b/src/quickcontrols/ios/images/busyindicator-frame-08-light.png Binary files differnew file mode 100644 index 0000000000..6fe3fb808d --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-08-light.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-08-light@2x.png b/src/quickcontrols/ios/images/busyindicator-frame-08-light@2x.png Binary files differnew file mode 100644 index 0000000000..fc967430bb --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-08-light@2x.png diff --git a/src/quickcontrols/ios/images/busyindicator-frame-08-light@3x.png b/src/quickcontrols/ios/images/busyindicator-frame-08-light@3x.png Binary files differnew file mode 100644 index 0000000000..d3c2e9fc9b --- /dev/null +++ b/src/quickcontrols/ios/images/busyindicator-frame-08-light@3x.png |