Merge pull request #38 from refilc/dev

dev to master

.github/workflows/android.yml

@@ -0,0 +1,40 @@
+name: Build for Android
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download Android keystore
+        id: android_keystore
+        uses: timheuer/base64-to-file@v1.0.3
+        with:
+          fileName: upload-keystore.jks
+          encodedString: ${{ secrets.KEYSTORE_BASE64 }}
+      - name: Create key.properties
+        run: |
+          echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > filcnaplo/android/key.properties
+          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> filcnaplo/android/key.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> filcnaplo/android/key.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> filcnaplo/android/key.properties
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "17.x"
+          cache: "gradle"
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: "3.10.2"
+          channel: "stable"
+          cache: "true"
+      - name: Install dependencies
+        run: ./fix-pub.sh
+      - name: Build
+        run: cd filcnaplo && ./build.sh
+      - name: Upload Android Release
+        uses: actions/upload-artifact@v2
+        with:
+          name: android-release
+          path: build/outputs/flutter-apk/app-release.apk

.github/workflows/ios.yml

@@ -0,0 +1,65 @@
+name: "Build and Publish iOS"
+on: workflow_dispatch
+    
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      # Checks-out our repository under $GITHUB_WORKSPACE, so our job can access it
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Install the Apple certificate and provisioning profile 
+      - name: Install the Apple certificate and provisioning profile
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode --output $PP_PATH
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+          # apply provisioning profile
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+      # Install flutter
+      - name: Flutter get
+        uses: subosito/flutter-action@v1
+        with:
+          flutter-version: '3.10.2'
+
+      # Install your project's dependencies
+      - name: Install dependencies
+        run: bash fix-pub.sh
+
+      # Build and sign the ipa using a single flutter command
+      - name: Building IPA
+        working-directory: filcnaplo
+        run: bash build-ipa.sh
+          
+      # Collect the file and upload as artifact         
+      - name: collect ipa artifacts
+        uses: actions/upload-artifact@v2
+        with:
+         name: release-ipa
+         # Path to the release files
+         path: filcnaplo/build/ios/ipa/*.ipa
+
+      # Important! Cleanup: remove the certificate and provisioning profile from the runner!
+      - name: Clean up keychain and provisioning profile
+        if: ${{ always() }}
+        run: |
+          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+          rm ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision

.gitignore

@@ -1,5 +1,7 @@
 # See https://www.dartlang.org/guides/libraries/private-files
 
+.gitignore
+
 termek.txt
 .DS_Store
 filc3.properties
@@ -25,3 +27,25 @@ doc/api/
 *.js.map
 
 *.txt
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/connectivity_plus
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/dynamic_color
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/flutter_acrylic
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/permission_handler_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/share_plus_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows
+filcnaplo/windows/flutter/ephemeral/generated_config.cmake
+filcnaplo/windows/flutter/generated_plugin_registrant.cc
+filcnaplo/windows/flutter/generated_plugin_registrant.h
+filcnaplo/windows/flutter/generated_plugins.cmake
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/*
+filcnaplo/ios/Podfile.lock
+.vscode/
+key.properties
+
+.flutter-plugins*
+filcnaplo/ios/Flutter/flutter_export_environment 4.sh

.idea/libraries/Dart_SDK.xml

@@ -0,0 +1,27 @@
+<component name="libraryTable">
+  <library name="Dart SDK">
+    <CLASSES>
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/async" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/cli" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/collection" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/convert" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/core" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/developer" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/ffi" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/html" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/indexed_db" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/io" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js_util" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/math" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/svg" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_audio" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_gl" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Android API 33, extension level 3 Platform" project-jdk-type="Android SDK" />
+</project>

.idea/naplo.iml

@@ -2,7 +2,65 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_desktop_ui/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_desktop_ui/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_desktop_ui/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_premium/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_premium/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_premium/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_kreta_api/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_kreta_api/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_kreta_api/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_mobile_ui/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_mobile_ui/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_mobile_ui/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.dart_tool" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

.vscode/launch.json

@@ -1,7 +1,4 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
     {
@@ -10,8 +7,27 @@
       "request": "launch",
       "type": "dart",
       "toolArgs": [
-        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1) --release"
+        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1)"
       ]
+    },
+    {
+      "name": "filcnaplo release",
+      "cwd": "filcnaplo release",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release",
+      "program": "lib/main.dart",
+      "toolArgs": [
+        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1)"
+      ]
+    },
+    {
+      "name": "Flutter",
+      "program": "lib/main.dart",
+      "cwd": "filcnaplo",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "debug"
     }
   ]
 }

CONTRIBUTING.md

@@ -1,39 +1,36 @@
 
-# Contributing Guide
+# Contribution 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.
+A folytatáshoz szükséged lesz egy Linux-ot vagy Windows-t 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 ;)
+Segít, ha már gyakorlottabb vagy a programozásban, és ha ismered a [Git](https://git-scm.com/) és a [GitHub](https://github.com/) működését. ;)
 
 ## 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.
+Kérünk, **olyan dologgal járulj hozzá** a **reFilc**hez, ami valószínűleg **sok embernek hasznos lehet**. 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 Fork-od.
 
-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.
+Fontos, hogy **mielőtt egy nagyobb méretű projektbe belekezdenél, futtasd meg ötletedet a [Discord szerverünkön](https://dc.refilc.hu/)**, ahol még azelőtt tudunk tanácsot adni, hogy 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).
+A legjobban annak örülünk, ha az [Issues](https://github.com/refilc/naplo/issues) oldalról szemezgetsz. Ha még új vagy a Flutterben, ajánljuk figyelmedbe ezeket a [viszonylag könnyen javítható hibákat](https://github.com/refilc/naplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22), ha éppen 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 telepítésében.
 
-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 **reFilc** a Google által pár éve létrehozott **[Flutter](https://flutter.dev/)** keretrendszert használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#, Java, C++, vagy egyéb hasonló programnyelvek működését, **nem fog nagy 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 vagy alkalmazásfejlesztéssel.
+Ha még nem használtad a Flutter-t, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw).
+Kód vagy UI teszteléséhez Flutter telepítése nélkül is használhatod a [DartPad](https://dartpad.dev/)-et.
 
-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.
+#### [Segítség a Flutter telepítéséhez](https://docs.flutter.dev/get-started/install)
-Ha még nem használtál Fluttert, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw).
+**Használd a Flutter stable verzióját!** Írd be a terminálba: `flutter channel stable`
-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)
+Ha nem értessz a Git-hez vagy a GitHub-hoz, 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, hogy a használatukat ne a **reFilc**en próbáld ki először. Hozz létre egy saját Repo-t és abban tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat.
-Fontos: **Legyél a flutter beta verzióján!** Írd be: `flutter channel beta`
 
-
+Készíts egy Fork-ot a saját GitHub fiókod alá.
-
+A **reFilc** legfrissebb, **épp fejlesztés alatt álló verzióját a [master branch](https://github.com/refilc/naplo/tree/master)-en találod**. Kérjük ide Commit-olj és ide célozd a Fork-odból a Pull Request-edet. Írd le benne, hogy mit változtattál és ha lehet, csatolj képernyőképet is.
-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.
+Minél gyakrabban készíts minél részletesebben elnevezett Commit-okat, hogy mások is el tudjanak igazodni az általad beküldött kódban.
-
-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.
+Az általad fejlesztett funkciók mellé a Changelog-ba odakerül a GitHub felhasználóneved.
-Ha jelentős és rendszeres hozzájáruló vagy, Discordon megkapod a `DEV` rangot.
+Ha jelentős és rendszeres hozzájáruló vagy, Discord-on megkaphatod a `DEV` rangot.
 
-Ha bárhol elakadtál, keress minket Discordon.
+Ha bárhol elakadtál vagy kérdésed van, keress bátran Discordon!
-Jó fejlesztést kívánunk!
+**Jó fejlesztést kívánunk!**

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021, Filc
+Copyright (c) 2023, reFilc
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -1,30 +1,24 @@
 <p align=center>
-  <img src="https://media.discordapp.net/attachments/1111727410677825596/1111790518964326510/reFilc_Logo2.png?width=671&height=671" width=150>
+  <img src="https://media.discordapp.net/attachments/1111727410677825596/1113217167513624646/reFilc_Logo_Squircle.png?width=671&height=671" width=150>
   <h1 align=center><b>reFilc</b></h1>
 </p>
 
-#### Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez - tanulóktól, tanulóknak.
+#### Nem hivatalos e-napló alkalmazás az e-KRÉTA rendszerhez - tanulóktól, tanulóknak.
 
-[![Downloads](https://img.shields.io/github/downloads-pre/refilc/naplo/latest/total?color=%23&label=Downloads&logo=github&sort=semver)](https://github.com/refilc/naplo/releases) &nbsp; [![discord](https://img.shields.io/discord/1111649116020285532?label=Discord)](http://dc.refilc.hu)
+[![Downloads](https://img.shields.io/github/downloads-pre/refilc/naplo/total?&logo=github&label=Downloads)](https://github.com/refilc/naplo/releases) &nbsp; [![Discord](https://img.shields.io/discord/1111649116020285532?logo=discord&label=Discord)](https://dc.refilc.hu)
 
 ## Setup
 
 ### Clone the project
 
 ```sh
-git clone --recursive https://github.com/refilc/naplo
+git clone https://github.com/refilc/naplo
 cd naplo
 ```
 
 ### Install packages
 
-```sh
+Run `fix-pub.sh`
-cd filcnaplo && flutter pub get && cd ..
-cd filcnaplo_mobile_ui && flutter pub get && cd ..
-cd filcnaplo_desktop_ui && flutter pub get && cd ..
-cd filcnaplo_kreta_api && flutter pub get && cd ..
-cd filcnaplo_premium && flutter pub get && cd ..
-```
 
 ### Run the app
 
@@ -33,12 +27,24 @@ cd filcnaplo
 flutter run
 ```
 
+### Contribution
+
+**Nézd meg a [Contribution guide](CONTRIBUTING.md)-ot!**
+
+Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a release-nél. Kérjük, írd le a Discord nevedet a Description-be, hogy adhassunk rangot.
+
 -------
 
-# Kudo
+# Team
+
+**kima:** head developer / project manager
+
+**Reiner, pdf, Pearoo:** community- and project manager / developer
 
-**annon:** a Filc napló készítője (ez az app a Filcen alapul)
+**vrolandd, TMarccci:** head developer
-
+
-**kima, chromium, peighter, mog, WolfY:** a fejlesztői csapat
+**dwe., xou:** designer
-
+
-**Regő, Pearoo:** weboldal design és community management
+**Péter:** social media manager / video editor
+
+**annon:** a régi Filc Napló fejlesztője (ez az app, ha bár sokban változott, alapjaiban a Filc-re épül)

filcnaplo/.gitignore

@@ -44,3 +44,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+key.properties

filcnaplo/.metadata

@@ -1,30 +1,30 @@
-# This file tracks properties of this Flutter project.
+# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
+#
-# This file should be version controlled.
+# This file should be version controlled.
-
+
-version:
+version:
-  revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-  channel: beta
+  channel: stable
-
+
-project_type: app
+project_type: app
-
+
-# Tracks metadata for the flutter migrate command
+# Tracks metadata for the flutter migrate command
-migration:
+migration:
-  platforms:
+  platforms:
-    - platform: root
+    - platform: root
-      create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-      base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-    - platform: macos
+    - platform: web
-      create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-      base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-
+
-  # User provided section
+  # User provided section
-
+
-  # List of Local paths (relative to this file) that should be
+  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
+  # ignored by the migrate tool.
-  #
+  #
-  # Files that are not part of the templates will be ignored by default.
+  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
+  unmanaged_files:
-    - 'lib/main.dart'
+    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

filcnaplo/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("filc3.properties")
+def keystorePropertiesFile = rootProject.file("key.properties")
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
@@ -44,7 +44,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "hu.filc.naplo"
+        applicationId "hu.refilc.naplo"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

filcnaplo/android/app/src/debug/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.refilc.naplo">
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.VIBRATE" />

filcnaplo/android/app/src/main/AndroidManifest.xml

@@ -1,13 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="hu.filc.naplo">
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
-    <application android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
+    <application android:name="${applicationName}" android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true">
-        <activity android:exported="true" android:name=".MainActivity"
+        <activity android:exported="true" android:name="hu.refilc.naplo.MainActivity"
             android:launchMode="singleTop" android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"
             android:showWhenLocked="true"
             android:turnScreenOn="true">
+            <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
             <meta-data android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
             <intent-filter>
@@ -18,16 +20,26 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Accepts URIs that begin with https://api.filcnaplo.hu -->
+                <!-- Accepts URIs that begin with https://api.refilcapp.hu -->
                 <data
                     android:scheme="https"
-                    android:host="api.filcnaplo.hu"
+                    android:host="api.refilcapp.hu"
-                    android:pathPrefix="/callback" />
+                    android:pathPrefix="/v1/auth/callback" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with https://refilc.hu -->
+                <data
+                    android:scheme="https"
+                    android:host="refilc.hu"
+                    android:pathPrefix="/app" />
             </intent-filter>
         </activity>
         <meta-data android:name="flutterEmbedding" android:value="2" />
 
-        <receiver android:name=".widget_timetable.WidgetTimetable"
+        <receiver android:name="hu.refilc.naplo.widget_timetable.WidgetTimetable"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -43,7 +55,7 @@
                 android:resource="@xml/home_widget_test_info" />
         </receiver>
 
-        <service android:name=".widget_timetable.WidgetTimetableService"
+        <service android:name="hu.refilc.naplo.widget_timetable.WidgetTimetableService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver android:name="es.antonborri.home_widget.HomeWidgetBackgroundReceiver"
@@ -57,14 +69,18 @@
             android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true" />
     </application>
 
+    <meta-data android:name="flutterEmbedding" android:value="2" />
+
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-</manifest>
+</manifest>

filcnaplo/android/app/src/main/java/hu/filc/naplo/MainActivity.java

@@ -1,18 +0,0 @@
-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));
-    }
-}

filcnaplo/android/app/src/main/java/hu/filc/naplo/database

@@ -1 +0,0 @@
-../../../../../../../../../filcnaplo_premium/android/database

filcnaplo/android/app/src/main/java/hu/filc/naplo/utils

@@ -1 +0,0 @@
-../../../../../../../../../filcnaplo_premium/android/utils

filcnaplo/android/app/src/main/java/hu/filc/naplo/widget_timetable

@@ -1 +0,0 @@
-../../../../../../../../../filcnaplo_premium/android/widget_timetable

filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java

@@ -0,0 +1,7 @@
+package hu.refilc.naplo;
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+    
+}

filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java

@@ -1,119 +1,119 @@
-package hu.filc.naplo.database;
+package hu.refilc.naplo.database;
-
+
-import android.content.ContentValues;
+import android.content.ContentValues;
-import android.content.Context;
+import android.content.Context;
-import android.database.Cursor;
+import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabase;
-
+
-import java.sql.SQLException;
+import java.sql.SQLException;
-
+
-import hu.filc.naplo.database.SQLiteHelper;
+import hu.refilc.naplo.database.SQLiteHelper;
-
+
-public class DBManager {
+public class DBManager {
-    private Context context;
+    private Context context;
-    private SQLiteDatabase database;
+    private SQLiteDatabase database;
-    private SQLiteHelper dbHelper;
+    private SQLiteHelper dbHelper;
-
+
-    public DBManager(Context c) {
+    public DBManager(Context c) {
-        this.context = c;
+        this.context = c;
-    }
+    }
-
+
-    public DBManager open() throws SQLException {
+    public DBManager open() throws SQLException {
-        this.dbHelper = new SQLiteHelper(this.context);
+        this.dbHelper = new SQLiteHelper(this.context);
-        this.database = this.dbHelper.getWritableDatabase();
+        this.database = this.dbHelper.getWritableDatabase();
-        return this;
+        return this;
-    }
+    }
-
+
-    public void close() {
+    public void close() {
-        this.dbHelper.close();
+        this.dbHelper.close();
-    }
+    }
-
+
-    public Cursor fetchWidget(int wid) {
+    public Cursor fetchWidget(int wid) {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_WIDGETS, new String[]{SQLiteHelper._ID, SQLiteHelper.DAY_SEL}, SQLiteHelper._ID + " = " + wid, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_WIDGETS, new String[]{SQLiteHelper._ID, SQLiteHelper.DAY_SEL}, SQLiteHelper._ID + " = " + wid, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchTimetable() {
+    public Cursor fetchTimetable() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_USER_DATA, new String[]{SQLiteHelper.TIMETABLE}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_USER_DATA, new String[]{SQLiteHelper.TIMETABLE}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchLastUser() {
+    public Cursor fetchLastUser() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LAST_ACCOUNT_ID}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LAST_ACCOUNT_ID}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchTheme() {
+    public Cursor fetchTheme() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.ACCENT_COLOR}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.ACCENT_COLOR}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchPremiumToken() {
+    public Cursor fetchPremiumToken() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_TOKEN}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_TOKEN}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchPremiumScopes() {
+    public Cursor fetchPremiumScopes() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_SCOPES}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_SCOPES}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchLocale() {
+    public Cursor fetchLocale() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LOCALE}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LOCALE}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public void deleteWidget(int _id) {
+    public void deleteWidget(int _id) {
-        this.database.delete(SQLiteHelper.TABLE_NAME_WIDGETS, "_id=" + _id, null);
+        this.database.delete(SQLiteHelper.TABLE_NAME_WIDGETS, "_id=" + _id, null);
-    }
+    }
-
+
-    /*public void changeSettings(int _id, Map<String, String> map) {
+    /*public void changeSettings(int _id, Map<String, String> map) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        for(Map.Entry<String, String> e: map.entrySet()){
+        for(Map.Entry<String, String> e: map.entrySet()){
-            con.put(e.getKey(), e.getValue());
+            con.put(e.getKey(), e.getValue());
-        }
+        }
-        this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, "_id = " + _id, null);
+        this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, "_id = " + _id, null);
-    }
+    }
-    public void insertSettings(int _id, Map<String, String> map) {
+    public void insertSettings(int _id, Map<String, String> map) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        for(Map.Entry<String, String> e: map.entrySet()){
+        for(Map.Entry<String, String> e: map.entrySet()){
-            con.put(e.getKey(), e.getValue());
+            con.put(e.getKey(), e.getValue());
-            //Log.d("Settings added", e.getKey() + " - " + e.getValue());
+            //Log.d("Settings added", e.getKey() + " - " + e.getValue());
-        }
+        }
-        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
+        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
-    }*/
+    }*/
-
+
-    public void insertSelDay(int _id, int day_sel) {
+    public void insertSelDay(int _id, int day_sel) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        con.put(SQLiteHelper._ID, _id);
+        con.put(SQLiteHelper._ID, _id);
-        con.put(SQLiteHelper.DAY_SEL, day_sel);
+        con.put(SQLiteHelper.DAY_SEL, day_sel);
-        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
+        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
-    }
+    }
-
+
-    public int update(int _id, int day_sel) {
+    public int update(int _id, int day_sel) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        con.put(SQLiteHelper.DAY_SEL, day_sel);
+        con.put(SQLiteHelper.DAY_SEL, day_sel);
-        return this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, SQLiteHelper._ID + " = " + _id, null);
+        return this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, SQLiteHelper._ID + " = " + _id, null);
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java

