Wearable: add style for PageIndicator

Change-Id: Id8f4948372f394ec5dbb4c2268f453724f65b594
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

8 files changed, 90 insertions, 98 deletions

diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
index bac1ca87..5dba4e4b 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml
@@ -163,22 +163,6 @@ Item {
 
             count: svAlarmsContainer.count
             currentIndex: svAlarmsContainer.currentIndex
-
-            delegate: Rectangle {
-                implicitWidth: 8
-                implicitHeight: 8
-
-                radius: width / 2
-                color: UIStyle.colorQtGray3
-
-                opacity: index === pgAlarmsIndicator.currentIndex ? 1.0 : 0.35
-
-                Behavior on opacity {
-                    OpacityAnimator {
-                        duration: 100
-                    }
-                }
-            }
         }
     }
 }
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
index 59ac0925..e2a9c21d 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml
@@ -142,22 +142,6 @@ Item {
 
             count: svFitnessContainer.count
             currentIndex: svFitnessContainer.currentIndex
-
-            delegate: Rectangle {
-                implicitWidth: 8
-                implicitHeight: 8
-
-                radius: width / 2
-                color: UIStyle.colorQtGray3
-
-                opacity: index === pgFitnessIndicator.currentIndex ? 1.0 : 0.35
-
-                Behavior on opacity {
-                    OpacityAnimator {
-                        duration: 100
-                    }
-                }
-            }
         }
     }
 }
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index da829707..6be065e5 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
@@ -149,23 +149,6 @@ Item {
 
             count: svNotificationsContainer.count
             currentIndex: svNotificationsContainer.currentIndex
-
-            delegate: Rectangle {
-                implicitWidth: 8
-                implicitHeight: 8
-
-                radius: width / 2
-                color: UIStyle.colorQtGray3
-
-                opacity: index === pgNotificationsIndicator.currentIndex
-                         ? 1.0 : 0.35
-
-                Behavior on opacity {
-                    OpacityAnimator {
-                        duration: 100
-                    }
-                }
-            }
         }
 
         Component.onCompleted: {
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
index 45a050c9..5b1c94e3 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml
@@ -162,22 +162,6 @@ Item {
 
             count: svSettingsContainer.count
             currentIndex: svSettingsContainer.currentIndex
-
-            delegate: Rectangle {
-                implicitWidth: 8
-                implicitHeight: 8
-
-                radius: width / 2
-                color: UIStyle.colorQtGray3
-
-                opacity: index === pgSettingsIndicator.currentIndex ? 1.0 : 0.35
-
-                Behavior on opacity {
-                    OpacityAnimator {
-                        duration: 100
-                    }
-                }
-            }
         }
     }
 }
diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
new file mode 100644
index 00000000..f12cc360
--- /dev/null
+++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.7
+import QtQuick.Templates 2.0 as T
+import "."
+
+T.PageIndicator {
+    id: control
+
+    implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
+    implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
+
+    spacing: 6
+    padding: 6
+
+    delegate: Rectangle {
+        implicitWidth: 8
+        implicitHeight: 8
+
+        radius: width / 2
+        color: UIStyle.colorQtGray3
+
+        opacity: index === control.currentIndex ? 1.0 : 0.35
+
+        Behavior on opacity {
+            OpacityAnimator {
+                duration: 100
+            }
+        }
+    }
+
+    contentItem: Row {
+        spacing: control.spacing
+
+        Repeater {
+            model: control.count
+            delegate: control.delegate
+        }
+    }
+}
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
index b66a149b..7b9cb916 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml
@@ -335,22 +335,6 @@ Item {
 
             count: svWeatherContainer.count
             currentIndex: svWeatherContainer.currentIndex
-
-            delegate: Rectangle {
-                implicitWidth: 8
-                implicitHeight: 8
-
-                radius: width / 2
-                color: UIStyle.colorQtGray3
-
-                opacity: index === pgWeatherIndicator.currentIndex ? 1.0 : 0.35
-
-                Behavior on opacity {
-                    OpacityAnimator {
-                        duration: 100
-                    }
-                }
-            }
         }
         Component.onCompleted: {
             WeatherData.requestWeatherData(wDataCntr)
diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
index 33e6dcfb..a0f3d27d 100644
--- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
+++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml
@@ -107,21 +107,5 @@ Item {
 
         count: svWatchContainer.count
         currentIndex: svWatchContainer.currentIndex
-
-        delegate: Rectangle {
-            implicitWidth: 8
-            implicitHeight: 8
-
-            radius: width / 2
-            color: UIStyle.colorQtGray3
-
-            opacity: index === pgWatchIndicator.currentIndex ? 1.0 : 0.35
-
-            Behavior on opacity {
-                OpacityAnimator {
-                    duration: 100
-                }
-            }
-        }
     }
 }
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc
index 4469aea2..eee722c6 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols2/wearable/wearable.qrc
@@ -16,9 +16,10 @@
         <file>qml/Settings/SettingsData.qml</file>
         <file>qml/Settings/SettingsPage.qml</file>
         <file>qml/Style/qmldir</file>
-        <file>qml/Style/UIStyle.qml</file>
+        <file>qml/Style/PageIndicator.qml</file>
         <file>qml/Style/Slider.qml</file>
         <file>qml/Style/Switch.qml</file>
+        <file>qml/Style/UIStyle.qml</file>
         <file>qml/Weather/weather.js</file>
         <file>qml/Weather/weather.json</file>
         <file>qml/Weather/WeatherPage.qml</file>