Merge remote-tracking branch 'origin/master'

fannyapp.pro

@@ -8,6 +8,7 @@ VERSION = 1.0.2
 # depend on your compiler). Please consult the documentation of the
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
+CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
 
 # You can also make your code fail to compile if you use deprecated APIs.
 # In order to do so, uncomment the following line.
@@ -37,8 +38,8 @@ HEADERS += \
     headers/appstyle.h
 
 RESOURCES += \
-    shared/shared.qrc \
+    resources/shared/shared.qrc \
-    qml/qml.qrc
+    resources/qml/qml.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =

qml/Components/CompatibleToolButton.qml

@@ -1,111 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Controls.Material 2.1
-
-Loader {
-    id: control
-
-    property QIconSource icon: QIconSource {}
-
-    property int fontPixelSize: height * 0.4
-
-    property string text
-
-    signal clicked
-
-    Connections {
-        target: icon
-
-        onNameChanged: {
-            control.syncProperties()
-        }
-
-        onColorChanged: {
-            control.syncProperties()
-        }
-    }
-
-    onTextChanged: {
-        control.syncProperties()
-    }
-
-    function syncProperties() {
-
-        if(control.status !== Loader.Ready) {
-            return
-        }
-
-        if(QtCompatiblityMode) {
-            control.item.text = control.text
-            control.item.font = control.font
-
-            if(control.fontPixelSize !== undefined) {
-                control.item.font.pixelSize = control.fontPixelSize
-            }
-        }
-        else {
-            control.item.icon.name = control.icon.name
-            control.item.icon.color = control.icon.color
-
-            control.item.icon.width = control.icon.width
-            control.item.icon.height = control.icon.height
-        }
-    }
-
-    onLoaded: {
-        control.syncProperties()
-    }
-
-    Component.onCompleted: {
-        if(QtCompatiblityMode) {
-            control.sourceComponent = ancientToolButtonCp
-        }
-        else {
-            control.sourceComponent = modernToolButtonCp
-        }
-    }
-
-    Connections {
-        target: control.item
-
-        onClicked: {
-            control.clicked()
-        }
-    }
-
-    Component {
-        id: ancientToolButtonCp
-
-        ToolButton {
-            id: tb
-
-            opacity: enabled ? 1.0 : 0.3
-
-            contentItem: Text {
-                text: tb.text
-                font.pixelSize: tb.height * 0.5
-                font.family: iconFont.name
-                color: app.style.style.textColor
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                elide: Text.ElideRight
-            }
-
-            FontLoader {
-                id: iconFont
-                source: "qrc:/fonts/IconFont.otf"
-            }
-
-        }
-    }
-
-    Component {
-        id: modernToolButtonCp
-
-        ToolButton  {
-            height: implicitHeight
-            width: implicitWidth
-        }
-    }
-
-}

qml/Components/QIconSource.qml

@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
-    property string name: ""
-    property int height
-    property int width
-    property color color: "black"
-}

readme.md

@@ -18,13 +18,10 @@ schreibe bitte eine Mail an contact@itsblue.de, oder frag mich in der Schule.
 Anpassung an neues Anmelddesystem fertiggestellt.
 
 ### Downloads:
