Skip to content

Commit 437a5fa

Browse files
jakobkoerberjakobkoerber
committed
Merge Grade and Lecture Tab into Studies Tab
1 parent e1f5b05 commit 437a5fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+160
-106
lines changed

‎android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.5.2' apply false
21+
id "com.android.application" version '8.6.0' apply false
2222
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23-
id "org.jetbrains.kotlin.plugin.serialization" version "2.0.0" apply false
23+
id "org.jetbrains.kotlin.plugin.serialization" version "2.0.20" apply false
2424
id "com.google.gms.google-services" version "4.4.2" apply false
2525
id "com.google.firebase.crashlytics" version "3.0.2" apply false
2626
}

‎lib/base/routing/router.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import 'package:campus_flutter/campusComponent/screen/student_clubs_screen.dart'
1010
import 'package:campus_flutter/departuresComponent/views/departures_details_view.dart';
1111
import 'package:campus_flutter/feedbackComponent/views/feedback_form_view.dart';
1212
import 'package:campus_flutter/feedbackComponent/views/feedback_success_view.dart';
13-
import 'package:campus_flutter/lectureComponent/model/lecture.dart';
14-
import 'package:campus_flutter/lectureComponent/views/lecture_details_view.dart';
1513
import 'package:campus_flutter/homeComponent/home_screen.dart';
1614
import 'package:campus_flutter/navigaTumComponent/model/navigatum_roomfinder_map.dart';
1715
import 'package:campus_flutter/navigaTumComponent/views/navigatum_room_view.dart';
@@ -34,7 +32,9 @@ import 'package:campus_flutter/placesComponent/views/studyGroups/study_rooms_vie
3432
import 'package:campus_flutter/searchComponent/views/appWideSearch/search_scaffold.dart';
3533
import 'package:campus_flutter/searchComponent/views/personRoomSearch/search_view.dart';
3634
import 'package:campus_flutter/settingsComponent/views/settings_scaffold.dart';
37-
import 'package:flutter/material.dart';
35+
import 'package:campus_flutter/studiesComponent/model/lecture.dart';
36+
import 'package:campus_flutter/studiesComponent/screen/studies_screen.dart';
37+
import 'package:campus_flutter/studiesComponent/view/lectureDetail/lecture_details_view.dart';
3838
import 'package:flutter_riverpod/flutter_riverpod.dart';
3939
import 'package:go_router/go_router.dart';
4040

@@ -82,7 +82,7 @@ final _router = GoRouter(
8282
GoRoute(
8383
path: studies,
8484
pageBuilder: (context, state) => const NoTransitionPage(
85-
child: Text("Studies"),
85+
child: StudiesScreen(),
8686
),
8787
),
8888
],

‎lib/onboardingComponent/views/permission_check_view.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:campus_flutter/base/util/custom_back_button.dart';
22
import 'package:campus_flutter/base/routing/routes.dart';
33
import 'package:campus_flutter/calendarComponent/services/calendar_service.dart';
4-
import 'package:campus_flutter/gradeComponent/services/grade_service.dart';
5-
import 'package:campus_flutter/lectureComponent/services/lecture_service.dart';
4+
import 'package:campus_flutter/studiesComponent/service/grade_service.dart';
5+
import 'package:campus_flutter/studiesComponent/service/lecture_service.dart';
66
import 'package:campus_flutter/profileComponent/services/profile_service.dart';
77
import 'package:easy_localization/easy_localization.dart';
88
import 'package:flutter/material.dart';

‎lib/searchComponent/viewModels/searchableViewModels/grades_search_viewmodel.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/gradeComponent/model/grade.dart';
2-
import 'package:campus_flutter/gradeComponent/services/grade_service.dart';
1+
import 'package:campus_flutter/studiesComponent/model/grade.dart';
2+
import 'package:campus_flutter/studiesComponent/service/grade_service.dart';
33
import 'package:campus_flutter/searchComponent/model/search_exception.dart';
44
import 'package:campus_flutter/searchComponent/protocols/global_search.dart';
55
import 'package:campus_flutter/searchComponent/protocols/search_viewmodel.dart';

