diff --git a/CHANGELOG.md b/CHANGELOG.md index 32c974b..ba409a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [1.1.0] - unreleased +## [1.1.1] - 2020-09-19 ### Hinzugefügt -- PDF-Taste oben links in der Vertretungsplan-Ansicht, um den Vertretungsplan als PDF anzusehen +- "Wo ist der Vertretungsplan?" - Menü + +### Entfernt +- Anmeldung +- Vertretungsplan +- Einstellungen für den Vertretungsplan +- "Folge uns" Taste in den Einstellungen + +## [1.1.0] - 2020-01 +### Hinzugefügt +- PDF-Taste oben rechts in der Vertretungsplan-Ansicht, um den Vertretungsplan als PDF anzusehen - Fehlermeldung "Verarbeitungsfehler" mit Taste zum Ansehen der PDF Datei ### Entfernt @@ -14,13 +24,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Geändert - einige Icons -- pull-to-refresh indikator ## [1.0.2] - 2019-03-14 ### Hinzugefügt - Dunkler Modus - ssl (https) Verschlüsselung -- "Support" und "Folge uns" Tasen in den Einstellungen +- "Support" und "Folge uns" Tasten in den Einstellungen ### Behoben - Fehler, der dafür sorgte, dass fälschlicherweise 'keine Verbindung zum server' angezeigt wurde diff --git a/android-sources/AndroidManifest.xml b/android-sources/AndroidManifest.xml index 4896870..5e75aa8 100644 --- a/android-sources/AndroidManifest.xml +++ b/android-sources/AndroidManifest.xml @@ -1,6 +1,6 @@ - - + + diff --git a/resources/qml/Components/SettingsDelegate.qml b/resources/qml/Components/SettingsDelegate.qml index ca6004e..f3ba0b0 100644 --- a/resources/qml/Components/SettingsDelegate.qml +++ b/resources/qml/Components/SettingsDelegate.qml @@ -62,6 +62,10 @@ ItemDelegate { text: control.description color: app.style.style.textColor + + onLinkActivated: { + Qt.openUrlExternally(link) + } } Text { diff --git a/resources/qml/Forms/HomeForm.qml b/resources/qml/Forms/HomeForm.qml index 7f2c4bf..04b9e3b 100644 --- a/resources/qml/Forms/HomeForm.qml +++ b/resources/qml/Forms/HomeForm.qml @@ -48,28 +48,28 @@ Page { anchors.horizontalCenter: parent.horizontalCenter FancyButton { - id: todayButton + id: foodplanButton - image: "qrc:/icons/sheute.png" + image: app.style.style.treffpunktFannyIcon + imageScale: 1.3 size: mainMenu.buttonSize onClicked: { - formStack.eventDay = 0 - formStack.push(eventForm) + formStack.push(foodPlanForm) } } FancyButton { - id: tomorrowButton + id: fannyButton - image: "qrc:/icons/smorgen.png" + image: app.style.style.fannyLogo + imageScale: 1.2 size: mainMenu.buttonSize onClicked: { - formStack.eventDay = 1 - formStack.push(eventForm) + Qt.openUrlExternally("http://www.fanny-leicht.de") } } @@ -84,32 +84,6 @@ Page { property int buttonSize: mainMenu.buttonSize * 0.7 - FancyButton { - id: foodplanButton - - image: app.style.style.treffpunktFannyIcon - imageScale: 1.3 - - size: smallMenu.buttonSize - - onClicked: { - formStack.push(foodPlanForm) - } - } - - FancyButton { - id: fannyButton - - image: app.style.style.fannyLogo - imageScale: 1.2 - - size: smallMenu.buttonSize - - onClicked: { - Qt.openUrlExternally("http://www.fanny-leicht.de") - } - } - FancyButton { id: settingsButton @@ -132,12 +106,32 @@ Page { size: smallMenu.buttonSize onClicked: { - logoutConfirmationDialog.open() + Qt.quit() //logoutConfirmationDialog.open() } } } } + Button { + id: whereIsTheSubstitutionplanButton + + anchors { + bottom: parent.bottom + bottomMargin: root.height* 0.01 + horizontalCenter: parent.horizontalCenter + } + + flat: true + + text: "Wo ist der Vertretungsplan?" + + font.capitalization: Font.MixedCase + + onClicked: { + formStack.push(postMortumForm) + } + } + Dialog { id: logoutConfirmationDialog diff --git a/resources/qml/Forms/PostMortumForm.qml b/resources/qml/Forms/PostMortumForm.qml new file mode 100644 index 0000000..a1e1ae6 --- /dev/null +++ b/resources/qml/Forms/PostMortumForm.qml @@ -0,0 +1,79 @@ +/* + Fannyapp - Application to view the cover plan of the Fanny-Leicht-Gymnasium ins Stuttgart Vaihingen, Germany + Copyright (C) 2019 Itsblue Development + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + */ + +import QtQuick 2.0 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.1 + +import "../Components" + +Page { + id: root + + property bool locked: false + + signal opened() + + title: "Wo ist der Vertretungsplan?" + + onOpened: {} + + Flickable { + id: flickable + + anchors.fill: parent + anchors.margins: 20 + + contentHeight: postMortumTextLabel.height + + clip: false + + boundsBehavior: Flickable.StopAtBounds + + + ScrollBar.vertical: verticalScrollBar + + Label { + id: postMortumTextLabel + width: parent.width + wrapMode: Text.Wrap + text: "

