New update for Issue#945

aau-giraf · Dec 5, 2023 · 5adff3a · 5adff3a
1 parent eaa64d0
commit 5adff3a
Show file tree

Hide file tree

Showing 9 changed files with 327 additions and 123 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -47,7 +47,7 @@ ext.getKeystorePassword = {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

diff --git a/assets/icons/folder.png b/assets/icons/folder.png
diff --git a/lib/blocs/activity_bloc.dart b/lib/blocs/activity_bloc.dart
@@ -89,6 +89,14 @@ class ActivityBloc extends BlocBase {
     update();
   }
 
+  /// Mark the selected activity as Removed when using long press
+  void removeActivity() {
+    _activityModel.state = _activityModel.state == ActivityState.Removed
+        ? ActivityState.Normal
+        : ActivityState.Removed;
+    update();
+  }
+
   /// Update the Activity with the new state.
   void update() {
     _api.activity
@@ -144,17 +152,18 @@ class ActivityBloc extends BlocBase {
   }
 
   /// Method to get alternate name from api
-  Future<void> getAlternateName() {
+  Future<Future<AlternateNameModel>> getAlternateName() async {
     final Completer<AlternateNameModel> f = Completer<AlternateNameModel>();
-    _api.alternateName
-        .get(_user.id!, _activityModel.pictograms.first.id!)
-        .listen((Object result) {
-      _alternateName = result as AlternateNameModel?;
-      f.complete();
-    }).onError((Object error) {
+    try {
+      final AlternateNameModel result = await _api.alternateName
+          .get(_user.id!, _activityModel.pictograms.first.id!)
+          .first;
+      _alternateName = result;
+      f.complete(result);
+    } catch (error) {
       _alternateName = null;
-      f.complete();
-    });
+      f.completeError(error);
+    }
     return f.future;
   }
 

diff --git a/lib/screens/show_activity_screen.dart b/lib/screens/show_activity_screen.dart
@@ -113,11 +113,17 @@ class ShowActivityScreen extends StatelessWidget {
     return Scaffold(
         resizeToAvoidBottomInset: false,
         appBar: GirafAppBar(
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back),
+            onPressed: () {
+              _weekplanBloc.loadWeek(_girafUser);
+              Routes().pop(context);
+            },
+          ),
           title: 'Aktivitet',
           appBarIcons: (mode == WeekplanMode.guardian)
               ? <AppBarIcon, VoidCallback>{AppBarIcon.changeToCitizen: () {}}
               : <AppBarIcon, VoidCallback>{AppBarIcon.changeToGuardian: () {}},
-          key: UniqueKey(),
         ),
         body: childContainer);
   }
@@ -843,6 +849,8 @@ class ShowActivityScreen extends StatelessWidget {
                             key: const Key('SavePictogramTextForCitizenBtn'),
                             onPressed: () {
                               _activityBloc.setAlternateName(tec.text);
+                              _weekplanBloc.loadWeek(_girafUser);
+                              Routes().pop(context);
                             },
                             text: 'Gem til borger',
                           ),

diff --git a/lib/widgets/giraf_app_bar_widget.dart b/lib/widgets/giraf_app_bar_widget.dart
@@ -8,7 +8,7 @@ import 'package:weekplanner/style/custom_color.dart';
 import 'package:weekplanner/widgets/giraf_title_header.dart';
 
 class GirafAppBar extends StatelessWidget implements PreferredSizeWidget {
-  GirafAppBar({Key? key, this.title, this.appBarIcons})
+  GirafAppBar({Key? key, this.title, this.appBarIcons, this.leading,})
       : toolbarBloc = di.get<ToolbarBloc>(),
         preferredSize = const Size.fromHeight(56.0),
         super(key: key);
@@ -19,7 +19,7 @@ class GirafAppBar extends StatelessWidget implements PreferredSizeWidget {
 
   @override
   final Size preferredSize;
-
+  final Widget? leading; // Define a leading widget
   @override
   Widget build(BuildContext context) {
     toolbarBloc.updateIcons(appBarIcons, context);
@@ -31,6 +31,7 @@ class GirafAppBar extends StatelessWidget implements PreferredSizeWidget {
       title: Text(title ?? '',
           overflow: TextOverflow.clip,
           style: const TextStyle(color: GirafColors.black)),
+      leading: leading, // set the leading widget
       flexibleSpace: const GirafTitleHeader(),
       actions: <Widget>[
         StreamBuilder<List<IconButton>>(

diff --git a/lib/widgets/weekplan_screen_widgets/activity_card.dart b/lib/widgets/weekplan_screen_widgets/activity_card.dart
@@ -320,6 +320,24 @@ class ActivityCard extends StatelessWidget {
                   }
                 }
 
+                return const Center(child: CircularProgressIndicator());
+              case ActivityState.Removed:
+                if (role == WeekplanMode.guardian) {
+                  return Icon(
+                    Icons.check,
+                    key: const Key('IconComplete'),
+                    color: theme.GirafColors.red,
+                    size: MediaQuery.of(context).size.width,
+                  );
+                } else if (role == WeekplanMode.citizen) {
+                  if (settings!.completeMark == null) {
+                    return Container(
+                      width: 0,
+                      height: 0,
+                    );
+                  }
+                }
+
                 return const Center(child: CircularProgressIndicator());
               case ActivityState.Canceled:
                 return Icon(