‎lib/searchComponent/viewModels/searchableViewModels/lecture_search_viewmodel.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/lectureComponent/model/lecture.dart';
2-
import 'package:campus_flutter/lectureComponent/services/lecture_search_service.dart';
1+
import 'package:campus_flutter/studiesComponent/model/lecture.dart';
2+
import 'package:campus_flutter/studiesComponent/service/lecture_search_service.dart';
33
import 'package:campus_flutter/searchComponent/model/search_exception.dart';
44
import 'package:campus_flutter/searchComponent/protocols/global_search.dart';
55
import 'package:campus_flutter/searchComponent/protocols/search_viewmodel.dart';

‎lib/searchComponent/viewModels/searchableViewModels/personal_lecture_seach_viewmodel.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/lectureComponent/model/lecture.dart';
2-
import 'package:campus_flutter/lectureComponent/services/lecture_service.dart';
1+
import 'package:campus_flutter/studiesComponent/model/lecture.dart';
2+
import 'package:campus_flutter/studiesComponent/service/lecture_service.dart';
33
import 'package:campus_flutter/searchComponent/model/search_exception.dart';
44
import 'package:campus_flutter/searchComponent/protocols/global_search.dart';
55
import 'package:campus_flutter/searchComponent/protocols/search_viewmodel.dart';

‎lib/searchComponent/views/appWideSearch/resultViews/grade_search_result_view.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/gradeComponent/model/grade.dart';
2-
import 'package:campus_flutter/gradeComponent/views/grade_view.dart';
1+
import 'package:campus_flutter/studiesComponent/model/grade.dart';
2+
import 'package:campus_flutter/studiesComponent/view/grade/grade_view.dart';
33
import 'package:campus_flutter/base/enums/search_category.dart';
44
import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/grades_search_viewmodel.dart';
55
import 'package:campus_flutter/searchComponent/views/appWideSearch/search_result_card_view.dart';

‎lib/searchComponent/views/appWideSearch/resultViews/lecture_search_result_view.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/lectureComponent/model/lecture.dart';
2-
import 'package:campus_flutter/lectureComponent/views/lecture_view.dart';
1+
import 'package:campus_flutter/studiesComponent/model/lecture.dart';
2+
import 'package:campus_flutter/studiesComponent/view/lecture/lecture_view.dart';
33
import 'package:campus_flutter/base/enums/search_category.dart';
44
import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/lecture_search_viewmodel.dart';
55
import 'package:campus_flutter/searchComponent/views/appWideSearch/search_result_card_view.dart';

‎lib/searchComponent/views/appWideSearch/resultViews/personal_lecture_search_result_view.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:campus_flutter/lectureComponent/model/lecture.dart';
2-
import 'package:campus_flutter/lectureComponent/views/lecture_view.dart';
1+
import 'package:campus_flutter/studiesComponent/model/lecture.dart';
2+
import 'package:campus_flutter/studiesComponent/view/lecture/lecture_view.dart';
33
import 'package:campus_flutter/base/enums/search_category.dart';
44
import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/personal_lecture_seach_viewmodel.dart';
55
import 'package:campus_flutter/searchComponent/views/appWideSearch/search_result_card_view.dart';

‎lib/settingsComponent/views/appearance_settings_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:campus_flutter/base/enums/appearance.dart';
44
import 'package:campus_flutter/base/enums/user_preference.dart';
55
import 'package:campus_flutter/base/views/seperated_list.dart';
66
import 'package:campus_flutter/calendarComponent/views/calendars_view.dart';
7-
import 'package:campus_flutter/gradeComponent/viewModels/grade_viewmodel.dart';
7+
import 'package:campus_flutter/studiesComponent/viewModel/grade_viewmodel.dart';
88
import 'package:campus_flutter/homeComponent/widgetComponent/views/widget_frame_view.dart';
99
import 'package:campus_flutter/main.dart';
1010
import 'package:campus_flutter/settingsComponent/viewModels/user_preferences_viewmodel.dart';

0 commit comments

Comments
 (0)