-<p><a href="https://play.google.com/store/apps/details?id=com.itsblue.flgvertretung&amp;pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1" target="_blank"><img src="https://play.google.com/intl/en_us/badges/images/generic/de_badge_web_generic.png" alt="Jetzt bei Google Play" width="25%"/></a><p>
+<p><a href='https://play.google.com/store/apps/details?id=com.itsblue.flgvertretung&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img width='150px;' alt='Jetzt bei Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/de_badge_web_generic.png'/></a></p>
-- [Mac OS](https://git.itsblue.de/dorian/fanny-app/raw/master/release/mac%20OS/fannyapp.dmg")  <br>
+<p><a href="https://apps.apple.com/us/app/fannyapp/id1495583845?mt=8"><img width='130px;' alt='Laden im AppStore' src='resources/shared/graphics/AppStoreBadge.png'/></a></p>
-- [Windows](https://git.itsblue.de/dorian/fanny-app/raw/master/release/windows/fannyapp-setup.exe)  
+- [Android (direkter Download) (.apk)](https://git.itsblue.de/dorian/fanny-app/raw/master/release/android/fannyapp-latest.apk)  <br>
-<br>
+- [Mac OS (.dmg)](https://git.itsblue.de/dorian/fanny-app/raw/master/release/mac%20OS/fannyapp.dmg")  <br>
+- [Windows (.exe)](https://git.itsblue.de/dorian/fanny-app/raw/master/release/windows/fannyapp-setup.exe)  <br>
 
 Verantwortlicher Entwickler: Dorian Zedler
-
-Credits:
-
-<div>eye icon by: <a href="https://www.flaticon.com/authors/smashicons" title="Smashicons">Smashicons</a> from <a href="https://www.flaticon.com/" 		    title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" 		    title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>

resources/qml/Components/CompatibleToolButton.qml

@@ -0,0 +1,31 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.1
+import QtQuick.Controls.Material 2.1
+
+ToolButton {
+    id: tb
+
+    opacity: enabled ? 1.0 : 0.3
+
+    contentItem: Item {
+
+        Text {
+            anchors.centerIn: parent
+            anchors.horizontalCenterOffset: 3
+            text: tb.text
+
+            font.pixelSize: tb.height * 0.5
+            font.family: iconFont.name
+            color: app.style.style.textColor
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
+        }
+    }
+
+    FontLoader {
+        id: iconFont
+        source: "qrc:/fonts/IconFont.otf"
+    }
+
+}

resources/qml/Components/SettingsDelegate.qml

@@ -64,24 +64,28 @@ ItemDelegate {
         color: app.style.style.textColor
     }
 
-    Image {
+    Text {
-        id: forwardIcon
-
-        visible: control.showForwardIcon
-
         anchors {
             verticalCenter: parent.verticalCenter
             right: parent.right
             rightMargin: 10
         }
 
-        height: parent.height * 0.4
+        visible: control.showForwardIcon
-
         rotation: 180
+        text: "\u0082"
 
-        fillMode: Image.PreserveAspectFit
+        font.pixelSize: parent.height * 0.4
+        font.family: iconFont.name
+        color: app.style.style.textColor
+        horizontalAlignment: Text.AlignLeft
+        verticalAlignment: Text.AlignVCenter
+        elide: Text.ElideRight
+    }
 
-        source: app.style.style.backIcon
+    FontLoader {
+        id: iconFont
+        source: "qrc:/fonts/IconFont.otf"
     }
 
 }

resources/qml/Forms/FilterForm.qml

@@ -292,9 +292,6 @@ Page {
 
                 height: parent.height
 
-                icon.name: "delete"
-                icon.color: app.style.style.textColor
-
                 text: "\u0083"
 
                 onClicked: {

resources/qml/Forms/HomeForm.qml

@@ -88,6 +88,7 @@ Page {
                 id: foodplanButton
 
                 image: app.style.style.treffpunktFannyIcon
+                imageScale: 1.3
 
                 size: smallMenu.buttonSize
 

resources/qml/Pages/LoginPage.qml

@@ -150,8 +150,6 @@ Page {
                         rightMargin: -width * 1.1
                     }
 
-                    icon.color: app.style.style.textColor
-
                     onClicked: {
                         if(state === "visible"){
                             state = "invisible"
@@ -168,7 +166,6 @@ Page {
                             name: "invisible"
                             PropertyChanges {
                                 target: passwordHideShow
-                                icon.name: "hide"
                                 text: "\u0081"
                             }
 
@@ -181,7 +178,6 @@ Page {
                             name: "visible"
                             PropertyChanges {
                                 target: passwordHideShow
-                                icon.name: "view"
                                 text: "\u0080"
                             }
                             PropertyChanges {

resources/qml/Pages/MainPage.qml

@@ -153,9 +153,6 @@ Page {
 
                 opacity: enabled ? 1:0.5
 
-                icon.name: "back"
-                icon.color: app.style.style.textColor
-
                 text: "\u0082"//"\u2039"
 
                 onClicked: {
@@ -197,9 +194,6 @@ Page {
 
                 visible: formStack.currentItem.title === "Vertretungsplan"
 
-                icon.name: "pdf"
-                icon.color: app.style.style.textColor
-
                 text: "\u0084"//"pdf ansehen"
 
                 onClicked: {

resources/qml/qml.qrc

@@ -18,6 +18,5 @@
         <file>Components/FannyDataListView.qml</file>
         <file>Components/ProgressCircle.qml</file>
         <file>Components/CompatibleToolButton.qml</file>
-        <file>Components/QIconSource.qml</file>
     </qresource>
 </RCC>

resources/shared/shared.qrc

@@ -0,0 +1,17 @@
+<RCC>
+    <qresource prefix="/">
+        <file>icons/TreffpunktFannyLogoDark.png</file>
+        <file>icons/TreffpunktFannyLogoLight.png</file>
+        <file>icons/logoutBlack.png</file>
+        <file>icons/logoutRed.png</file>
+        <file>icons/settings.png</file>
+        <file>icons/settingsBlack.png</file>
+        <file>icons/sheute.png</file>
+        <file>icons/smorgen.png</file>
+        <file>graphics/Icon Big square.png</file>
+        <file>graphics/favicon.png</file>
+        <file>fonts/IconFont.otf</file>
+        <file>icons/FannyLogoDark.jpg</file>
+        <file>icons/FannyLogoLight.png</file>
+    </qresource>
+</RCC>