diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 57b6d6f..329d2c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,39 +1,39 @@ - -# Contributing Guide -Köszönjük, ha programozással segíted a munkánkat! -A folytatáshoz szükséged lesz egy Linuxot vagy Windowst futtató számítógépre, minimális programozási tapasztalatra és egy kis angoltudásra. -Segít, ha nem csak kicsit tudsz programozni, és ha ismered a Gitet és a GitHubot ;) - -## Miben segítsek? -Kérünk, **olyan dologgal járulj hozzá** a Filchez, ami valószínűleg **sok embernek hasznos lesz** majd. Szeretnénk egy minél teljeskörűbb iskolai asszisztenst létrehozni, de az iskolaspecifikus, vagy külön neked hasznos funkciók helye inkább legyen a saját forkod. - -Fontos, hogy **mielőtt egy nagy volumenű projektbe belekezdesz, futtasd meg ötletedet a [Discord szerverünkön](https://filcnaplo.hu/discord),** ahol még azelőtt tudunk tanácsot adni, mielőtt sok-sok órát beleöltél volna egy esetleg felesleges dologba. - -A legjobban annak örülünk, ha az [Issues](https://github.com/filcnaplo/filcnaplo/issues) oldalról szemezgetsz, **ha lehet, a [priority taggel megjelöltekkel kezdd](https://github.com/filcnaplo/filcnaplo/issues?q=is%3Aissue+is%3Aopen+label%3Apriority),** vagy ha új vagy a Flutterhez, ajánljuk figyelmedbe [ezeket a viszonylag könnyen javítható hibákat](https://github.com/filcnaplo/filcnaplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) (ha épp van ilyen). - -## Hogyan segítsek? - -Nem ígérhetünk itt sem programozás-, sem git-kurzust, de a projektspecifikus dolgokat leírjuk, és segítünk a Flutter feltelepítésében. - -A Filc a Google által pár éve létrehozott **[Fluttert](https://flutter.dev/)** használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#-ot, Javát, C++t, vagy egyéb hasonló nyelvet, **nem fog gondot okozni a használata.** A felhasználói felület létrehozásában az is segíthet, ha foglalkoztál már korábban weboldalakkal. -Ha még nem használtál Fluttert, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw). -Könnyen tudsz kódot, vagy akár UI-t is tesztelni a [DartPad](https://dartpad.dev/) oldalon. - -#### [Segítség a Flutter telepítéséhez és a forráskód futtatásához](/.github/SETUP.md) -Fontos: **Legyél a flutter beta verzióján!** Írd be: `flutter channel beta` - - - -Ha nem értesz a Githez, ajánljuk figyelmedbe [ezt a cikket](https://medium.com/envienta-magyarorsz%C3%A1g/git-%C3%A9s-github-gyorstalpal%C3%B3-f2d78a732deb). Viszont arra kérünk, a Git használatát ne a Filcen próbáld ki először, hozz létre előbb egy saját Repót, és abba tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat. - -Készíts egy forkot a saját fiókod alá. -A Filc legfrissebb, épp fejlesztés alatt álló verzióját a [dev brancen](https://github.com/filcnaplo/filcnaplo/tree/dev) találod, kérjük ide commitolj, és ide célozd a forkodból a Pull Requested. Írd le benne, mit változtattál, és ha lehet, csatolj képernyőképet is. -Minél gyakrabban készíts minél részletesebben elnevezett commitokat, hogy el tudjunk tájékozódni az általad beküldött kódon. - ---- - -Az általad fejlesztett funkciók mellé a changelogban odakerül GitHub felhasználóneved. -Ha jelentős és rendszeres hozzájáruló vagy, Discordon megkapod a `DEV` rangot. - -Ha bárhol elakadtál, keress minket Discordon. -Jó fejlesztést kívánunk! + +# Contributing Guide +Köszönjük, ha programozással segíted a munkánkat! +A folytatáshoz szükséged lesz egy Linuxot vagy Windowst futtató számítógépre, minimális programozási tapasztalatra és egy kis angoltudásra. +Segít, ha nem csak kicsit tudsz programozni, és ha ismered a Gitet és a GitHubot ;) + +## Miben segítsek? +Kérünk, **olyan dologgal járulj hozzá** a Filchez, ami valószínűleg **sok embernek hasznos lesz** majd. Szeretnénk egy minél teljeskörűbb iskolai asszisztenst létrehozni, de az iskolaspecifikus, vagy külön neked hasznos funkciók helye inkább legyen a saját forkod. + +Fontos, hogy **mielőtt egy nagy volumenű projektbe belekezdesz, futtasd meg ötletedet a [Discord szerverünkön](https://filcnaplo.hu/discord),** ahol még azelőtt tudunk tanácsot adni, mielőtt sok-sok órát beleöltél volna egy esetleg felesleges dologba. + +A legjobban annak örülünk, ha az [Issues](https://github.com/filcnaplo/filcnaplo/issues) oldalról szemezgetsz, **ha lehet, a [priority taggel megjelöltekkel kezdd](https://github.com/filcnaplo/filcnaplo/issues?q=is%3Aissue+is%3Aopen+label%3Apriority),** vagy ha új vagy a Flutterhez, ajánljuk figyelmedbe [ezeket a viszonylag könnyen javítható hibákat](https://github.com/filcnaplo/filcnaplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) (ha épp van ilyen). + +## Hogyan segítsek? + +Nem ígérhetünk itt sem programozás-, sem git-kurzust, de a projektspecifikus dolgokat leírjuk, és segítünk a Flutter feltelepítésében. + +A Filc a Google által pár éve létrehozott **[Fluttert](https://flutter.dev/)** használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#-ot, Javát, C++t, vagy egyéb hasonló nyelvet, **nem fog gondot okozni a használata.** A felhasználói felület létrehozásában az is segíthet, ha foglalkoztál már korábban weboldalakkal. +Ha még nem használtál Fluttert, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw). +Könnyen tudsz kódot, vagy akár UI-t is tesztelni a [DartPad](https://dartpad.dev/) oldalon. + +#### [Segítség a Flutter telepítéséhez és a forráskód futtatásához](/.github/SETUP.md) +Fontos: **Legyél a flutter beta verzióján!** Írd be: `flutter channel beta` + + + +Ha nem értesz a Githez, ajánljuk figyelmedbe [ezt a cikket](https://medium.com/envienta-magyarorsz%C3%A1g/git-%C3%A9s-github-gyorstalpal%C3%B3-f2d78a732deb). Viszont arra kérünk, a Git használatát ne a Filcen próbáld ki először, hozz létre előbb egy saját Repót, és abba tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat. + +Készíts egy forkot a saját fiókod alá. +A Filc legfrissebb, épp fejlesztés alatt álló verzióját a [dev brancen](https://github.com/filcnaplo/filcnaplo/tree/dev) találod, kérjük ide commitolj, és ide célozd a forkodból a Pull Requested. Írd le benne, mit változtattál, és ha lehet, csatolj képernyőképet is. +Minél gyakrabban készíts minél részletesebben elnevezett commitokat, hogy el tudjunk tájékozódni az általad beküldött kódon. + +--- + +Az általad fejlesztett funkciók mellé a changelogban odakerül GitHub felhasználóneved. +Ha jelentős és rendszeres hozzájáruló vagy, Discordon megkapod a `DEV` rangot. + +Ha bárhol elakadtál, keress minket Discordon. +Jó fejlesztést kívánunk! diff --git a/LICENSE b/LICENSE index a23e6cd..f730060 100644 --- a/LICENSE +++ b/LICENSE @@ -1,29 +1,29 @@ -BSD 3-Clause License - -Copyright (c) 2021, Filc -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. 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. - -3. Neither the name of the copyright holder 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 HOLDER 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. +BSD 3-Clause License + +Copyright (c) 2021, Filc +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. 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. + +3. Neither the name of the copyright holder 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 HOLDER 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. diff --git a/README.md b/README.md index 09296b1..a9ac202 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,24 @@ -