@@ -1,36 +1,36 @@
-package hu.filc.naplo.database;
+package hu.refilc.naplo.database;
-
+
-import android.content.Context;
+import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteOpenHelper;
-
+
-public class SQLiteHelper extends SQLiteOpenHelper {
+public class SQLiteHelper extends SQLiteOpenHelper {
-    private static final String CREATE_TABLE_WIDGET = " create table widgets ( _id INTEGER NOT NULL, day_sel INTEGER NOT NULL);";
+    private static final String CREATE_TABLE_WIDGET = " create table widgets ( _id INTEGER NOT NULL, day_sel INTEGER NOT NULL);";
-    private static final String DB_NAME = "app.db";
+    private static final String DB_NAME = "app.db";
-    private static final int DB_VERSION = 1;
+    private static final int DB_VERSION = 1;
-    public static final String _ID = "_id";
+    public static final String _ID = "_id";
-    public static final String DAY_SEL = "day_sel";
+    public static final String DAY_SEL = "day_sel";
-    public static final String TIMETABLE = "timetable";
+    public static final String TIMETABLE = "timetable";
-    public static final String LAST_ACCOUNT_ID = "last_account_id";
+    public static final String LAST_ACCOUNT_ID = "last_account_id";
-    public static final String THEME = "theme";
+    public static final String THEME = "theme";
-    public static final String PREMIUM_TOKEN = "premium_token";
+    public static final String PREMIUM_TOKEN = "premium_token";
-    public static final String PREMIUM_SCOPES = "premium_scopes";
+    public static final String PREMIUM_SCOPES = "premium_scopes";
-    public static final String LOCALE = "language";
+    public static final String LOCALE = "language";
-    public static final String ACCENT_COLOR = "accent_color";
+    public static final String ACCENT_COLOR = "accent_color";
-    public static final String TABLE_NAME_WIDGETS = "widgets";
+    public static final String TABLE_NAME_WIDGETS = "widgets";
-    public static final String TABLE_NAME_USER_DATA = "user_data";
+    public static final String TABLE_NAME_USER_DATA = "user_data";
-    public static final String TABLE_NAME_SETTINGS = "settings";
+    public static final String TABLE_NAME_SETTINGS = "settings";
-
+
-    public SQLiteHelper(Context context) {
+    public SQLiteHelper(Context context) {
-        super(context, DB_NAME, null, 7);
+        super(context, DB_NAME, null, 7);
-    }
+    }
-
+
-    public void onCreate(SQLiteDatabase db) {
+    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(CREATE_TABLE_WIDGET);
+        db.execSQL(CREATE_TABLE_WIDGET);
-    }
+    }
-
+
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        db.execSQL("DROP TABLE IF EXISTS widgets");
+        db.execSQL("DROP TABLE IF EXISTS widgets");
-        onCreate(db);
+        onCreate(db);
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java

@@ -1,36 +1,36 @@
-package hu.filc.naplo.utils;
+package hu.refilc.naplo.utils;
-
+
-import android.content.Context;
+import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
+import android.net.NetworkInfo;
-
+
-import java.util.Calendar;
+import java.util.Calendar;
-import java.util.Date;
+import java.util.Date;
-
+
-public class Utils {
+public class Utils {
-    public static boolean hasNetwork(Context context) {
+    public static boolean hasNetwork(Context context) {
-        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo netInfo = cm.getActiveNetworkInfo();
+        NetworkInfo netInfo = cm.getActiveNetworkInfo();
-        if (netInfo != null && netInfo.isConnectedOrConnecting()) {
+        if (netInfo != null && netInfo.isConnectedOrConnecting()) {
-            return true;
+            return true;
-        }
+        }
-        return false;
+        return false;
-    }
+    }
-
+
-    public static Date getWeekStartDate() {
+    public static Date getWeekStartDate() {
-        Calendar calendar = Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
-        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
-            calendar.add(Calendar.DATE, -1);
+            calendar.add(Calendar.DATE, -1);
-        }
+        }
-        return calendar.getTime();
+        return calendar.getTime();
-    }
+    }
-
+
-    public static Date getWeekEndDate() {
+    public static Date getWeekEndDate() {
-        Calendar calendar = Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
-        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
-            calendar.add(Calendar.DATE, 1);
+            calendar.add(Calendar.DATE, 1);
-        }
+        }
-        calendar.add(Calendar.DATE, -1);
+        calendar.add(Calendar.DATE, -1);
-        return calendar.getTime();
+        return calendar.getTime();
-    }
+    }
-}
+}

filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java

@@ -1,65 +1,65 @@
-package hu.filc.naplo.utils;
+package hu.refilc.naplo.utils;
-
+
-import java.time.DayOfWeek;
+import java.time.DayOfWeek;
-import java.time.Duration;
+import java.time.Duration;
-import java.time.LocalDate;
+import java.time.LocalDate;
-
+
-public class Week {
+public class Week {
-    private final LocalDate start;
+    private final LocalDate start;
-    private final LocalDate end;
+    private final LocalDate end;
-
+
-    private Week(LocalDate start, LocalDate end) {
+    private Week(LocalDate start, LocalDate end) {
-        this.start = start;
+        this.start = start;
-        this.end = end;
+        this.end = end;
-    }
+    }
-
+
-    public static Week current() {
+    public static Week current() {
-        return fromDate(LocalDate.now());
+        return fromDate(LocalDate.now());
-    }
+    }
-
+
-    public static Week fromId(int id) {
+    public static Week fromId(int id) {
-        LocalDate _now = getYearStart().plusDays(id * 7L);
+        LocalDate _now = getYearStart().plusDays(id * 7L);
-        return new Week(_now.minusDays(_now.getDayOfWeek().getValue() - 1), _now.plusDays(7 - _now.getDayOfWeek().getValue()));
+        return new Week(_now.minusDays(_now.getDayOfWeek().getValue() - 1), _now.plusDays(7 - _now.getDayOfWeek().getValue()));
-    }
+    }
-
+
-    public static Week fromDate(LocalDate date) {
+    public static Week fromDate(LocalDate date) {
-
+
-        return new Week(date.minusDays(date.getDayOfWeek().getValue() - 1), date.plusDays(7 - date.getDayOfWeek().getValue()));
+        return new Week(date.minusDays(date.getDayOfWeek().getValue() - 1), date.plusDays(7 - date.getDayOfWeek().getValue()));
-    }
+    }
-
+
-    public Week next() {
+    public Week next() {
-        return Week.fromDate(start.plusDays(8));
+        return Week.fromDate(start.plusDays(8));
-    }
+    }
-
+
-    public int id() {
+    public int id() {
-        return (int) Math.ceil(Duration.between(getYearStart().atStartOfDay(), start.atStartOfDay()).toDays() / 7f);
+        return (int) Math.ceil(Duration.between(getYearStart().atStartOfDay(), start.atStartOfDay()).toDays() / 7f);
-    }
+    }
-
+
-    private static LocalDate getYearStart() {
+    private static LocalDate getYearStart() {
-        LocalDate now = LocalDate.now();
+        LocalDate now = LocalDate.now();
-        LocalDate start = getYearStart(now.getYear());
+        LocalDate start = getYearStart(now.getYear());
-        return start.isBefore(now) ? start : getYearStart(now.getYear() -1);
+        return start.isBefore(now) ? start : getYearStart(now.getYear() -1);
-    }
+    }
-
+
-    private static LocalDate getYearStart(int year) {
+    private static LocalDate getYearStart(int year) {
-        LocalDate time = LocalDate.of(year, 9, 1);
+        LocalDate time = LocalDate.of(year, 9, 1);
-        if (time.getDayOfWeek() == DayOfWeek.SATURDAY)
+        if (time.getDayOfWeek() == DayOfWeek.SATURDAY)
-            return time.plusDays(2);
+            return time.plusDays(2);
-        else if (time.getDayOfWeek() == DayOfWeek.SUNDAY)
+        else if (time.getDayOfWeek() == DayOfWeek.SUNDAY)
-            return time.plusDays(1);
+            return time.plusDays(1);
-        return time;
+        return time;
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean equals(Object o) {
+    public boolean equals(Object o) {
-        if (this == o) return true;
+        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || getClass() != o.getClass()) return false;
-        Week week = (Week) o;
+        Week week = (Week) o;
-        return this.id() == week.id();
+        return this.id() == week.id();
-    }
+    }
-
+
-    @Override
+    @Override
-    public int hashCode() {
+    public int hashCode() {
-        return id();
+        return id();
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java

@@ -1,397 +1,397 @@
-package hu.filc.naplo.widget_timetable;
+package hu.refilc.naplo.widget_timetable;
-
+
-import android.app.PendingIntent;
+import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
+import android.appwidget.AppWidgetProvider;
-import android.content.Context;
+import android.content.Context;
-import android.content.Intent;
+import android.content.Intent;
-import android.content.SharedPreferences;
+import android.content.SharedPreferences;
-import android.database.Cursor;
+import android.database.Cursor;
-import android.net.Uri;
+import android.net.Uri;
-import android.os.Build;
+import android.os.Build;
-import android.util.Log;
+import android.util.Log;
-import android.view.View;
+import android.view.View;
-import android.widget.RemoteViews;
+import android.widget.RemoteViews;
-import android.widget.Toast;
+import android.widget.Toast;
-
+
-import org.joda.time.DateTime;
+import org.joda.time.DateTime;
-import org.json.JSONArray;
+import org.json.JSONArray;
-import org.json.JSONException;
+import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.JSONObject;
-
+
-import java.time.DayOfWeek;
+import java.time.DayOfWeek;
-import java.time.format.TextStyle;
+import java.time.format.TextStyle;
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collections;
-import java.util.Comparator;
+import java.util.Comparator;
-import java.util.List;
+import java.util.List;
-import java.util.Locale;
+import java.util.Locale;
-
+
-import hu.filc.naplo.database.DBManager;
+import hu.refilc.naplo.database.DBManager;
-import hu.filc.naplo.MainActivity;
+import hu.refilc.naplo.MainActivity;
-import hu.filc.naplo.R;
+import hu.refilc.naplo.R;
-
+
-import hu.filc.naplo.utils.Week;
+import hu.refilc.naplo.utils.Week;
-
+
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
+import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-
+
-import es.antonborri.home_widget.HomeWidgetBackgroundIntent;
+import es.antonborri.home_widget.HomeWidgetBackgroundIntent;
-import es.antonborri.home_widget.HomeWidgetLaunchIntent;
+import es.antonborri.home_widget.HomeWidgetLaunchIntent;
-import es.antonborri.home_widget.HomeWidgetProvider;
+import es.antonborri.home_widget.HomeWidgetProvider;
-
+
-public class WidgetTimetable extends HomeWidgetProvider {
+public class WidgetTimetable extends HomeWidgetProvider {
-
+
-    private static final String ACTION_WIDGET_CLICK_NAV_LEFT = "list_widget.ACTION_WIDGET_CLICK_NAV_LEFT";
+    private static final String ACTION_WIDGET_CLICK_NAV_LEFT = "list_widget.ACTION_WIDGET_CLICK_NAV_LEFT";
-    private static final String ACTION_WIDGET_CLICK_NAV_RIGHT = "list_widget.ACTION_WIDGET_CLICK_NAV_RIGHT";
+    private static final String ACTION_WIDGET_CLICK_NAV_RIGHT = "list_widget.ACTION_WIDGET_CLICK_NAV_RIGHT";
-    private static final String ACTION_WIDGET_CLICK_NAV_TODAY = "list_widget.ACTION_WIDGET_CLICK_NAV_TODAY";
+    private static final String ACTION_WIDGET_CLICK_NAV_TODAY = "list_widget.ACTION_WIDGET_CLICK_NAV_TODAY";
-    private static final String ACTION_WIDGET_CLICK_NAV_REFRESH = "list_widget.ACTION_WIDGET_CLICK_NAV_REFRESH";
+    private static final String ACTION_WIDGET_CLICK_NAV_REFRESH = "list_widget.ACTION_WIDGET_CLICK_NAV_REFRESH";
-    private static final String ACTION_WIDGET_CLICK_BUY_PREMIUM = "list_widget.ACTION_WIDGET_CLICK_BUY_PREMIUM";
+    private static final String ACTION_WIDGET_CLICK_BUY_PREMIUM = "list_widget.ACTION_WIDGET_CLICK_BUY_PREMIUM";
-
+
-    @Override
+    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, SharedPreferences widgetData) {
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, SharedPreferences widgetData) {
-        for (int i = 0; i < appWidgetIds.length; i++) {
+        for (int i = 0; i < appWidgetIds.length; i++) {
-            RemoteViews views = generateView(context, appWidgetIds[i]);
+            RemoteViews views = generateView(context, appWidgetIds[i]);
-
+
-            if(premiumEnabled(context) && userLoggedIn(context)) {
+            if(premiumEnabled(context) && userLoggedIn(context)) {
-                int rday = selectDay(context, appWidgetIds[i], 0, true);
+                int rday = selectDay(context, appWidgetIds[i], 0, true);
-                views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+                views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-            }
+            }
-
+
-            pushUpdate(context, views, appWidgetIds[i]);
+            pushUpdate(context, views, appWidgetIds[i]);
-        }
+        }
-    }
+    }
-
+
-    public static void pushUpdate(Context context, RemoteViews remoteViews, int appWidgetSingleId) {
+    public static void pushUpdate(Context context, RemoteViews remoteViews, int appWidgetSingleId) {
-        AppWidgetManager manager = AppWidgetManager.getInstance(context);
+        AppWidgetManager manager = AppWidgetManager.getInstance(context);
-
+
-        manager.updateAppWidget(appWidgetSingleId, remoteViews);
+        manager.updateAppWidget(appWidgetSingleId, remoteViews);
-        manager.notifyAppWidgetViewDataChanged(appWidgetSingleId, R.id.widget_list);
+        manager.notifyAppWidgetViewDataChanged(appWidgetSingleId, R.id.widget_list);
-    }
+    }
-
+
-    public static RemoteViews generateView(Context context, int appId) {
+    public static RemoteViews generateView(Context context, int appId) {
-        Intent serviceIntent = new Intent(context, WidgetTimetableService.class);
+        Intent serviceIntent = new Intent(context, WidgetTimetableService.class);
-        serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appId);
+        serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appId);
-        serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
+        serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
-
+
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_timetable);
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_timetable);
-
+
-        views.setViewVisibility(R.id.need_premium, View.GONE);
+        views.setViewVisibility(R.id.need_premium, View.GONE);
-        views.setViewVisibility(R.id.need_login, View.GONE);
+        views.setViewVisibility(R.id.need_login, View.GONE);
-        views.setViewVisibility(R.id.tt_grid_cont, View.GONE);
+        views.setViewVisibility(R.id.tt_grid_cont, View.GONE);
-
+
-        if(!userLoggedIn(context)) {
+        if(!userLoggedIn(context)) {
-            views.setViewVisibility(R.id.need_login, View.VISIBLE);
+            views.setViewVisibility(R.id.need_login, View.VISIBLE);
-            views.setOnClickPendingIntent(R.id.open_login, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
+            views.setOnClickPendingIntent(R.id.open_login, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
-        } else if(premiumEnabled(context)) {
+        } else if(premiumEnabled(context)) {
-            views.setViewVisibility(R.id.tt_grid_cont, View.VISIBLE);
+            views.setViewVisibility(R.id.tt_grid_cont, View.VISIBLE);
-            views.setOnClickPendingIntent(R.id.nav_to_left, makePending(context, ACTION_WIDGET_CLICK_NAV_LEFT, appId));
+            views.setOnClickPendingIntent(R.id.nav_to_left, makePending(context, ACTION_WIDGET_CLICK_NAV_LEFT, appId));
-            views.setOnClickPendingIntent(R.id.nav_to_right, makePending(context, ACTION_WIDGET_CLICK_NAV_RIGHT, appId));
+            views.setOnClickPendingIntent(R.id.nav_to_right, makePending(context, ACTION_WIDGET_CLICK_NAV_RIGHT, appId));
-            views.setOnClickPendingIntent(R.id.nav_current, makePending(context, ACTION_WIDGET_CLICK_NAV_TODAY, appId));
+            views.setOnClickPendingIntent(R.id.nav_current, makePending(context, ACTION_WIDGET_CLICK_NAV_TODAY, appId));
-            views.setOnClickPendingIntent(R.id.nav_refresh, makePending(context, ACTION_WIDGET_CLICK_NAV_REFRESH, appId));
+            views.setOnClickPendingIntent(R.id.nav_refresh, makePending(context, ACTION_WIDGET_CLICK_NAV_REFRESH, appId));
-            views.setRemoteAdapter(R.id.widget_list, serviceIntent);
+            views.setRemoteAdapter(R.id.widget_list, serviceIntent);
-            views.setEmptyView(R.id.widget_list, R.id.empty_view);
+            views.setEmptyView(R.id.widget_list, R.id.empty_view);
-        } else  {
+        } else  {
-            views.setViewVisibility(R.id.need_premium, View.VISIBLE);
+            views.setViewVisibility(R.id.need_premium, View.VISIBLE);
-            views.setOnClickPendingIntent(R.id.buy_premium, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
+            views.setOnClickPendingIntent(R.id.buy_premium, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
-        }
+        }
-
+
-        return views;
+        return views;
-    }
+    }
-
+
-    static PendingIntent makePending(Context context, String action, int appWidgetId) {
+    static PendingIntent makePending(Context context, String action, int appWidgetId) {
-        Intent activebtnnext = new Intent(context, WidgetTimetable.class);
+        Intent activebtnnext = new Intent(context, WidgetTimetable.class);
-        activebtnnext.setAction(action);
+        activebtnnext.setAction(action);
-        activebtnnext.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        activebtnnext.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        return PendingIntent.getBroadcast(context, appWidgetId, activebtnnext , PendingIntent.FLAG_IMMUTABLE);
+        return PendingIntent.getBroadcast(context, appWidgetId, activebtnnext , PendingIntent.FLAG_IMMUTABLE);
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onReceive(Context context, Intent intent) {
+    public void onReceive(Context context, Intent intent) {
-        super.onReceive(context, intent);
+        super.onReceive(context, intent);
-
+
-        if(intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
+        if(intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
-            int appId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+            int appId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-            RemoteViews views = generateView(context, appId);
+            RemoteViews views = generateView(context, appId);
-
+
-            try {
+            try {
-                if(premiumEnabled(context) && userLoggedIn(context)) {
+                if(premiumEnabled(context) && userLoggedIn(context)) {
-                    if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_LEFT)) {
+                    if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_LEFT)) {
-                        int rday = selectDay(context, appId, -1, false);
+                        int rday = selectDay(context, appId, -1, false);
-                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-
+
-                        pushUpdate(context, views, appId);
+                        pushUpdate(context, views, appId);
-                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_RIGHT)) {
+                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_RIGHT)) {
-                        int rday = selectDay(context, appId, 1, false);
+                        int rday = selectDay(context, appId, 1, false);
-                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-
+
-                        pushUpdate(context, views, appId);
+                        pushUpdate(context, views, appId);
-                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_TODAY)) {
+                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_TODAY)) {
-                        int rday = getToday(context);
+                        int rday = getToday(context);
-                        setSelectedDay(context, appId, rday);
+                        setSelectedDay(context, appId, rday);
-
+
-                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-
+
-                        pushUpdate(context, views, appId);
+                        pushUpdate(context, views, appId);
-                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_REFRESH)) {
+                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_REFRESH)) {
-                        PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("timetable://refresh"));
+                        PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("timetable://refresh"));
-                        pendingIntent.send();
+                        pendingIntent.send();
-                    } else if (intent.getAction().equals("android.appwidget.action.APPWIDGET_DELETED")) {
+                    } else if (intent.getAction().equals("android.appwidget.action.APPWIDGET_DELETED")) {
-                        DBManager dbManager = new DBManager(context.getApplicationContext());
+                        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-                        try {
+                        try {
-                            dbManager.open();
+                            dbManager.open();
-                            dbManager.deleteWidget(appId);
+                            dbManager.deleteWidget(appId);
-                            dbManager.close();
+                            dbManager.close();
-                        } catch (Exception e) {
+                        } catch (Exception e) {
-                            e.printStackTrace();
+                            e.printStackTrace();
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-
+
-                if(intent.getAction().equals(ACTION_WIDGET_CLICK_BUY_PREMIUM)) {
+                if(intent.getAction().equals(ACTION_WIDGET_CLICK_BUY_PREMIUM)) {
-                    PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("settings://premium"));
+                    PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("settings://premium"));
-                    pendingIntent.send();
+                    pendingIntent.send();
-                }
+                }
-            }
+            }
-            catch (Exception e) {
+            catch (Exception e) {
-                e.printStackTrace();
+                e.printStackTrace();
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    public static String convertDayOfWeek(Context context, int rday) {
+    public static String convertDayOfWeek(Context context, int rday) {
-
+
-        /*if(rday == -1) return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));
+        /*if(rday == -1) return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));
-
+
-        String dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));*/
+        String dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));*/
-
+
-        String dayOfWeek = "Unknown";
+        String dayOfWeek = "Unknown";
-
+
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            Locale loc = getLocale(context);
+            Locale loc = getLocale(context);
-
+
-            if (rday == -1)
+            if (rday == -1)
-                return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, loc);
+                return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, loc);
-
+
-            dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, loc);
+            dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, loc);
-        }
+        }
-
+
-        return dayOfWeek.substring(0, 1).toUpperCase() + dayOfWeek.substring(1).toLowerCase();
+        return dayOfWeek.substring(0, 1).toUpperCase() + dayOfWeek.substring(1).toLowerCase();
-    }
+    }
-
+
-    public static void setSelectedDay(Context context, int wid, int day) {
+    public static void setSelectedDay(Context context, int wid, int day) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            dbManager.update(wid, day);
+            dbManager.update(wid, day);
-            dbManager.close();
+            dbManager.close();
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-    }
+    }
-
+
-    public static int getToday(Context context) {
+    public static int getToday(Context context) {
-        int rday = new DateTime().getDayOfWeek() - 1;
+        int rday = new DateTime().getDayOfWeek() - 1;
-        List<JSONArray> s = genJsonDays(context);
+        List<JSONArray> s = genJsonDays(context);
-
+
-        try {
+        try {
-            if(checkIsAfter(s, rday)) rday += 1;
+            if(checkIsAfter(s, rday)) rday += 1;
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-        return retDay(rday, s.size());
+        return retDay(rday, s.size());
-    }
+    }
-
+
-    public static int selectDay(Context context, int wid, int add, Boolean afterSubjects) {
+    public static int selectDay(Context context, int wid, int add, Boolean afterSubjects) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            Cursor cursor = dbManager.fetchWidget(wid);
+            Cursor cursor = dbManager.fetchWidget(wid);
-
+
-            List<JSONArray> s = genJsonDays(context);
+            List<JSONArray> s = genJsonDays(context);
-            int retday = new DateTime().getDayOfWeek() - 1;
+            int retday = new DateTime().getDayOfWeek() - 1;
-
+
-            if(cursor.getCount() != 0) retday = retDay(cursor.getInt(1) + add, s.size());
+            if(cursor.getCount() != 0) retday = retDay(cursor.getInt(1) + add, s.size());
-
+
-            if(afterSubjects) if(checkIsAfter(s, retday)) retday += 1;
+            if(afterSubjects) if(checkIsAfter(s, retday)) retday += 1;
-            retday = retDay(retday, s.size());
+            retday = retDay(retday, s.size());
-
+
-            if(cursor.getCount() == 0) dbManager.insertSelDay(wid, retday);
+            if(cursor.getCount() == 0) dbManager.insertSelDay(wid, retday);
-            else dbManager.update(wid, retday);
+            else dbManager.update(wid, retday);
-
+
-            dbManager.close();
+            dbManager.close();
-
+
-            return retday;
+            return retday;
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return 0;
+        return 0;
-    }
+    }
-
+
-    public static Boolean checkIsAfter(List<JSONArray> s, int retday) throws Exception {
+    public static Boolean checkIsAfter(List<JSONArray> s, int retday) throws Exception {
-        retday = retDay(retday, s.size());
+        retday = retDay(retday, s.size());
-
+
-        String vegIdopont = s.get(retday).getJSONObject(s.get(retday).length() - 1).getString("VegIdopont");
+        String vegIdopont = s.get(retday).getJSONObject(s.get(retday).length() - 1).getString("VegIdopont");
-
+
-        return new DateTime().isAfter(new DateTime(vegIdopont));
+        return new DateTime().isAfter(new DateTime(vegIdopont));
-    }
+    }
-
+
-    public static int retDay(int retday, int size) {
+    public static int retDay(int retday, int size) {
-        if (retday < 0) retday = size - 1;
+        if (retday < 0) retday = size - 1;
-        else if (retday > size - 1) retday = 0;
+        else if (retday > size - 1) retday = 0;
-
+
-        return retday;
+        return retday;
-    }
+    }
-
+
-    public static List<JSONArray> genJsonDays(Context context) {
+    public static List<JSONArray> genJsonDays(Context context) {
-        List<JSONArray> gen_days = new ArrayList<>();
+        List<JSONArray> gen_days = new ArrayList<>();
-
+
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            Cursor ct = dbManager.fetchTimetable();
+            Cursor ct = dbManager.fetchTimetable();
-            dbManager.close();
+            dbManager.close();
-
+
-            if(ct.getCount() == 0) {
+            if(ct.getCount() == 0) {
-                return gen_days;
+                return gen_days;
-            }
+            }
-
+
-            JSONObject fecthtt = new JSONObject(ct.getString(0));
+            JSONObject fecthtt = new JSONObject(ct.getString(0));
-
+
-            JSONArray dayArray = new JSONArray();
+            JSONArray dayArray = new JSONArray();
-            String currday = "";
+            String currday = "";
-
+
-            String currweek = String.valueOf(Week.current().id());
+            String currweek = String.valueOf(Week.current().id());
-
+
-            JSONArray week = fecthtt.getJSONArray(currweek);
+            JSONArray week = fecthtt.getJSONArray(currweek);
-
+
-            for (int i=0; i < week.length(); i++)
+            for (int i=0; i < week.length(); i++)
-            {
+            {
-                try {
+                try {
-                    if(i == 0) currday = week.getJSONObject(0).getString("Datum");
+                    if(i == 0) currday = week.getJSONObject(0).getString("Datum");
-                    JSONObject oraObj = week.getJSONObject(i);
+                    JSONObject oraObj = week.getJSONObject(i);
-
+
-                    if(!currday.equals(oraObj.getString("Datum"))) {
+                    if(!currday.equals(oraObj.getString("Datum"))) {
-                        gen_days.add(dayArray);
+                        gen_days.add(dayArray);
-                        currday = week.getJSONObject(i).getString("Datum");
+                        currday = week.getJSONObject(i).getString("Datum");
-                        dayArray = new JSONArray();
+                        dayArray = new JSONArray();
-                    }
+                    }
-
+
-                    dayArray.put(oraObj);
+                    dayArray.put(oraObj);
-                    if(i == week.length() - 1) {
+                    if(i == week.length() - 1) {
-                        gen_days.add(dayArray);
+                        gen_days.add(dayArray);
-                    }
+                    }
-                } catch (Exception e) {
+                } catch (Exception e) {
-                    e.printStackTrace();
+                    e.printStackTrace();
-                }
+                }
-            }
+            }
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        Collections.sort(gen_days, new Comparator<JSONArray>() {
+        Collections.sort(gen_days, new Comparator<JSONArray>() {
-
+
-            public int compare(JSONArray a, JSONArray b) {
+            public int compare(JSONArray a, JSONArray b) {
-                long valA = 0;
+                long valA = 0;
-                long valB = 0;
+                long valB = 0;
-
+
-                try {
+                try {
-                    valA = (long) new DateTime( a.getJSONObject(0).getString("Datum")).getMillis();
+                    valA = (long) new DateTime( a.getJSONObject(0).getString("Datum")).getMillis();
-                    valB = (long) new DateTime( b.getJSONObject(0).getString("Datum")).getMillis();
+                    valB = (long) new DateTime( b.getJSONObject(0).getString("Datum")).getMillis();
-                }
+                }
-                catch (JSONException ignored) {
+                catch (JSONException ignored) {
-                }
+                }
-
+
-                return (int) (valA - valB);
+                return (int) (valA - valB);
-            }
+            }
-        });
+        });
-
+
-        return gen_days;
+        return gen_days;
-    }
+    }
-
+
-    public static String zeroPad(int value, int padding){
+    public static String zeroPad(int value, int padding){
-        StringBuilder b = new StringBuilder();
+        StringBuilder b = new StringBuilder();
-        b.append(value);
+        b.append(value);
-        while(b.length() < padding){
+        while(b.length() < padding){
-            b.insert(0,"0");
+            b.insert(0,"0");
-        }
+        }
-        return b.toString();
+        return b.toString();
-    }
+    }
-
+
-    public static Locale getLocale(Context context) {
+    public static Locale getLocale(Context context) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            String loc = dbManager.fetchLocale().getString(0);
+            String loc = dbManager.fetchLocale().getString(0);
-            dbManager.close();
+            dbManager.close();
-
+
-            if(loc.equals("hu") || loc.equals("de")) {
+            if(loc.equals("hu") || loc.equals("de")) {
-                return new Locale(loc, loc.toUpperCase());
+                return new Locale(loc, loc.toUpperCase());
-            }
+            }
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return new Locale("en", "GB");
+        return new Locale("en", "GB");
-    }
+    }
-
+
-    public static boolean premiumEnabled(Context context) {
+    public static boolean premiumEnabled(Context context) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            String premium_token = dbManager.fetchPremiumToken().getString(0);
+            String premium_token = dbManager.fetchPremiumToken().getString(0);
-            String premium_scopes_raw = dbManager.fetchPremiumScopes().getString(0);
+            String premium_scopes_raw = dbManager.fetchPremiumScopes().getString(0);
-            dbManager.close();
+            dbManager.close();
-
+
-            JSONArray arr = new JSONArray(premium_scopes_raw);
+            JSONArray arr = new JSONArray(premium_scopes_raw);
-            List<String> premium_scopes = new ArrayList<>();
+            List<String> premium_scopes = new ArrayList<>();
-            for(int i = 0; i < arr.length(); i++){
+            for(int i = 0; i < arr.length(); i++){
-                String scope = arr.getString(i);
+                String scope = arr.getString(i);
-                premium_scopes.add(scope.substring(scope.lastIndexOf('.')  + 1));
+                premium_scopes.add(scope.substring(scope.lastIndexOf('.')  + 1));
-            }
+            }
-
+
-            if(!premium_token.equals("") && (premium_scopes.contains("*") || premium_scopes.contains("TIMETALBE_WIDGET"))) {
+            if(!premium_token.equals("") && (premium_scopes.contains("*") || premium_scopes.contains("TIMETALBE_WIDGET"))) {
-                return true;
+                return true;
-            }
+            }
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return false;
+        return false;
-    }
+    }
-
+
-    public static boolean userLoggedIn(Context context) {
+    public static boolean userLoggedIn(Context context) {
-        return !lastUserId(context).equals("");
+        return !lastUserId(context).equals("");
-    }
+    }
-
+
-    public static String lastUserId(Context context) {
+    public static String lastUserId(Context context) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            Cursor cursor = dbManager.fetchLastUser();
+            Cursor cursor = dbManager.fetchLastUser();
-            dbManager.close();
+            dbManager.close();
-
+
-            if(cursor != null && !cursor.getString(0).equals("")) {
+            if(cursor != null && !cursor.getString(0).equals("")) {
-                String last_user = cursor.getString(0);
+                String last_user = cursor.getString(0);
-                return last_user;
+                return last_user;
-            }
+            }
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return "";
+        return "";
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onEnabled(Context context) {
+    public void onEnabled(Context context) {
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onDisabled(Context context) {
+    public void onDisabled(Context context) {
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java

@@ -1,354 +1,354 @@
-package hu.filc.naplo.widget_timetable;
+package hu.refilc.naplo.widget_timetable;
-
+
-import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetManager;
-import android.content.Context;
+import android.content.Context;
-import android.content.Intent;
+import android.content.Intent;
-import android.database.Cursor;
+import android.database.Cursor;
-import android.os.Build;
+import android.os.Build;
-import android.util.Log;
+import android.util.Log;
-import android.view.View;
+import android.view.View;
-import android.widget.RemoteViews;
+import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
+import android.widget.RemoteViewsService;
-
+
-import org.joda.time.DateTime;
+import org.joda.time.DateTime;
-import org.json.JSONArray;
+import org.json.JSONArray;
-import org.json.JSONException;
+import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.JSONObject;
-
+
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collections;
-import java.util.Comparator;
+import java.util.Comparator;
-import java.util.List;
+import java.util.List;
-
+
-import hu.filc.naplo.database.DBManager;
+import hu.refilc.naplo.database.DBManager;
-import hu.filc.naplo.R;
+import hu.refilc.naplo.R;
-
+
-public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteViewsFactory {
+public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteViewsFactory {
-
+
-    private Context context;
+    private Context context;
-    private int appWidgetId;
+    private int appWidgetId;
-
+
-    private int rday = 0;
+    private int rday = 0;
-
+
-    private int theme;
+    private int theme;
-
+
-    private Integer[] colorValues;
+    private Integer[] colorValues;
-
+
-    List<Lesson> day_subjects = new ArrayList<>();
+    List<Lesson> day_subjects = new ArrayList<>();
-    List<Integer> lessonIndexes = new ArrayList<>();
+    List<Integer> lessonIndexes = new ArrayList<>();
-
+
-    Item witem;
+    Item witem;
-
+
-    /* Default values */
+    /* Default values */
-
+
-    static class Item {
+    static class Item {
-        int Layout;
+        int Layout;
-
+
-        int NumVisibility;
+        int NumVisibility;
-        int NameVisibility;
+        int NameVisibility;
-        int NameNodescVisibility;
+        int NameNodescVisibility;
-        int DescVisibility;
+        int DescVisibility;
-        int RoomVisibility;
+        int RoomVisibility;
-        int TimeVisibility;
+        int TimeVisibility;
-
+
-        int NumColor;
+        int NumColor;
-        int NameColor;
+        int NameColor;
-        int NameNodescColor;
+        int NameNodescColor;
-        int DescColor;
+        int DescColor;
-
+
-        Integer[] NameNodescPadding = {0, 0, 0, 0};
+        Integer[] NameNodescPadding = {0, 0, 0, 0};
-
+
-        public Item(int Layout, int NumVisibility,int NameVisibility,int NameNodescVisibility,int DescVisibility,int RoomVisibility,int TimeVisibility,int NumColor,int NameColor,int NameNodescColor,int DescColor) {
+        public Item(int Layout, int NumVisibility,int NameVisibility,int NameNodescVisibility,int DescVisibility,int RoomVisibility,int TimeVisibility,int NumColor,int NameColor,int NameNodescColor,int DescColor) {
-            this.Layout = Layout;
+            this.Layout = Layout;
-            this.NumVisibility = NumVisibility;
+            this.NumVisibility = NumVisibility;
-            this.NameVisibility = NameVisibility;
+            this.NameVisibility = NameVisibility;
-            this.NameNodescVisibility = NameNodescVisibility;
+            this.NameNodescVisibility = NameNodescVisibility;
-            this.DescVisibility = DescVisibility;
+            this.DescVisibility = DescVisibility;
-            this.RoomVisibility = RoomVisibility;
+            this.RoomVisibility = RoomVisibility;
-            this.TimeVisibility = TimeVisibility;
+            this.TimeVisibility = TimeVisibility;
-
+
-            this.NumColor = NumColor;
+            this.NumColor = NumColor;
-            this.NameColor = NameColor;
+            this.NameColor = NameColor;
-            this.NameNodescColor = NameNodescColor;
+            this.NameNodescColor = NameNodescColor;
-            this.DescColor = DescColor;
+            this.DescColor = DescColor;
-        }
+        }
-    }
+    }
-
+
-    static class Lesson {
+    static class Lesson {
-        String status;
+        String status;
-        String lessonIndex;
+        String lessonIndex;
-        String lessonName;
+        String lessonName;
-        String lessonTopic;
+        String lessonTopic;
-        String lessonRoom;
+        String lessonRoom;
-        long lessonStart;
+        long lessonStart;
-        long lessonEnd;
+        long lessonEnd;
-        String substituteTeacher;
+        String substituteTeacher;
-
+
-        public Lesson(String status, String lessonIndex,String lessonName,String lessonTopic, String lessonRoom,long lessonStart,long lessonEnd,String substituteTeacher) {
+        public Lesson(String status, String lessonIndex,String lessonName,String lessonTopic, String lessonRoom,long lessonStart,long lessonEnd,String substituteTeacher) {
-            this.status = status;
+            this.status = status;
-            this.lessonIndex = lessonIndex;
+            this.lessonIndex = lessonIndex;
-            this.lessonName = lessonName;
+            this.lessonName = lessonName;
-            this.lessonTopic = lessonTopic;
+            this.lessonTopic = lessonTopic;
-            this.lessonRoom = lessonRoom;
+            this.lessonRoom = lessonRoom;
-            this.lessonStart = lessonStart;
+            this.lessonStart = lessonStart;
-            this.lessonEnd = lessonEnd;
+            this.lessonEnd = lessonEnd;
-            this.substituteTeacher = substituteTeacher;
+            this.substituteTeacher = substituteTeacher;
-        }
+        }
-    }
+    }
-
+
-    Integer[] itemNameNodescPadding = {0, 0, 0, 0};
+    Integer[] itemNameNodescPadding = {0, 0, 0, 0};
-
+
-    public WidgetTimetableDataProvider(Context context, Intent intent) {
+    public WidgetTimetableDataProvider(Context context, Intent intent) {
-        this.context = context;
+        this.context = context;
-        this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+        this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-
+
-        this.theme = getThemeAccent(context);
+        this.theme = getThemeAccent(context);
-
+
-        this.colorValues = new Integer[]{R.color.filc,
+        this.colorValues = new Integer[]{R.color.filc,
-                R.color.blue_shade300,
+                R.color.blue_shade300,
-                R.color.green_shade300,
+                R.color.green_shade300,
-                R.color.lime_shade300,
+                R.color.lime_shade300,
-                R.color.yellow_shade300,
+                R.color.yellow_shade300,
-                R.color.orange_shade300,
+                R.color.orange_shade300,
-                R.color.red_shade300,
+                R.color.red_shade300,
-                R.color.pink_shade300,
+                R.color.pink_shade300,
-                R.color.purple_shade300};
+                R.color.purple_shade300};
-
+
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onCreate() {
+    public void onCreate() {
-        initData();
+        initData();
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onDataSetChanged() {
+    public void onDataSetChanged() {
-        initData();
+        initData();
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onDestroy() {
+    public void onDestroy() {
-
+
-    }
+    }
-
+
-    @Override
+    @Override
-    public int getCount() {
+    public int getCount() {
-
+
-        return day_subjects.size();
+        return day_subjects.size();
-    }
+    }
-
+
-    public void setLayout(final RemoteViews view) {
+    public void setLayout(final RemoteViews view) {
-        /* Visibilities */
+        /* Visibilities */
-        view.setViewVisibility(R.id.tt_item_num, witem.NumVisibility);
+        view.setViewVisibility(R.id.tt_item_num, witem.NumVisibility);
-        view.setViewVisibility(R.id.tt_item_name, witem.NameVisibility);
+        view.setViewVisibility(R.id.tt_item_name, witem.NameVisibility);
-        view.setViewVisibility(R.id.tt_item_name_nodesc, witem.NameNodescVisibility);
+        view.setViewVisibility(R.id.tt_item_name_nodesc, witem.NameNodescVisibility);
-        view.setViewVisibility(R.id.tt_item_desc, witem.DescVisibility);
+        view.setViewVisibility(R.id.tt_item_desc, witem.DescVisibility);
-        view.setViewVisibility(R.id.tt_item_room, witem.RoomVisibility);
+        view.setViewVisibility(R.id.tt_item_room, witem.RoomVisibility);
-        view.setViewVisibility(R.id.tt_item_time, witem.TimeVisibility);
+        view.setViewVisibility(R.id.tt_item_time, witem.TimeVisibility);
-
+
-        /* backgroundResources */
+        /* backgroundResources */
-        view.setInt(R.id.main_lay, "setBackgroundResource", witem.Layout);
+        view.setInt(R.id.main_lay, "setBackgroundResource", witem.Layout);
-
+
-        /* Paddings */
+        /* Paddings */
-        view.setViewPadding(R.id.tt_item_name_nodesc, witem.NameNodescPadding[0], witem.NameNodescPadding[1], witem.NameNodescPadding[2], witem.NameNodescPadding[3]);
+        view.setViewPadding(R.id.tt_item_name_nodesc, witem.NameNodescPadding[0], witem.NameNodescPadding[1], witem.NameNodescPadding[2], witem.NameNodescPadding[3]);
-
+
-        /* Text Colors */
+        /* Text Colors */
-        view.setInt(R.id.tt_item_num, "setTextColor", getColor(context, witem.NumColor));
+        view.setInt(R.id.tt_item_num, "setTextColor", getColor(context, witem.NumColor));
-        view.setInt(R.id.tt_item_name, "setTextColor",  getColor(context, witem.NameColor));
+        view.setInt(R.id.tt_item_name, "setTextColor",  getColor(context, witem.NameColor));
-        view.setInt(R.id.tt_item_name_nodesc, "setTextColor",  getColor(context, witem.NameNodescColor));
+        view.setInt(R.id.tt_item_name_nodesc, "setTextColor",  getColor(context, witem.NameNodescColor));
-        view.setInt(R.id.tt_item_desc, "setTextColor",  getColor(context, witem.DescColor));
+        view.setInt(R.id.tt_item_desc, "setTextColor",  getColor(context, witem.DescColor));
-    }
+    }
-
+
-    public int getColor(Context context, int color) {
+    public int getColor(Context context, int color) {
-        return context.getResources().getColor(color);
+        return context.getResources().getColor(color);
-    }
+    }
-
+
-    @Override
+    @Override
-    public RemoteViews getViewAt(int position) {
+    public RemoteViews getViewAt(int position) {
-        RemoteViews view = new RemoteViews(context.getPackageName(), R.layout.timetable_item);
+        RemoteViews view = new RemoteViews(context.getPackageName(), R.layout.timetable_item);
-
+
-        witem = defaultItem(theme);
+        witem = defaultItem(theme);
-
+
-        Lesson curr_subject = day_subjects.get(position);
+        Lesson curr_subject = day_subjects.get(position);
-
+
-        if (curr_subject.status.equals("empty")) {
+        if (curr_subject.status.equals("empty")) {
-            witem.NumColor = R.color.text_miss_num;
+            witem.NumColor = R.color.text_miss_num;
-
+
-            witem.TimeVisibility = View.GONE;
+            witem.TimeVisibility = View.GONE;
-            witem.RoomVisibility = View.GONE;
+            witem.RoomVisibility = View.GONE;
-
+
-            witem.NameNodescColor = R.color.text_miss;
+            witem.NameNodescColor = R.color.text_miss;
-        }
+        }
-
+
-        if (!curr_subject.substituteTeacher.equals("null")) {
+        if (!curr_subject.substituteTeacher.equals("null")) {
-            witem.NumColor = R.color.yellow;
+            witem.NumColor = R.color.yellow;
-            witem.Layout = R.drawable.card_layout_tile_helyetesitett;
+            witem.Layout = R.drawable.card_layout_tile_helyetesitett;
-        }
+        }
-
+
-        if (curr_subject.status.equals("Elmaradt")) {
+        if (curr_subject.status.equals("Elmaradt")) {
-            witem.NumColor = R.color.red;
+            witem.NumColor = R.color.red;
-            witem.Layout = R.drawable.card_layout_tile_elmarad;
+            witem.Layout = R.drawable.card_layout_tile_elmarad;
-        } else if (curr_subject.status.equals("TanevRendjeEsemeny")) {
+        } else if (curr_subject.status.equals("TanevRendjeEsemeny")) {
-            witem.NumVisibility = View.GONE;
+            witem.NumVisibility = View.GONE;
-            witem.TimeVisibility = View.GONE;
+            witem.TimeVisibility = View.GONE;
-            witem.RoomVisibility = View.GONE;
+            witem.RoomVisibility = View.GONE;
-
+
-            witem.NameNodescPadding[0] = 50;
+            witem.NameNodescPadding[0] = 50;
-            witem.NameNodescPadding[2] = 50;
+            witem.NameNodescPadding[2] = 50;
-
+
-            witem.NameNodescColor = R.color.text_miss;
+            witem.NameNodescColor = R.color.text_miss;
-        }
+        }
-
+
-        if (curr_subject.lessonTopic.equals("null")) {
+        if (curr_subject.lessonTopic.equals("null")) {
-            witem.DescVisibility = View.GONE;
+            witem.DescVisibility = View.GONE;
-            witem.NameVisibility = View.GONE;
+            witem.NameVisibility = View.GONE;
-
+
-            witem.NameNodescVisibility = View.VISIBLE;
+            witem.NameNodescVisibility = View.VISIBLE;
-        }
+        }
-
+
-        setLayout(view);
+        setLayout(view);
-
+
-        String lessonIndexTrailing = curr_subject.lessonIndex.equals("+") ? "" : ".";
+        String lessonIndexTrailing = curr_subject.lessonIndex.equals("+") ? "" : ".";
-
+
-        view.setTextViewText(R.id.tt_item_num, curr_subject.lessonIndex + lessonIndexTrailing);
+        view.setTextViewText(R.id.tt_item_num, curr_subject.lessonIndex + lessonIndexTrailing);
-        view.setTextViewText(R.id.tt_item_name, curr_subject.lessonName);
+        view.setTextViewText(R.id.tt_item_name, curr_subject.lessonName);
-        view.setTextViewText(R.id.tt_item_name_nodesc, curr_subject.lessonName);
+        view.setTextViewText(R.id.tt_item_name_nodesc, curr_subject.lessonName);
-        view.setTextViewText(R.id.tt_item_desc, curr_subject.lessonTopic);
+        view.setTextViewText(R.id.tt_item_desc, curr_subject.lessonTopic);
-        view.setTextViewText(R.id.tt_item_room, curr_subject.lessonRoom);
+        view.setTextViewText(R.id.tt_item_room, curr_subject.lessonRoom);
-        if(curr_subject.lessonStart != 0 && curr_subject.lessonEnd != 0)
+        if(curr_subject.lessonStart != 0 && curr_subject.lessonEnd != 0)
-            view.setTextViewText(R.id.tt_item_time, WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getMinuteOfHour(), 2) +
+            view.setTextViewText(R.id.tt_item_time, WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getMinuteOfHour(), 2) +
-                    "\n" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getMinuteOfHour(),2));
+                    "\n" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getMinuteOfHour(),2));
-
+
-        return view;
+        return view;
-    }
+    }
-
+
-    @Override
+    @Override
-    public RemoteViews getLoadingView() {
+    public RemoteViews getLoadingView() {
-        return null;
+        return null;
-    }
+    }
-
+
-    @Override
+    @Override
-    public int getViewTypeCount() {
+    public int getViewTypeCount() {
-        return 1;
+        return 1;
-    }
+    }
-
+
-    @Override
+    @Override
-    public long getItemId(int position) {
+    public long getItemId(int position) {
-        return position;
+        return position;
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean hasStableIds() {
+    public boolean hasStableIds() {
-        return true;
+        return true;
-    }
+    }
-
+
-    private void initData() {
+    private void initData() {
-
+
-        theme = getThemeAccent(context);
+        theme = getThemeAccent(context);
-
+
-        rday = WidgetTimetable.selectDay(context, appWidgetId, 0, false);
+        rday = WidgetTimetable.selectDay(context, appWidgetId, 0, false);
-
+
-        day_subjects.clear();
+        day_subjects.clear();
-        lessonIndexes.clear();
+        lessonIndexes.clear();
-
+
-        try {
+        try {
-            List<JSONArray> arr = WidgetTimetable.genJsonDays(context);
+            List<JSONArray> arr = WidgetTimetable.genJsonDays(context);
-
+
-            if(arr.isEmpty()) {
+            if(arr.isEmpty()) {
-                return;
+                return;
-            }
+            }
-            JSONArray arr_lessons = WidgetTimetable.genJsonDays(context).get(rday);
+            JSONArray arr_lessons = WidgetTimetable.genJsonDays(context).get(rday);
-
+
-            for (int i = 0; i < arr_lessons.length(); i++) {
+            for (int i = 0; i < arr_lessons.length(); i++) {
-                JSONObject obj_lessons = arr_lessons.getJSONObject(i);
+                JSONObject obj_lessons = arr_lessons.getJSONObject(i);
-
+
-                day_subjects.add(jsonToLesson(obj_lessons));
+                day_subjects.add(jsonToLesson(obj_lessons));
-            }
+            }
-        } catch (JSONException e) {
+        } catch (JSONException e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        if(day_subjects.size() > 0) {
+        if(day_subjects.size() > 0) {
-            Collections.sort(day_subjects, new Comparator<Lesson>() {
+            Collections.sort(day_subjects, new Comparator<Lesson>() {
-                public int compare(Lesson o1, Lesson o2) {
+                public int compare(Lesson o1, Lesson o2) {
-                    return new DateTime(o1.lessonStart).compareTo(new DateTime(o2.lessonStart));
+                    return new DateTime(o1.lessonStart).compareTo(new DateTime(o2.lessonStart));
-                }
+                }
-            });
+            });
-
+
-            for (int i = 0; i < day_subjects.size(); i++) {
+            for (int i = 0; i < day_subjects.size(); i++) {
-                if(!day_subjects.get(i).lessonIndex.equals("+")) {
+                if(!day_subjects.get(i).lessonIndex.equals("+")) {
-                    lessonIndexes.add(Integer.valueOf(day_subjects.get(i).lessonIndex));
+                    lessonIndexes.add(Integer.valueOf(day_subjects.get(i).lessonIndex));
-                }
+                }
-            }
+            }
-
+
-            if(lessonIndexes.size() > 0) {
+            if(lessonIndexes.size() > 0) {
-
+
-                int lessonsChecked = Collections.min(lessonIndexes);
+                int lessonsChecked = Collections.min(lessonIndexes);
-                int i = 0;
+                int i = 0;
-
+
-                while(lessonsChecked < Collections.max(lessonIndexes)) {
+                while(lessonsChecked < Collections.max(lessonIndexes)) {
-                    if(!lessonIndexes.contains(lessonsChecked)) {
+                    if(!lessonIndexes.contains(lessonsChecked)) {
-                        day_subjects.add(i, emptyLesson(lessonsChecked));
+                        day_subjects.add(i, emptyLesson(lessonsChecked));
-                    }
+                    }
-                    lessonsChecked++;
+                    lessonsChecked++;
-                    i++;
+                    i++;
-                }
+                }
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    public static Integer getThemeAccent(Context context) {
+    public static Integer getThemeAccent(Context context) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            Cursor cursor = dbManager.fetchTheme();
+            Cursor cursor = dbManager.fetchTheme();
-            dbManager.close();
+            dbManager.close();
-
+
-            return cursor.getInt(1);
+            return cursor.getInt(1);
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return 0;
+        return 0;
-    }
+    }
-
+
-    public Item defaultItem(int theme) {
+    public Item defaultItem(int theme) {
-        return new Item(
+        return new Item(
-                R.drawable.card_layout_tile,
+                R.drawable.card_layout_tile,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.INVISIBLE,
+                View.INVISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                colorValues[theme >= colorValues.length ? 0 : theme],
+                colorValues[theme >= colorValues.length ? 0 : theme],
-                R.color.text,
+                R.color.text,
-                R.color.text,
+                R.color.text,
-                R.color.text_desc
+                R.color.text_desc
-        );
+        );
-    }
+    }
-
+
-    public Lesson emptyLesson(int lessonIndex) {
+    public Lesson emptyLesson(int lessonIndex) {
-        return new Lesson("empty", String.valueOf(lessonIndex), "Lyukasóra", "null", "null", 0, 0, "null");
+        return new Lesson("empty", String.valueOf(lessonIndex), "Lyukasóra", "null", "null", 0, 0, "null");
-    }
+    }
-
+
-    public Lesson jsonToLesson(JSONObject json) {
+    public Lesson jsonToLesson(JSONObject json) {
-        try {
+        try {
-            return new Lesson(
+            return new Lesson(
-                    json.getJSONObject("Allapot").getString("Nev"),
+                    json.getJSONObject("Allapot").getString("Nev"),
-                    !json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+",
+                    !json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+",
-                    json.getString("Nev"),
+                    json.getString("Nev"),
-                    json.getString("Tema"),
+                    json.getString("Tema"),
-                    json.getString("TeremNeve"),
+                    json.getString("TeremNeve"),
-                    new DateTime(json.getString("KezdetIdopont")).getMillis(),
+                    new DateTime(json.getString("KezdetIdopont")).getMillis(),
-                    new DateTime(json.getString("VegIdopont")).getMillis(),
+                    new DateTime(json.getString("VegIdopont")).getMillis(),
-                    json.getString("HelyettesTanarNeve")
+                    json.getString("HelyettesTanarNeve")
-            );
+            );
-        }catch (Exception e) {
+        }catch (Exception e) {
-            Log.d("Filc", "exception: " + e);
+            Log.d("Filc", "exception: " + e);
-        };
+        };
-
+
-        return null;
+        return null;
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java

@@ -1,12 +1,12 @@
-package hu.filc.naplo.widget_timetable;
+package hu.refilc.naplo.widget_timetable;
-
+
-import android.content.Intent;
+import android.content.Intent;
-import android.os.Build;
+import android.os.Build;
-import android.widget.RemoteViewsService;
+import android.widget.RemoteViewsService;
-
+
-public class WidgetTimetableService extends RemoteViewsService {
+public class WidgetTimetableService extends RemoteViewsService {
-    @Override
+    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
+    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new WidgetTimetableDataProvider(getApplicationContext(), intent);
+        return new WidgetTimetableDataProvider(getApplicationContext(), intent);
-    }
+    }
-}
+}

filcnaplo/android/app/src/main/res/drawable-v21/launch_gradient_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <gradient
-                android:startColor="#123323"
-                android:endColor="#20AC9B"
-                android:angle="135" />
-        </shape>
-    </item>
-</selector>

filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_background.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/launch_gradient_background" />
-    <item>
-        <bitmap android:gravity="center" android:src="@mipmap/ic_splash"/>
-    </item>
-</layer-list>

filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_gradient_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <gradient
-                android:startColor="#123323"
-                android:endColor="#20AC9B"
-                android:angle="135" />
-        </shape>
-    </item>
-</selector>

filcnaplo/android/app/src/main/res/drawable/launch_gradient_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <gradient
-                android:startColor="#123323"
-                android:endColor="#20AC9B"
-                android:angle="135" />
-        </shape>
-    </item>
-</selector>

filcnaplo/android/app/src/main/res/layout/timetable_item.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:id="@+id/main_lay"
     android:layout_height="50dp"
@@ -15,12 +16,14 @@
         android:id="@+id/tt_item_num"
         android:layout_width="50dp"
         android:layout_height="match_parent"
+        android:fontFamily="@font/montserrat_medium"
+        android:gravity="center"
+        android:text="1."
+        android:textColor="@color/filc"
+        android:textColorLink="#ff3D7BF4"
         android:textSize="30sp"
         android:textStyle="bold"
-        android:fontFamily="@font/montserrat_medium"
+        tools:ignore="HardcodedText" />
-        android:text="1."
-        android:gravity="center"
-        android:textColor="@color/filc"></TextView>
 
     <TextView
         android:id="@+id/tt_item_name"
@@ -33,10 +36,11 @@
         android:text="Óra neve"
         android:maxLines="1"
         android:ellipsize="end"
-        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_toStartOf="@id/tt_item_room"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@id/tt_item_num"
+        android:layout_toEndOf="@id/tt_item_num"
-        android:textColor="@color/text"></TextView>
+        android:textColor="@color/text"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_name_nodesc"
@@ -47,13 +51,14 @@
         android:fontFamily="@font/montserrat_medium"
         android:visibility="gone"
         android:layout_marginTop="2.5dp"
-        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_toStartOf="@id/tt_item_room"
         android:text="Óra neve"
         android:maxLines="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@id/tt_item_num"
+        android:layout_toEndOf="@id/tt_item_num"
-        android:textColor="@color/text"></TextView>
+        android:textColor="@color/text"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_desc"
@@ -67,10 +72,11 @@
         android:maxLines="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@id/tt_item_num"
+        android:layout_toEndOf="@id/tt_item_num"
-        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_toStartOf="@id/tt_item_room"
         android:layout_below="@id/tt_item_name"
-        android:textColor="@color/text_desc"></TextView>
+        android:textColor="@color/text_desc"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_room"
@@ -84,8 +90,9 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:gravity="center"
-        android:layout_toLeftOf="@id/tt_item_time"
+        android:layout_toStartOf="@id/tt_item_time"
-        android:textColor="@color/text_desc"></TextView>
+        android:textColor="@color/text_desc"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_time"
@@ -95,11 +102,12 @@
         android:textFontWeight="500"
         android:fontFamily="@font/montserrat_medium"
         android:textStyle="bold"
-        android:layout_marginLeft="2dp"
+        android:layout_marginStart="2dp"
         android:layout_marginTop="-2dp"
         android:text="8:30\n9:10"
         android:gravity="center"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
-        android:textColor="@color/white"></TextView>
+        android:textColor="@color/white"
+        tools:ignore="HardcodedText" />
 
 </RelativeLayout>

filcnaplo/android/app/src/main/res/layout/widget_timetable.xml

@@ -19,10 +19,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:text="Empty"
+            android:text="Üres / Empty"
+            android:background="@drawable/widget_card_bottom_dark"
             android:textColor="@color/text"
             android:textSize="20sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <ListView
             android:id="@+id/widget_list"
@@ -43,57 +45,63 @@
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:background="@drawable/widget_card_top_dark">
+
             <ImageView
                 android:id="@+id/nav_refresh"
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
+                android:layout_toStartOf="@id/nav_to_left"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
                 android:src="@drawable/ic_refresh_cw"
-                android:layout_toLeftOf="@id/nav_to_left"
                 android:tint="@color/text_desc"
                 tools:ignore="UseAppTint"
-                android:padding="10dp" />
+                android:focusable="true" />
 
             <ImageView
                 android:id="@+id/nav_to_left"
-                android:layout_width="50dp"
+                android:layout_width="45dp"
                 android:layout_height="match_parent"
+                android:layout_toStartOf="@id/nav_to_right"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
                 android:src="@drawable/ic_chevron_left"
-                android:layout_toLeftOf="@id/nav_to_right"
                 android:tint="@color/text_desc"
                 tools:ignore="UseAppTint"
-                android:padding="10dp" />
+                android:focusable="true" />
 
             <ImageView
                 android:id="@+id/nav_to_right"
-                android:layout_width="50dp"
+                android:layout_width="45dp"
                 android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="5dp"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
                 android:src="@drawable/ic_chevron_right"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="5dp"
                 android:tint="@color/text_desc"
                 tools:ignore="UseAppTint"
-                android:padding="10dp" />
+                android:focusable="true" />
 
             <TextView
                 android:id="@+id/nav_current"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
-                android:layout_marginLeft="20sp"
+                android:layout_marginStart="15sp"
-                android:layout_toLeftOf="@id/nav_refresh"
+                android:layout_marginTop="2sp"
+                android:layout_toStartOf="@id/nav_refresh"
                 android:fontFamily="@font/montserrat_medium"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:text="Timetable"
+                android:text="Órarend"
                 android:textColor="@color/text"
-                android:textSize="24sp"
+                android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
         </RelativeLayout>
     </RelativeLayout>
 
@@ -131,8 +139,9 @@
             android:text="A widget használatához, bejelentkezés szükséges."
             android:textColor="@color/black"
             android:paddingTop="10dp"
-            android:textSize="17dp"
+            android:textSize="17sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <Button
             android:id="@+id/open_login"
@@ -145,8 +154,9 @@
             android:layout_margin="10dp"
             android:textColor="@color/white"
             android:fontFamily="@font/montserrat_medium"
-            android:textSize="16dp"
+            android:textSize="16sp"
-            android:textStyle="bold"/>
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 
@@ -185,8 +195,9 @@
             android:text="Órák a kezdőképernyőd kényelméből."
             android:textColor="@color/black"
             android:paddingTop="10dp"
-            android:textSize="16dp"
+            android:textSize="16sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -197,7 +208,8 @@
             android:textColor="@color/black"
             android:layout_marginTop="0dp"
             android:layout_marginHorizontal="15dp"
-            android:textSize="14dp" />
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
 
         <Button
             android:id="@+id/buy_premium"
@@ -211,8 +223,9 @@
             android:layout_margin="10dp"
             android:textColor="#ff691A9B"
             android:fontFamily="@font/montserrat_medium"
-            android:textSize="16dp"
+            android:textSize="16sp"
-            android:textStyle="bold"/>
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 

filcnaplo/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
 </adaptive-icon>

filcnaplo/android/app/src/main/res/values-v21/styles.xml

@@ -1,12 +0,0 @@
-<resources>
-
-    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_background</item>
-    </style>
-
-    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_inner_view_background</item>
-    </style>
-</resources>

filcnaplo/android/app/src/main/res/values/colors.xml

@@ -27,7 +27,7 @@
     <color name="yellow_light">#ffFFCC00</color>
     <color name="light_yellow_light">#40FFD60A</color>
     <color name="green_light">#ff34C759</color>
-    <color name="filc_light">#ff247665</color>
+    <color name="filc_light">#ff3D7BF4</color>
     <color name="teal_light">#ff5AC8FA</color>
     <color name="blue_light">#ff007AFF</color>
     <color name="indigo_light">#ff5856D6</color>
@@ -49,7 +49,7 @@
     <color name="yellow">#ffFFD60A</color>
     <color name="light_yellow">#40FFD60A</color>
     <color name="green">#ff32D74B</color>
-    <color name="filc">#ff29826F</color>
+    <color name="filc">#ff3D7BF4</color>
     <color name="teal">#ff64D2FF</color>
     <color name="blue">#ff0A84FF</color>
     <color name="indigo">#ff5E5CE6</color>

filcnaplo/android/app/src/profile/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.refilc.naplo">
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.VIBRATE" />

filcnaplo/android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

filcnaplo/android/filc3.properties

@@ -1,4 +0,0 @@
-storePassword=filc3fix
-keyPassword=filc3fix
-keyAlias=upload
-storeFile=C:/Users/Peti/upload-keystore.jks

filcnaplo/build-ipa.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+flutter clean
+dart pub get
+flutter doctor -v
+
+flutter build ipa --release --dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1) --no-tree-shake-icons

filcnaplo/build.sh

@@ -1,13 +1,3 @@
-#!/usr/bin/env fish
+#!/bin/sh
-
+
-# With build number
+flutter build apk --release --dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1) --no-tree-shake-icons
-function get_version_bn
-  cat pubspec.yaml | grep version: | cut -d' ' -f2
-end
-
-function get_version
-  cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1
-end
-
-flutter build apk --release --dart-define=APPVER=(get_version) --no-tree-shake-icons && \
-    cp -v "build/app/outputs/flutter-apk/app-release.apk" ~/"Desktop/hu.filc.naplo_"(get_version_bn).apk

filcnaplo/ios/Flutter/Generated 2.xcconfig

@@ -0,0 +1,15 @@
+// This is a generated file; do not edit or check into version control.
+FLUTTER_ROOT=/Users/kima/development/flutter
+FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=3.5.1
+FLUTTER_BUILD_NUMBER=197
+EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
+EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
+DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC9iNGZiMTEyMTRkZDJkZGE2Y2UwMTJkZDk4ZWE0OThlOWU4YjkxMjYyLw==
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json

filcnaplo/ios/Flutter/Generated 3.xcconfig

@@ -0,0 +1,15 @@
+// This is a generated file; do not edit or check into version control.
+FLUTTER_ROOT=/Users/kima/development/flutter
+FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=4.1.0
+FLUTTER_BUILD_NUMBER=213
+EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
+EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
+DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC8yYTM0MDFjOWJiYjVhOWE5YWVjNzRkNGY3MzVkMThhOWRkM2ViZjJkLw==
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json

filcnaplo/ios/Flutter/Generated 4.xcconfig

@@ -0,0 +1,15 @@
+// This is a generated file; do not edit or check into version control.
+FLUTTER_ROOT=/Users/kima/src/flutter
+FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=4.1.1
+FLUTTER_BUILD_NUMBER=216
+EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
+EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
+DART_DEFINES=QVBQVkVSPTQuMS4x,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC9jZGJlZGE3ODhhMjkzZmEyOTY2NWRjM2ZhM2Q2ZTYzYmQyMjFjYjBkLw==
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json