Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed packages/uni_app/assets/images/bus.png
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:uni/controller/background_workers/notifications.dart';
import 'package:uni/controller/fetchers/fees_fetcher.dart';
import 'package:uni/controller/fetchers/finances/current_account_fetcher.dart';
import 'package:uni/controller/local_storage/preferences_controller.dart';
import 'package:uni/controller/parsers/parser_fees.dart';
import 'package:uni/session/flows/base/session.dart';
Expand Down Expand Up @@ -54,7 +54,7 @@ class TuitionNotification extends Notification {
if (notificationsAreDisabled) {
return false;
}
final feesFetcher = FeesFetcher();
final feesFetcher = CurrentAccountFetcher();
DateTime? dueDate;
try {
dueDate = parseFeesNextLimit(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:flutter/services.dart';
import 'package:uni/model/entities/calendar_event.dart';

class CalendarFetcherJson {
class CalendarFetcher {
/// Fetches the calendar events from the local JSON file.
Future<List<CalendarEvent>> getCalendar(String locale) async {
final filePath = 'assets/text/calendar/${locale}Calendar.json';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:html/parser.dart';
import 'package:http/http.dart';
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/parser_course_unit_info.dart';
import 'package:uni/controller/parsers/schedule/new_api/parser.dart';
Expand All @@ -10,7 +10,7 @@ import 'package:uni/model/entities/course_units/sheet.dart';
import 'package:uni/model/entities/lecture.dart';
import 'package:uni/session/flows/base/session.dart';

class CourseUnitsInfoFetcher implements SessionDependantFetcher {
class CourseUnitsInfoFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
return NetworkRouter.getBaseUrlsFromSession(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'dart:convert';

import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/model/entities/course_units/course_unit.dart';
import 'package:uni/session/flows/base/session.dart';

class CurrentCourseUnitsFetcher implements SessionDependantFetcher {
class CurrentCourseUnitsFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
// all faculties list user course units on all faculties
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:http/http.dart';
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/model/entities/course_units/course_unit.dart';
import 'package:uni/session/flows/base/session.dart';

/// Returns the user's current list of [CourseUnit].
class CoursesFetcher implements SessionDependantFetcher {
class CoursesFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
final urls = NetworkRouter.getBaseUrlsFromSession(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/parser_exams.dart';
import 'package:uni/model/entities/course_units/course_unit.dart';
import 'package:uni/model/entities/exam.dart';
import 'package:uni/session/flows/base/session.dart';

class ExamFetcher implements SessionDependantFetcher {
class ExamFetcher implements SessionDependentFetcher {
ExamFetcher(this.userUcs);
List<CourseUnit> userUcs;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/model/entities/lecture.dart';
import 'package:uni/model/utils/time/week.dart';
import 'package:uni/session/flows/base/session.dart';

/// Class for fetching the user's schedule.
abstract class ScheduleFetcher extends SessionDependantFetcher {
abstract class ScheduleFetcher extends SessionDependentFetcher {
// Returns the user's lectures.
Future<List<Lecture>> getLectures(Session session, {int? lectiveYear});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:http/http.dart' as http;
import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher.dart';
import 'package:uni/controller/fetchers/academics/schedule/schedule_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/schedule/api/parser.dart';
import 'package:uni/model/entities/lecture.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:uni/controller/fetchers/schedule_fetcher/schedule_fetcher.dart';
import 'package:uni/controller/fetchers/academics/schedule/schedule_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/schedule/new_api/parser.dart';
import 'package:uni/model/entities/lecture.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:uni/controller/networking/network_router.dart';

class BookThumbFetcher {
class BookThumbnailFetcher {
Future<String?> fetchBookThumb(String isbn) async {
final googleBooksFuture = _fetchFromGoogleBooks(isbn);
final openLibraryFuture = _fetchFromOpenLibrary(isbn);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/services.dart' show rootBundle;
import 'package:uni/controller/fetchers/location_fetcher/location_fetcher.dart';
import 'package:uni/controller/fetchers/campus/locations/location_fetcher.dart';
import 'package:uni/model/entities/indoor_floor_plan.dart';
import 'package:uni/model/entities/location_group.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:http/http.dart' as http;
import 'package:uni/controller/fetchers/location_fetcher/location_fetcher.dart';
import 'package:uni/controller/fetchers/campus/locations/location_fetcher.dart';
import 'package:uni/controller/parsers/parser_osm.dart';
import 'package:uni/model/entities/indoor_floor_plan.dart';
import 'package:uni/model/entities/location_group.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:uni/session/flows/base/session.dart';

abstract class SessionDependantFetcher {
abstract class SessionDependentFetcher {
List<String> getEndpoints(Session session);
}
179 changes: 0 additions & 179 deletions packages/uni_app/lib/controller/fetchers/departures_fetcher.dart

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:http/http.dart';
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/parser_current_account.dart';
import 'package:uni/model/entities/current_account.dart';
import 'package:uni/session/flows/base/session.dart';

class FeesFetcher implements SessionDependantFetcher {
class CurrentAccountFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
// TO DO: Check balance on all faculties and discard if user is not enrolled
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:http/http.dart' as http;
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/session/flows/base/session.dart';

class PrintFetcher implements SessionDependantFetcher {
class PrintFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
final url = '${NetworkRouter.getBaseUrl('feup')}imp4_impressoes.atribs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:http/http.dart';
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/session/flows/base/session.dart';

class ReferenceFetcher implements SessionDependantFetcher {
class ReferenceFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
final baseUrls =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:uni/controller/fetchers/courses_fetcher.dart';
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/academics/courses_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/parser_courses.dart';
import 'package:uni/controller/parsers/parser_pedagogical_surveys.dart';
import 'package:uni/model/entities/profile.dart';
import 'package:uni/session/flows/base/session.dart';

class ProfileFetcher implements SessionDependantFetcher {
class ProfileFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
final url = NetworkRouter.getBaseUrlsFromSession(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:uni/controller/fetchers/session_dependant_fetcher.dart';
import 'package:uni/controller/fetchers/core/session_dependent_fetcher.dart';
import 'package:uni/controller/networking/network_router.dart';
import 'package:uni/controller/parsers/parser_profile_info.dart';
import 'package:uni/model/entities/profile_info.dart';
import 'package:uni/session/flows/base/session.dart';

class ProfileInfoFetcher implements SessionDependantFetcher {
class ProfileInfoFetcher implements SessionDependentFetcher {
@override
List<String> getEndpoints(Session session) {
final url = NetworkRouter.getBaseUrlsFromSession(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:convert';
import 'package:html/dom.dart' as dom;
import 'package:html/parser.dart';
import 'package:http/http.dart' as http;
import 'package:uni/controller/fetchers/course_units_fetcher/course_units_info_fetcher.dart';
import 'package:uni/controller/fetchers/academics/course_units/course_units_info_fetcher.dart';
import 'package:uni/model/entities/course_units/course_unit_class.dart';
import 'package:uni/model/entities/course_units/course_unit_directory.dart';
import 'package:uni/model/entities/course_units/course_unit_file.dart';
Expand Down
Loading
Loading