Revert "Rename everything filcnaplo-related to refilc"

This reverts commit d1a9625d93f30c19068f52fa9848a8266d8d97e7.
2023-09-19 18:16:57 +02:00 · 2023-09-19 18:16:57 +02:00 · 7b517b333a
commit 7b517b333a
parent d1a9625d93
669 changed files with 39481 additions and 39799 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -15,10 +15,10 @@ jobs:
          encodedString: ${{ secrets.KEYSTORE_BASE64 }}
      - name: Create key.properties
        run: |
-          echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > refilc/android/key.properties
-          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> refilc/android/key.properties
-          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> refilc/android/key.properties
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> refilc/android/key.properties
+          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"
@ -32,7 +32,7 @@ jobs:
      - name: Install dependencies
        run: ./fix-pub.sh
      - name: Build
-        run: cd refilc && ./build.sh
+        run: cd filcnaplo && ./build.sh
      - name: Upload Android Release
        uses: actions/upload-artifact@v2
        with:
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@ -46,7 +46,7 @@ jobs:

      # Build and sign the ipa using a single flutter command
      - name: Building IPA
-        working-directory: refilc
+        working-directory: filcnaplo
        run: bash build-ipa.sh
          
      # Collect the file and upload as artifact         
@ -55,7 +55,7 @@ jobs:
        with:
         name: release-ipa
         # Path to the release files
