Merge remote-tracking branch 'upstream/main' into issue-1123

This commit is contained in:
misha
2026-11-11 10:49:33 +03:00
59 changed files with 3234 additions and 494 deletions

View File

@@ -192,7 +192,18 @@ class OtherRoutes {
return CreatePlanScreen(plan: plan);
},
),
GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => const MyDietsScreen()),
GoRoute(
path: MyDietsScreen.path,
name: MyDietsScreen.name,
builder: (context, state) {
final initialTabIndex = int.tryParse(
state.uri.queryParameters['initialTabIndex'] ?? '',
);
return MyDietsScreen(
initialTabIndex: initialTabIndex ?? 0,
);
},
),
GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
GoRoute(path: MyRecipesScreen.path, name: MyRecipesScreen.name, builder: (context, state) => const MyRecipesScreen()),

View File

@@ -48,6 +48,7 @@ class WsManager {
Stream<ChannelReadEvent>? _directChatStream;
Stream<ChannelReadEvent>? _clientTypingStream;
Stream<ChannelReadEvent>? _chosenPlanStateChangedStream;
Stream<ChannelReadEvent>? get newMessagesStream =>
_privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
@@ -74,6 +75,9 @@ class WsManager {
Stream<ChannelReadEvent>? get clientTypingStream => _clientTypingStream;
Stream<ChannelReadEvent>? get chosenPlanStateChangedStream =>
_chosenPlanStateChangedStream;
/// Сигнал о реконнекте сокета: эмитится после повторной подписки на каналы.
///
/// Подписчики используют его, чтобы догрузить пропущенные за время обрыва
@@ -222,6 +226,9 @@ class WsManager {
'App\\Events\\ChatMessageUpdated',
);
_clientTypingStream = _privateDirectChatChannel?.bind('client-typing');
_chosenPlanStateChangedStream = _privateDirectChatChannel?.bind(
'chosen-plan-state-changed',
);
}
Future<void> initPresenceDirectChatChannel(String chatId) async {
@@ -367,6 +374,7 @@ class WsManager {
_privateDirectChatChannel?.unsubscribe();
_directChatStream = null;
_clientTypingStream = null;
_chosenPlanStateChangedStream = null;
}
void unsubscribePresenceDirectChatChannel() {
@@ -401,6 +409,7 @@ class WsManager {
_privateNotificationChannel = null;
_directChatStream = null;
_clientTypingStream = null;
_chosenPlanStateChangedStream = null;
}
}