diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 5316cb2..5927722 100644 --- 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 }}" > 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 + 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 - uses: actions/setup-java@v3 with: distribution: "zulu" @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: ./fix-pub.sh - name: Build - run: cd filcnaplo && ./build.sh + run: cd refilc && ./build.sh - name: Upload Android Release uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 604d8ea..c456926 100644 --- 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: filcnaplo + working-directory: refilc 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: filcnaplo/build/ios/ipa/*.ipa + path: refilc/build/ios/ipa/*.ipa # Important! Cleanup: remove the certificate and provisioning profile from the runner! - name: Clean up keychain and provisioning profile diff --git a/.idea/naplo.iml b/.idea/naplo.iml index ab2f482..1d81c0f 100644 --- a/.idea/naplo.iml +++ b/.idea/naplo.iml @@ -3,63 +3,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index b2035b9..699c55f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,9 +2,9 @@ - - - - + + + + \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 3c003e4..7acbc65 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,8 +2,8 @@ "version": "0.2.0", "configurations": [ { - "name": "filcnaplo", - "cwd": "filcnaplo", + "name": "refilc", + "cwd": "refilc", "request": "launch", "type": "dart", "toolArgs": [ @@ -11,8 +11,8 @@ ] }, // { - // "name": "filcnaplo release", - // "cwd": "filcnaplo release", + // "name": "refilc release", + // "cwd": "refilc release", // "request": "launch", // "type": "dart", // "program": "lib/main.dart", @@ -23,7 +23,7 @@ { "name": "Flutter", "program": "lib/main.dart", - "cwd": "filcnaplo", + "cwd": "refilc", "request": "launch", "type": "dart", "flutterMode": "debug" @@ -31,7 +31,7 @@ { "name": "Flutter (release)", "program": "lib/main.dart", - "cwd": "filcnaplo", + "cwd": "refilc", "request": "launch", "type": "dart", "flutterMode": "release" diff --git a/README.md b/README.md index 03b692c..1f127f0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Run `fix-pub.sh` ### Run the app ```sh -cd filcnaplo +cd refilc flutter run ``` diff --git a/filcnaplo/.gitignore b/filcnaplo/.gitignore deleted file mode 100644 index 7900af4..0000000 --- a/filcnaplo/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -# 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 diff --git a/filcnaplo/analysis_options.yaml b/filcnaplo/analysis_options.yaml deleted file mode 100644 index a7acf24..0000000 --- a/filcnaplo/analysis_options.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/filcnaplo/android/.gitignore b/filcnaplo/android/.gitignore deleted file mode 100644 index a2ea94a..0000000 --- a/filcnaplo/android/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java - -# Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app -key.properties -.project \ No newline at end of file diff --git a/filcnaplo/assets/fonts/Montserrat/OFL.txt b/filcnaplo/assets/fonts/Montserrat/OFL.txt deleted file mode 100644 index 7881887..0000000 --- a/filcnaplo/assets/fonts/Montserrat/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/filcnaplo/ios/.gitignore b/filcnaplo/ios/.gitignore deleted file mode 100644 index 8adea5a..0000000 --- a/filcnaplo/ios/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -*.mode1v3 -*.mode2v3 -*.moved-aside -*.pbxuser -*.perspectivev3 -**/*sync/ -.sconsign.dblite -.tags* -**/.vagrant/ -**/DerivedData/ -Icon? -**/Pods/ -**/.symlinks/ -profile -xcuserdata -**/.generated/ -Flutter/App.framework -Flutter/Flutter.framework -Flutter/Flutter.podspec -Flutter/Generated.xcconfig -Flutter/ephemeral/ -Flutter/app.flx -Flutter/app.zip -Flutter/flutter_assets/ -Flutter/flutter_export_environment.sh -ServiceDefinitions.json -Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!default.mode1v3 -!default.mode2v3 -!default.pbxuser -!default.perspectivev3 diff --git a/filcnaplo/lib/helpers/subject.dart b/filcnaplo/lib/helpers/subject.dart deleted file mode 100644 index 2880d17..0000000 --- a/filcnaplo/lib/helpers/subject.dart +++ /dev/null @@ -1,144 +0,0 @@ -import 'package:filcnaplo/icons/filc_icons.dart'; -import 'package:filcnaplo/models/icon_pack.dart'; -import 'package:filcnaplo/models/settings.dart'; -import 'package:filcnaplo/utils/format.dart'; -import 'package:filcnaplo_kreta_api/models/subject.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -typedef SubjectIconVariants = Map; - -class SubjectIconData { - final SubjectIconVariants data; - final String name; // for iOS live activities compatibilty - - SubjectIconData({ - this.data = const { - IconPack.material: Icons.widgets_outlined, - IconPack.cupertino: CupertinoIcons.rectangle_grid_2x2, - }, - this.name = "square.grid.2x2", - }); -} - -SubjectIconVariants createIcon({required IconData material, required IconData cupertino}) { - return { - IconPack.material: material, - IconPack.cupertino: cupertino, - }; -} - -class SubjectIcon { - static String resolveName({Subject? subject, String? subjectName}) => _resolve(subject: subject, subjectName: subjectName).name; - static IconData resolveVariant({Subject? subject, String? subjectName, required BuildContext context}) => - _resolve(subject: subject, subjectName: subjectName).data[Provider.of(context, listen: false).iconPack]!; - - static SubjectIconData _resolve({Subject? subject, String? subjectName}) { - assert(!(subject == null && subjectName == null)); - - String name = (subject?.name ?? subjectName ?? "").toLowerCase().specialChars().trim(); - String category = subject?.category.description.toLowerCase().specialChars() ?? ""; - - // todo: check for categories - if (RegExp("mate(k|matika)").hasMatch(name) || category == "matematika") { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.function, material: Icons.calculate_outlined), name: "function"); - } else if (RegExp("magyar nyelv|nyelvtan").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.textformat_alt, material: Icons.spellcheck_outlined), name: "textformat.alt"); - } else if (RegExp("irodalom").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.book, material: Icons.menu_book_outlined), name: "book"); - } else if (RegExp("tor(i|tenelem)").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.compass, material: Icons.hourglass_empty_outlined), name: "safari"); - } else if (RegExp("foldrajz").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.map, material: Icons.public_outlined), name: "map"); - } else if (RegExp("rajz|muvtori|muveszet|vizualis").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.paintbrush, material: Icons.palette_outlined), name: "paintbrush"); - } else if (RegExp("fizika").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.lightbulb, material: Icons.emoji_objects_outlined), name: "lightbulb"); - } else if (RegExp("^enek|zene|szolfezs|zongora|korus").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.music_note, material: Icons.music_note_outlined), name: "music.note"); - } else if (RegExp("^tes(i|tneveles)|sport").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.sportscourt, material: Icons.sports_soccer_outlined), name: "sportscourt"); - } else if (RegExp("kemia").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.lab_flask, material: Icons.science_outlined), name: "testtube.2"); - } else if (RegExp("biologia").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.paw, material: Icons.pets_outlined), name: "pawprint"); - } else if (RegExp("kornyezet|termeszet ?(tudomany|ismeret)|hon( es nep)?ismeret").hasMatch(name)) { - return SubjectIconData( - data: createIcon(cupertino: CupertinoIcons.arrow_3_trianglepath, material: Icons.eco_outlined), name: "arrow.3.trianglepath"); - } else if (RegExp("(hit|erkolcs)tan|vallas|etika").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.heart, material: Icons.favorite_border_outlined), name: "heart"); - } else if (RegExp("penzugy").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.money_dollar, material: Icons.savings_outlined), name: "dollarsign"); - } else if (RegExp("informatika|szoftver|iroda|digitalis").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.device_laptop, material: Icons.computer_outlined), name: "laptopcomputer"); - } else if (RegExp("prog").hasMatch(name)) { - return SubjectIconData( - data: createIcon(cupertino: CupertinoIcons.chevron_left_slash_chevron_right, material: Icons.code_outlined), - name: "chevron.left.forwardslash.chevron.right"); - } else if (RegExp("halozat").hasMatch(name)) { - return SubjectIconData( - data: createIcon(cupertino: CupertinoIcons.antenna_radiowaves_left_right, material: Icons.wifi_tethering_outlined), - name: "antenna.radiowaves.left.and.right"); - } else if (RegExp("szinhaz").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.hifispeaker, material: Icons.theater_comedy_outlined), name: "hifispeaker"); - } else if (RegExp("film|media").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.film, material: Icons.theaters_outlined), name: "film"); - } else if (RegExp("elektro(tech)?nika").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.bolt, material: Icons.electrical_services_outlined), name: "bolt"); - } else if (RegExp("gepesz|mernok|ipar").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.wrench, material: Icons.precision_manufacturing_outlined), name: "wrench"); - } else if (RegExp("technika").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.hammer, material: Icons.build_outlined), name: "hammer"); - } else if (RegExp("tanc").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.music_mic, material: Icons.speaker_outlined), name: "music.mic"); - } else if (RegExp("filozofia").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.bubble_left, material: Icons.psychology_outlined), name: "bubble.left"); - } else if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name) || name == "ofo") { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.group, material: Icons.groups_outlined), name: "person.3"); - } else if (RegExp("gazdasag").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.chart_pie, material: Icons.account_balance_outlined), name: "chart.pie"); - } else if (RegExp("szorgalom").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.checkmark_seal, material: Icons.verified_outlined), name: "checkmark.seal"); - } else if (RegExp("magatartas").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.smiley, material: Icons.emoji_people_outlined), name: "face.smiling"); - } else if (RegExp("angol|nemet|francia|olasz|orosz|spanyol|latin|kinai|nyelv").hasMatch(name)) { - return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.globe, material: Icons.translate_outlined), name: "globe"); - } else if (RegExp("linux").hasMatch(name)) { - return SubjectIconData(data: createIcon(material: FilcIcons.linux, cupertino: FilcIcons.linux)); - } - - return SubjectIconData(); - } -} - -class ShortSubject { - static String resolve({Subject? subject, String? subjectName}) { - assert(!(subject == null && subjectName == null)); - - String name = (subject?.name ?? subjectName ?? "").toLowerCase().specialChars().trim(); - // String category = subject?.category.description.toLowerCase().specialChars() ?? ""; - - if (RegExp("magyar irodalom").hasMatch(name)) { - return "Irodalom"; - } else if (RegExp("magyar nyelv").hasMatch(name)) { - return "Nyelvtan"; - } else if (RegExp("matematika").hasMatch(name)) { - return "Matek"; - } else if (RegExp("digitalis kultura").hasMatch(name)) { - return "Dig. kult."; - } else if (RegExp("testneveles").hasMatch(name)) { - return "Tesi"; - } else if (RegExp("tortenelem").hasMatch(name)) { - return "Töri"; - } else if (RegExp("(angol|nemet|francia|olasz|orosz|spanyol|latin|kinai) nyelv").hasMatch(name)) { - return (subject?.name ?? subjectName ?? "?").replaceAll(" nyelv", ""); - } else if (RegExp("informatika").hasMatch(name)) { - return "Infó"; - } else if (RegExp("osztalyfonoki").hasMatch(name)) { - return "Ofő"; - } - - return subject?.name.capital() ?? subjectName?.capital() ?? "?"; - } -} diff --git a/filcnaplo/lib/ui/filter/widgets/absences.dart b/filcnaplo/lib/ui/filter/widgets/absences.dart deleted file mode 100644 index 4e4748d..0000000 --- a/filcnaplo/lib/ui/filter/widgets/absences.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:filcnaplo/ui/date_widget.dart'; -import 'package:filcnaplo_kreta_api/models/absence.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/absence/absence_viewable.dart' as mobile; - -List getWidgets(List providerAbsences, {bool noExcused = false}) { - List items = []; - providerAbsences.where((a) => !noExcused || a.state != Justification.excused).forEach((absence) { - items.add(DateWidget( - key: absence.id, - date: absence.date, - widget: mobile.AbsenceViewable(absence), - )); - }); - return items; -} diff --git a/filcnaplo/lib/ui/filter/widgets/grades.dart b/filcnaplo/lib/ui/filter/widgets/grades.dart deleted file mode 100644 index 667e58a..0000000 --- a/filcnaplo/lib/ui/filter/widgets/grades.dart +++ /dev/null @@ -1,41 +0,0 @@ -import 'package:filcnaplo/ui/date_widget.dart'; -import 'package:filcnaplo/utils/platform.dart'; -import 'package:filcnaplo_kreta_api/models/grade.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/grade/grade_viewable.dart' as mobile; -import 'package:filcnaplo_mobile_ui/common/widgets/grade/new_grades.dart' as mobile; -import 'package:filcnaplo_desktop_ui/common/widgets/grade/grade_viewable.dart' as desktop; - -List getWidgets(List providerGrades, DateTime? lastSeenDate) { - List items = []; - for (var grade in providerGrades) { - final surprise = (!(lastSeenDate != null && grade.date.isAfter(lastSeenDate)) || grade.value.value == 0); - if (grade.type == GradeType.midYear && surprise) { - items.add(DateWidget( - key: grade.id, - date: grade.date, - widget: PlatformUtils.isMobile ? mobile.GradeViewable(grade) : desktop.GradeViewable(grade), - )); - } - } - return items; -} - -List getNewWidgets(List providerGrades, DateTime? lastSeenDate) { - List items = []; - List newGrades = []; - for (var grade in providerGrades) { - final surprise = !(lastSeenDate != null && !grade.date.isAfter(lastSeenDate)) && grade.value.value != 0; - if (grade.type == GradeType.midYear && surprise) { - newGrades.add(grade); - } - } - newGrades.sort((a, b) => a.date.compareTo(b.date)); - if (newGrades.isNotEmpty) { - items.add(DateWidget( - key: newGrades.last.id, - date: newGrades.last.date, - widget: mobile.NewGradesSurprise(newGrades), - )); - } - return items; -} diff --git a/filcnaplo/lib/ui/filter/widgets/lessons.dart b/filcnaplo/lib/ui/filter/widgets/lessons.dart deleted file mode 100644 index 676126a..0000000 --- a/filcnaplo/lib/ui/filter/widgets/lessons.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:filcnaplo/ui/date_widget.dart'; -import 'package:filcnaplo_kreta_api/models/lesson.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/lesson/changed_lesson_viewable.dart' as mobile; - -List getWidgets(List providerLessons) { - List items = []; - providerLessons.where((l) => l.isChanged && l.start.isAfter(DateTime.now())).forEach((lesson) { - items.add(DateWidget( - key: lesson.id, - date: DateTime(lesson.date.year, lesson.date.month, lesson.date.day, lesson.start.hour, lesson.start.minute), - widget: mobile.ChangedLessonViewable(lesson), - )); - }); - return items; -} diff --git a/filcnaplo/lib/ui/filter/widgets/messages.dart b/filcnaplo/lib/ui/filter/widgets/messages.dart deleted file mode 100644 index 4181ce7..0000000 --- a/filcnaplo/lib/ui/filter/widgets/messages.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:filcnaplo/ui/date_widget.dart'; -import 'package:filcnaplo/ui/filter/widgets/notes.dart' as note_filter; -import 'package:filcnaplo/ui/filter/widgets/events.dart' as event_filter; -import 'package:filcnaplo_kreta_api/models/event.dart'; -import 'package:filcnaplo_kreta_api/models/message.dart'; -import 'package:filcnaplo_kreta_api/models/note.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/message/message_viewable.dart' as mobile; - -List getWidgets(List providerMessages, List providerNotes, List providerEvents) { - List items = []; - for (var message in providerMessages) { - if (message.type == MessageType.inbox) { - items.add(DateWidget( - key: "${message.id}", - date: message.date, - widget: mobile.MessageViewable(message), - )); - } - } - items.addAll(note_filter.getWidgets(providerNotes)); - items.addAll(event_filter.getWidgets(providerEvents)); - return items; -} diff --git a/filcnaplo/lib/ui/filter/widgets/update.dart b/filcnaplo/lib/ui/filter/widgets/update.dart deleted file mode 100644 index 6b35e63..0000000 --- a/filcnaplo/lib/ui/filter/widgets/update.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:filcnaplo/models/release.dart'; -import 'package:filcnaplo/ui/date_widget.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/update/update_viewable.dart' as mobile; - -DateWidget getWidget(Release providerRelease) { - return DateWidget( - date: DateTime.now(), - widget: mobile.UpdateViewable(providerRelease), - ); -} diff --git a/filcnaplo/lib/utils/reverse_search.dart b/filcnaplo/lib/utils/reverse_search.dart deleted file mode 100644 index e313937..0000000 --- a/filcnaplo/lib/utils/reverse_search.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'dart:developer'; - -import 'package:filcnaplo_kreta_api/models/absence.dart'; -import 'package:filcnaplo_kreta_api/models/lesson.dart'; -import 'package:filcnaplo_kreta_api/models/week.dart'; -import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:provider/provider.dart'; - -class ReverseSearch { - static Future getLessonByAbsence(Absence absence, BuildContext context) async { - final timetableProvider = Provider.of(context, listen: false); - - List lessons = []; - final week = Week.fromDate(absence.date); - try { - await timetableProvider.fetch(week: week); - } catch (e) { - log("[ERROR] getLessonByAbsence: $e"); - } - lessons = timetableProvider.getWeek(week) ?? []; - - // Find absence lesson in timetable - Lesson lesson = lessons.firstWhere( - (l) => _sameDate(l.date, absence.date) && l.subject.id == absence.subject.id && l.lessonIndex == absence.lessonIndex.toString(), - orElse: () => Lesson.fromJson({'isEmpty': true}), - ); - - if (lesson.isEmpty) { - return null; - } else { - return lesson; - } - } - - // difference.inDays is not reliable - static bool _sameDate(DateTime a, DateTime b) => (a.year == b.year && a.month == b.month && a.day == b.day); -} diff --git a/filcnaplo/linux/.gitignore b/filcnaplo/linux/.gitignore deleted file mode 100644 index c7ea17f..0000000 --- a/filcnaplo/linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flutter/ephemeral diff --git a/filcnaplo/linux/CMakeLists.txt b/filcnaplo/linux/CMakeLists.txt deleted file mode 100644 index 900368d..0000000 --- a/filcnaplo/linux/CMakeLists.txt +++ /dev/null @@ -1,116 +0,0 @@ -cmake_minimum_required(VERSION 3.10) -project(runner LANGUAGES CXX) - -set(BINARY_NAME "filcnaplo") -set(APPLICATION_ID "hu.filc.filcnaplo") - -cmake_policy(SET CMP0063 NEW) - -set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") - -# Root filesystem for cross-building. -if(FLUTTER_TARGET_PLATFORM_SYSROOT) - set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) - set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) - set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -endif() - -# Configure build options. -if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") -endif() - -# Compilation settings that should be applied to most targets. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_14) - target_compile_options(${TARGET} PRIVATE -Wall -Werror) - target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") - target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") -endfunction() - -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") - -# Flutter library and tool build rules. -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# System-level dependencies. -find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) - -add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") - -# Application build -add_executable(${BINARY_NAME} - "main.cc" - "my_application.cc" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" -) -apply_standard_settings(${BINARY_NAME}) -target_link_libraries(${BINARY_NAME} PRIVATE flutter) -target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) -add_dependencies(${BINARY_NAME} flutter_assemble) -# Only the install-generated bundle's copy of the executable will launch -# correctly, since the resources must in the right relative locations. To avoid -# people trying to run the unbundled copy, put it in a subdirectory instead of -# the default top-level location. -set_target_properties(${BINARY_NAME} - PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" -) - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# By default, "installing" just makes a relocatable bundle in the build -# directory. -set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -# Start with a clean build bundle directory every time. -install(CODE " - file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") - " COMPONENT Runtime) - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -if(PLUGIN_BUNDLED_LIBRARIES) - install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") - install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() diff --git a/filcnaplo/linux/flutter/CMakeLists.txt b/filcnaplo/linux/flutter/CMakeLists.txt deleted file mode 100644 index 7a0003d..0000000 --- a/filcnaplo/linux/flutter/CMakeLists.txt +++ /dev/null @@ -1,87 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. - -# Serves the same purpose as list(TRANSFORM ... PREPEND ...), -# which isn't available in 3.10. -function(list_prepend LIST_NAME PREFIX) - set(NEW_LIST "") - foreach(element ${${LIST_NAME}}) - list(APPEND NEW_LIST "${PREFIX}${element}") - endforeach(element) - set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) -endfunction() - -# === Flutter Library === -# System-level dependencies. -find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) -pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) -pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) - -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "fl_basic_message_channel.h" - "fl_binary_codec.h" - "fl_binary_messenger.h" - "fl_dart_project.h" - "fl_engine.h" - "fl_json_message_codec.h" - "fl_json_method_codec.h" - "fl_message_codec.h" - "fl_method_call.h" - "fl_method_channel.h" - "fl_method_codec.h" - "fl_method_response.h" - "fl_plugin_registrar.h" - "fl_plugin_registry.h" - "fl_standard_message_codec.h" - "fl_standard_method_codec.h" - "fl_string_codec.h" - "fl_value.h" - "fl_view.h" - "flutter_linux.h" -) -list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") -target_link_libraries(flutter INTERFACE - PkgConfig::GTK - PkgConfig::GLIB - PkgConfig::GIO -) -add_dependencies(flutter flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CMAKE_CURRENT_BINARY_DIR}/_phony_ - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" - ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} -) diff --git a/filcnaplo/macos/.gitignore b/filcnaplo/macos/.gitignore deleted file mode 100644 index d4e0569..0000000 --- a/filcnaplo/macos/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Flutter-related -**/Flutter/ephemeral/ -**/Pods/ - -# Xcode-related -**/dgph -**/xcuserdata/ diff --git a/filcnaplo/windows/.gitignore b/filcnaplo/windows/.gitignore deleted file mode 100644 index d492d0d..0000000 --- a/filcnaplo/windows/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -flutter/ephemeral/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ diff --git a/filcnaplo_desktop_ui/.gitignore b/filcnaplo_desktop_ui/.gitignore deleted file mode 100644 index 516bea4..0000000 --- a/filcnaplo_desktop_ui/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -# 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 -pubspec.lock diff --git a/filcnaplo_desktop_ui/lib/pages/grades/grades_count.dart b/filcnaplo_desktop_ui/lib/pages/grades/grades_count.dart deleted file mode 100644 index c3c75f6..0000000 --- a/filcnaplo_desktop_ui/lib/pages/grades/grades_count.dart +++ /dev/null @@ -1,25 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:filcnaplo_kreta_api/models/grade.dart'; -import 'package:filcnaplo_desktop_ui/pages/grades/grades_count_item.dart'; -import 'package:collection/collection.dart'; - -class GradesCount extends StatelessWidget { - const GradesCount({Key? key, required this.grades}) : super(key: key); - - final List grades; - - @override - Widget build(BuildContext context) { - List gradesCount = List.generate(5, (int index) => grades.where((e) => e.value.value == index + 1).length); - - return Container( - width: 75, - padding: const EdgeInsets.only(bottom: 6.0, top: 6.0, left: 12.0, right: 0.0), - margin: const EdgeInsets.symmetric(horizontal: 12.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: gradesCount.mapIndexed((index, e) => GradesCountItem(count: e, value: index + 1)).toList(), - ), - ); - } -} diff --git a/filcnaplo_kreta_api/.gitignore b/filcnaplo_kreta_api/.gitignore deleted file mode 100644 index 516bea4..0000000 --- a/filcnaplo_kreta_api/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -# 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 -pubspec.lock diff --git a/filcnaplo_mobile_ui/.gitignore b/filcnaplo_mobile_ui/.gitignore deleted file mode 100644 index 516bea4..0000000 --- a/filcnaplo_mobile_ui/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -# 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 -pubspec.lock diff --git a/filcnaplo_mobile_ui/lib/common/widgets/cretification/certification_view.dart b/filcnaplo_mobile_ui/lib/common/widgets/cretification/certification_view.dart deleted file mode 100755 index 15cb282..0000000 --- a/filcnaplo_mobile_ui/lib/common/widgets/cretification/certification_view.dart +++ /dev/null @@ -1,43 +0,0 @@ -import 'package:filcnaplo_kreta_api/models/grade.dart'; -import 'package:filcnaplo_mobile_ui/common/panel/panel.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/cretification/certification_card.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/cretification/certification_tile.dart'; -import 'package:filcnaplo_mobile_ui/common/hero_scrollview.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_feather_icons/flutter_feather_icons.dart'; - -class CertificationView extends StatelessWidget { - const CertificationView(this.grades, {Key? key, required this.gradeType}) : super(key: key); - - final List grades; - final GradeType gradeType; - - static show(List grades, {required BuildContext context, required GradeType gradeType}) => - Navigator.of(context, rootNavigator: true).push(CupertinoPageRoute(builder: (context) => CertificationView(grades, gradeType: gradeType))); - - @override - Widget build(BuildContext context) { - grades.sort((a, b) => a.subject.name.compareTo(b.subject.name)); - List tiles = grades.map((e) => CertificationTile(e)).toList(); - return Scaffold( - body: HeroScrollView( - title: getGradeTypeTitle(gradeType), - icon: FeatherIcons.award, - iconSize: 50, - child: ListView( - children: [ - SafeArea( - child: Panel( - child: Column( - children: tiles, - ), - ), - ) - ], - shrinkWrap: true, - padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0), - physics: const BouncingScrollPhysics(), - ))); - } -} diff --git a/filcnaplo_mobile_ui/lib/common/widgets/exam/exam_viewable.dart b/filcnaplo_mobile_ui/lib/common/widgets/exam/exam_viewable.dart deleted file mode 100755 index c931bae..0000000 --- a/filcnaplo_mobile_ui/lib/common/widgets/exam/exam_viewable.dart +++ /dev/null @@ -1,20 +0,0 @@ -import 'package:filcnaplo_kreta_api/models/exam.dart'; -import 'package:filcnaplo_mobile_ui/common/viewable.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/card_handle.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/exam/exam_tile.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/exam/exam_view.dart'; -import 'package:flutter/material.dart'; - -class ExamViewable extends StatelessWidget { - const ExamViewable(this.exam, {Key? key}) : super(key: key); - - final Exam exam; - - @override - Widget build(BuildContext context) { - return Viewable( - tile: ExamTile(exam), - view: CardHandle(child: ExamView(exam)), - ); - } -} diff --git a/filcnaplo_mobile_ui/lib/pages/grades/grades_count.dart b/filcnaplo_mobile_ui/lib/pages/grades/grades_count.dart deleted file mode 100755 index f2a2e70..0000000 --- a/filcnaplo_mobile_ui/lib/pages/grades/grades_count.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:filcnaplo_kreta_api/models/grade.dart'; -import 'package:filcnaplo_mobile_ui/pages/grades/grades_count_item.dart'; -import 'package:collection/collection.dart'; - -class GradesCount extends StatelessWidget { - const GradesCount({Key? key, required this.grades}) : super(key: key); - - final List grades; - - @override - Widget build(BuildContext context) { - List gradesCount = List.generate(5, (int index) => grades.where((e) => e.value.value == index + 1).length); - - return Padding( - padding: const EdgeInsets.only(bottom: 6.0, top: 6.0, left: 12.0, right: 6.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: gradesCount.mapIndexed((index, e) => GradesCountItem(count: e, value: index + 1)).toList(), - ), - ); - } -} diff --git a/filcnaplo_premium/.gitignore b/filcnaplo_premium/.gitignore deleted file mode 100644 index 5de5aa0..0000000 --- a/filcnaplo_premium/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# 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 -pubspec.lock -android/local.properties diff --git a/fix-pub.sh b/fix-pub.sh index 27e50db..6fa5eea 100755 --- a/fix-pub.sh +++ b/fix-pub.sh @@ -1,7 +1,7 @@ -cd filcnaplo && flutter clean && flutter pub get && cd .. -cd filcnaplo_kreta_api && flutter clean && flutter pub get && cd .. -cd filcnaplo_mobile_ui && flutter clean && flutter pub get && cd .. -cd filcnaplo_desktop_ui && flutter clean && flutter pub get && cd .. -cd filcnaplo_premium && flutter clean && flutter pub get && cd .. +cd refilc && flutter clean && flutter pub get && cd .. +cd refilc_kreta_api && flutter clean && flutter pub get && cd .. +cd refilc_mobile_ui && flutter clean && flutter pub get && cd .. +cd refilc_desktop_ui && flutter clean && flutter pub get && cd .. +cd refilc_premium && flutter clean && flutter pub get && cd .. echo Fixed pub. \ No newline at end of file diff --git a/filcnaplo/.metadata b/refilc/.metadata similarity index 100% rename from filcnaplo/.metadata rename to refilc/.metadata diff --git a/filcnaplo/README.md b/refilc/README.md similarity index 86% rename from filcnaplo/README.md rename to refilc/README.md index 02c4c20..775cf06 100644 --- a/filcnaplo/README.md +++ b/refilc/README.md @@ -1,3 +1,3 @@ -# refilc - -Main lib +# refilc + +Main lib diff --git a/filcnaplo_mobile_ui/analysis_options.yaml b/refilc/analysis_options.yaml old mode 100755 new mode 100644 similarity index 98% rename from filcnaplo_mobile_ui/analysis_options.yaml rename to refilc/analysis_options.yaml index 16f5f56..61b6c4d --- a/filcnaplo_mobile_ui/analysis_options.yaml +++ b/refilc/analysis_options.yaml @@ -1,28 +1,29 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/filcnaplo/android/app/build.gradle b/refilc/android/app/build.gradle similarity index 96% rename from filcnaplo/android/app/build.gradle rename to refilc/android/app/build.gradle index 49825fb..b697642 100644 --- a/filcnaplo/android/app/build.gradle +++ b/refilc/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' +} diff --git a/filcnaplo/android/app/proguard-rules.pro b/refilc/android/app/proguard-rules.pro similarity index 86% rename from filcnaplo/android/app/proguard-rules.pro rename to refilc/android/app/proguard-rules.pro index 56fe627..0940b69 100644 --- a/filcnaplo/android/app/proguard-rules.pro +++ b/refilc/android/app/proguard-rules.pro @@ -1,5 +1,5 @@ --keep class io.flutter.plugin.editing.** { *; } --keep class androidx.lifecycle.DefaultLifecycleObserver --keep class com.pauldemarco.flutter_blue.** { *; } --keep class com.mr.flutter.plugin.filepicker.** { *; } +-keep class io.flutter.plugin.editing.** { *; } +-keep class androidx.lifecycle.DefaultLifecycleObserver +-keep class com.pauldemarco.flutter_blue.** { *; } +-keep class com.mr.flutter.plugin.filepicker.** { *; } -keep class com.shockwave.** \ No newline at end of file diff --git a/filcnaplo/android/app/src/debug/AndroidManifest.xml b/refilc/android/app/src/debug/AndroidManifest.xml similarity index 98% rename from filcnaplo/android/app/src/debug/AndroidManifest.xml rename to refilc/android/app/src/debug/AndroidManifest.xml index 826ca84..fcc14fa 100644 --- a/filcnaplo/android/app/src/debug/AndroidManifest.xml +++ b/refilc/android/app/src/debug/AndroidManifest.xml @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/refilc/android/app/src/main/AndroidManifest.xml similarity index 98% rename from filcnaplo/android/app/src/main/AndroidManifest.xml rename to refilc/android/app/src/main/AndroidManifest.xml index 14d49f3..3cdc402 100644 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ b/refilc/android/app/src/main/AndroidManifest.xml @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java b/refilc/android/app/src/main/java/hu/refilc/naplo/MainActivity.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/MainActivity.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java b/refilc/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java b/refilc/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java b/refilc/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java b/refilc/android/app/src/main/java/hu/refilc/naplo/utils/Week.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/utils/Week.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java diff --git a/filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java b/refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java similarity index 100% rename from filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java rename to refilc/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableService.java diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-hdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-hdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-hdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png rename to refilc/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png b/refilc/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png rename to refilc/android/app/src/main/res/drawable-hdpi/ic_stat_splash_logo.png diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png b/refilc/android/app/src/main/res/drawable-hdpi/splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-hdpi/splash.png rename to refilc/android/app/src/main/res/drawable-hdpi/splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png b/refilc/android/app/src/main/res/drawable-hdpi/tinta_image.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-hdpi/tinta_image.png rename to refilc/android/app/src/main/res/drawable-hdpi/tinta_image.png diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-mdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-mdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-mdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png rename to refilc/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png b/refilc/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png rename to refilc/android/app/src/main/res/drawable-mdpi/ic_stat_splash_logo.png diff --git a/filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png b/refilc/android/app/src/main/res/drawable-mdpi/splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-mdpi/splash.png rename to refilc/android/app/src/main/res/drawable-mdpi/splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-hdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-night-hdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-night-hdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-mdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-night-mdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-night-mdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-xhdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-night-xhdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-night-xhdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_check.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_check.xml index 4545224..62d6723 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_check.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml index a7f5dd6..01e9d40 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml index 93ad67e..c1e9015 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_droplet.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_droplet.xml index 865d06c..cc3690b 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_droplet.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml index a4f78de..07d5da9 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_launcher_background.xml @@ -1,170 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml index cc14f03..2b068d1 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_launcher_foreground.xml @@ -1,30 +1,30 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml index 90b35d8..273720c 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml @@ -1,13 +1,13 @@ - - - + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml b/refilc/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml rename to refilc/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml index 289cd49..f2365a8 100644 --- a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml +++ b/refilc/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml @@ -1,27 +1,27 @@ - - - - - + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml b/refilc/android/app/src/main/res/drawable-v21/app_widget_background.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml rename to refilc/android/app/src/main/res/drawable-v21/app_widget_background.xml index 6721d42..785445c 100644 --- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml +++ b/refilc/android/app/src/main/res/drawable-v21/app_widget_background.xml @@ -1,10 +1,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/refilc/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml rename to refilc/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml index 5ae60cf..007e287 100644 --- a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml +++ b/refilc/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml @@ -1,10 +1,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/background.png b/refilc/android/app/src/main/res/drawable-v21/background.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-v21/background.png rename to refilc/android/app/src/main/res/drawable-v21/background.png diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml b/refilc/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml rename to refilc/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-xhdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-xhdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml similarity index 96% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml index 0def536..860b811 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml index f12f731..6466eba 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml index ee09eea..426d5c1 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml index 030aaf2..6e5cbff 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png rename to refilc/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png b/refilc/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png rename to refilc/android/app/src/main/res/drawable-xhdpi/ic_stat_splash_logo.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png b/refilc/android/app/src/main/res/drawable-xhdpi/splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/splash.png rename to refilc/android/app/src/main/res/drawable-xhdpi/splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png b/refilc/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png rename to refilc/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml similarity index 96% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml index 80b52be..8a99162 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml similarity index 96% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml index f2d52b0..2551ee3 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml similarity index 96% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml index a37fed6..e0e9376 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml similarity index 96% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml index c41e2b5..4bbd0bb 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml b/refilc/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml similarity index 94% rename from filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml rename to refilc/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml index a4eab7e..a8f281e 100644 --- a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml +++ b/refilc/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-xxhdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxhdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-xxhdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png rename to refilc/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png b/refilc/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png rename to refilc/android/app/src/main/res/drawable-xxhdpi/ic_stat_splash_logo.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png b/refilc/android/app/src/main/res/drawable-xxhdpi/splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxhdpi/splash.png rename to refilc/android/app/src/main/res/drawable-xxhdpi/splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/android12splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxxhdpi/android12splash.png rename to refilc/android/app/src/main/res/drawable-xxxhdpi/android12splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png rename to refilc/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png rename to refilc/android/app/src/main/res/drawable-xxxhdpi/ic_stat_splash_logo.png diff --git a/filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/splash.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable-xxxhdpi/splash.png rename to refilc/android/app/src/main/res/drawable-xxxhdpi/splash.png diff --git a/filcnaplo/android/app/src/main/res/drawable/background.png b/refilc/android/app/src/main/res/drawable/background.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/background.png rename to refilc/android/app/src/main/res/drawable/background.png diff --git a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml b/refilc/android/app/src/main/res/drawable/btn_shape.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable/btn_shape.xml rename to refilc/android/app/src/main/res/drawable/btn_shape.xml index b820ec8..d91b3b2 100644 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape.xml +++ b/refilc/android/app/src/main/res/drawable/btn_shape.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml b/refilc/android/app/src/main/res/drawable/btn_shape_login.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml rename to refilc/android/app/src/main/res/drawable/btn_shape_login.xml index 84bb6fe..22c1d8f 100644 --- a/filcnaplo/android/app/src/main/res/drawable/btn_shape_login.xml +++ b/refilc/android/app/src/main/res/drawable/btn_shape_login.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_absences.png b/refilc/android/app/src/main/res/drawable/ic_absences.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/ic_absences.png rename to refilc/android/app/src/main/res/drawable/ic_absences.png diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_grades.png b/refilc/android/app/src/main/res/drawable/ic_grades.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/ic_grades.png rename to refilc/android/app/src/main/res/drawable/ic_grades.png diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_home.png b/refilc/android/app/src/main/res/drawable/ic_home.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/ic_home.png rename to refilc/android/app/src/main/res/drawable/ic_home.png diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_messages.png b/refilc/android/app/src/main/res/drawable/ic_messages.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/ic_messages.png rename to refilc/android/app/src/main/res/drawable/ic_messages.png diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_notification.png b/refilc/android/app/src/main/res/drawable/ic_notification.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/ic_notification.png rename to refilc/android/app/src/main/res/drawable/ic_notification.png diff --git a/filcnaplo/android/app/src/main/res/drawable/ic_timetable.png b/refilc/android/app/src/main/res/drawable/ic_timetable.png similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/ic_timetable.png rename to refilc/android/app/src/main/res/drawable/ic_timetable.png diff --git a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml b/refilc/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from filcnaplo/android/app/src/main/res/drawable/launch_background.xml rename to refilc/android/app/src/main/res/drawable/launch_background.xml diff --git a/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf b/refilc/android/app/src/main/res/font/montserrat_medium.ttf similarity index 100% rename from filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf rename to refilc/android/app/src/main/res/font/montserrat_medium.ttf diff --git a/filcnaplo/android/app/src/main/res/ic_launcher-web.png b/refilc/android/app/src/main/res/ic_launcher-web.png similarity index 100% rename from filcnaplo/android/app/src/main/res/ic_launcher-web.png rename to refilc/android/app/src/main/res/ic_launcher-web.png diff --git a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml b/refilc/android/app/src/main/res/layout/home_widget_test.xml similarity index 95% rename from filcnaplo/android/app/src/main/res/layout/home_widget_test.xml rename to refilc/android/app/src/main/res/layout/home_widget_test.xml index b12af8d..f0a315a 100644 --- a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml +++ b/refilc/android/app/src/main/res/layout/home_widget_test.xml @@ -1,26 +1,26 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml b/refilc/android/app/src/main/res/layout/timetable_item.xml similarity index 96% rename from filcnaplo/android/app/src/main/res/layout/timetable_item.xml rename to refilc/android/app/src/main/res/layout/timetable_item.xml index aa23af8..f057d2d 100644 --- a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml +++ b/refilc/android/app/src/main/res/layout/timetable_item.xml @@ -1,113 +1,113 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml b/refilc/android/app/src/main/res/layout/widget_timetable.xml similarity index 97% rename from filcnaplo/android/app/src/main/res/layout/widget_timetable.xml rename to refilc/android/app/src/main/res/layout/widget_timetable.xml index 69b80b0..86aaea9 100644 --- a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml +++ b/refilc/android/app/src/main/res/layout/widget_timetable.xml @@ -1,232 +1,232 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -