Merge pull request #8 from TMarccci/master

I think I fixed this

.github/FUNDING.yml

@@ -1 +1 @@
-patreon: filcnaplo
+github: filc

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pub" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.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,9 @@
 # See https://www.dartlang.org/guides/libraries/private-files
 
+termek.txt
+.DS_Store
+filc3.properties
+local.properties
 # Files and directories created by pub
 .dart_tool/
 .packages
@@ -19,3 +23,30 @@ doc/api/
 *.js_
 *.js.deps
 *.js.map
+
+*.txt
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+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/GeneratedPluginRegistrant.swift
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+.vscode/
+ 

.gitmodules

@@ -1,11 +0,0 @@
-[submodule "Mobile UI"]
-	path = filcnaplo_mobile_ui
-	url = https://github.com/filc/mobile
-
-[submodule "Desktop UI"]
-	path = filcnaplo_desktop_ui
-	url = https://github.com/filc/desktop
-  
-[submodule "Kreta API"]
-	path = filcnaplo_kreta_api
-	url = https://github.com/filc/kreten

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/naplo.iml" filepath="$PROJECT_DIR$/.idea/naplo.iml" />
+    </modules>
+  </component>
+</project>

.idea/naplo.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/filcnaplo_desktop_ui" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/filcnaplo_kreta_api" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/filcnaplo_mobile_ui" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/filcnaplo_premium" vcs="Git" />
+  </component>
+</project>

.vscode/launch.json

