Skip to content

Commit b5e27f0

Browse files
author
Magellan
committed
fix Forward message screen
1 parent 148d17d commit b5e27f0

3 files changed

Lines changed: 41 additions & 48 deletions

File tree

sama_chat_client/lib/src/features/conversation/view/messages_list.dart

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -372,18 +372,11 @@ class MessageItem extends StatelessWidget {
372372
context: context,
373373
backgroundColor: Colors.transparent,
374374
builder: (BuildContext bc) {
375-
return ClipRRect(
376-
borderRadius:
377-
const BorderRadius.vertical(
378-
top: Radius.circular(24),
379-
),
380-
child: BlocProvider.value(
381-
value:
382-
BlocProvider.of<ConversationBloc>(
383-
context),
384-
child:
385-
ForwardMessagesWidget({message}),
386-
));
375+
return BlocProvider.value(
376+
value: BlocProvider.of<ConversationBloc>(
377+
context),
378+
child: ForwardMessagesWidget({message}),
379+
);
387380
});
388381
}),
389382
FocusedPopupMenuItem(

sama_chat_client/lib/src/features/conversation/widgets/forward_messages/forward_search_form.dart

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:io';
2+
13
import 'package:flutter/material.dart';
24
import 'package:flutter_bloc/flutter_bloc.dart';
35
import 'package:go_router/go_router.dart';
@@ -6,10 +8,7 @@ import '../../../../db/models/models.dart';
68
import '../../../../navigation/constants.dart';
79
import '../../../../shared/ui/colors.dart';
810
import '../../../conversation_create/bloc/conversation_create_bloc.dart';
9-
import '../../../conversation_create/bloc/conversation_create_event.dart';
1011
import '../../../conversation_create/bloc/conversation_create_state.dart';
11-
import '../../../conversations_list/conversations_list.dart';
12-
import '../../../conversations_list/widgets/avatar_letter_icon.dart';
1312
import '../../../search/bloc/global_search_bloc.dart';
1413
import '../../../search/bloc/global_search_state.dart';
1514
import '../../../search/view/search_bar.dart';
@@ -28,27 +27,34 @@ class ForwardSearchForm extends StatelessWidget {
2827

2928
@override
3029
Widget build(BuildContext context) {
31-
return Scaffold(
32-
appBar: AppBar(
33-
backgroundColor: black,
34-
automaticallyImplyLeading: false,
35-
centerTitle: true,
36-
toolbarHeight: kToolbarHeight + 5,
37-
title: const Padding(
38-
padding: EdgeInsets.only(top: 10),
39-
child: Text(
40-
'Forward message',
41-
style: TextStyle(color: white),
42-
))),
43-
body: Container(
44-
padding: const EdgeInsets.only(left: 20, right: 20, top: 20),
45-
child: Column(
46-
spacing: 4,
47-
children: [
48-
const GlobalSearchBar(),
49-
_SearchBody(forwardMessages),
50-
],
51-
)));
30+
final window = WidgetsBinding.instance.platformDispatcher.views.first;
31+
double topPadding = window.viewPadding.top / window.devicePixelRatio -
32+
(Platform.isIOS ? 30 : 15);
33+
return ClipRRect(
34+
borderRadius: const BorderRadius.vertical(
35+
top: Radius.circular(28),
36+
),
37+
child: Scaffold(
38+
appBar: AppBar(
39+
backgroundColor: black,
40+
automaticallyImplyLeading: false,
41+
centerTitle: true,
42+
toolbarHeight: kToolbarHeight + topPadding,
43+
title: Padding(
44+
padding: EdgeInsets.only(top: topPadding + 5),
45+
child: const Text(
46+
'Forward message',
47+
style: TextStyle(color: white),
48+
))),
49+
body: Container(
50+
padding: const EdgeInsets.only(left: 20, right: 20, top: 20),
51+
child: Column(
52+
spacing: 4,
53+
children: [
54+
const GlobalSearchBar(),
55+
_SearchBody(forwardMessages),
56+
],
57+
))));
5258
}
5359
}
5460

sama_chat_client/lib/src/features/conversation/widgets/select_input.dart

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,12 @@ class _SelectInputState extends State<SelectInput> {
124124
context: context,
125125
backgroundColor: Colors.transparent,
126126
builder: (BuildContext bc) {
127-
return ClipRRect(
128-
borderRadius:
129-
const BorderRadius.vertical(
130-
top: Radius.circular(24),
131-
),
132-
child: BlocProvider.value(
133-
value:
134-
BlocProvider.of<ConversationBloc>(
135-
context),
136-
child: ForwardMessagesWidget(
137-
state.selectedMessages.value),
138-
));
127+
return BlocProvider.value(
128+
value: BlocProvider.of<ConversationBloc>(
129+
context),
130+
child: ForwardMessagesWidget(
131+
state.selectedMessages.value),
132+
);
139133
}));
140134
},
141135
),

0 commit comments

Comments
 (0)