migration to Qaterial

README.md

@@ -1,13 +1,8 @@
-# QQuickMaterialHelperGallery
+# Qaterial Gallery
 
+QaterialGallery is a showcase application and contains example for the library Qaterial . It is still under development.
 
-<a href="http://85.170.130.157:51861/viewType.html?buildTypeId=QQuickMaterialHelperGallery_Build_MSVC64&guest=1">
-<img src="http://85.170.130.157:51861/app/rest/builds/buildType:(id:QQuickMaterialHelperGallery_Build_MSVC64)/statusIcon"/>
-</a>
-
-QQuickMaterialHelperGallery is a showcase application and contains example for the library QQuickMaterialHelper. It is still under development.
-
-This project also showcase multiplatform deployment.
+This project also showcase multiplatform deployment with Qt.
 
 - [x] Windows
 - [ ] Linux *(Compile but no deployment)*
@@ -31,7 +26,7 @@ DOC TODO
 
 ## Build
 
-QQuickMaterialHelperGallery is a cross platform application that can be build natively or cross compiled. Qt precompiled binary are required and can be download from the [official website](http://download.qt.io/archive/qt/). Then simply use the qt manager to install the toolchain that you need. Minimum Qt version is `5.12`.
+QaterialGallery is a cross platform application that can be build natively or cross compiled. Qt precompiled binary are required and can be download from the [official website](http://download.qt.io/archive/qt/). Then simply use the qt manager to install the toolchain that you need. Minimum Qt version is `5.12`.
 
 ### Windows
 
@@ -48,8 +43,8 @@ export QT_DIR_MSVC64=C:/Qt/$QT_WIN_VERSION/msvc2017_64
 Then simply clone the repository and create an in source build folder.
 
 ```bash
-git clone https://github.com/OlivierLdff/QQuickMaterialHelperGallery 
-cd QQuickMaterialHelperGallery && mkdir build && cd build
+git clone https://github.com/OlivierLdff/QaterialGallery
+cd QaterialGallery && mkdir build && cd build
 ```
 
 **MinGw 32 bits - Make**
@@ -132,7 +127,7 @@ Depending on Qt Version you might need to change the Android STL.
 
 **CMAKE_BUILD_TYPE** can be set to multiple values. *Debug | Release | MinSizeRel | RelWithDebInfo*.
 
-*Tip for windows: If you don't have make installed you can use the one in the ndk:* 
+*Tip for windows: If you don't have make installed you can use the one in the ndk:*
 
 ```bash
 -DCMAKE_MAKE_PROGRAM="$ANDROID_NDK/prebuilt/windows-x86_64/bin/make.exe"
@@ -149,15 +144,15 @@ cmake -DQT_DIR=$QT_DIR_ARMV7A -G "Unix Makefiles" \
 -DANDROID_NATIVE_API_LEVEL=27 \
 -DANDROID_STL=c++_shared \
 -DANDROID_TOOLCHAIN=clang \
--DQQUICKMATERIALHELPERGALLERY_BUILD_SHARED=ON \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \
+-DQATERIALGALLERY_BUILD_SHARED=ON \
+-DQATERIALGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \
+-DQATERIALGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \
+-DQATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \
 ..
 make -j8
 ```
 
-The resulted apk will be in `QQuickMaterialHelperGallery-armeabi-v7a/build/outputs/apk/release/`.
+The resulted apk will be in `QaterialGallery-armeabi-v7a/build/outputs/apk/release/`.
 
 #### Arm64 v8a
 
@@ -170,14 +165,14 @@ cmake -DQT_DIR=$QT_DIR_ARM64V8A -G "Unix Makefiles" \
 -DANDROID_NATIVE_API_LEVEL=27 \
 -DANDROID_STL=c++_shared \
 -DANDROID_TOOLCHAIN=clang \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \
+-DQATERIALGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \
+-DQATERIALGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \
+-DQATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \
 ..
 make -j8
 ```
 
-The resulted apk will be in `QQuickMaterialHelperGallery-arm64-v8a/build/outputs/apk/release/`.
+The resulted apk will be in `QaterialGallery-arm64-v8a/build/outputs/apk/release/`.
 
 #### x86
 
@@ -190,15 +185,15 @@ cmake -DQT_DIR=$QT_DIR_X86 -G "Unix Makefiles" \
 -DANDROID_NATIVE_API_LEVEL=27 \
 -DANDROID_STL=c++_shared \
 -DANDROID_TOOLCHAIN=clang \
--DQQUICKMATERIALHELPERGALLERY_BUILD_SHARED=ON \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \
--DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \
+-DQATERIALGALLERY_BUILD_SHARED=ON \
+-DQATERIALGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \
+-DQATERIALGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \
+-DQATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \
 ..
 make -j8
 ```
 
-The resulted apk will be in `QQuickMaterialHelperGallery-x86/build/outputs/apk/release/`.
+The resulted apk will be in `QaterialGallery-x86/build/outputs/apk/release/`.
 
 ### Ios
 
@@ -262,25 +257,25 @@ or launch the generated XCode project.
 
 *Note: Exe, Shared and Static can't be ON at the same time.*
 
-* **QQUICKMATERIALHELPERGALLERY_BUILD_SHARED** : Build as a shared library [ON OFF]. *Default: OFF*.
-* **QQUICKMATERIALHELPERGALLERY_BUILD_STATIC** : Build as a static library [ON OFF]. *Default: OFF*.
-* **QQUICKMATERIALHELPERGALLERY_BUILD_EXE** : Build as an executable [ON OFF]. *Default: ON*.
-* **QQUICKMATERIALHELPERGALLERY_PROJECT** : Name of the project. *Default: QQuickMaterialHelperGallery*.
-* **QQUICKMATERIALHELPERGALLERY_TARGET** : Name of the project. *Default: QQuickMaterialHelperGallery*.
-* **QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE** : Should the library be compiled with a namespace. *Default: ON*.
-* **QQUICKMATERIALHELPERGALLERY_NAMESPACE** : Namespace of the library ig **QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE** is ON. *Default : Qqmh.*
+* **QATERIALGALLERY_BUILD_SHARED** : Build as a shared library [ON OFF]. *Default: OFF*.
+* **QATERIALGALLERY_BUILD_STATIC** : Build as a static library [ON OFF]. *Default: OFF*.
+* **QATERIALGALLERY_BUILD_EXE** : Build as an executable [ON OFF]. *Default: ON*.
+* **QATERIALGALLERY_PROJECT** : Name of the project. *Default: QaterialGallery*.
+* **QATERIALGALLERY_TARGET** : Name of the project. *Default: QaterialGallery*.
+* **QATERIALGALLERY_USE_NAMESPACE** : Should the library be compiled with a namespace. *Default: ON*.
+* **QATERIALGALLERY_NAMESPACE** : Namespace of the library ig **QATERIALGALLERY_USE_NAMESPACE** is ON. *Default : Qqmh.*
 
 ### Dependencies
 
 ### Output
 
-* **QQUICKMATERIALHELPERGALLERY_TARGET** : Output target to link to. *Default: QQuickMaterialHelperGallery*
+* **QATERIALGALLERY_TARGET** : Output target to link to. *Default: QaterialGallery*
 
 ## Versions
 
-To create a new release: 
+To create a new release:
 
-* Update in `CMakelist.txt` variables **QQUICKMATERIALHELPERGALLERY_VERSION_MAJOR**, **QQUICKMATERIALHELPERGALLERY_VERSION_MINOR**, **QQUICKMATERIALHELPERGALLERY_VERSION_PATCH**.
+* Update in `CMakelist.txt` variables **QATERIALGALLERY_VERSION_MAJOR**, **QATERIALGALLERY_VERSION_MINOR**, **QATERIALGALLERY_VERSION_PATCH**.
 * Increment in `platform/PostBuildPlatform.cmake` the parameter **VERSION_CODE** in the android apk macro
 
 ## Authors

images/images.qrc

@@ -1,5 +1,5 @@
 <RCC>
-	<qresource prefix="/QQuickMaterialHelperGallery/images">
+	<qresource prefix="/QaterialGallery/images">
 	<file>icon.png</file>
 	<file>icons/back.png</file>
 	<file>icons/drawer.png</file>
@@ -14,13 +14,13 @@
 	<file>icons/airplane.svg</file>
 	<file>icons/briefcase.svg</file>
 	<file>icons/compass.svg</file>
-	
+
 	<file>icons/album.svg</file>
 	<file>icons/settings.svg</file>
 	<file>icons/music-note.svg</file>
 	<file>icons/heart.svg</file>
 	<file>icons/thumb-up.svg</file>
-	
+
 	<file>icons/pencil.svg</file>
 	<file>icons/content-copy.svg</file>
 	<file>icons/crosshairs-gps.svg</file>
@@ -72,6 +72,6 @@
 	<file>card168x168_3.png</file>
 	<file>card168x168_4.png</file>
 	<file>card168x168_5.png</file>
-	
+
 	</qresource>
 </RCC>

platform/PostBuildPlatform.cmake

@@ -3,7 +3,7 @@ MESSAGE(STATUS "Post Build Platform Dependancies Configuration")
 # ───────── WINDOWS ──────────
 
 IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    IF(QQUICKMATERIALHELPERGALLERY_BUILD_EXE)
+    IF(QATERIALGALLERY_BUILD_EXE)
 
         message(STATUS "Download QtWindowsCMake from ${QTWINDOWSCMAKE_REPOSITORY}")
 
@@ -15,13 +15,13 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
         )
         FetchContent_MakeAvailable(QtWindowsCMake)
 
-        add_qt_windows_exe( ${QQUICKMATERIALHELPERGALLERY_TARGET}
+        add_qt_windows_exe( ${QATERIALGALLERY_TARGET}
             ALL
-            NAME "QQuickMaterialHelperGallery"
-            VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION}
+            NAME "QaterialGallery"
+            VERSION ${QATERIALGALLERY_VERSION}
             PUBLISHER "OlivierLdff"
-            PRODUCT_URL "www.materialGallery.com"
-            PACKAGE "com.oliv.materialGallery"
+            PRODUCT_URL "https://github.com/OlivierLDff/QaterialGallery"
+            PACKAGE "com.oliv.qaterial"
             ICON ${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.ico
             ICON_RC ${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.rc
             QML_DIR ${QT_WINDOWS_QT_ROOT}/qml
@@ -31,10 +31,10 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
          )
 
         if(MSVC)
-            set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${QQUICKMATERIALHELPERGALLERY_TARGET})
+            set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${QATERIALGALLERY_TARGET})
         endif() # MSVC
 
-    endif() # QQUICKMATERIALHELPERGALLERY_BUILD_EXE
+    endif() # QATERIALGALLERY_BUILD_EXE
 endif() # Windows
 
 # ────────── LINUX ───────────
@@ -55,18 +55,18 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     FetchContent_MakeAvailable(QtAndroidCMake)
 
     # Set keystore variable
-    IF(QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE)
+    IF(QATERIALGALLERY_ANDROID_KEYSTORE)
     SET(KEYSTORE_SIGNATURE
-        KEYSTORE ${QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE} ${QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS}
-        KEYSTORE_PASSWORD ${QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD}
+        KEYSTORE ${QATERIALGALLERY_ANDROID_KEYSTORE} ${QATERIALGALLERY_ANDROID_KEYSTORE_ALIAS}
+        KEYSTORE_PASSWORD ${QATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD}
         )
-    ENDIF(QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE)
+    ENDIF(QATERIALGALLERY_ANDROID_KEYSTORE)
 
-    add_qt_android_apk(${QQUICKMATERIALHELPERGALLERY_TARGET}Apk ${QQUICKMATERIALHELPERGALLERY_TARGET}
-        NAME "QQuickMaterialHelperGallery"
-        VERSION_NAME ${QQUICKMATERIALHELPERGALLERY_VERSION}
+    add_qt_android_apk(${QATERIALGALLERY_TARGET}Apk ${QATERIALGALLERY_TARGET}
+        NAME "Qaterial Gallery"
+        VERSION_NAME ${QATERIALGALLERY_VERSION}
         VERSION_CODE 1 # Must be incremented on each release
-        PACKAGE_NAME "com.oliv.materialGallery"
+        PACKAGE_NAME "com.oliv.qaterial"
         PACKAGE_SOURCES  ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/src
         ANDROID_MANIFEST_IN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/AndroidManifest.xml.in
         ${KEYSTORE_SIGNATURE}
@@ -92,11 +92,11 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
         SET(TEAM_ID "AAAAAAAA")
     ENDIF(NOT TEAM_ID)
 
-    add_qt_ios_app(${QQUICKMATERIALHELPERGALLERY_TARGET}
+    add_qt_ios_app(${QATERIALGALLERY_TARGET}
         NAME "Qml Material Helper Gallery"
-        BUNDLE_IDENTIFIER "com.oliv.materialGallery"
-        VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION}
-        LONG_VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION}.${QQUICKMATERIALHELPERGALLERY_VERSION_TAG}
+        BUNDLE_IDENTIFIER "com.oliv.qaterial"
+        VERSION ${QATERIALGALLERY_VERSION}
+        LONG_VERSION ${QATERIALGALLERY_VERSION}.${QATERIALGALLERY_VERSION_TAG}
         CODE_SIGN_IDENTITY "iPhone Developer"
         TEAM_ID ${TEAM_ID} # TEAM_ID must be specified when executing cmake or later in XCode
         COPYRIGHT "Copyright Olivier Ldff 2019"

platform/PreBuildPlatform.cmake

@@ -20,8 +20,8 @@ ENDMACRO(download_qbc)
 
 IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
-    set(QQUICKMATERIALHELPERGALLERY_PLATFORM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.rc")
-    set(QQUICKMATERIALHELPERGALLERY_PLATFORM_TARGET WIN32)
+    set(QATERIALGALLERY_PLATFORM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.rc")
+    set(QATERIALGALLERY_PLATFORM_TARGET WIN32)
 
 ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
@@ -45,9 +45,9 @@ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 
 IF(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
 
-    set(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED ON CACHE BOOL "Build as a shared library" FORCE)
-    set(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC OFF CACHE BOOL "Build as a static library" FORCE)
-    set(QQUICKMATERIALHELPERGALLERY_BUILD_EXE OFF CACHE BOOL "Build as an executable" FORCE)
+    set(QATERIALGALLERY_BUILD_SHARED ON CACHE BOOL "Build as a shared library" FORCE)
+    set(QATERIALGALLERY_BUILD_STATIC OFF CACHE BOOL "Build as a static library" FORCE)
+    set(QATERIALGALLERY_BUILD_EXE OFF CACHE BOOL "Build as an executable" FORCE)
 
 ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
 

platform/ios/LaunchScreen.storyboard

@@ -21,7 +21,7 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QQuickMaterialHelperGallery" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QaterialGallery" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
                                 <rect key="frame" x="0.0" y="202" width="375" height="43"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

qml/AppBarBottomPage.qml

@@ -1,39 +1,36 @@
-/** Copyright (C) Olivier Le Doeuff 2019 
+/** Copyright (C) Olivier Le Doeuff 2019
  * Contact: olivier.ldff@gmail.com */
 
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
 
-import QQuickMaterialHelper.Components 1.12
-import QQuickMaterialHelper.Containers 1.12
-import QQuickMaterialHelper.Style 1.12
+import Qaterial 1.0
 
-Page 
+Page
 {
     id: page
 
-    header: AppBar 
+    header: AppBar
     {
         AppBarContent { anchors.fill: parent; title: "Buttons" }
     } // AppBar
 
-    footer: AppBar 
+    footer: AppBar
     {
         Row
         {
             anchors.verticalCenter: parent.verticalCenter
             spacing: 0
 
-            AppBarButton 
+            AppBarButton
             {
-                icon.source: "qrc:/QQuickMaterialHelperGallery/images/icons/menu.svg"
+                icon.source: "qrc:/QaterialGallery/images/icons/menu.svg"
                 onPrimary: true
             } // ToolButton
 
-            AppBarButton 
+            AppBarButton
             {
-                icon.source: "qrc:/QQuickMaterialHelperGallery/images/icons/settings.svg"
+                icon.source: "qrc:/QaterialGallery/images/icons/settings.svg"
                 onPrimary: true
             } // ToolButton
         } // RowLayout

qml/AppBarContent.qml

@@ -1,29 +1,27 @@
-/** Copyright (C) Olivier Le Doeuff 2019 
+/** Copyright (C) Olivier Le Doeuff 2019
  * Contact: olivier.ldff@gmail.com */
 
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
 
-import QQuickMaterialHelper.Components 1.12
-import QQuickMaterialHelper.Style 1.12
+import Qaterial 1.0
 
-RowLayout 
+RowLayout
 {
     Layout.fillWidth: true
-    Layout.preferredHeight: MaterialStyle.toolbar.implicitHeight
+    Layout.preferredHeight: Style.toolbar.implicitHeight
     property alias title: titleLabel.text
 
-    AppBarButton 
+    AppBarButton
     {
         id: _backButton
-        icon.source: "qrc:/QQuickMaterialHelperGallery/images/icons/arrow-left.svg"
+        icon.source: "qrc:/QaterialGallery/images/icons/arrow-left.svg"
         onClicked:  stackView.pop()
         visible: stackView.depth > 1
         onPrimary: true
     } // ToolButton
 
-    Label 
+    Label
     {
         id: titleLabel
 
@@ -32,13 +30,13 @@ RowLayout
         onPrimary: true
 
         text: "Default text"
-        textType: MaterialStyle.TextType.Title
+        textType: Style.TextType.Title
         elide: Label.ElideRight
     } // Label
 
-    AppBarButton 
+    AppBarButton
     {
-        icon.source: "qrc:/QQuickMaterialHelperGallery/images/icons/palette.svg"
+        icon.source: "qrc:/QaterialGallery/images/icons/palette.svg"
         onPrimary: true
         onClicked:  themeDialog.open()
     } // ToolButton