Launcher Redesign (qt5)

qml.qrc

@@ -9,11 +9,15 @@
         <file>qml/ThemedControls/MBusyIndicator.qml</file>
         <file>qml/ThemedControls/MButton.qml</file>
         <file>qml/ThemedControls/MCheckBox.qml</file>
+        <file>qml/ThemedControls/BaseHeader.qml</file>
+        <file>qml/ThemedControls/HorizontalDivider.qml</file>
+        <file>qml/ThemedControls/MSideBarItem.qml</file>
+        <file>qml/ThemedControls/CenteredScrollView.qml</file>
         <file>qml/MinecraftNews.qml</file>
+        <file>qml/Launcher.qml</file>
         <file>qml/LauncherMain.qml</file>
         <file>qml/LauncherBase.qml</file>
         <file>qml/LauncherLogin.qml</file>
-        <file>qml/CenteredRectangle.qml</file>
         <file>qml/ProfileComboBox.qml</file>
         <file>qml/GoogleTosApprovalWindow.qml</file>
         <file>qml/EditProfileWindow.qml</file>
@@ -27,22 +31,12 @@
         <file>Resources/noise.png</file>
         <file>Resources/mcpelauncher-logo.png</file>
         <file>Resources/green-button.png</file>
-        <file>Resources/dropdown.png</file>
-        <file>Resources/dropdown-bg.png</file>
-        <file>Resources/dropdown-active.png</file>
-        <file>Resources/progressbar.png</file>
-        <file>Resources/progressbar-progress.png</file>
-        <file>Resources/field.png</file>
-        <file>Resources/field-active.png</file>
-        <file>Resources/button-active.png</file>
-        <file>Resources/button.png</file>
-        <file>Resources/button-tab.png</file>
-        <file>Resources/button-tab-active.png</file>
-        <file>Resources/button-tab-selected.png</file>
         <file>Resources/check.png</file>
         <file>Resources/icon-edit.png</file>
         <file>Resources/icon-settings.png</file>
         <file>Resources/icon-copy.png</file>
+        <file>Resources/icon-home.png</file>
+        <file>Resources/icon-news.png</file>
         <file>qml/ThemedControls/MTabButton.qml</file>
         <file>qml/LauncherSettingsGeneral.qml</file>
         <file>qml/TroubleshooterWindow.qml</file>

qml/ApkImportHelper.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.9
 
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
@@ -8,30 +8,29 @@ import io.mrarm.mcpelauncher 1.0
 import "ThemedControls"
 
 Item {
-
-    signal started()
-    signal finished()
-    signal error()
+    signal started
+    signal finished
+    signal error
 
     property VersionManager versionManager
     property bool extractingApk: false
     property var progressBar: null
     property alias task: apkExtractionTask
-    property var allowIncompatible: false
+    property bool allowIncompatible: false
 
     id: root
 
     FileDialog {
         id: apkPicker
         title: "Please pick the Minecraft .apk file"
-        nameFilters: [ "Android package files (*.apk *.zip)", "All files (*)" ]
+        nameFilters: ["Android package files (*.apk *.zip)", "All files (*)"]
         selectMultiple: true
 
         onAccepted: {
             if (!apkExtractionTask.setSourceUrls(fileUrls)) {
                 apkExtractionMessageDialog.text = "Invalid file URL"
                 apkExtractionMessageDialog.open()
-                return;
+                return
             }
             console.log("Extracting " + apkExtractionTask.sources.join(','))
             extractingApk = true
@@ -44,17 +43,17 @@ Item {
         id: apkExtractionTask
         versionManager: root.versionManager
 
-        onProgress: function(val) {
+        onProgress: function (val) {
             root.progressBar.indeterminate = false
             root.progressBar.value = val
         }
 
-        onFinished: function() {
+        onFinished: function () {
             root.finished()
             extractingApk = false
         }
 
-        onError: function(err) {
+        onError: function (err) {
             apkExtractionMessageDialog.text = qsTr("The specified file is not compatible with the launcher<br/>Login to Google Play with an account owning Minecraft ( Playstore ) and let the launcher download compatible versions, including previous versions of Minecraft<br/>Details:<br/>%1").arg(err)
             apkExtractionMessageDialog.open()
             extractingApk = false
@@ -69,9 +68,7 @@ Item {
         title: "Apk extraction"
     }
 
-
     function pickFile() {
         apkPicker.open()
     }
-
 }

qml/ApkImportWindow.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.4
+import QtQuick 2.9
 
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
@@ -8,7 +8,6 @@ import io.mrarm.mcpelauncher 1.0
 import "ThemedControls"
 
 Window {
-
     property VersionManager versionManager
 
     id: root
@@ -17,29 +16,25 @@ Window {
     flags: Qt.Dialog
     title: "Minecraft .apk import"
     visible: apkImportHelper.extractingApk
-    property var allowIncompatible: false
+    color: "#333"
+
+    property bool allowIncompatible: false
 
-    onClosing: function() {
+    onClosing: function () {
         close.accepted = false
     }
 
     ColumnLayout {
         id: layout
         anchors.fill: parent
         anchors.margins: 10
-        spacing: 10
-
-        Text {
-            text: "Extracting the .apk"
-            Layout.fillWidth: true
-        }
 
         MProgressBar {
             id: apkExtractionProgressBar
-            width: parent.width
+            label: qsTr("Extracting the .apk")
             Layout.fillWidth: true
+            Layout.minimumHeight: 30
         }
-
     }
 
     ApkImportHelper {
@@ -52,5 +47,4 @@ Window {
     function pickFile() {
         apkImportHelper.pickFile()
     }
-
 }