Merge pull request #736 from krille-chan/krille/status-msg-isntead-st…

…ories refactor: Replace stories feature with presence status msg
krille-chan · Dec 22, 2023 · 376d598 · 376d598
2 parents 9c24547 + 895de76
commit 376d598
Show file tree

Hide file tree

Showing 21 changed files with 364 additions and 2,386 deletions.
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
@@ -2551,5 +2551,6 @@
   "startConversation": "Start conversation",
   "commandHint_sendraw": "Send raw json",
   "databaseMigrationTitle": "Database is optimized",
-  "databaseMigrationBody": "Please wait. This may take a moment."
+  "databaseMigrationBody": "Please wait. This may take a moment.",
+  "leaveEmptyToClearStatus": "Leave empty to clear your status."
 }
diff --git a/lib/config/routes.dart b/lib/config/routes.dart
@@ -5,7 +5,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:go_router/go_router.dart';
 
 import 'package:fluffychat/config/themes.dart';
-import 'package:fluffychat/pages/add_story/add_story.dart';
 import 'package:fluffychat/pages/archive/archive.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat_details/chat_details.dart';
@@ -28,9 +27,7 @@ import 'package:fluffychat/pages/settings_ignore_list/settings_ignore_list.dart'
 import 'package:fluffychat/pages/settings_multiple_emotes/settings_multiple_emotes.dart';
 import 'package:fluffychat/pages/settings_notifications/settings_notifications.dart';
 import 'package:fluffychat/pages/settings_security/settings_security.dart';
-import 'package:fluffychat/pages/settings_stories/settings_stories.dart';
 import 'package:fluffychat/pages/settings_style/settings_style.dart';
-import 'package:fluffychat/pages/story/story_page.dart';
 import 'package:fluffychat/pages/tasks/tasks.dart';
 import 'package:fluffychat/widgets/layouts/empty_page.dart';
 import 'package:fluffychat/widgets/layouts/two_column_layout.dart';
@@ -113,32 +110,6 @@ abstract class AppRoutes {
                   ),
           ),
           routes: [
-            GoRoute(
-              path: 'stories/create',
-              pageBuilder: (context, state) => defaultPageBuilder(
-                context,
-                const AddStoryPage(),
-              ),
-              redirect: loggedOutRedirect,
-            ),
-            GoRoute(
-              path: 'stories/:roomid',
-              pageBuilder: (context, state) => defaultPageBuilder(
-                context,
-                const StoryPage(),
-              ),
-              redirect: loggedOutRedirect,
-              routes: [
-                GoRoute(
-                  path: 'share',
-                  pageBuilder: (context, state) => defaultPageBuilder(
-                    context,
-                    const AddStoryPage(),
-                  ),
-                  redirect: loggedOutRedirect,
-                ),
-              ],
-            ),
             GoRoute(
               path: 'archive',
               pageBuilder: (context, state) => defaultPageBuilder(
@@ -271,14 +242,6 @@ abstract class AppRoutes {
                         const SettingsSecurity(),
                       ),
                       routes: [
-                        GoRoute(
-                          path: 'stories',
-                          pageBuilder: (context, state) => defaultPageBuilder(
-                            context,
-                            const SettingsStories(),
-                          ),
-                          redirect: loggedOutRedirect,
-                        ),
                         GoRoute(
                           path: 'ignorelist',
                           pageBuilder: (context, state) {

diff --git a/lib/pages/add_story/add_story.dart b/lib/pages/add_story/add_story.dart