Merge remote-tracking branch 'origin/main' into enhancement/288-display-study-room-utilization-percentages-using-iris

jakobkoerber · jakobkoerber · commit 6df49730cd47 · 2024-11-13T19:42:36.000+01:00
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -20,7 +20,7 @@ plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '8.6.1' apply false
     id "org.jetbrains.kotlin.android" version "1.9.20" apply false
-    id "org.jetbrains.kotlin.plugin.serialization" version "2.0.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
     id "com.google.firebase.crashlytics" version "3.0.2" apply false
 }
diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -230,7 +230,7 @@
   "campus": "Campus",
   "studies": "Studium",
   "suggested": "Interessante {}",
-  "all": "Alle",
+  "more": "Mehr",
   "visibility": "Sichtbarkeit",
   "utilizationAt": "Auslastung bei {}%"
 }
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -230,7 +230,7 @@
   "campus": "Campus",
   "studies": "Studies",
   "suggested": "Suggested {}",
-  "all": "All",
+  "more": "More",
   "visibility": "Visibility",
   "utilizationAt": "Utilization at {}%"
 }
diff --git a/lib/base/util/grid_utility.dart b/lib/base/util/grid_utility.dart
@@ -0,0 +1,38 @@
+import 'package:campus_flutter/base/enums/device.dart';
+import 'package:campus_flutter/base/services/device_type_service.dart';
+import 'package:flutter/material.dart';
+
+class GridUtility {
+  static int campusCrossAxisCount(BuildContext context) {
+    switch (DeviceService.getType(context)) {
+      case Device.landscapeTablet:
+        return 6;
+      case Device.portraitTablet:
+        return 4;
+      case Device.phone:
+        return 2;
+    }
+  }
+
+  static int campusPaddedCrossAxisCount(BuildContext context) {
+    switch (DeviceService.getType(context)) {
+      case Device.landscapeTablet:
+        return 3;
+      case Device.portraitTablet:
+        return 4;
+      case Device.phone:
+        return 2;
+    }
+  }
+
+  static int campusNumberOfItems(BuildContext context) {
+    switch (DeviceService.getType(context)) {
+      case Device.landscapeTablet:
+        return 6;
+      case Device.portraitTablet:
+        return 8;
+      case Device.phone:
+        return 6;
+    }
+  }
+}
diff --git a/lib/campusComponent/screen/movie_screen.dart b/lib/campusComponent/screen/movie_screen.dart
@@ -1,11 +1,10 @@
-import 'package:campus_flutter/base/enums/device.dart';
 import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/errorHandling/error_handling_router.dart';
 import 'package:campus_flutter/base/extensions/context.dart';
-import 'package:campus_flutter/base/services/device_type_service.dart';
 import 'package:campus_flutter/base/util/delayed_loading_indicator.dart';
+import 'package:campus_flutter/base/util/grid_utility.dart';
 import 'package:campus_flutter/base/util/url_launcher.dart';
