Upgrade to Flutter v2.10.5 (#153)

* Upgrade to `2.10.5` * Replace `IntegerDivisionByZeroException` * Remove `primaryColorBrightness` * Fix `common_domain_models` * Fix `sharezone` * Add header * Remove local `streaming_shared_preferences` * Add header * Upgrade kotlin version * Increase `compileSdkVersion` * Remove `Theme` widget for activation * Update pubspec.lock * Update podfile lock * Run iOS * Fix Theme * Fix Theme on GroupJoinPage * Remove unused import * Revert "Run iOS" This reverts commit 7aea540. * Successful build with Flutter 2.5.2 * Run `sz pub get` * Run iOS * Fix `TabBar` color for homework page * Fix Date Picker * Fix edit time
SharezoneApp · May 9, 2022 · 0b52623 · 0b52623
1 parent 54f45cc
commit 0b52623
Show file tree

Hide file tree

Showing 139 changed files with 612 additions and 3,546 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.5.2",
+  "flutterSdkVersion": "2.10.5",
   "flavors": {}
 }
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -31,7 +31,7 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'

diff --git a/app/android/build.gradle b/app/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.6.21'
 
     repositories {
         google()

diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -567,7 +567,7 @@ SPEC CHECKSUMS:
   GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
   GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
   image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6
-  integration_test: 7db6d89f336f671dcbc7563ee27a5b08f6f8aee1
+  integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
   jitsi_meet_wrapper: f78c5a212de5dfbadcd81ce559217f3661a26ce7
   JitsiMeetSDK: edcac8e2b92ee0c7f3e75bd0aefefbe9faccfc93
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc

diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -186,7 +186,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/app/lib/activation_code/activation_code_page.dart b/app/lib/activation_code/activation_code_page.dart
@@ -8,7 +8,6 @@
 
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:sharezone/activation_code/src/bloc/enter_activation_code_bloc_factory.dart';
 import 'package:sharezone/groups/src/widgets/contact_support.dart';
 import 'package:sharezone_widgets/theme.dart';
@@ -36,17 +35,14 @@ class _EnterActivationCodePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Theme(
-      data: Theme.of(context).copyWith(primaryColorBrightness: Brightness.dark),
-      child: Scaffold(
-        appBar: const _EnterActivationCodeAppBar(),
-        body: SafeArea(
-          child: SingleChildScrollView(
-            child: _EnterActivationCodeDescription(),
-          ),
+    return Scaffold(
+      appBar: const _EnterActivationCodeAppBar(),
+      body: SafeArea(
+        child: SingleChildScrollView(
+          child: _EnterActivationCodeDescription(),
         ),
-        bottomNavigationBar: ContactSupport(),
       ),
+      bottomNavigationBar: ContactSupport(),
     );
   }
 }

diff --git a/app/lib/auth/email_and_password_link_page.dart b/app/lib/auth/email_and_password_link_page.dart
@@ -9,7 +9,6 @@
 import 'package:authentification_base/authentification.dart';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:sharezone/account/account_page_bloc.dart';
 import 'package:sharezone/account/register_account_section.dart';
 import 'package:sharezone/blocs/application_bloc.dart';

diff --git a/app/lib/auth/login_page.dart b/app/lib/auth/login_page.dart
@@ -12,7 +12,6 @@ import 'package:authentification_base/authentification_analytics.dart';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:sharezone/download_app_tip/widgets/download_app_tip_card.dart';
 import 'package:sharezone/groups/src/widgets/contact_support.dart';
 import 'package:sharezone/onboarding/sign_up/sign_up_page.dart';

diff --git a/app/lib/dashboard/dashboard_page.dart b/app/lib/dashboard/dashboard_page.dart
@@ -49,7 +49,6 @@ import 'package:sharezone/widgets/homework/homework_card.dart';
 import 'package:sharezone/widgets/machting_type_of_user_stream_builder.dart';
 import 'package:sharezone/widgets/material/modal_bottom_sheet_big_icon_button.dart';
 import 'package:sharezone_common/helper_functions.dart';
-import 'package:sharezone_utils/dimensions.dart';
 import 'package:sharezone_utils/platform.dart';
 import 'package:sharezone_widgets/announcement_card.dart';
 import 'package:sharezone_widgets/snackbars.dart';
@@ -87,26 +86,21 @@ class _DashboardPageState extends State<DashboardPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Theme(
-      data: Dimensions.fromMediaQuery(context).isDesktopModus
-          ? Theme.of(context)
-          : Theme.of(context).copyWith(primaryColorBrightness: Brightness.dark),
-      child: SharezoneCustomScaffold(
-        appBarConfiguration: SliverAppBarConfiguration(
-          title: _AppBarTitle(),
-          backgroundColor:
-              isDarkThemeEnabled(context) ? ElevationColors.dp8 : blueColor,
-          expandedHeight: 210,
-          elevation: 1,
-          pinned: true,
-          actions: const <Widget>[_ProfileAvatar()],
-          flexibleSpace: _AppBarBottom(),
-          drawerIconColor: Colors.white,
-        ),
-        navigationItem: NavigationItem.overview,
-        body: DashboardPageBody(),
-        floatingActionButton: _DashboardPageFAB(),
+    return SharezoneCustomScaffold(
+      appBarConfiguration: SliverAppBarConfiguration(
+        title: _AppBarTitle(),
+        backgroundColor:
+            isDarkThemeEnabled(context) ? ElevationColors.dp8 : blueColor,
+        expandedHeight: 210,
+        elevation: 1,
+        pinned: true,
+        actions: const <Widget>[_ProfileAvatar()],
+        flexibleSpace: _AppBarBottom(),
+        drawerIconColor: Colors.white,
       ),
+      navigationItem: NavigationItem.overview,
+      body: DashboardPageBody(),
+      floatingActionButton: _DashboardPageFAB(),
     );
   }
 }

diff --git a/app/lib/dashboard/models/homework_view.dart b/app/lib/dashboard/models/homework_view.dart
@@ -6,13 +6,10 @@
 //
 // SPDX-License-Identifier: EUPL-1.2
 
-import 'dart:ui';
-
 import 'package:firebase_hausaufgabenheft_logik/firebase_hausaufgabenheft_logik.dart';
 import 'package:flutter/material.dart';
 import 'package:group_domain_models/group_domain_models.dart';
 import 'package:intl/intl.dart';
-import 'package:meta/meta.dart';
 import 'package:sharezone/util/api/courseGateway.dart';
 
 class HomeworkView {

diff --git a/app/lib/donate/bloc/donation_bloc.dart b/app/lib/donate/bloc/donation_bloc.dart
@@ -14,7 +14,6 @@ import 'package:meta/meta.dart';
 import 'package:optional/optional.dart';
 import 'package:purchases_flutter/errors.dart';
 import 'package:sharezone/donate/analytics/donation_analytics.dart';
-import 'package:sharezone/donate/donation_service/donation_item.dart';
 import 'package:sharezone/donate/donation_service/donation_service.dart';
 import 'package:sharezone/donate/page/donation_item_view.dart';
 import 'package:sharezone_utils/platform.dart';

diff --git a/app/lib/filesharing/file_page.dart b/app/lib/filesharing/file_page.dart
@@ -9,7 +9,6 @@
 import 'package:files_basics/files_models.dart';
 import 'package:files_basics/local_file.dart';
 import 'package:files_usecases/file_viewer.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:sharezone/filesharing/bloc/file_page_bloc.dart';
 import 'package:sharezone_widgets/widgets.dart';
@@ -124,7 +123,7 @@ class __LoadingPageState extends State<_LoadingPage> {
   @override
   Widget build(BuildContext context) {
     return Theme(
-      data: Theme.of(context).copyWith(primaryColorBrightness: Brightness.dark),
+      data: Theme.of(context).copyWith(brightness: Brightness.dark),
       child: Scaffold(
         appBar:
             FilePageAppBar(name: widget.name, nameStream: widget.nameStream),

diff --git a/app/lib/filesharing/widgets/sheet.dart b/app/lib/filesharing/widgets/sheet.dart
@@ -6,8 +6,6 @@
 //
 // SPDX-License-Identifier: EUPL-1.2
 
-import 'dart:ui';
-
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:files_basics/files_models.dart';
 import 'package:filesharing_logic/filesharing_logic_models.dart';

diff --git a/app/lib/groups/group_join/group_join_page.dart b/app/lib/groups/group_join/group_join_page.dart
@@ -9,7 +9,6 @@
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:crash_analytics/crash_analytics.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:sharezone/blocs/application_bloc.dart';
 import 'package:sharezone/groups/src/widgets/contact_support.dart';
 import 'package:sharezone/pages/settings/support_page.dart';
@@ -42,13 +41,10 @@ class _GroupJoinPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Theme(
-      data: Theme.of(context).copyWith(primaryColorBrightness: Brightness.dark),
-      child: Scaffold(
-        appBar: const GroupJoinAppBar(),
-        body: SafeArea(child: SingleChildScrollView(child: GroupJoinHelp())),
-        bottomNavigationBar: ContactSupport(),
-      ),
+    return Scaffold(
+      appBar: const GroupJoinAppBar(),
+      body: SafeArea(child: SingleChildScrollView(child: GroupJoinHelp())),
+      bottomNavigationBar: ContactSupport(),
     );
   }
 }

diff --git a/app/lib/groups/src/pages/course/create/course_create_page.dart b/app/lib/groups/src/pages/course/create/course_create_page.dart
@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:group_domain_models/group_domain_models.dart';
 import 'package:sharezone/groups/src/pages/course/create/src/bloc/course_create_bloc.dart';

diff --git a/app/lib/groups/src/pages/course/group_help.dart b/app/lib/groups/src/pages/course/group_help.dart
@@ -35,19 +35,14 @@ class CourseHelpInnerPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SafeArea(
-      child: Theme(
-        data: Theme.of(context).copyWith(
-            colorScheme:
-                ColorScheme.fromSwatch().copyWith(secondary: Colors.black)),
-        child: Column(
-          children: <Widget>[
-            _WhatIsAPublicKey(),
-            _HowToJoinAGroup(),
-            _WhyHasEveryMemberOfAGroupADifferentSharecode(),
-            _WhatIsTheDifferenceBetweenAGroupACourseAndASchoolClass(),
-            _GroupRolesExplained(),
-          ],
-        ),
+      child: Column(
+        children: <Widget>[
+          _WhatIsAPublicKey(),
+          _HowToJoinAGroup(),
+          _WhyHasEveryMemberOfAGroupADifferentSharecode(),
+          _WhatIsTheDifferenceBetweenAGroupACourseAndASchoolClass(),
+          _GroupRolesExplained(),
+        ],
       ),
     );
   }

diff --git a/app/lib/groups/src/pages/course/group_page.dart b/app/lib/groups/src/pages/course/group_page.dart
@@ -7,10 +7,7 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:group_domain_models/group_domain_models.dart';
 import 'package:sharezone/blocs/application_bloc.dart';

diff --git a/app/lib/groups/src/pages/school_class/create_course/school_class_create_course.dart b/app/lib/groups/src/pages/school_class/create_course/school_class_create_course.dart
@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:group_domain_models/group_domain_models.dart';
 import 'package:sharezone/blocs/application_bloc.dart';

diff --git a/app/lib/groups/src/pages/school_class/school_class_details/school_class_member_option.dart b/app/lib/groups/src/pages/school_class/school_class_details/school_class_member_option.dart
@@ -8,7 +8,6 @@
 
 import 'package:app_functions/app_functions.dart';
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:group_domain_models/group_domain_models.dart';
 import 'package:sharezone/additional/course_permission.dart';

diff --git a/app/lib/groups/src/widgets/meeting/group_meeting_button.dart b/app/lib/groups/src/widgets/meeting/group_meeting_button.dart
@@ -9,7 +9,6 @@
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:common_domain_models/common_domain_models.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:group_domain_models/group_domain_models.dart';
 import 'package:sharezone/crash_analytics/crash_analytics_bloc.dart';

diff --git a/app/lib/groups/src/widgets/sharecode_text.dart b/app/lib/groups/src/widgets/sharecode_text.dart
@@ -6,7 +6,6 @@
 //
 // SPDX-License-Identifier: EUPL-1.2
 
-import 'package:characters/characters.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:sharezone_utils/platform.dart';

diff --git a/app/lib/homework/shared/homework_list_section.dart b/app/lib/homework/shared/homework_list_section.dart
@@ -28,7 +28,7 @@ class HomeworkListSection extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final curve = Curves.easeOutSine;
+    const curve = Curves.easeOutSine;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[

diff --git a/app/lib/homework/student/student_homework_page.dart b/app/lib/homework/student/student_homework_page.dart
@@ -10,9 +10,6 @@ import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:hausaufgabenheft_logik/hausaufgabenheft_logik.dart';
 import 'package:provider/provider.dart';
-import 'package:sharezone/homework/shared/animated_tab_visibility.dart';
-import 'package:sharezone/homework/shared/bottom_of_scrollview_visibility.dart';
-import 'package:sharezone/homework/shared/homework_fab.dart';
 import 'package:sharezone/homework/shared/shared.dart';
 import 'package:sharezone/homework/student/src/homework_bottom_action_bar.dart';
 import 'package:sharezone/navigation/logic/navigation_bloc.dart';

diff --git a/app/lib/homework/teacher/src/teacher_open_homework_list.dart b/app/lib/homework/teacher/src/teacher_open_homework_list.dart
@@ -8,7 +8,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:hausaufgabenheft_logik/hausaufgabenheft_logik_lehrer.dart';
-import 'package:sharezone/homework/shared/glowing_overscroll_color_changer.dart';
 import 'package:sharezone/homework/shared/shared.dart';
 
 import 'teacher_homework_tile.dart';

diff --git a/app/lib/homework/teacher/teacher_homework_page.dart b/app/lib/homework/teacher/teacher_homework_page.dart
@@ -10,10 +10,6 @@ import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:hausaufgabenheft_logik/hausaufgabenheft_logik_lehrer.dart';
 import 'package:provider/provider.dart';
-import 'package:sharezone/homework/shared/animated_tab_visibility.dart';
-import 'package:sharezone/homework/shared/bottom_of_scrollview_visibility.dart';
-import 'package:sharezone/homework/shared/homework_fab.dart';
-import 'package:sharezone/homework/shared/placeholder_templates.dart';
 import 'package:sharezone/homework/shared/shared.dart';
 import 'package:sharezone/navigation/logic/navigation_bloc.dart';
 import 'package:sharezone/navigation/models/navigation_item.dart';

diff --git a/app/lib/main/auth_app.dart b/app/lib/main/auth_app.dart
@@ -9,7 +9,6 @@
 import 'package:analytics/analytics.dart';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:bloc_provider/multi_bloc_provider.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:sharezone/auth/login_page.dart';
 import 'package:sharezone/auth/sign_in_with_qr_code_page.dart';

diff --git a/app/lib/main/run_app.dart b/app/lib/main/run_app.dart
@@ -13,10 +13,7 @@ import 'package:app_functions/app_functions.dart';
 import 'package:authentification_base/authentification.dart';
 import 'package:cloud_functions/cloud_functions.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:overlay_support/overlay_support.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:sharezone/blocs/bloc_dependencies.dart';

diff --git a/app/lib/main/sharezone.dart b/app/lib/main/sharezone.dart
@@ -11,7 +11,6 @@ import 'package:authentification_base/authentification.dart';
 import 'package:authentification_base/authentification_base.dart';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/material.dart';
-import 'package:meta/meta.dart';
 import 'package:provider/provider.dart';
 import 'package:sharezone/account/theme/theme_settings.dart';
 import 'package:sharezone/blocs/bloc_dependencies.dart';

diff --git a/app/lib/navigation/drawer/drawer.dart b/app/lib/navigation/drawer/drawer.dart
@@ -8,7 +8,6 @@
 
 import 'package:authentification_base/authentification.dart';
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:sharezone/blocs/application_bloc.dart';
 import 'package:sharezone/navigation/analytics/navigation_analytics.dart';

diff --git a/app/lib/navigation/navigation_controller.dart b/app/lib/navigation/navigation_controller.dart
@@ -7,7 +7,6 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 import 'package:bloc_provider/bloc_provider.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:sharezone/navigation/logic/navigation_bloc.dart';
 import 'package:sharezone/notifications/firebase_messaging_callback_configurator.dart';

diff --git a/app/lib/navigation/scaffold/portable/bottom_navigation_bar/bottom_navigation_bar.dart b/app/lib/navigation/scaffold/portable/bottom_navigation_bar/bottom_navigation_bar.dart
@@ -9,7 +9,6 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:build_context/build_context.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:sharezone/navigation/analytics/navigation_analytics.dart';
 import 'package:sharezone/navigation/logic/navigation_bloc.dart';

diff --git a/.../navigation/scaffold/portable/bottom_navigation_bar/extendable_bottom_navigation_bar.dart b/.../navigation/scaffold/portable/bottom_navigation_bar/extendable_bottom_navigation_bar.dart
@@ -11,7 +11,6 @@ import 'package:auto_size_text/auto_size_text.dart';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:build_context/build_context.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:sharezone/navigation/analytics/navigation_analytics.dart';
 import 'package:sharezone/navigation/logic/navigation_bloc.dart';
 import 'package:sharezone/navigation/models/navigation_item.dart';