@@ -1,14 +1,33 @@
 {
-  // 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": [
     {
       "name": "filcnaplo",
       "cwd": "filcnaplo",
       "request": "launch",
-      "type": "dart"
+      "type": "dart",
+      "toolArgs": [
+        "--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

@@ -5,17 +5,17 @@ A folytatáshoz szükséged lesz egy Linuxot vagy Windowst futtató számítóg
 Segít, ha nem csak kicsit tudsz programozni, és ha ismered a Gitet és a GitHubot ;)
 
 ## Miben segítsek?
-Kérünk, **olyan dologgal járulj hozzá** a Filchez, ami valószínűleg **sok embernek hasznos lesz** majd. Szeretnénk egy minél teljeskörűbb iskolai asszisztenst létrehozni, de az iskolaspecifikus, vagy külön neked hasznos funkciók helye inkább legyen a saját forkod.
+Kérünk, **olyan dologgal járulj hozzá** a reFilchez, ami valószínűleg **sok embernek hasznos lesz** majd. Szeretnénk egy minél teljeskörűbb iskolai asszisztenst létrehozni, de az iskolaspecifikus, vagy külön neked hasznos funkciók helye inkább legyen a saját forkod.
 
-Fontos, hogy **mielőtt egy nagy volumenű projektbe belekezdesz, futtasd meg ötletedet a [Discord szerverünkön](https://filcnaplo.hu/discord),** ahol még azelőtt tudunk tanácsot adni, mielőtt sok-sok órát beleöltél volna egy esetleg felesleges dologba.
+Fontos, hogy **mielőtt egy nagy volumenű projektbe belekezdesz, futtasd meg ötletedet a [Discord szerverünkön](https://dc.refilc.hu/),** ahol még azelőtt tudunk tanácsot adni, mielőtt sok-sok órát beleöltél volna egy esetleg felesleges dologba.
 
-A legjobban annak örülünk, ha az [Issues](https://github.com/filcnaplo/filcnaplo/issues) oldalról szemezgetsz, **ha lehet, a [priority taggel megjelöltekkel kezdd](https://github.com/filcnaplo/filcnaplo/issues?q=is%3Aissue+is%3Aopen+label%3Apriority),** vagy ha új vagy a Flutterhez, ajánljuk figyelmedbe [ezeket a viszonylag könnyen javítható hibákat](https://github.com/filcnaplo/filcnaplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) (ha épp van ilyen).
+A legjobban annak örülünk, ha az [Issues](https://github.com/refilc/filcnaplo/issues) oldalról szemezgetsz, **ha lehet, a [priority taggel megjelöltekkel kezdd](https://github.com/refilc/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/refilc/filcnaplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) (ha épp van ilyen).
 
 ## Hogyan segítsek?
 
 Nem ígérhetünk itt sem programozás-, sem git-kurzust, de a projektspecifikus dolgokat leírjuk, és segítünk a Flutter feltelepítésében.
 
-A Filc a Google által pár éve létrehozott **[Fluttert](https://flutter.dev/)** használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#-ot, Javát, C++t, vagy egyéb hasonló nyelvet, **nem fog gondot okozni a használata.** A felhasználói felület létrehozásában az is segíthet, ha foglalkoztál már korábban weboldalakkal.
+A reFilc a Google által pár éve létrehozott **[Fluttert](https://flutter.dev/)** használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#-ot, Javát, C++t, vagy egyéb hasonló nyelvet, **nem fog gondot okozni a használata.** A felhasználói felület létrehozásában az is segíthet, ha foglalkoztál már korábban weboldalakkal.
 Ha még nem használtál Fluttert, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw).
 Könnyen tudsz kódot, vagy akár UI-t is tesztelni a [DartPad](https://dartpad.dev/) oldalon.
 
@@ -24,10 +24,10 @@ Fontos: **Legyél a flutter beta verzióján!** Írd be: `flutter channel beta`
 
 
 
-Ha nem értesz a Githez, ajánljuk figyelmedbe [ezt a cikket](https://medium.com/envienta-magyarorsz%C3%A1g/git-%C3%A9s-github-gyorstalpal%C3%B3-f2d78a732deb). Viszont arra kérünk, a Git használatát ne a Filcen próbáld ki először, hozz létre előbb egy saját Repót, és abba tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat.
+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 reFilcen próbáld ki először, hozz létre előbb egy saját Repót, és abba tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat.
 
 Készíts egy forkot a saját fiókod alá.
-A Filc legfrissebb, épp fejlesztés alatt álló verzióját a [dev brancen](https://github.com/filcnaplo/filcnaplo/tree/dev) találod, kérjük ide commitolj, és ide célozd a forkodból a Pull Requested. Írd le benne, mit változtattál, és ha lehet, csatolj képernyőképet is.
+A reFilc legfrissebb, épp fejlesztés alatt álló verzióját a [dev brancen](https://github.com/refilc/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.
 
 ---

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,24 +1,42 @@
 <p align=center>
-  <img src=".github/logo.png" width=150>
-  <h1 align=center><b>Filc Napló</b></h1>
+  <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
+#### Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez - tanulóktól, tanulóknak.
 
-[![Downloads](https://img.shields.io/github/downloads-pre/filc/naplo/latest/total?color=%23&label=Downloads&logo=github&sort=semver)](https://github.com/filc/naplo/releases) &nbsp; [![discord](https://img.shields.io/discord/712698455193157643?label=Discord)](http://filcnaplo.hu/discord) &nbsp; [![Codemagic build status](https://api.codemagic.io/apps/612cc79b35b443d1b2c638ec/612cc79b35b443d1b2c638eb/status_badge.svg)](https://codemagic.io/apps/612cc79b35b443d1b2c638ec/612cc79b35b443d1b2c638eb/latest_build)
+[![Downloads](https://img.shields.io/github/downloads-pre/refilc/naplo/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)
 
 ## Setup
 
-### Clone the project:
+### Clone the project
 
-```
-$ git clone --recursive https://github.com/filc/naplo
-$ cd naplo
+```sh
+git clone --recursive https://github.com/refilc/naplo
+cd naplo
 ```
 
-### Run the app:
+### Install packages
 
+Run `fix-pub.sh`
+
+### Run the app
+
+```sh
+cd filcnaplo
+flutter run
 ```
-$ cd filcnaplo
-$ flutter run
-```
+
+### Contribution
+
+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
+
+**annon:** a Filc napló készítője (ez az app a Filcen alapul)
+
+**kima, mog, WolfY:** fő fejlesztők
+
+**Regő, Pearoo:** weboldal design és community management

changelog.md

@@ -0,0 +1,13 @@
+What's new:
+
+- design tweak
+- new premium ui
+- premium fix
+- rounding fix
+- graph percentage fix
+- fail warning
+- Widget
+- fix sent messages
+- fix ios live activities
+- Hibajavítások 🐛
+- **Megérkezett a Filc Premium!** ✨

filcnaplo/.gitignore

@@ -8,7 +8,6 @@
 .buildlog/
 .history
 .svn/
-build.sh
 
 # IntelliJ related
 *.iml

filcnaplo/.metadata

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

filcnaplo/README.md

@@ -1,3 +1,3 @@
-# filcnaplo
+# refilc
 
 Main lib

filcnaplo/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

filcnaplo/android/.gitignore

@@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+.project

filcnaplo/android/app/build.gradle

@@ -26,13 +26,8 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("$System.env.ANDROID_SIGNING")
-if (keystorePropertiesFile.exists()) {
+def keystorePropertiesFile = rootProject.file("key.properties")
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-} else {
-    keystoreProperties.load(new FileInputStream(rootProject.file("signing/signing.properties")))
-
-}
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -43,15 +38,27 @@ android {
 
     lintOptions {
         disable 'InvalidPackage'
+        disable "Instantiatable"
+        checkReleaseBuilds false
+        abortOnError false
     }
 
     defaultConfig {
-        applicationId "hu.filc.naplo"
+        applicationId "hu.refilc.naplo"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+    }
+
+    compileOptions {
+      // Flag to enable support for the new language APIs
+      coreLibraryDesugaringEnabled true
+      // Sets Java compatibility to Java 8
+      sourceCompatibility JavaVersion.VERSION_1_8
+      targetCompatibility JavaVersion.VERSION_1_8
     }
 
     signingConfigs {
@@ -70,6 +77,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 flutter {
@@ -77,7 +88,12 @@ flutter {
 }
 
 dependencies {
+    implementation 'com.android.support:multidex:2.0.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'joda-time:joda-time:2.9.4'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation 'androidx.window:window:1.0.0'
+    implementation 'androidx.window:window-java:1.0.0'
 }

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,60 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
-  <application android:label="Filc Napló" android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true">
-    <activity android:name=".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">
-      <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
+    <application android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
+        android:requestLegacyExternalStorage="true">
+        <activity android:exported="true" android:name=".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.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </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://api.filcnaplo.hu -->
+                <data
+                    android:scheme="https"
+                    android:host="api.filcnaplo.hu"
+                    android:pathPrefix="/callback" />
+            </intent-filter>
         </activity>
         <meta-data android:name="flutterEmbedding" android:value="2" />
+
+        <receiver android:name=".widget_timetable.WidgetTimetable"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="list_widget.ACTION_WIDGET_CLICK_NAV_LEFT" />
+                <action android:name="list_widget.ACTION_WIDGET_CLICK_NAV_RIGHT" />
+                <action android:name="list_widget.ACTION_WIDGET_CLICK_NAV_TODAY" />
+                <action android:name="list_widget.ACTION_WIDGET_CLICK_NAV_REFRESH" />
+                <action android:name="list_widget.ACTION_WIDGET_CLICK_BUY_PREMIUM" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/home_widget_test_info" />
+        </receiver>
+
+        <service android:name=".widget_timetable.WidgetTimetableService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <receiver android:name="es.antonborri.home_widget.HomeWidgetBackgroundReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="es.antonborri.home_widget.action.BACKGROUND" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="es.antonborri.home_widget.HomeWidgetBackgroundService"
+            android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true" />
     </application>
 
     <!-- Permissions -->
@@ -16,4 +63,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <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>

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

@@ -0,0 +1,18 @@
+package hu.refilc.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

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

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

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

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

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

filcnaplo/android/app/src/main/kotlin/hu/filc/naplo/MainActivity.kt

@@ -1,6 +0,0 @@
-package hu.filc.naplo
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,6l-11,11l-5,-5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,18l-6,-6l6,-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,18l6,-6l-6,-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2.69l5.66,5.66a8,8 0,1 1,-11.31 0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2l7,19l-7,-4l-7,4l7,-19z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+</vector>

filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,4l0,6l-6,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M1,20l0,-6l6,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3.51,9a9,9 0,0 1,14.85 -3.36L23,10M1,14l4.64,4.36A9,9 0,0 0,20.49 15"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ff141516"
+      android:strokeLineCap="round"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Background for widgets to make the rounded corners based on the
+appWidgetRadius attribute value
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="?attr/appWidgetRadius" />
+    <solid android:color="?android:attr/colorBackground" />
+</shape>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Background for views inside widgets to make the rounded corners based on the
+appWidgetInnerRadius attribute value
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="?attr/appWidgetInnerRadius" />
+    <solid android:color="?android:attr/colorAccent" />
+</shape>

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

@@ -1,7 +1,9 @@
 <?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"/>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
 </layer-list>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <stroke android:width="1dp" android:color="#D8E0E1" />
+    <corners android:radius="10dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#00FFFFFF"/>
+    <corners android:radius="10dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/light_red"/>
+    <corners android:radius="10dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/light_yellow"/>
+    <corners android:radius="10dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,7 @@
+<?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

@@ -0,0 +1,11 @@
+<?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/widget_card_bottom.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight_light"/>
+    <stroke android:width="1dp" android:color="@color/highlight_light" />
+    <corners android:bottomLeftRadius="14dp" android:bottomRightRadius="14dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight"/>
+    <stroke android:width="1dp" android:color="@color/highlight" />
+    <corners android:bottomLeftRadius="14dp" android:bottomRightRadius="14dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight_light"/>
+    <stroke android:width="1dp" android:color="@color/highlight_light" />
+    <corners android:topLeftRadius="14dp" android:topRightRadius="14dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/highlight"/>
+    <stroke android:width="1dp" android:color="@color/highlight" />
+    <corners android:topLeftRadius="14dp" android:topRightRadius="14dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp"/>
+</shape>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!--<gradient
+        android:angle="45"
+        android:endColor="@color/filc"
+        android:startColor="@color/filc" />-->
+
+    <solid android:color="@color/highlight_light"/>
+
+    <corners android:radius="12dp" />
+    <size android:width="2dp"/>
+    <padding
+        android:left="0.5dp"
+        android:right="0.5dp" />
+
+</shape>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffE0CCEC"></solid>
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:endColor="#ffE0CCEC" android:startColor="#ffC9ABDC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+</selector>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#ff1D8868"></solid>
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:endColor="#ff1D8868" android:startColor="#ff1EA18F" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+
+</selector>

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

@@ -1,7 +1,9 @@
 <?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"/>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
 </layer-list>

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

@@ -0,0 +1,26 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="8dp"
+    android:orientation="vertical"
+    android:background="@drawable/app_widget_background"
+    android:padding="8dp"
+    android:id="@+id/widget_container">
+
+    <TextView
+        android:id="@+id/widget_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="36sp"
+        android:textStyle="bold"
+        tools:text="Title" />
+
+    <TextView
+        android:id="@+id/widget_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        tools:text="Message" />
+</LinearLayout>

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:id="@+id/main_lay"
+    android:layout_height="50dp"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp"
+    android:layout_marginTop="2.5dp"
+    android:layout_marginBottom="2.5dp"
+    android:layout_marginLeft="7.5dp"
+    android:layout_marginRight="7.5dp"
+    android:background="@drawable/card_layout_tile">
+
+    <TextView
+        android:id="@+id/tt_item_num"
+        android:layout_width="50dp"
+        android:layout_height="match_parent"
+        android:textSize="30sp"
+        android:textStyle="bold"
+        android:fontFamily="@font/montserrat_medium"
+        android:text="1."
+        android:gravity="center"
+        android:textColor="@color/filc"></TextView>
+
+    <TextView
+        android:id="@+id/tt_item_name"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:textSize="15.5sp"
+        android:textFontWeight="700"
+        android:fontFamily="@font/montserrat_medium"
+        android:layout_marginTop="2.5dp"
+        android:text="Óra neve"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_toLeftOf="@id/tt_item_room"
+        android:gravity="center_vertical"
+        android:layout_toRightOf="@id/tt_item_num"
+        android:textColor="@color/text"></TextView>
+
+    <TextView
+        android:id="@+id/tt_item_name_nodesc"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textSize="15.5sp"
+        android:textStyle="bold"
+        android:fontFamily="@font/montserrat_medium"
+        android:visibility="gone"
+        android:layout_marginTop="2.5dp"
+        android:layout_toLeftOf="@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:textColor="@color/text"></TextView>
+
+    <TextView
+        android:id="@+id/tt_item_desc"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:textFontWeight="600"
+        android:fontFamily="@font/montserrat_medium"
+        android:text="Óra leírása"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:layout_toRightOf="@id/tt_item_num"
+        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_below="@id/tt_item_name"
+        android:textColor="@color/text_desc"></TextView>
+
+    <TextView
+        android:id="@+id/tt_item_room"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:textSize="14sp"
+        android:textFontWeight="500"
+        android:fontFamily="@font/montserrat_medium"
+        android:textStyle="bold"
+        android:text="56."
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:gravity="center"
+        android:layout_toLeftOf="@id/tt_item_time"
+        android:textColor="@color/text_desc"></TextView>
+
+    <TextView
+        android:id="@+id/tt_item_time"
+        android:layout_width="50dp"
+        android:layout_height="match_parent"
+        android:textSize="14sp"
+        android:textFontWeight="500"
+        android:fontFamily="@font/montserrat_medium"
+        android:textStyle="bold"
+        android:layout_marginLeft="2dp"
+        android:layout_marginTop="-2dp"
+        android:text="8:30\n9:10"
+        android:gravity="center"
+        android:layout_alignParentRight="true"
+        android:textColor="@color/white"></TextView>
+
+</RelativeLayout>

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

@@ -0,0 +1,219 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_margin="@dimen/widget_margin">
+
+    <RelativeLayout
+        android:id="@+id/tt_grid_cont"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:backgroundTint="#00000000"
+        android:background="@drawable/card_layout_bg"
+        android:orientation="vertical">
+
+
+        <TextView
+            android:id="@+id/empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="Empty"
+            android:textColor="@color/text"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <ListView
+            android:id="@+id/widget_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/bottom_nav"
+            android:layout_marginTop="-8dp"
+            android:background="@drawable/widget_card_bottom_dark"
+            android:divider="#00000000"
+            android:paddingTop="5dp"
+            android:paddingBottom="16dp"
+            android:scrollbarFadeDuration="150"
+            android:scrollbarSize="10dp"
+            android:scrollbarThumbVertical="@drawable/widget_scroll_style" />
+
+        <RelativeLayout
+            android:id="@+id/bottom_nav"
+            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:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:src="@drawable/ic_refresh_cw"
+                android:layout_toLeftOf="@id/nav_to_left"
+                android:tint="@color/text_desc"
+                tools:ignore="UseAppTint"
+                android:padding="10dp" />
+
+            <ImageView
+                android:id="@+id/nav_to_left"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:src="@drawable/ic_chevron_left"
+                android:layout_toLeftOf="@id/nav_to_right"
+                android:tint="@color/text_desc"
+                tools:ignore="UseAppTint"
+                android:padding="10dp" />
+
+            <ImageView
+                android:id="@+id/nav_to_right"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                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" />
+
+            <TextView
+                android:id="@+id/nav_current"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="20sp"
+                android:layout_toLeftOf="@id/nav_refresh"
+                android:fontFamily="@font/montserrat_medium"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:text="Timetable"
+                android:textColor="@color/text"
+                android:textSize="24sp"
+                android:textStyle="bold" />
+        </RelativeLayout>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:visibility="gone"
+        android:id="@+id/need_login"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:backgroundTint="#ffF4F4F4"
+        android:background="@drawable/card_layout_bg"
+        android:orientation="vertical" >
+
+        <!--<ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:paddingHorizontal="10dp"
+            android:paddingTop="5dp"
+            android:src="@drawable/tinta_icon" />-->
+
+        <ImageView
+            android:id="@+id/iv_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:paddingHorizontal="10dp"
+            android:paddingTop="10dp"
+            android:src="@drawable/tinta_image" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/iv_1"
+            android:layout_marginHorizontal="15dp"
+            android:fontFamily="@font/montserrat_medium"
+            android:text="A widget használatához, bejelentkezés szükséges."
+            android:textColor="@color/black"
+            android:paddingTop="10dp"
+            android:textSize="17dp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/open_login"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/btn_shape_login"
+            android:text="Alkalmazás megnyitása"
+            android:padding="0dp"
+            android:layout_margin="10dp"
+            android:textColor="@color/white"
+            android:fontFamily="@font/montserrat_medium"
+            android:textSize="16dp"
+            android:textStyle="bold"/>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:visibility="gone"
+        android:id="@+id/need_premium"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:backgroundTint="#ffF4F4F4"
+        android:background="@drawable/card_layout_bg"
+        android:orientation="vertical" >
+
+        <!--<ImageView
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:paddingHorizontal="10dp"
+            android:paddingTop="5dp"
+            android:src="@drawable/tinta_icon" />-->
+
+        <ImageView
+            android:id="@+id/iv_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:paddingHorizontal="10dp"
+            android:paddingTop="10dp"
+            android:src="@drawable/tinta_image" />
+
+        <TextView
+            android:id="@+id/tw_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/iv_2"
+            android:layout_marginHorizontal="15dp"
+            android:fontFamily="@font/montserrat_medium"
+            android:text="Órák a kezdőképernyőd kényelméből."
+            android:textColor="@color/black"
+            android:paddingTop="10dp"
+            android:textSize="16dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tw_1"
+            android:fontFamily="@font/montserrat_medium"
+            android:text="Támogass Tinta szinten és helyezz egy widgetet a kezdőképernyődre."
+            android:textColor="@color/black"
+            android:layout_marginTop="0dp"
+            android:layout_marginHorizontal="15dp"
+            android:textSize="14dp" />
+
+        <Button
+            android:id="@+id/buy_premium"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:background="@drawable/btn_shape"
+            android:gravity="center"
+            android:text="Vigyél oda!"
+            android:padding="0dp"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="10dp"
+            android:textColor="#ff691A9B"
+            android:fontFamily="@font/montserrat_medium"
+            android:textSize="16dp"
+            android:textStyle="bold"/>
+
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <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/mipmap-anydpi-v26/ic_launcher_round.xml

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