Compare commits
No commits in common. "47c535910d3d86eea07dfa9d5eebf9ae601ea1de" and "f5fbe1f483dae14295c70f232b3ec4558dd27a98" have entirely different histories.
47c535910d
...
f5fbe1f483
@ -26,7 +26,6 @@ import 'package:solian/widgets/chat/chat_event_list.dart';
|
|||||||
import 'package:solian/widgets/chat/chat_message_input.dart';
|
import 'package:solian/widgets/chat/chat_message_input.dart';
|
||||||
import 'package:solian/widgets/chat/chat_typing_indicator.dart';
|
import 'package:solian/widgets/chat/chat_typing_indicator.dart';
|
||||||
import 'package:solian/widgets/current_state_action.dart';
|
import 'package:solian/widgets/current_state_action.dart';
|
||||||
import 'package:solian/widgets/root_container.dart';
|
|
||||||
|
|
||||||
class ChannelChatScreen extends StatefulWidget {
|
class ChannelChatScreen extends StatefulWidget {
|
||||||
final String alias;
|
final String alias;
|
||||||
@ -218,149 +217,145 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return RootContainer(
|
return Scaffold(
|
||||||
child: Scaffold(
|
appBar: AppBar(
|
||||||
appBar: AppBar(
|
leading: AppBarLeadingButton.adaptive(context),
|
||||||
leading: AppBarLeadingButton.adaptive(context),
|
title: AppBarTitle(title),
|
||||||
title: AppBarTitle(title),
|
centerTitle: false,
|
||||||
centerTitle: false,
|
titleSpacing: AppTheme.titleSpacing(context),
|
||||||
titleSpacing: AppTheme.titleSpacing(context),
|
toolbarHeight: AppTheme.toolbarHeight(context),
|
||||||
toolbarHeight: AppTheme.toolbarHeight(context),
|
actions: [
|
||||||
actions: [
|
const BackgroundStateWidget(),
|
||||||
const BackgroundStateWidget(),
|
Builder(builder: (context) {
|
||||||
Builder(builder: (context) {
|
if (_isBusy || _channel == null) return const SizedBox.shrink();
|
||||||
if (_isBusy || _channel == null) return const SizedBox.shrink();
|
|
||||||
|
|
||||||
return ChatCallButton(
|
return ChatCallButton(
|
||||||
realm: _channel!.realm,
|
realm: _channel!.realm,
|
||||||
channel: _channel!,
|
channel: _channel!,
|
||||||
ongoingCall: _ongoingCall,
|
ongoingCall: _ongoingCall,
|
||||||
);
|
|
||||||
}),
|
|
||||||
IconButton(
|
|
||||||
icon: const Icon(Icons.more_vert),
|
|
||||||
onPressed: () {
|
|
||||||
if (_channel == null) return;
|
|
||||||
|
|
||||||
AppRouter.instance
|
|
||||||
.pushNamed(
|
|
||||||
'channelDetail',
|
|
||||||
pathParameters: {'alias': widget.alias},
|
|
||||||
queryParameters: {'realm': widget.realm},
|
|
||||||
extra: ChannelDetailArguments(
|
|
||||||
profile: _channelProfile!,
|
|
||||||
channel: _channel!,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.then((value) {
|
|
||||||
if (value == false) AppRouter.instance.pop();
|
|
||||||
if (value != null) {
|
|
||||||
final resp =
|
|
||||||
Channel.fromJson(value as Map<String, dynamic>);
|
|
||||||
_getChannel(alias: resp.alias);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: AppTheme.isLargeScreen(context) ? 8 : 16,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
body: Builder(builder: (context) {
|
|
||||||
if (_isBusy || _channel == null) {
|
|
||||||
return const Center(
|
|
||||||
child: CircularProgressIndicator(),
|
|
||||||
);
|
);
|
||||||
}
|
}),
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.more_vert),
|
||||||
|
onPressed: () {
|
||||||
|
if (_channel == null) return;
|
||||||
|
|
||||||
return Row(
|
AppRouter.instance
|
||||||
children: [
|
.pushNamed(
|
||||||
Expanded(
|
'channelDetail',
|
||||||
child: Column(
|
pathParameters: {'alias': widget.alias},
|
||||||
children: [
|
queryParameters: {'realm': widget.realm},
|
||||||
if (_ongoingCall != null)
|
extra: ChannelDetailArguments(
|
||||||
ChannelCallIndicator(
|
profile: _channelProfile!,
|
||||||
channel: _channel!,
|
channel: _channel!,
|
||||||
ongoingCall: _ongoingCall!,
|
|
||||||
onJoin: () {
|
|
||||||
if (!AppTheme.isUltraLargeScreen(context)) {
|
|
||||||
final ChatCallProvider call = Get.find();
|
|
||||||
call.gotoScreen(context);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
Expanded(
|
|
||||||
child: ChatEventList(
|
|
||||||
noAnimated:
|
|
||||||
_prefs.getBool('non_animated_message_list') ??
|
|
||||||
false,
|
|
||||||
scope: widget.realm,
|
|
||||||
channel: _channel!,
|
|
||||||
chatController: _chatController,
|
|
||||||
onEdit: (item) {
|
|
||||||
setState(() => _messageToEditing = item);
|
|
||||||
},
|
|
||||||
onReply: (item) {
|
|
||||||
setState(() => _messageToReplying = item);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
ClipRect(
|
|
||||||
child: BackdropFilter(
|
|
||||||
filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
|
|
||||||
child: SafeArea(
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
ChatTypingIndicator(users: _typingUsers),
|
|
||||||
ChatMessageInput(
|
|
||||||
edit: _messageToEditing,
|
|
||||||
reply: _messageToReplying,
|
|
||||||
realm: widget.realm,
|
|
||||||
placeholder: placeholder,
|
|
||||||
channel: _channel!,
|
|
||||||
onSent: (Event item) {
|
|
||||||
setState(() {
|
|
||||||
_chatController.addPendingEvent(item);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onReset: () {
|
|
||||||
setState(() {
|
|
||||||
_messageToReplying = null;
|
|
||||||
_messageToEditing = null;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
Obx(() {
|
.then((value) {
|
||||||
final ChatCallProvider call = Get.find();
|
if (value == false) AppRouter.instance.pop();
|
||||||
if (call.isMounted.value &&
|
if (value != null) {
|
||||||
AppTheme.isUltraLargeScreen(context)) {
|
final resp = Channel.fromJson(value as Map<String, dynamic>);
|
||||||
return const Expanded(
|
_getChannel(alias: resp.alias);
|
||||||
child: Row(children: [
|
}
|
||||||
VerticalDivider(width: 0.3, thickness: 0.3),
|
});
|
||||||
Expanded(
|
},
|
||||||
child: CallScreen(
|
),
|
||||||
hideAppBar: true,
|
SizedBox(
|
||||||
isExpandable: true,
|
width: AppTheme.isLargeScreen(context) ? 8 : 16,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
body: Builder(builder: (context) {
|
||||||
|
if (_isBusy || _channel == null) {
|
||||||
|
return const Center(
|
||||||
|
child: CircularProgressIndicator(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
if (_ongoingCall != null)
|
||||||
|
ChannelCallIndicator(
|
||||||
|
channel: _channel!,
|
||||||
|
ongoingCall: _ongoingCall!,
|
||||||
|
onJoin: () {
|
||||||
|
if (!AppTheme.isUltraLargeScreen(context)) {
|
||||||
|
final ChatCallProvider call = Get.find();
|
||||||
|
call.gotoScreen(context);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: ChatEventList(
|
||||||
|
noAnimated:
|
||||||
|
_prefs.getBool('non_animated_message_list') ?? false,
|
||||||
|
scope: widget.realm,
|
||||||
|
channel: _channel!,
|
||||||
|
chatController: _chatController,
|
||||||
|
onEdit: (item) {
|
||||||
|
setState(() => _messageToEditing = item);
|
||||||
|
},
|
||||||
|
onReply: (item) {
|
||||||
|
setState(() => _messageToReplying = item);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
ClipRect(
|
||||||
|
child: BackdropFilter(
|
||||||
|
filter: ImageFilter.blur(sigmaX: 50, sigmaY: 50),
|
||||||
|
child: SafeArea(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
ChatTypingIndicator(users: _typingUsers),
|
||||||
|
ChatMessageInput(
|
||||||
|
edit: _messageToEditing,
|
||||||
|
reply: _messageToReplying,
|
||||||
|
realm: widget.realm,
|
||||||
|
placeholder: placeholder,
|
||||||
|
channel: _channel!,
|
||||||
|
onSent: (Event item) {
|
||||||
|
setState(() {
|
||||||
|
_chatController.addPendingEvent(item);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onReset: () {
|
||||||
|
setState(() {
|
||||||
|
_messageToReplying = null;
|
||||||
|
_messageToEditing = null;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
]),
|
),
|
||||||
);
|
),
|
||||||
}
|
],
|
||||||
return const SizedBox.shrink();
|
),
|
||||||
}),
|
),
|
||||||
],
|
Obx(() {
|
||||||
);
|
final ChatCallProvider call = Get.find();
|
||||||
}),
|
if (call.isMounted.value &&
|
||||||
),
|
AppTheme.isUltraLargeScreen(context)) {
|
||||||
|
return const Expanded(
|
||||||
|
child: Row(children: [
|
||||||
|
VerticalDivider(width: 0.3, thickness: 0.3),
|
||||||
|
Expanded(
|
||||||
|
child: CallScreen(
|
||||||
|
hideAppBar: true,
|
||||||
|
isExpandable: true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return const SizedBox.shrink();
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -177,6 +177,9 @@ class _AttachmentListState extends State<AttachmentList> {
|
|||||||
if (element == null) return const SizedBox.shrink();
|
if (element == null) return const SizedBox.shrink();
|
||||||
double ratio = element.metadata?['ratio']?.toDouble() ?? 16 / 9;
|
double ratio = element.metadata?['ratio']?.toDouble() ?? 16 / 9;
|
||||||
return Container(
|
return Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Theme.of(context).colorScheme.surfaceContainerHigh,
|
||||||
|
),
|
||||||
constraints: BoxConstraints(
|
constraints: BoxConstraints(
|
||||||
maxWidth: widget.columnMaxWidth,
|
maxWidth: widget.columnMaxWidth,
|
||||||
maxHeight: 640,
|
maxHeight: 640,
|
||||||
@ -244,7 +247,7 @@ class _AttachmentListState extends State<AttachmentList> {
|
|||||||
maxHeight: widget.flatMaxHeight,
|
maxHeight: widget.flatMaxHeight,
|
||||||
),
|
),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.transparent,
|
color: Theme.of(context).colorScheme.surfaceContainerHigh,
|
||||||
border: Border.symmetric(
|
border: Border.symmetric(
|
||||||
horizontal: BorderSide(
|
horizontal: BorderSide(
|
||||||
width: 0.3,
|
width: 0.3,
|
||||||
@ -254,7 +257,6 @@ class _AttachmentListState extends State<AttachmentList> {
|
|||||||
),
|
),
|
||||||
child: CarouselSlider.builder(
|
child: CarouselSlider.builder(
|
||||||
options: CarouselOptions(
|
options: CarouselOptions(
|
||||||
animateToClosest: true,
|
|
||||||
aspectRatio: _aspectRatio,
|
aspectRatio: _aspectRatio,
|
||||||
viewportFraction:
|
viewportFraction:
|
||||||
widget.viewport ?? (widget.attachmentsId.length > 1 ? 0.95 : 1),
|
widget.viewport ?? (widget.attachmentsId.length > 1 ? 0.95 : 1),
|
||||||
@ -317,7 +319,6 @@ class AttachmentListEntry extends StatelessWidget {
|
|||||||
width: width ?? MediaQuery.of(context).size.width,
|
width: width ?? MediaQuery.of(context).size.width,
|
||||||
height: height,
|
height: height,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Colors.transparent,
|
|
||||||
border: showBorder
|
border: showBorder
|
||||||
? Border.symmetric(
|
? Border.symmetric(
|
||||||
vertical: BorderSide(
|
vertical: BorderSide(
|
||||||
|
|||||||
@ -117,16 +117,30 @@ class _PostItemState extends State<PostItem> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (_contentHeight >= 80 && !widget.isFullContent)
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.bottomCenter,
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: Container(
|
||||||
|
height: 80,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.bottomCenter,
|
||||||
|
end: Alignment.topCenter,
|
||||||
|
colors: [
|
||||||
|
Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
|
Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.surface
|
||||||
|
.withOpacity(0),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
if (_contentHeight >= 80 && !widget.isFullContent)
|
|
||||||
Opacity(
|
|
||||||
opacity: 0.8,
|
|
||||||
child: InkWell(child: Text('readMore'.tr)),
|
|
||||||
).paddingOnly(
|
|
||||||
left: 12,
|
|
||||||
top: 4,
|
|
||||||
),
|
|
||||||
LinkExpansion(content: item.body['content']).paddingOnly(
|
LinkExpansion(content: item.body['content']).paddingOnly(
|
||||||
left: 8,
|
left: 8,
|
||||||
right: 8,
|
right: 8,
|
||||||
@ -211,16 +225,34 @@ class _PostItemState extends State<PostItem> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (_contentHeight >= 320 && !widget.isFullContent)
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.bottomCenter,
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: Container(
|
||||||
|
height: 320,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.bottomCenter,
|
||||||
|
end: Alignment.topCenter,
|
||||||
|
colors: [
|
||||||
|
(widget.backgroundColor ??
|
||||||
|
Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.surface),
|
||||||
|
(widget.backgroundColor ??
|
||||||
|
Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.surface)
|
||||||
|
.withOpacity(0),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
if (_contentHeight >= 320 && !widget.isFullContent)
|
|
||||||
Opacity(
|
|
||||||
opacity: 0.8,
|
|
||||||
child: InkWell(child: Text('readMore'.tr)),
|
|
||||||
).paddingOnly(
|
|
||||||
left: 12,
|
|
||||||
top: 4,
|
|
||||||
),
|
|
||||||
if (widget.item.replyTo != null && widget.isShowEmbed)
|
if (widget.item.replyTo != null && widget.isShowEmbed)
|
||||||
Container(
|
Container(
|
||||||
constraints: const BoxConstraints(maxWidth: 480),
|
constraints: const BoxConstraints(maxWidth: 480),
|
||||||
@ -304,7 +336,8 @@ class _PostItemState extends State<PostItem> {
|
|||||||
),
|
),
|
||||||
closedElevation: 0,
|
closedElevation: 0,
|
||||||
openElevation: 0,
|
openElevation: 0,
|
||||||
closedColor: Colors.transparent,
|
closedColor:
|
||||||
|
widget.backgroundColor ?? Theme.of(context).colorScheme.surface,
|
||||||
openColor: Theme.of(context).colorScheme.surface,
|
openColor: Theme.of(context).colorScheme.surface,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -541,7 +574,7 @@ class _PostEmbedWidget extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
closedElevation: 0,
|
closedElevation: 0,
|
||||||
openElevation: 0,
|
openElevation: 0,
|
||||||
closedColor: Colors.transparent,
|
closedColor: Theme.of(context).colorScheme.surface,
|
||||||
openColor: Theme.of(context).colorScheme.surface,
|
openColor: Theme.of(context).colorScheme.surface,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,7 +27,7 @@ class RootContainer extends StatelessWidget {
|
|||||||
backgroundBlendMode: BlendMode.darken,
|
backgroundBlendMode: BlendMode.darken,
|
||||||
color: Theme.of(context).colorScheme.surface,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
image: DecorationImage(
|
image: DecorationImage(
|
||||||
opacity: 0.2,
|
opacity: 0.5,
|
||||||
image: FileImage(file),
|
image: FileImage(file),
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
),
|
),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user