Add Room Search to Quick Actions (#284)

Author: jakobkoerber

android/app/build.gradle

@@ -46,7 +46,7 @@ android {
         applicationId "de.tum.in.tumcampus"
         minSdkVersion 29
         targetSdkVersion flutter.targetSdkVersion
-        ndkVersion "26.1.10909125"
+        ndkVersion "27.0.12077973"
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip

android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.6.1' apply false
+    id "com.android.application" version '8.7.0' apply false
     id "org.jetbrains.kotlin.android" version "1.9.20" apply false
     id "org.jetbrains.kotlin.plugin.serialization" version "2.0.21" apply false
     id "com.google.gms.google-services" version "4.4.2" apply false

ios/Podfile.lock

@@ -251,7 +251,7 @@ SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
+  geolocator_apple: 9bcea1918ff7f0062d98345d238ae12718acfbc1
   Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321
   google_maps_flutter_ios: e31555a04d1986ab130f2b9f24b6cdc861acc6d3
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7

lib/base/enums/search_category.dart

@@ -1,5 +1,18 @@
+import 'package:campus_flutter/searchComponent/protocols/search_category_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/cafeteria_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/calendar_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/grades_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/lecture_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/movie_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/navigatum_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/news_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/person_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/personal_lecture_seach_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/student_club_search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/viewModels/searchableViewModels/study_room_search_viewmodel.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 enum SearchCategory {
   cafeterias,
@@ -62,4 +75,31 @@ extension SearchCategoryExtension on SearchCategory {
       SearchCategory.studentClub,
     ];
   }
+
+  Provider<SearchCategoryViewModel> get viewModel {
+    switch (this) {
+      case SearchCategory.cafeterias:
+        return cafeteriaSearchViewModel;
+      case SearchCategory.calendar:
+        return calendarSearchViewModel;
+      case SearchCategory.grade:
+        return gradesSearchViewModel;
+      case SearchCategory.movie:
+        return movieSearchViewModel;
+      case SearchCategory.news:
+        return newsSearchViewModel;
+      case SearchCategory.studyRoom:
+        return studyRoomSearchViewModel;
+      case SearchCategory.lectures:
+        return lectureSearchViewModel;
+      case SearchCategory.personalLectures:
+        return personalLectureSearchViewModel;
+      case SearchCategory.persons:
+        return personSearchViewModel;
+      case SearchCategory.rooms:
+        return navigaTumSearchViewModel;
+      case SearchCategory.studentClub:
+        return studentClubSearchViewModel;
+    }
+  }
 }

lib/base/enums/search_type.dart

@@ -0,0 +1,5 @@
+enum SearchType {
+  general,
+  room,
+  person;
+}

lib/base/enums/shortcut_item.dart