-import 'package:campus_flutter/campusComponent/view/movie/movie_card_view.dart';
+import 'package:campus_flutter/campusComponent/view/movie/movie_grid_view.dart';
 import 'package:campus_flutter/campusComponent/viewmodel/movies_viewmodel.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -34,15 +33,11 @@ class MovieScreen extends ConsumerWidget {
           ),
           body: () {
             if (snapshot.hasData) {
-              return GridView.count(
+              return MovieGridView(
+                movies: snapshot.data!,
                 padding: EdgeInsets.all(context.padding),
-                crossAxisCount: crossAxisCount(context),
-                mainAxisSpacing: context.padding,
-                crossAxisSpacing: context.padding,
-                childAspectRatio: 250 / 470,
-                children: [
-                  for (var movie in snapshot.data!) MovieCardView(movie: movie),
-                ],
+                crossAxisCount: GridUtility.campusCrossAxisCount(context),
+                withinScrollView: false,
               );
             } else if (snapshot.hasError) {
               return Center(
@@ -63,15 +58,4 @@ class MovieScreen extends ConsumerWidget {
       },
     );
   }
-
-  int crossAxisCount(BuildContext context) {
-    switch (DeviceService.getType(context)) {
-      case Device.landscapeTablet:
-        return 6;
-      case Device.portraitTablet:
-        return 4;
-      case Device.phone:
-        return 2;
-    }
-  }
 }
diff --git a/lib/campusComponent/screen/student_clubs_screen.dart b/lib/campusComponent/screen/student_clubs_screen.dart
@@ -1,12 +1,13 @@
 import 'package:campus_flutter/base/enums/device.dart';
 import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
 import 'package:campus_flutter/base/errorHandling/error_handling_router.dart';
+import 'package:campus_flutter/base/extensions/context.dart';
 import 'package:campus_flutter/base/networking/apis/tumdev/campus_backend.pb.dart';
 import 'package:campus_flutter/base/services/device_type_service.dart';
 import 'package:campus_flutter/base/util/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/util/url_launcher.dart';
 import 'package:campus_flutter/campusComponent/model/student_club_collection.dart';
-import 'package:campus_flutter/campusComponent/view/studentClub/student_club_item_view.dart';
+import 'package:campus_flutter/campusComponent/view/studentClub/student_club_grid_view.dart';
 import 'package:campus_flutter/campusComponent/viewmodel/student_club_viewmodel.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -48,34 +49,11 @@ class StudentClubsScreen extends ConsumerWidget {
                 return TabBarView(
                   children: [
                     for (var collection in snapshot.data!)
-                      Padding(
-                        padding: const EdgeInsets.only(
-                          top: 15,
-                          left: 11,
-                          right: 11,
-                        ),
-                        child: GridView.count(
-                          crossAxisCount: crossAxisCount(context),
-                          children: [
-                            for (var studentClub in collection.clubs)
-                              Padding(
-                                padding: const EdgeInsets.all(4.0),
-                                child: Container(
-                                  decoration: const ShapeDecoration(
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.all(
-                                        Radius.circular(28.0),
-                                      ),
-                                    ),
-                                  ),
-                                  clipBehavior: Clip.antiAlias,
-                                  child: StudentClubItemView(
-                                    studentClub: studentClub,
-                                  ),
-                                ),
-                              ),
-                          ],
-                        ),
+                      StudentClubGridView(
+                        studentClubs: collection.clubs,
+                        padding: EdgeInsets.all(context.padding),
+                        crossAxisCount: crossAxisCount(context),
+                        withinScrollView: false,
                       ),
                   ],
                 );
diff --git a/lib/campusComponent/view/movie/movie_card_view.dart b/lib/campusComponent/view/movie/movie_card_view.dart
@@ -7,36 +7,25 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class MovieCardView extends ConsumerWidget {
-  const MovieCardView({
-    super.key,
-    required this.movie,
-    this.isCarousel = false,
-  });
+  const MovieCardView({super.key, required this.movie});
 
   final Movie movie;
-  final bool isCarousel;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    if (isCarousel) {
-      return body(context);
-    } else {
-      return InkWell(
-        onTap: () {
-          UrlLauncher.urlString(movie.additionalInformationUrl, ref);
-        },
-        child: body(context),
-      );
-    }
+    return InkWell(
+      onTap: () {
+        UrlLauncher.urlString(movie.additionalInformationUrl, ref);
+      },
+      child: body(context),
+    );
   }
 
   Widget body(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
         color: Theme.of(context).cardTheme.color,
-        borderRadius: isCarousel
-            ? BorderRadius.zero
-            : const BorderRadius.all(Radius.circular(12)),
+        borderRadius: const BorderRadius.all(Radius.circular(12)),
       ),
       clipBehavior: Clip.antiAlias,
       child: AspectRatio(
diff --git a/lib/campusComponent/view/movie/movie_grid_view.dart b/lib/campusComponent/view/movie/movie_grid_view.dart
@@ -0,0 +1,33 @@
+import 'package:campus_flutter/base/extensions/context.dart';
+import 'package:campus_flutter/base/networking/apis/tumdev/campus_backend.pb.dart';
+import 'package:campus_flutter/campusComponent/view/movie/movie_card_view.dart';
+import 'package:flutter/material.dart';
+
+class MovieGridView extends StatelessWidget {
+  const MovieGridView({
+    super.key,
+    required this.movies,
+    required this.padding,
+    required this.crossAxisCount,
+    required this.withinScrollView,
+  });
+
+  final List<Movie> movies;
+  final EdgeInsets padding;
+  final int crossAxisCount;
+  final bool withinScrollView;
+
+  @override
+  Widget build(BuildContext context) {
+    return GridView.count(
+      shrinkWrap: withinScrollView,
+      physics: withinScrollView ? NeverScrollableScrollPhysics() : null,
+      padding: padding,
+      crossAxisCount: crossAxisCount,
+      mainAxisSpacing: context.padding,
+      crossAxisSpacing: context.padding,
+      childAspectRatio: 250 / 470,
+      children: [for (var movie in movies) MovieCardView(movie: movie)],
+    );
+  }
+}
diff --git a/lib/campusComponent/view/movie/movies_widget_view.dart b/lib/campusComponent/view/movie/movies_widget_view.dart
@@ -1,12 +1,13 @@
 import 'package:campus_flutter/base/enums/error_handling_view_type.dart';
+import 'package:campus_flutter/base/extensions/context.dart';
 import 'package:campus_flutter/base/routing/routes.dart';
 import 'package:campus_flutter/base/util/delayed_loading_indicator.dart';
 import 'package:campus_flutter/base/networking/apis/tumdev/campus_backend.pbgrpc.dart';
 import 'package:campus_flutter/base/errorHandling/error_handling_router.dart';
-import 'package:campus_flutter/base/util/url_launcher.dart';
+import 'package:campus_flutter/base/util/grid_utility.dart';
+import 'package:campus_flutter/campusComponent/view/movie/movie_grid_view.dart';
 import 'package:campus_flutter/homeComponent/view/widget/widget_frame_view.dart';
 import 'package:campus_flutter/campusComponent/viewmodel/movies_viewmodel.dart';
-import 'package:campus_flutter/campusComponent/view/movie/movie_card_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -47,7 +48,7 @@ class _MoviesHomeWidgetState extends ConsumerState<MovieWidgetView> {
                 const Spacer(),
                 InkWell(
                   child: Text(
-                    context.tr("all"),
+                    context.tr("more"),
                     style: Theme.of(context).textTheme.titleMedium,
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
@@ -65,45 +66,29 @@ class _MoviesHomeWidgetState extends ConsumerState<MovieWidgetView> {
 
   Widget body(AsyncSnapshot<List<Movie>?> snapshot) {
     if (snapshot.hasData) {
-      final height = MediaQuery.of(context).size.height * 0.34;
-      final width = height * 250 / 470;
-      return SizedBox(
-        height: height,
-        child: Padding(
-          padding: const EdgeInsets.only(left: 11),
-          child: CarouselView(
-            itemExtent: width,
-            shrinkExtent: width,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(12),
-            ),
-            children: [
-              for (var data in snapshot.data!)
-                MovieCardView(
-                  movie: data,
-                  isCarousel: true,
-                ),
-            ],
-            onTap: (index) => UrlLauncher.urlString(
-              snapshot.data![index].additionalInformationUrl,
-              ref,
-            ),
-          ),
-        ),
+      return MovieGridView(
+        movies: snapshot.data!
+            .take(GridUtility.campusNumberOfItems(context))
+            .toList(),
+        padding: EdgeInsets.symmetric(horizontal: context.padding),
+        crossAxisCount: GridUtility.campusPaddedCrossAxisCount(context),
+        withinScrollView: true,
       );
     } else if (snapshot.hasError) {
-      return SizedBox(
-        height: MediaQuery.of(context).size.height * 0.34,
-        child: ErrorHandlingRouter(
-          error: snapshot.error!,
-          errorHandlingViewType: ErrorHandlingViewType.textOnly,
-          retry: (() => ref.read(movieViewModel).fetch(true)),
+      return AspectRatio(
+        aspectRatio: 2,
+        child: Card(
+          child: ErrorHandlingRouter(
+            error: Error(),
+            errorHandlingViewType: ErrorHandlingViewType.textOnly,
+            retry: (() => ref.read(movieViewModel).fetch(true)),
+          ),
         ),
       );
     } else {
-      return Card(
-        child: SizedBox(
-          height: MediaQuery.of(context).size.height * 0.34,
+      return AspectRatio(
+        aspectRatio: 2,
+        child: Card(
           child: DelayedLoadingIndicator(name: context.tr("movies")),
         ),
       );
diff --git a/lib/campusComponent/view/news/news_widget_view.dart b/lib/campusComponent/view/news/news_widget_view.dart
@@ -40,7 +40,7 @@ class _NewsWidgetViewState extends ConsumerState<NewsWidgetView> {
           const Spacer(),
           InkWell(
             child: Text(
-              context.tr("all"),
+              context.tr("more"),
               style: Theme.of(context).textTheme.titleMedium,
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
diff --git a/lib/campusComponent/view/studentClub/student_club_card_view.dart b/lib/campusComponent/view/studentClub/student_club_card_view.dart
@@ -6,31 +6,26 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 
-class StudentClubItemView extends ConsumerWidget {
-  const StudentClubItemView({
+class StudentClubCardView extends ConsumerWidget {
+  const StudentClubCardView({
     super.key,
     required this.studentClub,
-    this.isCarousel = false,
   });
 
   final StudentClub studentClub;
-  final bool isCarousel;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    if (isCarousel) {
-      return body(context);
-    } else {
-      return InkWell(
-        onTap: () => UrlLauncher.urlString(studentClub.linkUrl, ref),
-        child: body(context),
-      );
-    }
+    return InkWell(
+      onTap: () => UrlLauncher.urlString(studentClub.linkUrl, ref),
+      child: body(context),
+    );
   }
 
   Widget body(BuildContext context) {
-    return Container(
-      color: Theme.of(context).cardTheme.color,
+    return Card(
+      margin: EdgeInsets.zero,
+      clipBehavior: Clip.hardEdge,
       child: Column(
         children: [
           if (studentClub.coverUrl.contains("svg"))
@@ -67,6 +62,7 @@ class StudentClubItemView extends ConsumerWidget {
                 ),
               ),
             ),
+          Divider(height: 0),
           Expanded(
             flex: 2,
             child: Center(
diff --git a/lib/campusComponent/view/studentClub/student_club_grid_view.dart b/lib/campusComponent/view/studentClub/student_club_grid_view.dart
diff --git a/lib/campusComponent/view/studentClub/student_club_widget_view.dart b/lib/campusComponent/view/studentClub/student_club_widget_view.dart
diff --git a/lib/campusComponent/viewmodel/student_club_viewmodel.dart b/lib/campusComponent/viewmodel/student_club_viewmodel.dart
diff --git a/lib/homeComponent/view/contactCard/contact_card_loading_view.dart b/lib/homeComponent/view/contactCard/contact_card_loading_view.dart
diff --git a/lib/homeComponent/view/contactCard/contact_card_view.dart b/lib/homeComponent/view/contactCard/contact_card_view.dart

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`	`21`	`id "com.android.application" version '8.6.1' apply false`
`22`	`22`	`id "org.jetbrains.kotlin.android" version "1.9.20" apply false`
`23`		`- id "org.jetbrains.kotlin.plugin.serialization" version "2.0.20" apply false`
	`23`	`+ id "org.jetbrains.kotlin.plugin.serialization" version "2.0.21" apply false`
`24`	`24`	`id "com.google.gms.google-services" version "4.4.2" apply false`
`25`	`25`	`id "com.google.firebase.crashlytics" version "3.0.2" apply false`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@`
`230`	`230`	`"campus": "Campus",`
`231`	`231`	`"studies": "Studium",`
`232`	`232`	`"suggested": "Interessante {}",`
`233`		`- "all": "Alle",`
	`233`	`+ "more": "Mehr",`
`234`	`234`	`"visibility": "Sichtbarkeit",`
`235`	`235`	`"utilizationAt": "Auslastung bei {}%"`
`236`	`236`	`}`