talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into v4

Browse Source
This commit is contained in:
Salvatore Giordano
2022-04-29 16:24:12 +02:00
parent 28e8910c11 5f92937f57
commit da627a6c8a
80 changed files with 607 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/CHANGELOG.md
+13
View File
@@ -1,3 +1,16 @@
## Upcoming
✅ Added
- [[#1087]](https://github.com/GetStream/stream-chat-flutter/issues/1087): Handle limited access to camera on iOS.
- `centerTitle` and `elevation` properties to `ChannelHeader`, `ThreadHeader` and `ChannelListHeader`.
🐞 Fixed
- [[#1067]](https://github.com/GetStream/stream-chat-flutter/issues/1067): Fix name text overflow in reaction card.
- [[#842]](https://github.com/GetStream/stream-chat-flutter/issues/842): show date divider for first message.
- Loosen up url check for attachment download.
- Use `ogScrapeUrl` for LinkAttachments.
## 4.0.0-beta.2
✅ Added
packages/stream_chat_flutter/lib/src/attachment/attachment_title.dart
+5 -8
View File
@@ -24,14 +24,11 @@ class StreamAttachmentTitle extends StatelessWidget {
@override
Widget build(BuildContext context) {
final normalizedTitleLink = attachment.titleLink?.replaceFirst(
RegExp(r'https?://(www\.)?'),
'',
);
final ogScrapeUrl = attachment.ogScrapeUrl;
return GestureDetector(
onTap: () {
final titleLink = attachment.titleLink;
if (titleLink != null) launchURL(context, titleLink);
final ogScrapeUrl = attachment.ogScrapeUrl;
if (ogScrapeUrl != null) launchURL(context, ogScrapeUrl);
},
child: Padding(
padding: const EdgeInsets.all(8),
@@ -48,8 +45,8 @@ class StreamAttachmentTitle extends StatelessWidget {
fontWeight: FontWeight.bold,
),
),
if (normalizedTitleLink != null)
Text(normalizedTitleLink, style: messageTheme.messageTextStyle),
if (ogScrapeUrl != null)
Text(ogScrapeUrl, style: messageTheme.messageTextStyle),
],
),
),
packages/stream_chat_flutter/lib/src/attachment/url_attachment.dart
+4 -4
View File
@@ -43,11 +43,11 @@ class StreamUrlAttachment extends StatelessWidget {
final chatThemeData = StreamChatTheme.of(context);
return GestureDetector(
onTap: () {
final titleLink = urlAttachment.titleLink;
if (titleLink != null) {
final ogScrapeUrl = urlAttachment.ogScrapeUrl;
if (ogScrapeUrl != null) {
onLinkTap != null
? onLinkTap!(titleLink)
: launchURL(context, titleLink);
? onLinkTap!(ogScrapeUrl)
: launchURL(context, ogScrapeUrl);
}
},
child: Column(
packages/stream_chat_flutter/lib/src/channel_header.dart
+18 -3
View File
@@ -68,9 +68,11 @@ class StreamChannelHeader extends StatelessWidget
this.showConnectionStateTile = false,
this.title,
this.subtitle,
this.centerTitle,
this.leading,
this.actions,
this.backgroundColor,
this.elevation = 1,
}) : preferredSize = const Size.fromHeight(kToolbarHeight),
super(key: key);
@@ -99,6 +101,9 @@ class StreamChannelHeader extends StatelessWidget
/// Subtitle widget
final Widget? subtitle;
/// Whether the title should be centered
final bool? centerTitle;
/// Leading widget
final Widget? leading;
@@ -109,8 +114,16 @@ class StreamChannelHeader extends StatelessWidget
/// The background color for this [StreamChannelHeader].
final Color? backgroundColor;
/// The elevation for this [StreamChannelHeader].
final double elevation;
@override
Widget build(BuildContext context) {
final effectiveCenterTitle = getEffectiveCenterTitle(
Theme.of(context),
actions: actions,
centerTitle: centerTitle,
);
final channel = StreamChannel.of(context).channel;
final channelHeaderTheme = StreamChannelHeaderTheme.of(context);
@@ -151,7 +164,7 @@ class StreamChannelHeader extends StatelessWidget
systemOverlayStyle: theme.brightness == Brightness.dark
? SystemUiOverlayStyle.light
: SystemUiOverlayStyle.dark,
elevation: 1,
elevation: elevation,
leading: leadingWidget,
backgroundColor: backgroundColor ?? channelHeaderTheme.color,
actions: actions ??
@@ -170,14 +183,16 @@ class StreamChannelHeader extends StatelessWidget
),
),
],
centerTitle: true,
centerTitle: centerTitle,
title: InkWell(
onTap: onTitleTap,
child: SizedBox(
height: preferredSize.height,
width: preferredSize.width,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: effectiveCenterTitle
? CrossAxisAlignment.center
: CrossAxisAlignment.stretch,
children: <Widget>[
title ??
StreamChannelName(
packages/stream_chat_flutter/lib/src/channel_list_header.dart
+10 -2
View File
@@ -62,9 +62,11 @@ class StreamChannelListHeader extends StatelessWidget
this.showConnectionStateTile = false,
this.preNavigationCallback,
this.subtitle,
this.centerTitle,
this.leading,
this.actions,
this.backgroundColor,
this.elevation = 1,
}) : super(key: key);
/// Pass this if you don't have a [StreamChatClient] in your widget tree.
@@ -89,6 +91,9 @@ class StreamChannelListHeader extends StatelessWidget
/// Subtitle widget
final Widget? subtitle;
/// Whether the title should be centered
final bool? centerTitle;
/// Leading widget
/// By default it shows the logged in user avatar
final Widget? leading;
@@ -100,6 +105,9 @@ class StreamChannelListHeader extends StatelessWidget
/// The background color for this [StreamChannelListHeader].
final Color? backgroundColor;
/// The elevation for this [StreamChannelListHeader].
final double elevation;
@override
Widget build(BuildContext context) {
final _client = client ?? StreamChat.of(context).client;
@@ -135,10 +143,10 @@ class StreamChannelListHeader extends StatelessWidget
systemOverlayStyle: theme.brightness == Brightness.dark
? SystemUiOverlayStyle.light
: SystemUiOverlayStyle.dark,
elevation: 1,
elevation: elevation,
backgroundColor:
backgroundColor ?? channelListHeaderThemeData.color,
centerTitle: true,
centerTitle: centerTitle,
leading: leading ??
Center(
child: user != null
packages/stream_chat_flutter/lib/src/channel_list_view.dart
+3
View File
@@ -1,3 +1,6 @@
// ignore: lines_longer_than_80_chars
// ignore_for_file: deprecated_member_use_from_same_package, deprecated_member_use
import 'package:flutter/material.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:shimmer/shimmer.dart';
packages/stream_chat_flutter/lib/src/extension.dart
+9
View File
@@ -272,3 +272,12 @@ extension MessageX on Message {
return copyWith(text: messageTextToSend);
}
}
/// Extensions on [Uri]
extension UriX on Uri {
/// Return the URI adding the http scheme if it is missing
Uri get withScheme {
if (hasScheme) return this;
return Uri.parse('http://${toString()}');
}
}
packages/stream_chat_flutter/lib/src/full_screen_media.dart
-1
View File
@@ -5,7 +5,6 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:chewie/chewie.dart';
import 'package:flutter/material.dart';
import 'package:photo_view/photo_view.dart';
import 'package:stream_chat_flutter/src/stream_attachment_package.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
import 'package:video_player/video_player.dart';
packages/stream_chat_flutter/lib/src/localization/translations.dart
+6 -1
View File
@@ -1,7 +1,6 @@
import 'package:jiffy/jiffy.dart';
import 'package:stream_chat_flutter/src/connection_status_builder.dart';
import 'package:stream_chat_flutter/src/message_list_view.dart';
import 'package:stream_chat_flutter/src/message_search_list_view.dart';
import 'package:stream_chat_flutter/src/v4/message_input/stream_message_input.dart';
import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'
show User;
@@ -321,6 +320,9 @@ abstract class Translations {
/// The label for "Reply to message"
String get replyToMessageLabel;
/// The label for "View library"
String get viewLibrary;
/// Label for "Attachment limit exceeded:
/// it's not possible to add more than $limit attachments"
String attachmentLimitExceedError(int limit);
@@ -696,6 +698,9 @@ class DefaultTranslations implements Translations {
@override
String get slowModeOnLabel => 'Slow mode ON';
@override
String get viewLibrary => 'View library';
@override
String attachmentLimitExceedError(int limit) => """
Attachment limit exceeded: it's not possible to add more than $limit attachments""";
packages/stream_chat_flutter/lib/src/media_list_view.dart
+37 -7
View File
@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:stream_chat_flutter/src/media_list_view_controller.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
/// {@macro media_list_view}
@@ -20,6 +21,7 @@ class StreamMediaListView extends StatefulWidget {
Key? key,
this.selectedIds = const [],
this.onSelect,
this.controller,
}) : super(key: key);
/// Stores the media selected
@@ -28,18 +30,28 @@ class StreamMediaListView extends StatefulWidget {
/// Callback for on media selected
final void Function(AssetEntity media)? onSelect;
/// Controller that handles MediaListView
final MediaListViewController? controller;
@override
_StreamMediaListViewState createState() => _StreamMediaListViewState();
}
class _StreamMediaListViewState extends State<StreamMediaListView> {
final _media = <AssetEntity>[];
final ScrollController _scrollController = ScrollController();
int _currentPage = 0;
var _media = <AssetEntity>[];
var _currentPage = 0;
final _scrollController = ScrollController();
/// Controller necessary to verify limited access to photo gallery in iOS and
/// update the media list when listerners are emitted
late final controller = widget.controller ?? MediaListViewController();
@override
Widget build(BuildContext context) => LazyLoadScrollView(
onEndOfPage: () async => _getMedia(),
onEndOfPage: () async {
await _getMedia();
_updatePage();
},
child: GridView.builder(
itemCount: _media.length,
controller: _scrollController,
@@ -136,9 +148,29 @@ class _StreamMediaListViewState extends State<StreamMediaListView> {
@override
void initState() {
super.initState();
controller.addListener(_updateMediaList);
_getMedia();
}
@override
void dispose() {
super.dispose();
controller.removeListener(_updateMediaList);
if (widget.controller == null) {
controller.dispose();
}
}
void _updateMediaList() {
if (controller.shouldUpdateMedia) {
_getMedia();
}
}
void _updatePage() {
++_currentPage;
}
Future<void> _getMedia() async {
final assetList = (await PhotoManager.getAssetPathList(
filterOption: FilterOptionGroup(
@@ -157,13 +189,11 @@ class _StreamMediaListViewState extends State<StreamMediaListView> {
page: _currentPage,
size: 50,
);
if (media?.isNotEmpty == true) {
setState(() {
_media.addAll(media!);
_media = media!;
});
}
++_currentPage;
}
}
packages/stream_chat_flutter/lib/src/media_list_view_controller.dart
+16
View File
@@ -0,0 +1,16 @@
import 'package:flutter/material.dart';
/// Controller for MediaListView Widget
class MediaListViewController extends ChangeNotifier {
var _shouldUpdateMedia = false;
/// Getter that knows if the media should be updated.
bool get shouldUpdateMedia => _shouldUpdateMedia;
/// Method that update shouldUpdateMedia and notify all listeners
/// about this update.
void updateMedia({required bool newValue}) {
_shouldUpdateMedia = newValue;
notifyListeners();
}
}
packages/stream_chat_flutter/lib/src/message_input.dart
+30 -2
View File
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use_from_same_package
import 'dart:async';
import 'dart:math';
@@ -15,7 +17,7 @@ import 'package:stream_chat_flutter/src/emoji/emoji.dart';
import 'package:stream_chat_flutter/src/emoji_overlay.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/media_list_view.dart';
import 'package:stream_chat_flutter/src/multi_overlay.dart';
import 'package:stream_chat_flutter/src/media_list_view_controller.dart';
import 'package:stream_chat_flutter/src/quoted_message_widget.dart';
import 'package:stream_chat_flutter/src/user_mentions_overlay.dart';
import 'package:stream_chat_flutter/src/video_thumbnail_image.dart';
@@ -333,6 +335,7 @@ class MessageInputState extends State<MessageInput> {
final List<User> _mentionedUsers = [];
final _imagePicker = ImagePicker();
final _mediaListViewController = MediaListViewController();
late final _focusNode = widget.focusNode ?? FocusNode();
late final _isInternalFocusNode = widget.focusNode == null;
bool _inputEnabled = true;
@@ -1046,6 +1049,26 @@ class MessageInputState extends State<MessageInput> {
);
},
),
const Spacer(),
FutureBuilder(
future: PhotoManager.requestPermissionExtend(),
builder: (context, snapshot) {
if (snapshot.hasData &&
snapshot.data == PermissionState.limited) {
return TextButton(
child: Text(context.translations.viewLibrary),
onPressed: () async {
await PhotoManager.presentLimited();
_mediaListViewController.updateMedia(
newValue: true,
);
},
);
}
return const SizedBox.shrink();
},
),
],
),
DecoratedBox(
@@ -1078,6 +1101,7 @@ class MessageInputState extends State<MessageInput> {
borderRadius: BorderRadius.circular(8),
),
child: _PickerWidget(
mediaListViewController: _mediaListViewController,
filePickerIndex: _filePickerIndex,
streamChatTheme: _streamChatTheme,
containsFile: _attachmentContainsFile,
@@ -1241,7 +1265,7 @@ class MessageInputState extends State<MessageInput> {
Widget _buildReplyToMessage() {
if (!_hasQuotedMessage) return const Offstage();
final containsUrl = widget.quotedMessage!.attachments
.any((element) => element.titleLink != null);
.any((element) => element.ogScrapeUrl != null);
return StreamQuotedMessageWidget(
reverse: true,
showBorder: !containsUrl,
@@ -1909,6 +1933,7 @@ class _PickerWidget extends StatefulWidget {
required this.onAddMoreFilesClick,
required this.onMediaSelected,
required this.streamChatTheme,
required this.mediaListViewController,
}) : super(key: key);
final int filePickerIndex;
@@ -1917,6 +1942,7 @@ class _PickerWidget extends StatefulWidget {
final void Function(DefaultAttachmentTypes) onAddMoreFilesClick;
final void Function(AssetEntity) onMediaSelected;
final StreamChatThemeData streamChatTheme;
final MediaListViewController mediaListViewController;
@override
_PickerWidgetState createState() => _PickerWidgetState();
@@ -1964,7 +1990,9 @@ class _PickerWidgetState extends State<_PickerWidget> {
),
);
}
return StreamMediaListView(
controller: widget.mediaListViewController,
selectedIds: widget.selectedMedias,
onSelect: widget.onMediaSelected,
);
packages/stream_chat_flutter/lib/src/message_list_view.dart
+25 -13
View File
@@ -579,6 +579,9 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
if (widget.reverse
? widget.headerBuilder == null
: widget.footerBuilder == null) {
if (messages.isNotEmpty) {
return _buildDateDivider(messages.last);
}
if (_isThreadConversation) return const Offstage();
return const SizedBox(height: 52);
}
@@ -603,21 +606,12 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
message = messages[i - 2];
nextMessage = messages[i - 1];
}
if (!Jiffy(message.createdAt.toLocal()).isSame(
nextMessage.createdAt.toLocal(),
Units.DAY,
)) {
final divider = widget.dateDividerBuilder != null
? widget.dateDividerBuilder!(
nextMessage.createdAt.toLocal(),
)
: Padding(
padding: const EdgeInsets.symmetric(vertical: 12),
child: StreamDateDivider(
dateTime: nextMessage.createdAt.toLocal(),
),
);
return divider;
return _buildDateDivider(nextMessage);
}
final timeDiff =
Jiffy(nextMessage.createdAt.toLocal()).diff(
@@ -769,6 +763,20 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
return child;
}
Widget _buildDateDivider(Message message) {
final divider = widget.dateDividerBuilder != null
? widget.dateDividerBuilder!(
message.createdAt.toLocal(),
)
: Padding(
padding: const EdgeInsets.symmetric(vertical: 12),
child: StreamDateDivider(
dateTime: message.createdAt.toLocal(),
),
);
return divider;
}
Widget _buildThreadSeparator() {
if (widget.threadSeparatorBuilder != null) {
return widget.threadSeparatorBuilder!.call(context);
@@ -825,7 +833,11 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
index = _getBottomElementIndex(values);
}
if (index == null) return const Offstage();
if ((index == null) ||
(!_isThreadConversation && index == itemCount - 2) ||
(_isThreadConversation && index == itemCount - 1)) {
return const Offstage();
}
if (index <= 2 || index >= itemCount - 3) {
if (widget.reverse) {
@@ -1109,7 +1121,7 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
final isOnlyEmoji = message.text?.isOnlyEmoji ?? false;
final hasUrlAttachment =
message.attachments.any((it) => it.titleLink != null);
message.attachments.any((it) => it.ogScrapeUrl != null);
final borderSide =
isOnlyEmoji || hasUrlAttachment || (isMyMessage && !hasFileAttachment)
packages/stream_chat_flutter/lib/src/message_reactions_modal.dart
+2
View File
@@ -246,6 +246,8 @@ class StreamMessageReactionsModal extends StatelessWidget {
reaction.user!.name.split(' ')[0],
style: chatThemeData.textTheme.footnoteBold,
textAlign: TextAlign.center,
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
],
),
packages/stream_chat_flutter/lib/src/message_search_list_view.dart
+3
View File
@@ -1,3 +1,6 @@
// ignore: lines_longer_than_80_chars
// ignore_for_file: deprecated_member_use_from_same_package, deprecated_member_use
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
packages/stream_chat_flutter/lib/src/message_widget.dart
+5 -5
View File
@@ -581,11 +581,11 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
bool get isOnlyEmoji => widget.message.text?.isOnlyEmoji == true;
bool get hasNonUrlAttachments => widget.message.attachments
.where((it) => it.titleLink == null || it.type == 'giphy')
.where((it) => it.ogScrapeUrl == null || it.type == 'giphy')
.isNotEmpty;
bool get hasUrlAttachments => widget.message.attachments
.any((it) => it.titleLink != null && it.type != 'giphy');
.any((it) => it.ogScrapeUrl != null && it.type != 'giphy');
bool get showBottomRow =>
showThreadReplyIndicator ||
@@ -1006,9 +1006,9 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
Widget _buildUrlAttachment() {
final urlAttachment = widget.message.attachments
.firstWhere((element) => element.titleLink != null);
.firstWhere((element) => element.ogScrapeUrl != null);
final host = Uri.parse(urlAttachment.titleLink!).host;
final host = Uri.parse(urlAttachment.ogScrapeUrl!).withScheme.host;
final splitList = host.split('.');
final hostName = splitList.length == 3 ? splitList[1] : splitList[0];
final hostDisplayName = urlAttachment.authorName?.capitalize() ??
@@ -1176,7 +1176,7 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
widget.message.attachments
.where((element) =>
(element.titleLink == null && element.type != null) ||
(element.ogScrapeUrl == null && element.type != null) ||
element.type == 'giphy')
.forEach((e) {
if (attachmentGroups[e.type] == null) {
packages/stream_chat_flutter/lib/src/quoted_message_widget.dart
+2 -2
View File
@@ -57,7 +57,7 @@ class StreamQuotedMessageWidget extends StatelessWidget {
bool get _hasAttachments => message.attachments.isNotEmpty;
bool get _containsLinkAttachment =>
message.attachments.any((element) => element.titleLink != null);
message.attachments.any((element) => element.ogScrapeUrl != null);
bool get _containsText => message.text?.isNotEmpty == true;
@@ -161,7 +161,7 @@ class StreamQuotedMessageWidget extends StatelessWidget {
Attachment attachment;
if (_containsLinkAttachment) {
attachment = message.attachments.firstWhere(
(element) => element.titleLink != null,
(element) => element.ogScrapeUrl != null,
);
child = _buildUrlAttachment(attachment);
} else {
packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
+1 -1
View File
@@ -414,7 +414,7 @@ class StreamChatThemeData {
/// Theme configuration for the [StreamUserListView] widget.
final StreamUserListViewThemeData userListViewTheme;
/// Theme configuration for the [MessageSearchListView] widget.
/// Theme configuration for the [StreamMessageSearchListView] widget.
final StreamMessageSearchListViewThemeData messageSearchListViewTheme;
/// Creates a copy of [StreamChatThemeData] with specified attributes
packages/stream_chat_flutter/lib/src/thread_header.dart
+21 -3
View File
@@ -72,11 +72,13 @@ class StreamThreadHeader extends StatelessWidget
this.onBackPressed,
this.title,
this.subtitle,
this.centerTitle,
this.leading,
this.actions,
this.onTitleTap,
this.showTypingIndicator = true,
this.backgroundColor,
this.elevation = 1,
}) : preferredSize = const Size.fromHeight(kToolbarHeight),
super(key: key);
@@ -99,6 +101,9 @@ class StreamThreadHeader extends StatelessWidget
/// Subtitle widget
final Widget? subtitle;
/// Whether the title should be centered
final bool? centerTitle;
/// Leading widget
final Widget? leading;
@@ -112,8 +117,17 @@ class StreamThreadHeader extends StatelessWidget
/// The background color of this [StreamThreadHeader].
final Color? backgroundColor;
/// The elevation for this [StreamThreadHeader].
final double elevation;
@override
Widget build(BuildContext context) {
final effectiveCenterTitle = getEffectiveCenterTitle(
Theme.of(context),
actions: actions,
centerTitle: centerTitle,
);
final channelHeaderTheme = StreamChannelHeaderTheme.of(context);
final defaultSubtitle = subtitle ??
@@ -126,7 +140,8 @@ class StreamThreadHeader extends StatelessWidget
style: channelHeaderTheme.subtitleStyle,
),
Flexible(
child: ChannelName(
child: StreamChannelName(
channel: StreamChannel.of(context).channel,
textStyle: channelHeaderTheme.subtitleStyle,
),
),
@@ -141,7 +156,7 @@ class StreamThreadHeader extends StatelessWidget
systemOverlayStyle: theme.brightness == Brightness.dark
? SystemUiOverlayStyle.light
: SystemUiOverlayStyle.dark,
elevation: 1,
elevation: elevation,
leading: leading ??
(showBackButton
? StreamBackButton(
@@ -151,7 +166,7 @@ class StreamThreadHeader extends StatelessWidget
)
: const SizedBox()),
backgroundColor: backgroundColor ?? channelHeaderTheme.color,
centerTitle: true,
centerTitle: centerTitle,
actions: actions,
title: InkWell(
onTap: onTitleTap,
@@ -160,6 +175,9 @@ class StreamThreadHeader extends StatelessWidget
width: 250,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: effectiveCenterTitle
? CrossAxisAlignment.center
: CrossAxisAlignment.stretch,
children: [
title ??
Text(
packages/stream_chat_flutter/lib/src/typing_indicator.dart
+6
View File
@@ -49,6 +49,12 @@ class StreamTypingIndicator extends StatelessWidget {
.where((element) => element.value.parentId == parentId)
.map((e) => e.key)),
builder: (context, users) => AnimatedSwitcher(
layoutBuilder: (currentChild, previousChildren) => Stack(
children: <Widget>[
...previousChildren,
if (currentChild != null) currentChild,
],
),
duration: const Duration(milliseconds: 300),
child: users.isNotEmpty
? Padding(
packages/stream_chat_flutter/lib/src/user_list_view.dart
+3
View File
@@ -1,3 +1,6 @@
// ignore: lines_longer_than_80_chars
// ignore_for_file: deprecated_member_use_from_same_package, deprecated_member_use
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
packages/stream_chat_flutter/lib/src/utils.dart
+27 -6
View File
@@ -2,22 +2,43 @@ import 'dart:async';
import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/stream_attachment_package.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
import 'package:url_launcher/url_launcher.dart';
/// Launch URL
Future<void> launchURL(BuildContext context, String url) async {
if (await canLaunch(url)) {
await launch(url);
} else {
try {
await launch(Uri.parse(url).withScheme.toString());
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(context.translations.launchUrlError)),
);
}
}
/// Get centerTitle considering a default and platform specific behaviour
bool getEffectiveCenterTitle(
ThemeData theme, {
bool? centerTitle,
List<Widget>? actions,
}) {
if (centerTitle != null) return centerTitle;
if (theme.appBarTheme.centerTitle != null) {
return theme.appBarTheme.centerTitle!;
}
switch (theme.platform) {
case TargetPlatform.android:
case TargetPlatform.fuchsia:
case TargetPlatform.linux:
case TargetPlatform.windows:
return false;
case TargetPlatform.iOS:
case TargetPlatform.macOS:
return actions == null || actions.length < 2;
}
}
/// Shows confirmation dialog
Future<bool?> showConfirmationDialog(
BuildContext context, {
@@ -433,8 +454,8 @@ int levenshtein(String s, String t, {bool caseSensitive = true}) {
/// An easy way to handle attachment related operations on a message
extension AttachmentPackagesX on Message {
/// This extension will return a List of type [StreamAttachmentPackage] from the
/// existing attachments of the message
/// This extension will return a List of type [StreamAttachmentPackage]
/// from the existing attachments of the message
List<StreamAttachmentPackage> getAttachmentPackageList() {
final _attachmentPackages = List<StreamAttachmentPackage>.generate(
attachments.length,
packages/stream_chat_flutter/lib/src/v4/message_input/stream_attachment_picker.dart
+26
View File
@@ -5,6 +5,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/media_list_view.dart';
import 'package:stream_chat_flutter/src/media_list_view_controller.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
/// Callback for when a file has to be picked.
@@ -113,6 +114,7 @@ class StreamAttachmentPicker extends StatefulWidget {
class _StreamAttachmentPickerState extends State<StreamAttachmentPicker> {
int _filePickerIndex = 0;
final _mediaListViewController = MediaListViewController();
@override
Widget build(BuildContext context) {
@@ -281,6 +283,26 @@ class _StreamAttachmentPickerState extends State<StreamAttachmentPicker> {
),
],
),
const Spacer(),
FutureBuilder(
future: PhotoManager.requestPermissionExtend(),
builder: (context, snapshot) {
if (snapshot.hasData &&
snapshot.data == PermissionState.limited) {
return TextButton(
child: Text(context.translations.viewLibrary),
onPressed: () async {
await PhotoManager.presentLimited();
_mediaListViewController.updateMedia(
newValue: true,
);
},
);
}
return const SizedBox.shrink();
},
),
DecoratedBox(
decoration: BoxDecoration(
color: _streamChatTheme.colorTheme.barsBg,
@@ -315,6 +337,7 @@ class _StreamAttachmentPickerState extends State<StreamAttachmentPicker> {
borderRadius: BorderRadius.circular(8),
),
child: _PickerWidget(
mediaListViewController: _mediaListViewController,
filePickerIndex: _filePickerIndex,
streamChatTheme: _streamChatTheme,
containsFile: _attachmentContainsFile,
@@ -410,6 +433,7 @@ class _PickerWidget extends StatefulWidget {
required this.streamChatTheme,
required this.allowedAttachmentTypes,
required this.customAttachmentTypes,
required this.mediaListViewController,
}) : super(key: key);
final int filePickerIndex;
@@ -420,6 +444,7 @@ class _PickerWidget extends StatefulWidget {
final StreamChatThemeData streamChatTheme;
final List<DefaultAttachmentTypes> allowedAttachmentTypes;
final List<CustomAttachmentType> customAttachmentTypes;
final MediaListViewController mediaListViewController;
@override
_PickerWidgetState createState() => _PickerWidgetState();
@@ -473,6 +498,7 @@ class _PickerWidgetState extends State<_PickerWidget> {
return StreamMediaListView(
selectedIds: widget.selectedMedias,
onSelect: widget.onMediaSelected,
controller: widget.mediaListViewController,
);
}
packages/stream_chat_flutter/lib/src/v4/message_input/stream_message_input.dart
-1
View File
@@ -13,7 +13,6 @@ import 'package:stream_chat_flutter/src/commands_overlay.dart';
import 'package:stream_chat_flutter/src/emoji/emoji.dart';
import 'package:stream_chat_flutter/src/emoji_overlay.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/multi_overlay.dart';
import 'package:stream_chat_flutter/src/quoted_message_widget.dart';
import 'package:stream_chat_flutter/src/user_mentions_overlay.dart';
import 'package:stream_chat_flutter/src/v4/message_input/simple_safe_area.dart';
packages/stream_chat_flutter/lib/src/v4/message_input/stream_message_text_field.dart
+1 -1
View File
@@ -437,7 +437,7 @@ class StreamMessageTextField extends StatefulWidget {
/// This setting is only honored on iOS devices.
///
/// If unset, defaults to the brightness of
/// [ThemeData.primaryColorBrightness].
/// [ThemeData.brightness].
final Brightness? keyboardAppearance;
/// {@macro flutter.widgets.editableText.scrollPadding}
packages/stream_chat_flutter/lib/src/v4/scroll_view/channel_scroll_view/stream_channel_grid_view.dart
+4 -2
View File
@@ -158,7 +158,8 @@ class StreamChannelGridView extends StatelessWidget {
/// only scroll the view if it has sufficient content. See [physics].
///
/// Also when true, the scroll view is used for default [ScrollAction]s. If a
/// ScrollAction is not handled by an otherwise focused part of the application,
/// ScrollAction is not handled by
/// an otherwise focused part of the application,
/// the ScrollAction will be evaluated using this scroll view, for example,
/// when executing [Shortcuts] key events like page up and down.
///
@@ -288,7 +289,8 @@ class StreamChannelGridView extends StatelessWidget {
///
/// See also:
///
/// * [SemanticsConfiguration.scrollChildCount], the corresponding semantics property.
/// * [SemanticsConfiguration.scrollChildCount],
/// the corresponding semantics property.
final int? semanticChildCount;
/// {@macro flutter.widgets.scrollable.dragStartBehavior}
packages/stream_chat_flutter/lib/src/v4/scroll_view/message_search_scroll_view/stream_message_search_grid_view.dart
+6 -4
View File
@@ -2,7 +2,6 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_empty_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_error_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_error.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_indicator.dart';
@@ -75,7 +74,8 @@ class StreamMessageSearchGridView extends StatelessWidget {
/// A builder that is called to build items in the [PagedValueGridView].
///
/// The `value` parameter is the [GetMessageBuilder] at this position in the grid.
/// The `value` parameter is the [GetMessageBuilder]
/// at this position in the grid.
final StreamMessageSearchGridViewIndexedWidgetBuilder itemBuilder;
/// A builder that is called to build the empty state of the grid.
@@ -144,7 +144,8 @@ class StreamMessageSearchGridView extends StatelessWidget {
/// only scroll the view if it has sufficient content. See [physics].
///
/// Also when true, the scroll view is used for default [ScrollAction]s. If a
/// ScrollAction is not handled by an otherwise focused part of the application,
/// ScrollAction is not handled by
/// an otherwise focused part of the application,
/// the ScrollAction will be evaluated using this scroll view, for example,
/// when executing [Shortcuts] key events like page up and down.
///
@@ -274,7 +275,8 @@ class StreamMessageSearchGridView extends StatelessWidget {
///
/// See also:
///
/// * [SemanticsConfiguration.scrollChildCount], the corresponding semantics property.
/// * [SemanticsConfiguration.scrollChildCount],
/// the corresponding semantics property.
final int? semanticChildCount;
/// {@macro flutter.widgets.scrollable.dragStartBehavior}
packages/stream_chat_flutter/lib/src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart
+2 -1
View File
@@ -1,7 +1,8 @@
// ignore_for_file: deprecated_member_use_from_same_package
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_empty_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_error_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_error.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_indicator.dart';
packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_grid_view.dart
+4 -3
View File
@@ -1,7 +1,6 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_empty_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_error_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_error.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_indicator.dart';
@@ -152,7 +151,8 @@ class StreamUserGridView extends StatelessWidget {
/// only scroll the view if it has sufficient content. See [physics].
///
/// Also when true, the scroll view is used for default [ScrollAction]s. If a
/// ScrollAction is not handled by an otherwise focused part of the application,
/// ScrollAction is not handled by
/// an otherwise focused part of the application,
/// the ScrollAction will be evaluated using this scroll view, for example,
/// when executing [Shortcuts] key events like page up and down.
///
@@ -282,7 +282,8 @@ class StreamUserGridView extends StatelessWidget {
///
/// See also:
///
/// * [SemanticsConfiguration.scrollChildCount], the corresponding semantics property.
/// * [SemanticsConfiguration.scrollChildCount],
/// the corresponding semantics property.
final int? semanticChildCount;
/// {@macro flutter.widgets.scrollable.dragStartBehavior}
packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_list_tile.dart
+4 -3
View File
@@ -48,10 +48,11 @@ class StreamUserListTile extends StatelessWidget {
/// A widget to display at the end of tile.
final Widget? selectedWidget;
/// If this tile is also [enabled] then icons and text are rendered with the same color.
/// If this tile is also [enabled] then icons
/// and text are rendered with the same color.
///
/// By default the selected color is the theme's primary color. The selected color
/// can be overridden with a [ListTileTheme].
/// By default the selected color is the theme's primary color.
/// The selected color can be overridden with a [ListTileTheme].
///
/// {@tool dartpad}
/// Here is an example of using a [StatefulWidget] to keep track of the
packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_list_view.dart
+2 -1
View File
@@ -1,7 +1,8 @@
// ignore_for_file: deprecated_member_use_from_same_package
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:stream_chat_flutter/src/extension.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_empty_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_error_widget.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_error.dart';
import 'package:stream_chat_flutter/src/v4/scroll_view/stream_scroll_view_load_more_indicator.dart';
packages/stream_chat_flutter/lib/stream_chat_flutter.dart
+1
View File
@@ -22,6 +22,7 @@ export 'src/info_tile.dart';
export 'src/localization/stream_chat_localizations.dart';
export 'src/localization/translations.dart' show DefaultTranslations;
export 'src/message_action.dart';
// ignore: deprecated_member_use_from_same_package
export 'src/message_input.dart' show MessageInput, MessageInputState;
export 'src/message_list_view.dart';
export 'src/message_search_item.dart';
packages/stream_chat_flutter/test/src/channel_header_test.dart
+1 -1
View File
@@ -280,7 +280,7 @@ void main() {
expect(find.text('test'), findsNothing);
expect(find.byType(StreamBackButton), findsNothing);
expect(find.byType(ChannelAvatar), findsNothing);
expect(find.byType(StreamChannelAvatar), findsNothing);
expect(find.byType(StreamChannelInfo), findsNothing);
expect(find.text('leading'), findsOneWidget);
expect(find.text('title'), findsOneWidget);
packages/stream_chat_flutter/test/src/channel_image_test.dart
+15 -8
View File
@@ -31,8 +31,10 @@ void main() {
client: client,
child: StreamChannel(
channel: channel,
child: const Scaffold(
body: ChannelAvatar(),
child: Scaffold(
body: StreamChannelAvatar(
channel: channel,
),
),
),
),
@@ -101,8 +103,10 @@ void main() {
client: client,
child: StreamChannel(
channel: channel,
child: const Scaffold(
body: ChannelAvatar(),
child: Scaffold(
body: StreamChannelAvatar(
channel: channel,
),
),
),
),
@@ -162,8 +166,10 @@ void main() {
client: client,
child: StreamChannel(
channel: channel,
child: const Scaffold(
body: ChannelAvatar(),
child: Scaffold(
body: StreamChannelAvatar(
channel: channel,
),
),
),
),
@@ -202,9 +208,10 @@ void main() {
client: client,
child: StreamChannel(
channel: channel,
child: const Scaffold(
body: ChannelAvatar(
child: Scaffold(
body: StreamChannelAvatar(
selected: true,
channel: channel,
),
),
),
packages/stream_chat_flutter/test/src/channel_name_test.dart
+4 -2
View File
@@ -57,8 +57,10 @@ void main() {
client: client,
child: StreamChannel(
channel: channel,
child: const Scaffold(
body: ChannelName(),
child: Scaffold(
body: StreamChannelName(
channel: channel,
),
),
),
),
packages/stream_chat_flutter/test/src/channel_preview_test.dart
+2
View File
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use_from_same_package
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
packages/stream_chat_flutter/test/src/media_list_view_controller_test.dart
+37
View File
@@ -0,0 +1,37 @@
import 'package:stream_chat_flutter/src/media_list_view_controller.dart';
import 'package:test/test.dart';
void main() {
test('should update media', () {
final controller = MediaListViewController();
expect(controller.shouldUpdateMedia, false);
controller.updateMedia(newValue: true);
expect(controller.shouldUpdateMedia, true);
controller.dispose();
});
test('should notify listeners on update media', () {
final controller = MediaListViewController();
var callCount = 0;
void updateCallsSpy() => callCount++;
controller.addListener(updateCallsSpy);
expect(callCount, 0);
controller.updateMedia(newValue: false);
expect(controller.shouldUpdateMedia, false);
expect(callCount, 1);
controller.updateMedia(newValue: true);
expect(controller.shouldUpdateMedia, true);
expect(callCount, 2);
controller
..removeListener(updateCallsSpy)
..dispose();
});
}
packages/stream_chat_flutter/test/src/theme/channel_list_view_theme_test.dart
+2
View File
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use_from_same_package
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
packages/stream_chat_flutter/test/src/theme/message_search_list_view_theme_test.dart
+3
View File
@@ -1,3 +1,6 @@
// ignore: lines_longer_than_80_chars
// ignore_for_file: deprecated_member_use, deprecated_member_use_from_same_package
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
packages/stream_chat_flutter/test/src/theme/user_list_view_theme_test.dart
+3
View File
@@ -1,3 +1,6 @@
// ignore: lines_longer_than_80_chars
// ignore_for_file: deprecated_member_use_from_same_package, deprecated_member_use
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
packages/stream_chat_flutter/test/src/thread_header_test.dart
+2
View File
@@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use_from_same_package
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';