Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging Blissey #242

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+61 −58
Open

Staging Blissey #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3482fc
feat: Use user live collection for global user search
kornsitti Nov 28, 2024
40865b4
feat: Show chat is push notifiable
kornsitti Dec 10, 2024
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
18 changes: 17 additions & 1 deletion lib/presentation/screen/channel_list/channel_list_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ class _ChannelListScreenState extends State<ChannelListScreen> {
AmityChannelSortOption _sort = AmityChannelSortOption.LAST_ACTIVITY;
List<String>? _tags;
List<String>? _excludingTags;
bool? isPushNotifiable;

@override
void initState() {
resetLiveCollection(isReset: false);
scrollcontroller.addListener(pagination);
fetchNotificationSettings();
super.initState();
}

Expand All @@ -47,6 +49,14 @@ class _ChannelListScreenState extends State<ChannelListScreen> {
}
}

void fetchNotificationSettings() async {
final settings = await AmityNotification().user().getSettings();
final chatModuleSetting = settings.events?.whereType<Chat>().firstOrNull;
setState(() {
isPushNotifiable = (settings.isEnabled ?? true) && (chatModuleSetting?.isEnabled ?? true);
});
}

void resetLiveCollection({ bool isReset = true }) async {
if (isReset) {
_channelLiveCollection.getStreamController().stream;
Expand Down Expand Up @@ -85,6 +95,12 @@ class _ChannelListScreenState extends State<ChannelListScreen> {
appBar: AppBar(title: const Text('Channel List ')),
body: Column(
children: [
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
width: double.infinity,
color: Colors.grey[200],
child: Text("chat.push_notification.enable: ${isPushNotifiable ?? "unknown"}"),
),
Container(
padding: const EdgeInsets.all(12),
child: TextFormField(
Expand Down Expand Up @@ -304,7 +320,7 @@ class _ChannelListScreenState extends State<ChannelListScreen> {
alignment: Alignment.center,
child: _channelLiveCollection.isFetching
? const CircularProgressIndicator()
: const Text('No Post'),
: const Text('No channel found'),
),
),
if (_channelLiveCollection.isFetching && amityChannels.isNotEmpty)
Expand Down
99 changes: 43 additions & 56 deletions lib/presentation/screen/global_user_search/global_user_search.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import 'package:amity_sdk/amity_sdk.dart';
import 'package:flutter/material.dart';
import 'package:flutter_social_sample_app/core/constant/global_constant.dart';
import 'package:flutter_social_sample_app/core/utils/debouncer.dart';
import 'package:flutter_social_sample_app/core/widget/dialog/amity_user_info_widget.dart';
import 'package:flutter_social_sample_app/core/widget/dialog/error_dialog.dart';

class GlobalUserSearch extends StatefulWidget {
const GlobalUserSearch({Key? key, this.showAppBar = true}) : super(key: key);
Expand All @@ -13,8 +11,8 @@ class GlobalUserSearch extends StatefulWidget {
}

class _GlobalUserSearchState extends State<GlobalUserSearch> {
late PagingController<AmityUser> _controller;
final amityUsers = <AmityUser>[];
late UserLiveCollection _userLiveCollection;
List<AmityUser> amityUsers = <AmityUser>[];

final scrollcontroller = ScrollController();
bool loading = false;
Expand All @@ -26,54 +24,15 @@ class _GlobalUserSearchState extends State<GlobalUserSearch> {
AmityUserSortOption _sort = AmityUserSortOption.DISPLAY;
@override
void initState() {
_controller = PagingController(
pageFuture: (token) => AmityCoreClient.newUserRepository()
.searchUserByDisplayName(_keyword)
.sortBy(_sort)
.getPagingData(token: token, limit: GlobalConstant.pageSize),
pageSize: GlobalConstant.pageSize,
)..addListener(
() {
if (_controller.error == null) {
if (mounted) {
setState(() {
amityUsers.clear();
amityUsers.addAll(_controller.loadedItems);
});
}
} else {
//Error on pagination controller
setState(() {});
ErrorDialog.show(context,
title: 'Error', message: _controller.error.toString());
}
},
);

WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
_controller.fetchNextPage();
});

resetLiveCollection(isReset: false);
scrollcontroller.addListener(pagination);

super.initState();
}

// void addMembers(List<AmityChannelMember> members) {
// _controller.addAll(members);
// }

// void removeMembers(List<String> userIds) {
// _controller.removeWhere((member) => userIds.contains(member.userId));
// }

void pagination() {
if ((scrollcontroller.position.pixels ==
scrollcontroller.position.maxScrollExtent) &&
_controller.hasMoreItems) {
setState(() {
_controller.fetchNextPage();
});
if ((scrollcontroller.position.pixels == scrollcontroller.position.maxScrollExtent)
&& _userLiveCollection.hasNextPage()) {
_userLiveCollection.loadNext();
}
}

Expand All @@ -92,8 +51,7 @@ class _GlobalUserSearchState extends State<GlobalUserSearch> {
onChanged: (value) {
_debouncer.run(() {
_keyword = value;
_controller.reset();
_controller.fetchNextPage();
resetLiveCollection();
});
},
decoration: const InputDecoration(hintText: 'Enter Keybaord'),
Expand Down Expand Up @@ -134,9 +92,7 @@ class _GlobalUserSearchState extends State<GlobalUserSearch> {
if (index == 3) {
_sort = AmityUserSortOption.LAST_CREATED;
}

_controller.reset();
_controller.fetchNextPage();
resetLiveCollection();
},
),
),
Expand All @@ -146,8 +102,7 @@ class _GlobalUserSearchState extends State<GlobalUserSearch> {
child: amityUsers.isNotEmpty
? RefreshIndicator(
onRefresh: () async {
_controller.reset();
_controller.fetchNextPage();
resetLiveCollection();
},
child: ListView.builder(
physics: const AlwaysScrollableScrollPhysics(),
Expand All @@ -163,12 +118,12 @@ class _GlobalUserSearchState extends State<GlobalUserSearch> {
)
: Container(
alignment: Alignment.center,
child: _controller.isFetching
child: _userLiveCollection.isFetching
? const CircularProgressIndicator()
: const Text('No Members'),
),
),
if (_controller.isFetching && amityUsers.isNotEmpty)
if (_userLiveCollection.isFetching && amityUsers.isNotEmpty)
Container(
alignment: Alignment.center,
child: const CircularProgressIndicator(),
Expand All @@ -178,6 +133,38 @@ class _GlobalUserSearchState extends State<GlobalUserSearch> {
);
}

void resetLiveCollection({ bool isReset = true }) async {
if (isReset) {
_userLiveCollection.getStreamController().close();
setState(() {
amityUsers = [];
});
}

_userLiveCollection = AmityCoreClient.newUserRepository()
.searchUserByDisplayName(_keyword)
.sortBy(_sort)
.getLiveCollection();

_userLiveCollection.getStreamController().stream.listen((event) {
if (mounted) {
setState(() {
amityUsers = event;
});
}
});

_userLiveCollection.observeLoadingState().listen((event) {
if (mounted) {
setState(() {
loading = event;
});
}
});

_userLiveCollection.loadNext();
}

// void _muteMember(BuildContext context, AmityChannelMember member) {
// AmityChatClient.newChannelRepository()
// .moderation(member.channelId!)
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: flutter_social_sample_app
description: Demonstrates how to use the flutter_application_1 plugin.
version: 1.1.50+67
version: 1.1.51+68



Expand Down
Loading