Goodbye, old friend ...

+
Nach mehr als zwei Jahren, hunderten Stunden Arbeit und tausenden Zeilen Code, die ich für die Fannyapp geschrieben habe, stelle ich die Entwicklung nun schweren Herzens ein. Grund dafür ist, dass das Fanny ab diesem Schuljahr (2020/2021) in Sachen Vertretungsplan auf die kommerzielle App \"Untis mobile\" setzt, was den Vertretungsplan in der Fannyapp leider obsolet macht. Allerdings wird die App auch in Zukunft noch den Speiseplan anzeigen können. +

Ich möchte an dieser Stelle nochmals Allen danken, die die Entwicklung der App mit Feedback und Rückmeldungen unterstützt haben, allen voran dem Verein der Freunde, der mir den kostspieligen Apple Entwickler-Account gesponsert hat.

Bei weiteren Fragen bin ich erreichbar unter contact@itsblue.de.

Ich wünsche allen Fanny-SchülerInnen eine genauso schöne Zeit am Fanny, wie ich sie haben durfte :) +

Der Vertretungsplan findet sich ab jetzt hier bei Untis +

Viele Grüße +
Dorian Zedler | Entwickler der Fannyapp (und ehemaliger Fanny-Schüler)" + onLinkActivated: { + Qt.openUrlExternally(link) + } + } + } + + ScrollBar { + id: verticalScrollBar + + anchors { + top: flickable.top + left: flickable.right + leftMargin: 2 + bottom: flickable.bottom + } + + interactive: false + } +} diff --git a/resources/qml/Forms/SettingsForm.qml b/resources/qml/Forms/SettingsForm.qml index 16ec136..169c57a 100644 --- a/resources/qml/Forms/SettingsForm.qml +++ b/resources/qml/Forms/SettingsForm.qml @@ -36,7 +36,7 @@ Page { anchors.fill: parent - SettingsDelegate { + /*SettingsDelegate { width: parent.width onClicked: { @@ -45,9 +45,9 @@ Page { title: "Filter" description: "Wähle die Klassen(stufen) bzw. Lehrerkürzel aus, für die du den Vertretungsplan ansehen möchtest" - } + }*/ - SwitchDelegate { + /*SwitchDelegate { width: parent.width height: 10 + shortDescription.height + 2 + longDescription.height + 10 @@ -126,8 +126,7 @@ Page { } } } - - } + }*/ SwitchDelegate { width: parent.width @@ -211,7 +210,7 @@ Page { } } - SettingsDelegate { + /*SettingsDelegate { width: parent.width title: "Folge uns" @@ -235,6 +234,29 @@ Page { onClicked: { Qt.openUrlExternally("https://t.me/FlgQtAgSupportbot") } + }*/ + + SettingsDelegate { + width: parent.width + + title: "Support" + description: "Bei Fragen können sie sich gerne per mail unter contact@itsblue.de an den Entwickler der App wenden." + + showForwardIcon: false + + onClicked: { + Qt.openUrlExternally("mailto:contact@itsblue.de") + } + } + + SettingsDelegate { + width: parent.width + + showForwardIcon: false + + title: "Open source notice" + description: "This app was built using the open source version of the Qt Framework which is licensed under the lgplV3 license.

This app is open source and licensed under the lgplV3 license, the source code can be found here on GitHub." + } } } diff --git a/resources/qml/Pages/MainPage.qml b/resources/qml/Pages/MainPage.qml index e3039d6..335ba6f 100644 --- a/resources/qml/Pages/MainPage.qml +++ b/resources/qml/Pages/MainPage.qml @@ -92,6 +92,11 @@ Page { FilterForm {} } + Component { + id: postMortumForm + PostMortumForm {} + } + popEnter: Transition { XAnimator { from: (formStack.mirrored ? -1 : 1) * -formStack.width diff --git a/resources/qml/main.qml b/resources/qml/main.qml index 690b450..db93cc6 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -41,7 +41,7 @@ ApplicationWindow { property QtObject style: style - state: serverConn.state + state: "loggedIn" //serverConn.state states: [ State { @@ -65,7 +65,7 @@ ApplicationWindow { id: serverConn onStateChanged: { - app.state = newState + //app.state = newState } } diff --git a/resources/qml/qml.qrc b/resources/qml/qml.qrc index 3ad45b2..6a060c5 100644 --- a/resources/qml/qml.qrc +++ b/resources/qml/qml.qrc @@ -18,5 +18,6 @@ Components/FannyDataListView.qml Components/ProgressCircle.qml Components/CompatibleToolButton.qml + Forms/PostMortumForm.qml diff --git a/resources/shared/graphics/Icon Big square.png b/resources/shared/graphics/Icon Big square.png deleted file mode 100644 index 079afc9..0000000 Binary files a/resources/shared/graphics/Icon Big square.png and /dev/null differ diff --git a/resources/shared/graphics/faviconNoOutline.png b/resources/shared/graphics/faviconNoOutline.png new file mode 100644 index 0000000..7cf8b25 Binary files /dev/null and b/resources/shared/graphics/faviconNoOutline.png differ