Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'
hide Consumer, FutureProvider, Provider;
import 'package:overlay_support/overlay_support.dart';
import 'package:provider/provider.dart';

import 'account/account_key_value.dart';
import 'account/notification_service.dart';
import 'constants/brightness_theme_data.dart';
import 'constants/resources.dart';
import 'generated/l10n.dart';

import 'ui/home/bloc/conversation_list_bloc.dart';
import 'ui/home/conversation/conversation_page.dart';
import 'ui/home/home.dart';
Expand Down Expand Up @@ -61,11 +59,7 @@ class App extends HookConsumerWidget {
} else {
child = _LoginApp(authState: authState);
}

return FocusHelper(
child: Directionality(
textDirection: TextDirection.ltr,
child: OverlaySupport.local(child: child)));
return FocusHelper(child: child);
}
}

Expand Down Expand Up @@ -262,7 +256,7 @@ class _Home extends HookConsumerWidget {
..limit = MediaQuery.sizeOf(context).height ~/
(ConversationPage.conversationItemHeight / 1.75)
..init();
return const HomePage();
return const PortalProviders(child: HomePage());
}
return const LandingPage();
}
Expand Down
31 changes: 12 additions & 19 deletions lib/ui/home/chat/voice_recorder_bottom_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import '../../../utils/load_balancer_utils.dart';
import '../../../utils/logger.dart';
import '../../../utils/system/audio_session.dart';
import '../../../widgets/action_button.dart';
import '../../../widgets/brightness_observer.dart';
import '../../../widgets/dialog.dart';
import '../../../widgets/toast.dart';
import '../../../widgets/waveform_widget.dart';
Expand Down Expand Up @@ -192,15 +191,13 @@ class VoiceRecorderBarOverlayComposition extends HookConsumerWidget {
converter: (state) => state.state != RecorderState.idle,
);
final link = useMemoized(LayerLink.new);
final overlay = Overlay.of(context, rootOverlay: true);

final overlay = Navigator.of(context).overlay ?? Overlay.of(context);

final recorderBottomBarEntry = useRef<OverlayEntry?>(null);

final voiceRecorderCubit = context.read<VoiceRecorderCubit>();

final value = BrightnessData.of(context);
final theme = BrightnessData.themeOf(context);

useEffect(
() {
recorderBottomBarEntry.value?.remove();
Expand All @@ -215,20 +212,16 @@ class VoiceRecorderBarOverlayComposition extends HookConsumerWidget {
value: voiceRecorderCubit,
),
],
child: BrightnessData(
value: value,
brightnessThemeData: theme,
child: _RecordingInterceptor(
child: UnconstrainedBox(
child: CompositedTransformFollower(
link: link,
showWhenUnlinked: false,
targetAnchor: Alignment.center,
followerAnchor: Alignment.center,
child: SizedBox(
width: layoutWidth,
child: const Material(child: VoiceRecorderBottomBar()),
),
child: _RecordingInterceptor(
child: UnconstrainedBox(
child: CompositedTransformFollower(
link: link,
showWhenUnlinked: false,
targetAnchor: Alignment.center,
followerAnchor: Alignment.center,
child: SizedBox(
width: layoutWidth,
child: const Material(child: VoiceRecorderBottomBar()),
),
),
),
Expand Down