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

removed deprecated uses, fmt

Browse Source
This commit is contained in:
Deven Joshi
2021-05-17 14:40:50 +05:30
parent 0303e18945
commit 1ba92a8676
24 changed files with 208 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/chatty/lib/data/local/image_picker_impl.dart
+2 -1
View File
@@ -6,7 +6,8 @@ class ImagePickerImpl extends ImagePickerRepository {
@override
Future<File> pickImage() async {
final picker = ImagePicker();
final pickedFile = await picker.getImage(source: ImageSource.gallery, maxWidth: 400);
final pickedFile =
await picker.getImage(source: ImageSource.gallery, maxWidth: 400);
return File(pickedFile.path);
}
}
packages/chatty/lib/data/local/stream_api_local_impl.dart
+11 -8
View File
@@ -46,7 +46,9 @@ class StreamApiLocalImpl extends StreamApiRepository {
}
@override
Future<Channel> createGroupChat(String channelId, String name, List<String> members, {String image}) async {
Future<Channel> createGroupChat(
String channelId, String name, List<String> members,
{String image}) async {
final channel = _client.channel('messaging', id: channelId, extraData: {
'name': name,
'image': image,
@@ -58,13 +60,14 @@ class StreamApiLocalImpl extends StreamApiRepository {
@override
Future<Channel> createSimpleChat(String friendId) async {
final channel =
_client.channel('messaging', id: '${_client.state.user.id.hashCode}${friendId.hashCode}', extraData: {
'members': [
friendId,
_client.state.user.id,
],
});
final channel = _client.channel('messaging',
id: '${_client.state.user.id.hashCode}${friendId.hashCode}',
extraData: {
'members': [
friendId,
_client.state.user.id,
],
});
await channel.watch();
return channel;
}
packages/chatty/lib/data/prod/auth_impl.dart
+4 -2
View File
@@ -20,8 +20,10 @@ class AuthImpl extends AuthRepository {
try {
UserCredential userCredential;
final GoogleSignInAccount googleUser = await GoogleSignIn().signIn();
final GoogleSignInAuthentication googleAuth = await googleUser.authentication;
final GoogleAuthCredential googleAuthCredential = GoogleAuthProvider.credential(
final GoogleSignInAuthentication googleAuth =
await googleUser.authentication;
final GoogleAuthCredential googleAuthCredential =
GoogleAuthProvider.credential(
accessToken: googleAuth.accessToken,
idToken: googleAuth.idToken,
);
packages/chatty/lib/data/prod/stream_api_impl.dart
+10 -8
View File
@@ -62,7 +62,8 @@ class StreamApiImpl extends StreamApiRepository {
}
@override
Future<Channel> createGroupChat(String id, String name, List<String> members, {String image}) async {
Future<Channel> createGroupChat(String id, String name, List<String> members,
{String image}) async {
final channel = _client.channel('messaging', id: id, extraData: {
'name': name,
'image': image,
@@ -74,13 +75,14 @@ class StreamApiImpl extends StreamApiRepository {
@override
Future<Channel> createSimpleChat(String friendId) async {
final channel =
_client.channel('messaging', id: '${_client.state.user.id.hashCode}${friendId.hashCode}', extraData: {
'members': [
friendId,
_client.state.user.id,
],
});
final channel = _client.channel('messaging',
id: '${_client.state.user.id.hashCode}${friendId.hashCode}',
extraData: {
'members': [
friendId,
_client.state.user.id,
],
});
await channel.watch();
return channel;
}
packages/chatty/lib/data/stream_api_repository.dart
+3 -1
View File
@@ -6,7 +6,9 @@ abstract class StreamApiRepository {
Future<String> getToken(String userId);
Future<bool> connectIfExist(String userId);
Future<ChatUser> connectUser(ChatUser user, String token);
Future<Channel> createGroupChat(String channelId, String name, List<String> members, {String image});
Future<Channel> createGroupChat(
String channelId, String name, List<String> members,
{String image});
Future<Channel> createSimpleChat(String friendId);
Future<void> logout();
}
packages/chatty/lib/dependencies.dart
+6 -3
View File
@@ -18,10 +18,13 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
List<RepositoryProvider> buildRepositories(StreamChatClient client) {
//TODO: Here you can use your local implementations of your repositories
return [
RepositoryProvider<StreamApiRepository>(create: (_) => StreamApiImpl(client)),
RepositoryProvider<PersistentStorageRepository>(create: (_) => PersistentStorageImpl()),
RepositoryProvider<StreamApiRepository>(
create: (_) => StreamApiImpl(client)),
RepositoryProvider<PersistentStorageRepository>(
create: (_) => PersistentStorageImpl()),
RepositoryProvider<AuthRepository>(create: (_) => AuthImpl()),
RepositoryProvider<UploadStorageRepository>(create: (_) => UploadStorageImpl()),
RepositoryProvider<UploadStorageRepository>(
create: (_) => UploadStorageImpl()),
RepositoryProvider<ImagePickerRepository>(create: (_) => ImagePickerImpl()),
RepositoryProvider<ProfileSignInUseCase>(
create: (context) => ProfileSignInUseCase(
packages/chatty/lib/domain/usecases/create_group_usecase.dart
+2 -1
View File
@@ -25,7 +25,8 @@ class CreateGroupUseCase {
final channelId = Uuid().v4();
String image;
if (input.imageFile != null) {
image = await _uploadStorageRepository.uploadPhoto(input.imageFile, 'channels/$channelId');
image = await _uploadStorageRepository.uploadPhoto(
input.imageFile, 'channels/$channelId');
}
final channel = await _streamApiRepository.createGroupChat(
channelId,
packages/chatty/lib/domain/usecases/profile_sign_in_usecase.dart
+4 -2
View File
@@ -27,8 +27,10 @@ class ProfileSignInUseCase {
final token = await _streamApiRepository.getToken(auth.id);
String image;
if (input.imageFile != null) {
image = await _uploadStorageRepository.uploadPhoto(input.imageFile, 'users/${auth.id}');
image = await _uploadStorageRepository.uploadPhoto(
input.imageFile, 'users/${auth.id}');
}
await _streamApiRepository.connectUser(ChatUser(name: input.name, id: auth.id, image: image), token);
await _streamApiRepository.connectUser(
ChatUser(name: input.name, id: auth.id, image: image), token);
}
}
packages/chatty/lib/main.dart
+2 -1
View File
@@ -34,7 +34,8 @@ class MyApp extends StatelessWidget {
return StreamChat(
child: child,
client: _streamChatClient,
streamChatThemeData: StreamChatThemeData.fromTheme(Theme.of(context)).copyWith(
streamChatThemeData:
StreamChatThemeData.fromTheme(Theme.of(context)).copyWith(
ownMessageTheme: MessageTheme(
messageBackgroundColor: Theme.of(context).accentColor,
messageText: TextStyle(color: Colors.white),
packages/chatty/lib/navigator_utils.dart
+3 -1
View File
@@ -18,5 +18,7 @@ Future pushAndReplaceToPage(BuildContext context, Widget widget) async {
Future popAllAndPush(BuildContext context, Widget widget) async {
await Navigator.pushAndRemoveUntil(
context, MaterialPageRoute(builder: (BuildContext context) => widget), ModalRoute.withName('/'));
context,
MaterialPageRoute(builder: (BuildContext context) => widget),
ModalRoute.withName('/'));
}
packages/chatty/lib/ui/common/my_channel_preview.dart
+60 -20
View File
@@ -90,7 +90,8 @@ class MyChannelPreview extends StatelessWidget {
children: <Widget>[
Flexible(
child: ChannelName(
textStyle: StreamChatTheme.of(context).channelPreviewTheme.title,
textStyle:
StreamChatTheme.of(context).channelPreviewTheme.title,
),
),
StreamBuilder<List<Member>>(
@@ -99,7 +100,8 @@ class MyChannelPreview extends StatelessWidget {
builder: (context, snapshot) {
if (!snapshot.hasData ||
snapshot.data.isEmpty ||
!snapshot.data.any((Member e) => e.user.id == channel.client.state.user.id)) {
!snapshot.data.any((Member e) =>
e.user.id == channel.client.state.user.id)) {
return SizedBox();
}
return ChannelUnreadIndicator(
@@ -118,15 +120,21 @@ class MyChannelPreview extends StatelessWidget {
(m) => !m.isDeleted && m.shadowed != true,
orElse: () => null,
);
if (lastMessage?.user?.id == StreamChat.of(context).user.id) {
if (lastMessage?.user?.id ==
StreamChat.of(context).user.id) {
return Padding(
padding: const EdgeInsets.only(right: 4.0),
child: SendingIndicator(
message: lastMessage,
size: StreamChatTheme.of(context).channelPreviewTheme.indicatorIconSize,
size: StreamChatTheme.of(context)
.channelPreviewTheme
.indicatorIconSize,
isMessageRead: channel.state.read
?.where((element) => element.user.id != channel.client.state.user.id)
?.where((element) => element.lastRead.isAfter(lastMessage.createdAt))
?.where((element) =>
element.user.id !=
channel.client.state.user.id)
?.where((element) => element.lastRead
.isAfter(lastMessage.createdAt))
?.isNotEmpty ==
true,
),
@@ -158,7 +166,8 @@ class MyChannelPreview extends StatelessWidget {
var startOfDay = DateTime(now.year, now.month, now.day);
if (lastMessageAt.millisecondsSinceEpoch >= startOfDay.millisecondsSinceEpoch) {
if (lastMessageAt.millisecondsSinceEpoch >=
startOfDay.millisecondsSinceEpoch) {
stringDate = Jiffy(lastMessageAt.toLocal()).format('HH:mm');
} else if (lastMessageAt.millisecondsSinceEpoch >=
startOfDay.subtract(Duration(days: 1)).millisecondsSinceEpoch) {
@@ -187,8 +196,14 @@ class MyChannelPreview extends StatelessWidget {
),
Text(
' Channel is muted',
style: StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color,
style: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle
.copyWith(
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle
.color,
),
),
],
@@ -198,7 +213,8 @@ class MyChannelPreview extends StatelessWidget {
channel: channel,
alternativeWidget: _buildLastMessage(context),
style: StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color,
color:
StreamChatTheme.of(context).channelPreviewTheme.subtitle.color,
),
);
}
@@ -208,7 +224,9 @@ class MyChannelPreview extends StatelessWidget {
stream: channel.state.messagesStream,
initialData: channel.state.messages,
builder: (context, snapshot) {
final lastMessage = snapshot.data?.lastWhere((m) => m.shadowed != true && !m.isDeleted, orElse: () => null);
final lastMessage = snapshot.data?.lastWhere(
(m) => m.shadowed != true && !m.isDeleted,
orElse: () => null);
if (lastMessage == null) {
return SizedBox();
}
@@ -224,7 +242,9 @@ class MyChannelPreview extends StatelessWidget {
} else if (e.type == 'giphy') {
return '[GIF]';
}
return e == lastMessage.attachments.last ? (e.title ?? 'File') : '${e.title ?? 'File'} , ';
return e == lastMessage.attachments.last
? (e.title ?? 'File')
: '${e.title ?? 'File'} , ';
}).where((e) => e != null),
lastMessage.text ?? '',
];
@@ -238,11 +258,21 @@ class MyChannelPreview extends StatelessWidget {
lastMessage.mentionedUsers,
lastMessage.attachments,
StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted) ? FontStyle.italic : FontStyle.normal),
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle
.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted)
? FontStyle.italic
: FontStyle.normal),
StreamChatTheme.of(context).channelPreviewTheme.subtitle.copyWith(
color: StreamChatTheme.of(context).channelPreviewTheme.subtitle.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted) ? FontStyle.italic : FontStyle.normal,
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle
.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted)
? FontStyle.italic
: FontStyle.normal,
fontWeight: FontWeight.bold),
),
maxLines: 1,
@@ -252,19 +282,27 @@ class MyChannelPreview extends StatelessWidget {
);
}
TextSpan _getDisplayText(String text, List<User> mentions, List<Attachment> attachments, TextStyle normalTextStyle,
TextSpan _getDisplayText(
String text,
List<User> mentions,
List<Attachment> attachments,
TextStyle normalTextStyle,
TextStyle mentionsTextStyle) {
var textList = text.split(' ');
var resList = <TextSpan>[];
for (var e in textList) {
if (mentions != null && mentions.isNotEmpty && mentions.any((element) => '@${element.name}' == e)) {
if (mentions != null &&
mentions.isNotEmpty &&
mentions.any((element) => '@${element.name}' == e)) {
resList.add(TextSpan(
text: '$e ',
style: mentionsTextStyle,
));
} else if (attachments != null &&
attachments.isNotEmpty &&
attachments.where((e) => e.title != null).any((element) => element.title == e)) {
attachments
.where((e) => e.title != null)
.any((element) => element.title == e)) {
resList.add(TextSpan(
text: '$e ',
style: normalTextStyle.copyWith(fontStyle: FontStyle.italic),
@@ -301,7 +339,9 @@ class ChannelUnreadIndicator extends StatelessWidget {
return Material(
borderRadius: BorderRadius.circular(8),
color: StreamChatTheme.of(context).channelPreviewTheme.unreadCounterColor,
color: StreamChatTheme.of(context)
.channelPreviewTheme
.unreadCounterColor,
child: Padding(
padding: const EdgeInsets.only(
left: 5.0,
packages/chatty/lib/ui/home/chat/chat_view.dart
+4 -2
View File
@@ -43,8 +43,10 @@ class ChatView extends StatelessWidget {
name = channel.extraData['name'];
image = channel.extraData['image'];
} else {
final friend =
channel.state.members.where((element) => element.userId != currentUser.id).first.user;
final friend = channel.state.members
.where((element) => element.userId != currentUser.id)
.first
.user;
name = friend.name;
image = friend.extraData['image'];
}
packages/chatty/lib/ui/home/chat/selection/friends_selection_cubit.dart
+11 -5
View File
@@ -13,21 +13,27 @@ class FriendsSelectionCubit extends Cubit<List<ChatUserState>> {
FriendsSelectionCubit(this._streamApiRepository) : super([]);
final StreamApiRepository _streamApiRepository;
List<ChatUserState> get selectedUsers => state.where((element) => element.selected).toList();
List<ChatUserState> get selectedUsers =>
state.where((element) => element.selected).toList();
Future<void> init() async {
final chatUsers = (await _streamApiRepository.getChatUsers()).map((e) => ChatUserState(e)).toList();
final chatUsers = (await _streamApiRepository.getChatUsers())
.map((e) => ChatUserState(e))
.toList();
emit(chatUsers);
}
void selectUser(ChatUserState chatUser) {
final index = state.indexWhere((element) => element.chatUser.id == chatUser.chatUser.id);
state[index] = ChatUserState(state[index].chatUser, selected: !chatUser.selected);
final index = state
.indexWhere((element) => element.chatUser.id == chatUser.chatUser.id);
state[index] =
ChatUserState(state[index].chatUser, selected: !chatUser.selected);
emit(List<ChatUserState>.from(state));
}
Future<Channel> createFriendChannel(ChatUserState chatUserState) async {
return await _streamApiRepository.createSimpleChat(chatUserState.chatUser.id);
return await _streamApiRepository
.createSimpleChat(chatUserState.chatUser.id);
}
}
packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart
+31 -14
View File
@@ -7,8 +7,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
class FriendsSelectionView extends StatelessWidget {
void _createFriendChannel(BuildContext context, ChatUserState chatUserState) async {
final channel = await context.read<FriendsSelectionCubit>().createFriendChannel(chatUserState);
void _createFriendChannel(
BuildContext context, ChatUserState chatUserState) async {
final channel = await context
.read<FriendsSelectionCubit>()
.createFriendChannel(chatUserState);
pushAndReplaceToPage(
context,
Scaffold(
@@ -26,19 +29,23 @@ class FriendsSelectionView extends StatelessWidget {
final accentColor = Theme.of(context).accentColor;
return MultiBlocProvider(
providers: [
BlocProvider(create: (context) => FriendsSelectionCubit(context.read())..init()),
BlocProvider(
create: (context) => FriendsSelectionCubit(context.read())..init()),
BlocProvider(create: (_) => FriendsGroupCubit()),
],
child: BlocBuilder<FriendsGroupCubit, bool>(builder: (context, isGroup) {
return BlocBuilder<FriendsSelectionCubit, List<ChatUserState>>(builder: (context, snapshot) {
final selectedUsers = context.read<FriendsSelectionCubit>().selectedUsers;
return BlocBuilder<FriendsSelectionCubit, List<ChatUserState>>(
builder: (context, snapshot) {
final selectedUsers =
context.read<FriendsSelectionCubit>().selectedUsers;
return Scaffold(
floatingActionButton: isGroup && selectedUsers.isNotEmpty
? FloatingActionButton(
child: Icon(Icons.arrow_right_alt_rounded),
onPressed: () {
pushAndReplaceToPage(context, GroupSelectionView(selectedUsers));
pushAndReplaceToPage(
context, GroupSelectionView(selectedUsers));
})
: null,
backgroundColor: Theme.of(context).canvasColor,
@@ -91,12 +98,14 @@ class FriendsSelectionView extends StatelessWidget {
backgroundColor: accentColor,
child: Icon(Icons.group_outlined),
),
title: Text('Create group', style: TextStyle(fontWeight: FontWeight.w700)),
title: Text('Create group',
style: TextStyle(fontWeight: FontWeight.w700)),
subtitle: Text('Talk with 2 or more contacts'),
)
else if (isGroup && selectedUsers.isEmpty)
Padding(
padding: const EdgeInsets.only(top: 15.0, left: 20.0, bottom: 20),
padding: const EdgeInsets.only(
top: 15.0, left: 20.0, bottom: 20),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@@ -123,7 +132,8 @@ class FriendsSelectionView extends StatelessWidget {
itemBuilder: (context, index) {
final chatUserState = selectedUsers[index];
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 13.0),
padding: const EdgeInsets.symmetric(
horizontal: 13.0),
child: Stack(
clipBehavior: Clip.none,
children: [
@@ -132,7 +142,8 @@ class FriendsSelectionView extends StatelessWidget {
children: [
CircleAvatar(
radius: 30,
backgroundImage: NetworkImage(chatUserState.chatUser.image),
backgroundImage: NetworkImage(
chatUserState.chatUser.image),
),
Text(chatUserState.chatUser.name),
],
@@ -141,11 +152,14 @@ class FriendsSelectionView extends StatelessWidget {
bottom: 40,
right: -4,
child: InkWell(
onTap: () => context.read<FriendsSelectionCubit>().selectUser(chatUserState),
onTap: () => context
.read<FriendsSelectionCubit>()
.selectUser(chatUserState),
child: CircleAvatar(
radius: 9,
backgroundColor: accentColor,
child: Icon(Icons.close_rounded, size: 12),
child: Icon(Icons.close_rounded,
size: 12),
),
),
),
@@ -163,7 +177,8 @@ class FriendsSelectionView extends StatelessWidget {
_createFriendChannel(context, chatUserState);
},
leading: CircleAvatar(
backgroundImage: NetworkImage(chatUserState.chatUser.image),
backgroundImage:
NetworkImage(chatUserState.chatUser.image),
),
title: Text(chatUserState.chatUser.name),
trailing: isGroup
@@ -171,7 +186,9 @@ class FriendsSelectionView extends StatelessWidget {
value: chatUserState.selected,
onChanged: (val) {
print('select user for group');
context.read<FriendsSelectionCubit>().selectUser(chatUserState);
context
.read<FriendsSelectionCubit>()
.selectUser(chatUserState);
},
)
: null,
packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart
+9 -4
View File
@@ -21,7 +21,8 @@ class GroupSelectionView extends StatelessWidget {
context.read(),
context.read(),
),
child: BlocConsumer<GroupSelectionCubit, GroupSelectionState>(listener: (context, snapshot) {
child: BlocConsumer<GroupSelectionCubit, GroupSelectionState>(
listener: (context, snapshot) {
if (snapshot.channel != null) {
pushAndReplaceToPage(
context,
@@ -76,9 +77,12 @@ class GroupSelectionView extends StatelessWidget {
vertical: 20,
),
child: TextField(
controller: context.read<GroupSelectionCubit>().nameTextController,
controller:
context.read<GroupSelectionCubit>().nameTextController,
decoration: InputDecoration(
fillColor: Theme.of(context).bottomNavigationBarTheme.backgroundColor,
fillColor: Theme.of(context)
.bottomNavigationBarTheme
.backgroundColor,
hintText: 'Name of the group',
hintStyle: TextStyle(
fontSize: 13,
@@ -99,7 +103,8 @@ class GroupSelectionView extends StatelessWidget {
children: [
CircleAvatar(
radius: 30,
backgroundImage: NetworkImage(chatUserState.chatUser.image),
backgroundImage:
NetworkImage(chatUserState.chatUser.image),
),
Text(chatUserState.chatUser.name),
],
packages/chatty/lib/ui/home/home_view.dart
+7 -3
View File
@@ -61,7 +61,9 @@ class HomeNavigationBar extends StatelessWidget {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: Theme.of(context).bottomNavigationBarTheme.backgroundColor,
color: Theme.of(context)
.bottomNavigationBarTheme
.backgroundColor,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -122,8 +124,10 @@ class _HomeNavItem extends StatelessWidget {
@override
Widget build(BuildContext context) {
final selectedColor = Theme.of(context).bottomNavigationBarTheme.selectedItemColor;
final unselectedColor = Theme.of(context).bottomNavigationBarTheme.unselectedItemColor;
final selectedColor =
Theme.of(context).bottomNavigationBarTheme.selectedItemColor;
final unselectedColor =
Theme.of(context).bottomNavigationBarTheme.unselectedItemColor;
final color = selected ? selectedColor : unselectedColor;
return GestureDetector(
onTap: onTap,
packages/chatty/lib/ui/home/settings/settings_view.dart
+7 -3
View File
@@ -16,7 +16,8 @@ class SettingsView extends StatelessWidget {
return MultiBlocProvider(
providers: [
BlocProvider(
create: (_) => SettingsSwitchCubit(context.read<AppThemeCubit>().isDark),
create: (_) =>
SettingsSwitchCubit(context.read<AppThemeCubit>().isDark),
),
BlocProvider(
create: (_) => SettingsLogoutCubit(context.read()),
@@ -75,11 +76,14 @@ class SettingsView extends StatelessWidget {
),
),
Spacer(),
BlocBuilder<SettingsSwitchCubit, bool>(builder: (context, snapshot) {
BlocBuilder<SettingsSwitchCubit, bool>(
builder: (context, snapshot) {
return Switch(
value: snapshot,
onChanged: (val) {
context.read<SettingsSwitchCubit>().onChangeDarkMode(val);
context
.read<SettingsSwitchCubit>()
.onChangeDarkMode(val);
context.read<AppThemeCubit>().updateTheme(val);
},
);
packages/chatty/lib/ui/profile_verify/profile_verify_view.dart
+7 -3
View File
@@ -13,7 +13,8 @@ class ProfileVerifyView extends StatelessWidget {
Widget build(BuildContext context) {
return BlocProvider(
create: (context) => ProfileVerifyCubit(context.read(), context.read()),
child: BlocConsumer<ProfileVerifyCubit, ProfileState>(listener: (context, snapshot) {
child: BlocConsumer<ProfileVerifyCubit, ProfileState>(
listener: (context, snapshot) {
if (snapshot.success) {
pushAndReplaceToPage(context, HomeView());
}
@@ -59,9 +60,12 @@ class ProfileVerifyView extends StatelessWidget {
vertical: 20,
),
child: TextField(
controller: context.read<ProfileVerifyCubit>().nameController,
controller:
context.read<ProfileVerifyCubit>().nameController,
decoration: InputDecoration(
fillColor: Theme.of(context).bottomNavigationBarTheme.backgroundColor,
fillColor: Theme.of(context)
.bottomNavigationBarTheme
.backgroundColor,
hintText: 'Or just how people now you',
hintStyle: TextStyle(
fontSize: 13,
packages/chatty/lib/ui/sign_in/sign_in_view.dart
+5 -2
View File
@@ -11,7 +11,8 @@ class SignInView extends StatelessWidget {
Widget build(BuildContext context) {
return BlocProvider(
create: (context) => SignInCubit(context.read()),
child: BlocConsumer<SignInCubit, SignInState>(listener: (context, snapshot) {
child:
BlocConsumer<SignInCubit, SignInState>(listener: (context, snapshot) {
if (snapshot == SignInState.none) {
pushAndReplaceToPage(context, ProfileVerifyView());
} else {
@@ -59,7 +60,9 @@ class SignInView extends StatelessWidget {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
color: Theme.of(context).bottomNavigationBarTheme.backgroundColor,
color: Theme.of(context)
.bottomNavigationBarTheme
.backgroundColor,
child: InkWell(
onTap: () {
context.read<SignInCubit>().signIn();
packages/imessage/lib/utils.dart
-1
View File
@@ -49,7 +49,6 @@ class CupertinoCircleAvatar extends StatelessWidget {
}
}
class Divider extends StatelessWidget {
const Divider({
Key key,
packages/stream_chat_v1/lib/advanced_options_page.dart
+16 -8
View File
@@ -221,14 +221,22 @@ class _AdvancedOptionsPageState extends State<AdvancedOptionsPage> {
),
),
Spacer(),
RaisedButton(
color: Theme.of(context).brightness == Brightness.light
? StreamChatTheme.of(context).colorTheme.accentBlue
: Colors.white,
elevation: 0,
padding: const EdgeInsets.symmetric(vertical: 16),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(26),
ElevatedButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all<Color>(
Theme.of(context).brightness == Brightness.light
? StreamChatTheme.of(context)
.colorTheme
.accentBlue
: Colors.white),
elevation: MaterialStateProperty.all<double>(0),
padding: MaterialStateProperty.all<EdgeInsets>(
const EdgeInsets.symmetric(vertical: 16)),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(26),
),
),
),
child: Text(
'Login',
packages/stream_chat_v1/lib/chat_info_screen.dart
+2 -1
View File
@@ -56,7 +56,8 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
'admin',
'owner',
].contains(channel.state!.members
.firstWhereOrNull((m) => m.userId == channel.client.state.user!.id)
.firstWhereOrNull(
(m) => m.userId == channel.client.state.user!.id)
?.role))
_buildDeleteListTile(),
],
packages/stream_chat_v1/lib/group_chat_details_screen.dart
+1 -1
View File
@@ -306,7 +306,7 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FlatButton(
TextButton(
child: Text(
'OK',
style: StreamChatTheme.of(context)
packages/stream_chat_v1/lib/stream_version.dart
+1 -1
View File
@@ -26,7 +26,7 @@ class StreamVersion extends StatelessWidget {
yaml['packages']['stream_chat_flutter']['version'];
return Text(
'Stream SDK v ${streamChatDep}',
'Stream SDK v $streamChatDep',
style: TextStyle(
fontSize: 14,
color: StreamChatTheme.of(context).colorTheme.greyGainsboro,