Merge remote-tracking branch 'origin/main' into sz-test-randomness-fr…

…om-seed

.github/workflows/alpha.yml

@@ -116,6 +116,11 @@ jobs:
           flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
           channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
 
+      - name: Install Sharezone Repo CLI
+        run: |
+          flutter pub global activate --source path "$CI_CD_DART_SCRIPTS_PACKAGE_PATH"
+          echo $(realpath ./bin) >> $GITHUB_PATH
+
       - name: Install Codemagic CLI Tools
         run: pip3 install codemagic-cli-tools==0.50.3
 
@@ -168,7 +173,7 @@ jobs:
           # because they easier to install. App Bundles are installed via the
           # PlayStore which resulted in problems in the past.
 
-          sz build android \
+          sz build app android \
             --stage alpha \
             --build-number $BUMPED_BUILD_NUMBER \
             --output-type apk

.github/workflows/safe_app_ci.yml

@@ -178,10 +178,14 @@ jobs:
           flutter pub global activate --source path "$CI_CD_DART_SCRIPTS_PACKAGE_PATH"
           echo $(pwd)/bin >> $GITHUB_PATH
 
+      # Running with -c 1 as using -c 4 would lead to to this dependency error:
+      # https://github.com/SharezoneApp/sharezone-app/pull/1322#issuecomment-1981410505
+      # We don't know why this happens.
+      # In the future please try to use a higher concurrency value again.
       - name: Run tests via "sz test"
         run: |
           sz test \
-            -c 4 \
+            -c 1 \
             --package-timeout-minutes 15 \
             --only-goldens
 

README.md

@@ -14,6 +14,25 @@ We might expand to more languages and regions in the future 🌍🚀
 
 [Join our Discord](https://sharezone.net/discord) for active discussions, announcements, feedback and more!
 
+## Repository Overview
+
+- 🛠 **.github/**: Our fully automated CI/CD pipeline using GitHub Actions and [`codemagic-cli-tools`](https://github.com/codemagic-ci-cd/cli-tools).
+  Used to publish alpha, beta, and stable versions to Google Play Store (Android), App Store (iOS, macOS), TestFlight (iOS, macOS), and Firebase Hosting (Web).
+
+- 📱 **app/**: The main "Sharezone" app, created with [Flutter](https://flutter.dev).
+
+- 📚 **lib/**: A place for our internal Dart/Flutter packages. Used to modularize and share code between app, website and admin console.
+
+- 📖 **docs/**: Our end user documentation [docs.sharezone.net](https://docs.sharezone.net), built with [Nextra](https://nextra.site/).
+  Is currently pretty sparse, but we are working on improving it.
+
+- 🌐 **website/**: Our [sharezone.net](https://sharezone.net) website (not the web app)  built with Flutter.
+
+- 🔧 **console/**: Our admin console used by the Sharezone team for support / administrative tasks. Also built with Flutter.
+
+- 🛠️ **tools/sz_repo_cli/**: Our custom `sz` Dart CLI used by developers and CI/CD pipelines.
+  Helps with tasks like testing, analyzing, building, deploying etc.
+
 ## Open-Source
 
 We are currently in the process of open-sourcing this repository.\

app/lib/blackboard/blackboard_dialog.dart

@@ -21,7 +21,6 @@ import 'package:sharezone/filesharing/dialog/attach_file.dart';
 import 'package:sharezone/filesharing/dialog/course_tile.dart';
 import 'package:sharezone/main/application_bloc.dart';
 import 'package:sharezone/markdown/markdown_analytics.dart';
-import 'package:sharezone/widgets/material/list_tile_with_description.dart';
 import 'package:sharezone/widgets/material/save_button.dart';
 import 'package:sharezone_common/api_errors.dart';
 import 'package:sharezone_widgets/sharezone_widgets.dart';

app/lib/feedback/feedback_box_page.dart

@@ -11,15 +11,18 @@ import 'dart:developer';
 import 'package:bloc_provider/bloc_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_rating_bar/flutter_rating_bar.dart';
+import 'package:platform_check/platform_check.dart';
+import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:sharezone/feedback/history/feedback_history_page.dart';
+import 'package:sharezone/feedback/history/feedback_history_page_controller.dart';
 import 'package:sharezone/feedback/src/bloc/feedback_bloc.dart';
 import 'package:sharezone/feedback/src/cache/cooldown_exception.dart';
 import 'package:sharezone/feedback/src/widgets/thank_you_bottom_sheet.dart';
 import 'package:sharezone/navigation/logic/navigation_bloc.dart';
 import 'package:sharezone/navigation/models/navigation_item.dart';
 import 'package:sharezone/navigation/scaffold/app_bar_configuration.dart';
 import 'package:sharezone/navigation/scaffold/sharezone_main_scaffold.dart';
-import 'package:platform_check/platform_check.dart';
 import 'package:sharezone_widgets/sharezone_widgets.dart';
 
 const double _padding = 12.0;
@@ -38,14 +41,42 @@ class FeedbackPage extends StatelessWidget {
         popToOverview(context);
       },
       child: const SharezoneMainScaffold(
-        appBarConfiguration: AppBarConfiguration(title: "Feedback-Box"),
+        appBarConfiguration: AppBarConfiguration(
+          title: "Feedback-Box",
+          actions: [_HistoryButton()],
+        ),
         navigationItem: NavigationItem.feedbackBox,
         body: FeedbackPageBody(),
       ),
     );
   }
 }
 
+class _HistoryButton extends StatelessWidget {
+  const _HistoryButton();
+
+  void _logAnalytics(BuildContext context) {
+    final controller = context.read<FeedbackHistoryPageController>();
+    controller.logOpenedPage();
+  }
+
+  void _openHistoryPage(BuildContext context) {
+    Navigator.pushNamed(context, FeedbackHistoryPage.tag);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return IconButton(
+      tooltip: "Meine Feedbacks",
+      icon: const Icon(Icons.history),
+      onPressed: () {
+        _logAnalytics(context);
+        _openHistoryPage(context);
+      },
+    );
+  }
+}
+
 @visibleForTesting
 class FeedbackPageBody extends StatelessWidget {
   const FeedbackPageBody({super.key});