@@ -7,7 +7,8 @@ enum ShortcutItemType {
   cafeterias(en: "Cafeterias", de: "Mensen"),
   studyRooms(en: "Study Rooms", de: "Lernräume"),
   calendar(en: "Calendar", de: "Kalendar"),
-  studies(en: "Studies", de: "Studium");
+  studies(en: "Studies", de: "Studium"),
+  roomSearch(en: "Room Search", de: "Raumsuche");
 
   final String en;
   final String? de;
@@ -24,16 +25,7 @@ extension Routing on ShortcutItemType {
     return isGerman ? de! : en;
   }
 
-  String? get icon {
-    switch (this) {
-      case ShortcutItemType.home:
-      case ShortcutItemType.cafeterias:
-      case ShortcutItemType.studyRooms:
-      case ShortcutItemType.calendar:
-      case ShortcutItemType.studies:
-        return null;
-    }
-  }
+  String? get icon => null;
 
   ShortcutItem shortcutItem(Locale? locale) {
     return ShortcutItem(
@@ -55,14 +47,16 @@ extension Routing on ShortcutItemType {
         return routes.calendar;
       case ShortcutItemType.studies:
         return routes.studies;
+      case ShortcutItemType.roomSearch:
+        return routes.roomSearch;
     }
   }
 }
 
 extension ActiveShortcuts on ShortcutItemType {
   static List<ShortcutItemType> get items => [
         ShortcutItemType.cafeterias,
-        ShortcutItemType.studyRooms,
+        ShortcutItemType.roomSearch,
         ShortcutItemType.calendar,
         ShortcutItemType.studies,
       ];

lib/base/routing/router.dart

@@ -1,4 +1,5 @@
 import 'package:campus_flutter/base/enums/campus.dart';
+import 'package:campus_flutter/base/enums/search_type.dart';
 import 'package:campus_flutter/base/util/fullscreen_image_view.dart';
 import 'package:campus_flutter/base/routing/router_service.dart';
 import 'package:campus_flutter/base/routing/routes.dart';
@@ -31,8 +32,8 @@ import 'package:campus_flutter/placesComponent/views/campuses/campus_scaffold.da
 import 'package:campus_flutter/placesComponent/views/places_screen.dart';
 import 'package:campus_flutter/placesComponent/views/studyGroups/study_room_group_scaffold.dart';
 import 'package:campus_flutter/placesComponent/views/studyGroups/study_rooms_view.dart';
-import 'package:campus_flutter/searchComponent/views/appWideSearch/search_scaffold.dart';
-import 'package:campus_flutter/searchComponent/views/personRoomSearch/search_view.dart';
+import 'package:campus_flutter/searchComponent/viewModels/search_viewmodel.dart';
+import 'package:campus_flutter/searchComponent/views/search_scaffold.dart';
 import 'package:campus_flutter/settingsComponent/views/settings_scaffold.dart';
 import 'package:campus_flutter/studiesComponent/model/lecture.dart';
 import 'package:campus_flutter/studiesComponent/screen/studies_screen.dart';
@@ -220,7 +221,24 @@ final _router = GoRouter(
     ),
     GoRoute(
       path: search,
-      builder: (context, state) => const SearchScaffold(),
+      builder: (context, state) => SearchScaffold(
+        searchVM: searchViewModel(SearchType.general),
+        searchString: state.extra as String?,
+      ),
+    ),
+    GoRoute(
+      path: roomSearch,
+      builder: (context, state) => SearchScaffold(
+        searchVM: searchViewModel(SearchType.room),
+        searchString: state.extra as String?,
+      ),
+    ),
+    GoRoute(
+      path: personSearch,
+      builder: (context, state) => SearchScaffold(
+        searchVM: searchViewModel(SearchType.person),
+        searchString: state.extra as String?,
+      ),
     ),
     GoRoute(
       path: studyRoom,
@@ -244,16 +262,6 @@ final _router = GoRouter(
         imageData: state.extra as String,
       ),
     ),
-    GoRoute(
-      path: roomSearch,
-      builder: (context, state) {
-        final data = state.extra as (String?, bool?);
-        return PersonRoomSearchScaffold(
-          searchString: data.$1,
-          isRoomSearch: data.$2 ?? true,
-        );
-      },
-    ),
     GoRoute(
       path: eventCreation,
       builder: (context, state) => EventCreationScaffold(

lib/base/routing/routes.dart

@@ -37,12 +37,15 @@ const menuSettings = "/menu+settings";
 const feedback = "$menuSettings/feedback";
 const feedbackSuccess = "$feedback/success";
 
-/// General
+/// Search
 const search = "/search";
+const roomSearch = "/roomSearch";
+const personSearch = "/personSearch";
+
+/// General
 const navigaTum = "/navigaTum";
 const personDetails = "/personDetails";
 const cafeteria = "/cafeteria";
 const studyRoom = "/studyRoom";
 const networkImage = "/networkImage";
 const localeImage = "/localeImage";
-const roomSearch = "/roomSearch";

lib/base/util/custom_back_button.dart

@@ -5,18 +5,30 @@ import 'package:go_router/go_router.dart';
 class CustomBackButton extends StatelessWidget {
   const CustomBackButton({
     super.key,
+    this.beforeOnPressed,
     this.onPressed,
     this.color,
   });
 
   final Function()? onPressed;
+  final Function()? beforeOnPressed;
   final Color? color;
 
   @override
   Widget build(BuildContext context) {
     return BackButton(
       color: color,
-      onPressed: onPressed ?? () => defaultOnPressed(context),
+      onPressed: () {
+        if (beforeOnPressed != null) {
+          beforeOnPressed!();
+        }
+
+        if (onPressed != null) {
+          onPressed!();
+        } else {
+          defaultOnPressed(context);
+        }
+      },
     );
   }