folder restructuring

lib/notification/notification_controller.dart

@@ -1,9 +1,9 @@
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 
-import '../widget/debug/debugTile.dart';
-import '../widget/debug/jsonViewer.dart';
-import 'notificationTasks.dart';
+import '../widget/debug/debug_tile.dart';
+import '../widget/debug/json_viewer.dart';
+import 'notification_tasks.dart';
 
 class NotificationController {
   @pragma('vm:entry-point')
@@ -44,7 +44,7 @@ class NotificationController {
   }
 
   static Future<void> onAppOpenedByNotification(RemoteMessage message, BuildContext context) async {
-    NotificationTasks.navigateToTalk(context);
+    NotificationTasks.navigateToTalk(context, chatToken: _extractChatToken(message));
     NotificationTasks.updateProviders(context);
 
     DebugTile(context).run(() {
@@ -60,4 +60,12 @@ class NotificationController {
       ));
     });
   }
+
+  static String? _extractChatToken(RemoteMessage message) {
+    for (final key in const ['chatToken', 'token', 'roomToken']) {
+      final value = message.data[key];
+      if (value is String && value.isNotEmpty) return value;
+    }
+    return null;
+  }
 }

lib/notification/notification_tasks.dart

@@ -3,8 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter_app_badge/flutter_app_badge.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-import '../main.dart';
-import '../state/app/modules/app_modules.dart';
+import '../routing/app_routes.dart';
 import '../state/app/modules/chat/bloc/chat_bloc.dart';
 import '../state/app/modules/chatList/bloc/chat_list_bloc.dart';
 
@@ -18,9 +17,14 @@ class NotificationTasks {
     context.read<ChatBloc>().refresh();
   }
 
-  static void navigateToTalk(BuildContext context) {
-    final talkTab = AppModule.getBottomBarModules(context).map((e) => e.module).toList().indexOf(Modules.talk);
-    if (talkTab == -1) return;
-    Main.bottomNavigator.jumpToTab(talkTab);
+  /// Switches to the Talk tab. If [chatToken] is provided, also schedules
+  /// the matching chat to be opened automatically once the chat list view
+  /// resolves the token (handled inside [ChatList]).
+  static void navigateToTalk(BuildContext context, {String? chatToken}) {
+    if (chatToken != null && chatToken.isNotEmpty) {
+      AppRoutes.openChatByToken(context, chatToken);
+    } else {
+      AppRoutes.goToTalkTab(context);
+    }
   }
 }

lib/notification/notify_updater.dart

@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
 
 import '../api/mhsl/notify/register/notifyRegister.dart';
 import '../api/mhsl/notify/register/notifyRegisterParams.dart';
-import '../model/accountData.dart';
+import '../model/account_data.dart';
 import '../state/app/modules/settings/bloc/settings_cubit.dart';
-import '../widget/confirmDialog.dart';
+import '../widget/confirm_dialog.dart';
 
 class NotifyUpdater {
   static ConfirmDialog enableAfterDisclaimer(SettingsCubit settings) => ConfirmDialog(