- -

Filc Napló

-

- -#### Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez - -## Setup - -### Clone the project - -```sh -git clone --recursive https://github.com/refilc/naplo -cd naplo -``` - -### Run the app - -```sh -cd filcnaplo -flutter run -``` +

+ +

Filc Napló

+

+ +#### Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez + +[![Downloads](https://img.shields.io/github/downloads-pre/filc/naplo/latest/total?color=%23&label=Downloads&logo=github&sort=semver)](https://github.com/filc/naplo/releases)   [![discord](https://img.shields.io/discord/712698455193157643?label=Discord)](http://filcnaplo.hu/discord) + +## Setup + +### Clone the project + +```sh +git clone --recursive https://github.com/filc/naplo +cd naplo +``` + +### Run the app + +```sh +cd filcnaplo +flutter run +``` diff --git a/changelog.md b/changelog.md index b1c705a..f01585f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,13 +1,13 @@ -What's new: - -- design tweak -- new premium ui -- premium fix -- rounding fix -- graph percentage fix -- fail warning -- Widget -- fix sent messages -- fix ios live activities -- Hibajavítások 🐛 -- **Megérkezett a Filc Premium!** ✨ +What's new: + +- design tweak +- new premium ui +- premium fix +- rounding fix +- graph percentage fix +- fail warning +- Widget +- fix sent messages +- fix ios live activities +- Hibajavítások 🐛 +- **Megérkezett a Filc Premium!** ✨ diff --git a/filcnaplo/.gitignore b/filcnaplo/.gitignore index 0fa6b67..8906afc 100644 --- a/filcnaplo/.gitignore +++ b/filcnaplo/.gitignore @@ -1,46 +1,46 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/filcnaplo/.metadata b/filcnaplo/.metadata index 2d65d0e..ebe4e24 100644 --- a/filcnaplo/.metadata +++ b/filcnaplo/.metadata @@ -1,30 +1,30 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled. - -version: - revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 - channel: beta - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 - base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 - - platform: macos - create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 - base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled. + +version: + revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 + channel: beta + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 + base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 + - platform: macos + create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 + base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/filcnaplo/README.md b/filcnaplo/README.md index 6464f55..fc8676c 100644 --- a/filcnaplo/README.md +++ b/filcnaplo/README.md @@ -1,3 +1,3 @@ -# filcnaplo - +# filcnaplo + Main lib \ No newline at end of file diff --git a/filcnaplo/analysis_options.yaml b/filcnaplo/analysis_options.yaml index 61b6c4d..a7acf24 100644 --- a/filcnaplo/analysis_options.yaml +++ b/filcnaplo/analysis_options.yaml @@ -1,29 +1,29 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/filcnaplo/android/.gitignore b/filcnaplo/android/.gitignore index deb764a..a2ea94a 100644 --- a/filcnaplo/android/.gitignore +++ b/filcnaplo/android/.gitignore @@ -1,12 +1,12 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java - -# Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app -key.properties +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties .project \ No newline at end of file diff --git a/filcnaplo/android/app/build.gradle b/filcnaplo/android/app/build.gradle index f41fff5..b7cf519 100644 --- a/filcnaplo/android/app/build.gradle +++ b/filcnaplo/android/app/build.gradle @@ -1,99 +1,99 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - throw new GradleException("Undefined VersionCode") -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - throw new GradleException("Undefined VersionName") -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file("filc3.properties") -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - disable 'InvalidPackage' - disable "Instantiatable" - checkReleaseBuilds false - abortOnError false - } - - defaultConfig { - applicationId "hu.filc.naplo" - minSdkVersion 21 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - multiDexEnabled true - } - - compileOptions { - // Flag to enable support for the new language APIs - coreLibraryDesugaringEnabled true - // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - } - } - - buildTypes { - release { - signingConfig signingConfigs.release - shrinkResources false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - buildFeatures { - viewBinding true - } -} - -flutter { - source '../..' -} - -dependencies { - implementation 'com.android.support:multidex:2.0.1' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'joda-time:joda-time:2.9.4' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation 'androidx.window:window:1.0.0' - implementation 'androidx.window:window-java:1.0.0' -} +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + throw new GradleException("Undefined VersionCode") +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + throw new GradleException("Undefined VersionName") +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file("filc3.properties") +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + +android { + compileSdkVersion rootProject.ext.compileSdkVersion + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + lintOptions { + disable 'InvalidPackage' + disable "Instantiatable" + checkReleaseBuilds false + abortOnError false + } + + defaultConfig { + applicationId "hu.filc.naplo" + minSdkVersion 21 + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + multiDexEnabled true + } + + compileOptions { + // Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true + // Sets Java compatibility to Java 8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + shrinkResources false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + buildFeatures { + viewBinding true + } +} + +flutter { + source '../..' +} + +dependencies { + implementation 'com.android.support:multidex:2.0.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'joda-time:joda-time:2.9.4' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + implementation 'androidx.window:window:1.0.0' + implementation 'androidx.window:window-java:1.0.0' +} diff --git a/filcnaplo/android/app/proguard-rules.pro b/filcnaplo/android/app/proguard-rules.pro index 0940b69..56fe627 100644 --- a/filcnaplo/android/app/proguard-rules.pro +++ b/filcnaplo/android/app/proguard-rules.pro @@ -1,5 +1,5 @@ --keep class io.flutter.plugin.editing.** { *; } --keep class androidx.lifecycle.DefaultLifecycleObserver --keep class com.pauldemarco.flutter_blue.** { *; } --keep class com.mr.flutter.plugin.filepicker.** { *; } +-keep class io.flutter.plugin.editing.** { *; } +-keep class androidx.lifecycle.DefaultLifecycleObserver +-keep class com.pauldemarco.flutter_blue.** { *; } +-keep class com.mr.flutter.plugin.filepicker.** { *; } -keep class com.shockwave.** \ No newline at end of file diff --git a/filcnaplo/android/app/src/debug/AndroidManifest.xml b/filcnaplo/android/app/src/debug/AndroidManifest.xml index f4f2d81..5888d0a 100644 --- a/filcnaplo/android/app/src/debug/AndroidManifest.xml +++ b/filcnaplo/android/app/src/debug/AndroidManifest.xml @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/filcnaplo/android/app/src/main/AndroidManifest.xml index e37928c..297f8ff 100644 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ b/filcnaplo/android/app/src/main/AndroidManifest.xml @@ -1,70 +1,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/java/hu/filc/naplo/MainActivity.java b/filcnaplo/android/app/src/main/java/hu/filc/naplo/MainActivity.java index bab435e..9006cd5 100644 --- a/filcnaplo/android/app/src/main/java/hu/filc/naplo/MainActivity.java +++ b/filcnaplo/android/app/src/main/java/hu/filc/naplo/MainActivity.java @@ -1,18 +1,18 @@ -package hu.filc.naplo; - -import android.os.Bundle; - -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -import io.flutter.embedding.engine.FlutterEngine; - -public class MainActivity extends FlutterActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - GeneratedPluginRegistrant.registerWith(new FlutterEngine(this)); - } -} +package hu.filc.naplo; + +import android.os.Bundle; + +import io.flutter.embedding.android.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; + +import io.flutter.embedding.engine.FlutterEngine; + +public class MainActivity extends FlutterActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + GeneratedPluginRegistrant.registerWith(new FlutterEngine(this)); + } +} diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..f6c3767 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png new file mode 100644 index 0000000..6b9e74b Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..10fc564 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png new file mode 100644 index 0000000..b4566e0 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml index 62d6723..4545224 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml index 01e9d40..a7f5dd6 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml index c1e9015..93ad67e 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml index cc3690b..865d06c 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml index 07d5da9..a4f78de 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml @@ -1,170 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml index 2b068d1..cc14f03 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml @@ -1,30 +1,30 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml index 273720c..90b35d8 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml index f2365a8..289cd49 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml @@ -1,27 +1,27 @@ - - - - - + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml index 785445c..6721d42 100644 --- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml @@ -1,10 +1,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml index 007e287..5ae60cf 100644 --- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml @@ -1,10 +1,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/background.png b/filcnaplo/android/app/src/main/res/drawable-v21/background.png new file mode 100644 index 0000000..d90316e Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-v21/background.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml index 86aa265..51cb1b4 100644 --- a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml @@ -1,7 +1,9 @@ - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml index 860b811..0def536 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml index 6466eba..f12f731 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml index 426d5c1..ee09eea 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml index 6e5cbff..030aaf2 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d86d9d5 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_background.xml index 86aa265..293a93c 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_background.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_gradient_background.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_gradient_background.xml index a69ce1e..67e425a 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_gradient_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_gradient_background.xml @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png new file mode 100644 index 0000000..7fb243f Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml index 8a99162..80b52be 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml index 2551ee3..f2d52b0 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml index e0e9376..a37fed6 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml index 4bbd0bb..c41e2b5 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml index a8f281e..a4eab7e 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..656bdce Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png new file mode 100644 index 0000000..25992cd Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..76b9abd Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png new file mode 100644 index 0000000..529aa20 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable/background.png b/filcnaplo/android/app/src/main/res/drawable/background.png new file mode 100644 index 0000000..d90316e Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable/background.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml b/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml index d91b3b2..b820ec8 100644 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml +++ b/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml b/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml index 22c1d8f..84bb6fe 100644 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml +++ b/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable/launch_background.xml index 86aa265..51cb1b4 100644 --- a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml +++ b/filcnaplo/android/app/src/main/res/drawable/launch_background.xml @@ -1,7 +1,9 @@ - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml b/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml index f0a315a..b12af8d 100644 --- a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml +++ b/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml @@ -1,26 +1,26 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml b/filcnaplo/android/app/src/main/res/layout/timetable_item.xml index 8d107fe..6b2a7f8 100644 --- a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml +++ b/filcnaplo/android/app/src/main/res/layout/timetable_item.xml @@ -1,105 +1,105 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml index 0e69a8a..e10fda1 100644 --- a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml +++ b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml @@ -1,219 +1,219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -