Major tasks changes

.github/workflows/ci.yaml

@@ -1,7 +1,7 @@
 name: CI
 
 env:
-  FLUTTER_VERSION: '3.16.0'
+  FLUTTER_VERSION: '3.24.1'
 
 on:
   push:

.github/workflows/tasks-android.yaml

@@ -2,7 +2,7 @@ name: Deploy tasks to Google Play
 
 env:
   RUBY_VERSION: '2.6.10'
-  FLUTTER_VERSION: '3.16.0'
+  FLUTTER_VERSION: '3.24.1'
   MELOS_VERSION: '3.0.0'
 
 on:

apps/tasks/android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
   id "dev.flutter.flutter-plugin-loader" version "1.0.0"
   id "com.android.application" version "7.3.0" apply false
-  id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+  id "org.jetbrains.kotlin.android" version "2.0.21" apply false
 }
 
 include ':app'

apps/tasks/android/version.properties

@@ -2,6 +2,6 @@
 
 # lowest possible
 flutter.minSdkVersion=20
-flutter.targetSdkVersion=33
+flutter.targetSdkVersion=34
 # highest possible
-flutter.compileSdkVersion=33
+flutter.compileSdkVersion=34

apps/tasks/lib/components/bottom_sheet_pages/assignee_select.dart

@@ -0,0 +1,52 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:helpwave_localization/localization.dart';
+import 'package:helpwave_service/user.dart';
+import 'package:helpwave_widget/bottom_sheets.dart';
+import 'package:helpwave_widget/content_selection.dart';
+
+/// A [BottomSheet] for selecting a assignee
+class AssigneeSelectBottomSheet extends StatelessWidget {
+  /// The callback when the assignee should be changed
+  ///
+  /// Null if the assignee should be removed
+  final Function(User? assignee) onChanged;
+
+  final FutureOr<List<User>> users;
+
+  final String? selectedId;
+
+  const AssigneeSelectBottomSheet({super.key, required this.onChanged, required this.users, this.selectedId});
+
+  @override
+  Widget build(BuildContext context) {
+    return BottomSheetBase(
+      header: BottomSheetHeader(
+        titleText: context.localization.assignee,
+      ),
+      onClosing: () => {},
+      child: Column(
+          children: [
+            TextButton(
+              child: Text(context.localization.remove),
+              onPressed: () => onChanged(null),
+            ),
+            const SizedBox(height: 10),
+            SingleChildScrollView(
+              child: ListSelect(
+                items: users,
+                onSelect: onChanged,
+                builder: (context, user, select) => ListTile(
+                  onTap: select,
+                  leading: CircleAvatar(
+                      foregroundColor: Colors.blue, backgroundImage: NetworkImage(user.profileUrl.toString())),
+                  title: Text(user.nickName,
+                      style: TextStyle(decoration: user.id == selectedId ? TextDecoration.underline : null)),
+                ),
+              ),
+            ),
+          ],
+        ),
+    );
+  }
+}

apps/tasks/lib/components/bottom_sheet_pages/organization_bottom_sheet.dart

@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:helpwave_localization/localization.dart';
+import 'package:helpwave_service/user.dart';
+import 'package:helpwave_theme/constants.dart';
+import 'package:helpwave_theme/util.dart';
+import 'package:helpwave_widget/bottom_sheets.dart';
+import 'package:helpwave_widget/lists.dart';
+import 'package:helpwave_widget/loading.dart';
+import 'package:helpwave_widget/navigation.dart';
+import 'package:helpwave_widget/text_input.dart';
+import 'package:helpwave_widget/widgets.dart';
+import 'package:provider/provider.dart';
+import 'package:tasks/components/bottom_sheet_pages/organization_members_bottom_sheet.dart';
+import 'package:tasks/components/bottom_sheet_pages/properties_bottom_sheet.dart';
+import 'package:tasks/components/bottom_sheet_pages/wards_bottom_sheet_page.dart';
+
+class OrganizationBottomSheetPage extends StatelessWidget {
+  final String organizationId;
+
+  const OrganizationBottomSheetPage({super.key, required this.organizationId});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => OrganizationController(id: organizationId),
+      child: Consumer<OrganizationController>(builder: (context, controller, _) {
+        return BottomSheetPage(
+          header: BottomSheetHeader.navigation(
+            context,
+            title: LoadingAndErrorWidget.pulsing(
+              state: controller.state,
+              child: Text(
+                controller.data.combinedName,
+                style: const TextStyle(fontWeight: FontWeight.w800, fontSize: 16),
+              ),
+            ),
+          ),
+          child: Flexible(
+            child: LoadingAndErrorWidget(
+              state: controller.state,
+              child: ListView(
+                shrinkWrap: true,
+                children: [
+                  const SizedBox(height: distanceMedium),
+                  Text(context.localization.shortName, style: context.theme.textTheme.titleMedium),
+                  const SizedBox(height: distanceTiny),
+                  TextFormFieldWithTimer(
+                    initialValue: controller.data.shortName,
+                    onUpdate: (value) => controller.update(OrganizationUpdate(shortName: value)),
+                  ),
+                  const SizedBox(height: distanceMedium),
+                  Text(context.localization.longName, style: context.theme.textTheme.titleMedium),
+                  const SizedBox(height: distanceTiny),
+                  TextFormFieldWithTimer(
+                    initialValue: controller.data.longName,
+                    onUpdate: (value) => controller.update(OrganizationUpdate(longName: value)),
+                  ),
+                  const SizedBox(height: distanceMedium),
+                  Text(context.localization.contactEmail, style: context.theme.textTheme.titleMedium),
+                  const SizedBox(height: distanceTiny),
+                  TextFormFieldWithTimer(
+                    initialValue: controller.data.details?.email,
+                    // TODO validation
+                    onUpdate: (value) => controller.update(OrganizationUpdate(email: value)),
+                  ),
+                  const SizedBox(height: distanceMedium),
+                  Text(context.localization.settings, style: context.theme.textTheme.titleMedium),
+                  const SizedBox(height: distanceTiny),
+                  RoundedListTiles(
+                    children: [
+                      ForwardNavigationTile(
+                        icon: Icons.house_rounded,
+                        title: context.localization.wards,
+                        onTap: () {
+                          NavigationStackController.of(context)
+                              .push(WardsBottomSheetPage(organizationId: organizationId));
+                        },
+                      ),
+                      ForwardNavigationTile(
+                        icon: Icons.person,
+                        title: context.localization.members,
+                        onTap: () {
+                          NavigationStackController.of(context)
+                              .push(OrganizationMembersBottomSheetPage(organizationId: organizationId));
+                        },
+                      ),
+                      ForwardNavigationTile(
+                        icon: Icons.label,
+                        title: context.localization.properties,
+                        onTap: () {
+                          NavigationStackController.of(context).push(const PropertiesBottomSheet());
+                        },
+                      )
+                    ],
+                  ),
+                  const SizedBox(height: distanceMedium),
+                  Text(context.localization.dangerZone, style: context.theme.textTheme.titleMedium),
+                  Text(
+                    context.localization.organizationDangerZoneDescription,
+                    style: TextStyle(color: context.theme.hintColor),
+                  ),
+                  PressableText(
+                    text: "${context.localization.delete} ${context.localization.organization}",
+                    style: const TextStyle(color: Colors.red, fontWeight: FontWeight.w700), // TODO get from theme
+                    onPressed: () {
+                      // TODO show modal and delete organization
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+        );
+      }),
+    );
+  }
+}

apps/tasks/lib/components/bottom_sheet_pages/organization_members_bottom_sheet.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+import 'package:helpwave_localization/localization.dart';
+import 'package:helpwave_service/auth.dart';
+import 'package:helpwave_service/user.dart';
+import 'package:helpwave_theme/constants.dart';
+import 'package:helpwave_theme/util.dart';
+import 'package:helpwave_widget/bottom_sheets.dart';
+import 'package:helpwave_widget/lists.dart';
+import 'package:helpwave_widget/loading.dart';
+import 'package:provider/provider.dart';
+
+class OrganizationMembersBottomSheetPage extends StatelessWidget {
+  final String organizationId;
+
+  const OrganizationMembersBottomSheetPage({super.key, required this.organizationId});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => OrganizationMemberController(organizationId),
+      child: BottomSheetPage(
+        header: BottomSheetHeader.navigation(
+          context,
+          title: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(context.localization.members, style: context.theme.textTheme.titleMedium),
+              Text(CurrentWardService().currentWard?.organizationName ?? "",
+                  style: TextStyle(color: context.theme.hintColor)),
+            ],
+          ),
+          trailing: BottomSheetAction(
+            icon: Icons.add,
+            onPressed: () {
+              // TODO show dialog
+            },
+          ),
+        ),
+        child: Flexible(
+          child: ListView(
+            children: [
+              Consumer<OrganizationMemberController>(builder: (context, controller, child) {
+                return LoadingAndErrorWidget(
+                  state: controller.state,
+                  child: RoundedListTiles(
+                    children: controller.members
+                        .map(
+                          (member) => ListTile(
+                            leading: Icon(
+                              Icons.person_rounded,
+                              color: context.theme.colorScheme.primary,
+                            ),
+                            title: Text(member.name, style: const TextStyle(fontWeight: FontWeight.w700),),
+                            subtitle: Text(member.email, style: TextStyle(color: context.theme.hintColor),),
+                            trailing: IconButton(
+                              onPressed: () {
+                                controller.removeMember(organizationId: organizationId, userId: member.id);
+                              },
+                              icon: const Icon(
+                                Icons.remove,
+                                color: Colors.red, // TODO use theme
+                              ),
+                            ),
+                          ),
+                        )
+                        .toList(),
+                  ),
+                );
+              }),
+              Padding(
+                padding: const EdgeInsets.only(top: distanceMedium, bottom: distanceTiny),
+                child: Text(
+                  context.localization.invitations,
+                  style: context.theme.textTheme.titleMedium,
+                ),
+              ),
+              Consumer<OrganizationMemberController>(builder: (context, controller, child) {
+                return LoadingAndErrorWidget(
+                  state: controller.state,
+                  child: RoundedListTiles(
+                    children: controller.invitations
+                        .map(
+                          (invitation) => ListTile(
+                            leading: Icon(
+                              Icons.email_rounded,
+                              color: context.theme.colorScheme.primary,
+                            ),
+                            title: Text(invitation.email),
+                            trailing: IconButton(
+                              onPressed: () {
+                                controller.revokeInvitation(invitationId: invitation.id);
+                              },
+                              icon: const Icon(
+                                Icons.remove,
+                                color: Colors.red, // TODO use theme
+                              ),
+                            ),
+                          ),
+                        )
+                        .toList(),
+                  ),
+                );
+              }),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}