-         path: refilc/build/ios/ipa/*.ipa
+         path: filcnaplo/build/ios/ipa/*.ipa

      # Important! Cleanup: remove the certificate and provisioning profile from the runner!
      - name: Clean up keychain and provisioning profile
--- a/.idea/naplo.iml
+++ b/.idea/naplo.iml
@ -3,63 +3,63 @@
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/refilc/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_desktop_ui/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_desktop_ui/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_desktop_ui/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_premium/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_premium/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_premium/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/share_plus/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/share_plus/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/share_plus/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_kreta_api/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_kreta_api/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_kreta_api/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_mobile_ui/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_mobile_ui/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc_mobile_ui/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/build" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/refilc/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.dart_tool" />
+      <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" />
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -2,9 +2,9 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/refilc_desktop_ui" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/refilc_kreta_api" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/refilc_mobile_ui" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/refilc_premium" 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>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -2,8 +2,8 @@
  "version": "0.2.0",
  "configurations": [
    {
-      "name": "refilc",
-      "cwd": "refilc",
+      "name": "filcnaplo",
+      "cwd": "filcnaplo",
      "request": "launch",
      "type": "dart",
      "toolArgs": [
@ -11,8 +11,8 @@
      ]
    },
    // {
-    //   "name": "refilc release",
-    //   "cwd": "refilc release",
+    //   "name": "filcnaplo release",
+    //   "cwd": "filcnaplo release",
    //   "request": "launch",
    //   "type": "dart",
    //   "program": "lib/main.dart",
@ -23,7 +23,7 @@
    {
      "name": "Flutter",
      "program": "lib/main.dart",
-      "cwd": "refilc",
+      "cwd": "filcnaplo",
      "request": "launch",
      "type": "dart",
      "flutterMode": "debug"
@ -31,7 +31,7 @@
    {
      "name": "Flutter (release)",
      "program": "lib/main.dart",
-      "cwd": "refilc",
+      "cwd": "filcnaplo",
      "request": "launch",
      "type": "dart",
      "flutterMode": "release"
--- a/README.md
+++ b/README.md
@ -23,7 +23,7 @@ Run `fix-pub.sh`
 ### Run the app

 ```sh
-cd refilc
+cd filcnaplo
 flutter run
 ```

--- a/filcnaplo/.gitignore
+++ b/filcnaplo/.gitignore
@ -0,0 +1,47 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+key.properties
--- a/filcnaplo/.metadata
+++ b/filcnaplo/.metadata
--- a/filcnaplo/README.md
+++ b/filcnaplo/README.md
@ -1,3 +1,3 @@
-# refilc
-
-Main lib
+# refilc
+
+Main lib
--- a/filcnaplo/analysis_options.yaml
+++ b/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
--- a/filcnaplo/android/.gitignore
+++ b/filcnaplo/android/.gitignore
@ -0,0 +1,12 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+.project
--- a/filcnaplo/android/app/build.gradle
+++ b/filcnaplo/android/app/build.gradle
@ -1,99 +1,99 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    throw new GradleException("Undefined VersionCode")
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    throw new GradleException("Undefined VersionName")
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("key.properties")
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    lintOptions {
-        disable 'InvalidPackage'
-        disable "Instantiatable"
-        checkReleaseBuilds false
-        abortOnError false
-    }
-
-    defaultConfig {
-        applicationId "hu.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 {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-    }
-
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    
-    buildFeatures {
-        viewBinding true
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation 'com.android.support:multidex:2.0.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'joda-time:joda-time:2.9.4'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-    implementation 'androidx.window:window:1.0.0'
-    implementation 'androidx.window:window-java:1.0.0'
-}
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    throw new GradleException("Undefined VersionCode")
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    throw new GradleException("Undefined VersionName")
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file("key.properties")
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    lintOptions {
+        disable 'InvalidPackage'
+        disable "Instantiatable"
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
+    defaultConfig {
+        applicationId "hu.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 {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {
+    implementation 'com.android.support:multidex:2.0.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'joda-time:joda-time:2.9.4'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation 'androidx.window:window:1.0.0'
+    implementation 'androidx.window:window-java:1.0.0'
+}
--- a/filcnaplo/android/app/proguard-rules.pro
+++ b/filcnaplo/android/app/proguard-rules.pro
@ -1,5 +1,5 @@
-keep class io.flutter.plugin.editing.** { *; }
-keep class androidx.lifecycle.DefaultLifecycleObserver
-keep class com.pauldemarco.flutter_blue.** { *; }
-keep class com.mr.flutter.plugin.filepicker.** { *; }
+-keep class io.flutter.plugin.editing.** { *; }
+-keep class androidx.lifecycle.DefaultLifecycleObserver
+-keep class com.pauldemarco.flutter_blue.** { *; }
+-keep class com.mr.flutter.plugin.filepicker.** { *; }
 -keep class com.shockwave.**
--- a/filcnaplo/android/app/src/debug/AndroidManifest.xml
+++ b/filcnaplo/android/app/src/debug/AndroidManifest.xml
@ -1,8 +1,8 @@
-<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" />
-  <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" />
-</manifest>
+<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" />
+  <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" />
+</manifest>
--- a/filcnaplo/android/app/src/main/AndroidManifest.xml
+++ b/filcnaplo/android/app/src/main/AndroidManifest.xml
@ -1,86 +1,86 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
-    <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="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>
-                <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.refilcapp.hu -->
-                <data
-                    android:scheme="https"
-                    android:host="api.refilcapp.hu"
-                    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="hu.refilc.naplo.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="hu.refilc.naplo.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>
-
-    <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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
+    <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="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>
+                <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.refilcapp.hu -->
+                <data
+                    android:scheme="https"
+                    android:host="api.refilcapp.hu"
+                    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="hu.refilc.naplo.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="hu.refilc.naplo.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>
+
+    <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>
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java
--- a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java
+++ b/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java
--- a/filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png
+++ b/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png
--- a/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png
+++ b/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png
--- a/filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png
+++ b/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png
--- a/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml
@ -1,13 +1,13 @@
-<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>
+<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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml
@ -1,13 +1,13 @@
-<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>
+<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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml
@ -1,13 +1,13 @@
-<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>
+<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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml
@ -1,13 +1,13 @@
-<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>
+<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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml
@ -1,170 +1,170 @@
-<?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>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml
@ -1,30 +1,30 @@
-<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 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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml
@ -1,13 +1,13 @@
-<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>
+<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>
--- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml
@ -1,27 +1,27 @@
-<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>
+<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>
--- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml
@ -1,10 +1,10 @@
-<?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" />
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml
@ -1,10 +1,10 @@
-<?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" />
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-v21/background.png
+++ b/filcnaplo/android/app/src/main/res/drawable-v21/background.png
--- a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml
@ -1,7 +1,7 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml
@ -1,6 +1,6 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml
@ -1,6 +1,6 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml
@ -1,6 +1,6 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml
@ -1,7 +1,7 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml
@ -1,7 +1,7 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml
@ -1,7 +1,7 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml
@ -1,7 +1,7 @@
-<?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"/>
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml
@ -1,17 +1,17 @@
-<?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" />
-
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png
--- a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png
+++ b/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png
--- a/filcnaplo/android/app/src/main/res/drawable/background.png
+++ b/filcnaplo/android/app/src/main/res/drawable/background.png
--- a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml
+++ b/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml
@ -1,18 +1,18 @@
-<?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>
-
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml
+++ b/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml
@ -1,18 +1,18 @@
-<?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>
-
+<?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>
--- a/filcnaplo/android/app/src/main/res/drawable/ic_absences.png
+++ b/filcnaplo/android/app/src/main/res/drawable/ic_absences.png
--- a/filcnaplo/android/app/src/main/res/drawable/ic_grades.png
+++ b/filcnaplo/android/app/src/main/res/drawable/ic_grades.png
--- a/filcnaplo/android/app/src/main/res/drawable/ic_home.png
+++ b/filcnaplo/android/app/src/main/res/drawable/ic_home.png
--- a/filcnaplo/android/app/src/main/res/drawable/ic_messages.png
+++ b/filcnaplo/android/app/src/main/res/drawable/ic_messages.png
--- a/filcnaplo/android/app/src/main/res/drawable/ic_notification.png
+++ b/filcnaplo/android/app/src/main/res/drawable/ic_notification.png
--- a/filcnaplo/android/app/src/main/res/drawable/ic_timetable.png
+++ b/filcnaplo/android/app/src/main/res/drawable/ic_timetable.png
--- a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable/launch_background.xml
--- a/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf
+++ b/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf
--- a/filcnaplo/android/app/src/main/res/ic_launcher-web.png
+++ b/filcnaplo/android/app/src/main/res/ic_launcher-web.png
--- a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml
+++ b/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml
@ -1,26 +1,26 @@
-
-<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 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>
--- a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml
+++ b/filcnaplo/android/app/src/main/res/layout/timetable_item.xml
@ -1,113 +1,113 @@
-<?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"
-    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:fontFamily="@font/montserrat_medium"
-        android:gravity="center"
-        android:text="1."
-        android:textColor="@color/filc"
-        android:textColorLink="#ff3D7BF4"
-        android:textSize="30sp"
-        android:textStyle="bold"
-        tools:ignore="HardcodedText" />
-
-    <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_toStartOf="@id/tt_item_room"
-        android:gravity="center_vertical"
-        android:layout_toEndOf="@id/tt_item_num"
-        android:textColor="@color/text"
-        tools:ignore="HardcodedText" />
-
-    <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_toStartOf="@id/tt_item_room"
-        android:text="Óra neve"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:layout_toEndOf="@id/tt_item_num"
-        android:textColor="@color/text"
-        tools:ignore="HardcodedText" />
-
-    <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_toEndOf="@id/tt_item_num"
-        android:layout_toStartOf="@id/tt_item_room"
-        android:layout_below="@id/tt_item_name"
-        android:textColor="@color/text_desc"
-        tools:ignore="HardcodedText" />
-
-    <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_toStartOf="@id/tt_item_time"
-        android:textColor="@color/text_desc"
-        tools:ignore="HardcodedText" />
-
-    <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_marginStart="2dp"
-        android:layout_marginTop="-2dp"
-        android:text="8:30\n9:10"
-        android:gravity="center"
-        android:layout_alignParentEnd="true"
-        android:textColor="@color/white"
-        tools:ignore="HardcodedText" />
-
+<?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"
+    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:fontFamily="@font/montserrat_medium"
+        android:gravity="center"
+        android:text="1."
+        android:textColor="@color/filc"
+        android:textColorLink="#ff3D7BF4"
+        android:textSize="30sp"
+        android:textStyle="bold"
+        tools:ignore="HardcodedText" />
+
+    <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_toStartOf="@id/tt_item_room"
+        android:gravity="center_vertical"
+        android:layout_toEndOf="@id/tt_item_num"
+        android:textColor="@color/text"
+        tools:ignore="HardcodedText" />
+
+    <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_toStartOf="@id/tt_item_room"
+        android:text="Óra neve"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:layout_toEndOf="@id/tt_item_num"
+        android:textColor="@color/text"
+        tools:ignore="HardcodedText" />
+
+    <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_toEndOf="@id/tt_item_num"
+        android:layout_toStartOf="@id/tt_item_room"
+        android:layout_below="@id/tt_item_name"
+        android:textColor="@color/text_desc"
+        tools:ignore="HardcodedText" />
+
+    <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_toStartOf="@id/tt_item_time"
+        android:textColor="@color/text_desc"
+        tools:ignore="HardcodedText" />
+
+    <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_marginStart="2dp"
+        android:layout_marginTop="-2dp"
+        android:text="8:30\n9:10"
+        android:gravity="center"
+        android:layout_alignParentEnd="true"
+        android:textColor="@color/white"
+        tools:ignore="HardcodedText" />
+
 </RelativeLayout>
--- a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml
+++ b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml
@ -1,232 +1,232 @@
-<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="Üres / Empty"
-            android:background="@drawable/widget_card_bottom_dark"
-            android:textColor="@color/text"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            tools:ignore="HardcodedText" />
-
-        <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:layout_toStartOf="@id/nav_to_left"
-                android:clickable="true"
-                android:foreground="?android:attr/selectableItemBackground"
-                android:padding="10dp"
-                android:src="@drawable/ic_refresh_cw"
-                android:tint="@color/text_desc"
-                tools:ignore="UseAppTint"
-                android:focusable="true" />
-
-            <ImageView
-                android:id="@+id/nav_to_left"
-                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:tint="@color/text_desc"
-                tools:ignore="UseAppTint"
-                android:focusable="true" />
-
-            <ImageView
-                android:id="@+id/nav_to_right"
-                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:tint="@color/text_desc"
-                tools:ignore="UseAppTint"
-                android:focusable="true" />
-
-            <TextView
-                android:id="@+id/nav_current"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentStart="true"
-                android:layout_marginStart="15sp"
-                android:layout_marginTop="2sp"
-                android:layout_toStartOf="@id/nav_refresh"
-                android:fontFamily="@font/montserrat_medium"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:text="Órarend"
-                android:textColor="@color/text"
-                android:textSize="22sp"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
-        </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="17sp"
-            android:textStyle="bold"
-            tools:ignore="HardcodedText" />
-
-        <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="16sp"
-            android:textStyle="bold"
-            tools:ignore="HardcodedText" />
-
-    </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="16sp"
-            android:textStyle="bold"
-            tools:ignore="HardcodedText" />
-
-        <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="14sp"
-            tools:ignore="HardcodedText" />
-
-        <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="16sp"
-            android:textStyle="bold"
-            tools:ignore="HardcodedText" />
-
-    </RelativeLayout>
-
+<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="Üres / Empty"
+            android:background="@drawable/widget_card_bottom_dark"
+            android:textColor="@color/text"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+        <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:layout_toStartOf="@id/nav_to_left"
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
+                android:src="@drawable/ic_refresh_cw"
+                android:tint="@color/text_desc"
+                tools:ignore="UseAppTint"
+                android:focusable="true" />
+
+            <ImageView
+                android:id="@+id/nav_to_left"
+                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:tint="@color/text_desc"
+                tools:ignore="UseAppTint"
+                android:focusable="true" />
+
+            <ImageView
+                android:id="@+id/nav_to_right"
+                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:tint="@color/text_desc"
+                tools:ignore="UseAppTint"
+                android:focusable="true" />
+
+            <TextView
+                android:id="@+id/nav_current"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="15sp"
+                android:layout_marginTop="2sp"
+                android:layout_toStartOf="@id/nav_refresh"
+                android:fontFamily="@font/montserrat_medium"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:text="Órarend"
+                android:textColor="@color/text"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
+        </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="17sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+        <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="16sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+    </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="16sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+        <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="14sp"
+            tools:ignore="HardcodedText" />
+
+        <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="16sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+
+    </RelativeLayout>
+
 </RelativeLayout>
--- a/filcnaplo/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/filcnaplo/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
--- a/filcnaplo/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/filcnaplo/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,6 +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"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
-</adaptive-icon>
+<?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"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
+</adaptive-icon>
--- a/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
--- a/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
--- a/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
--- a/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
--- a/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
--- a/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
+++ b/filcnaplo/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
--- a/Show More
+++ b/Show More