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

Jump to bottom

Filter rooms by Tags #197

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Filter rooms by Tags #197

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
9b54597
feat: Added filter by tag feature.
ShivamMenda Oct 16, 2023
4d7eda5
fix: Added required logging statements
ShivamMenda Oct 16, 2023
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
70 changes: 62 additions & 8 deletions lib/controllers/rooms_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@ class RoomsController extends GetxController {
Client client = AppwriteService.getClient();
final Databases databases = AppwriteService.getDatabases();
List<AppwriteRoom> rooms = [];
List tagsList = [];

@override
void onInit() async {
super.onInit();
await getRooms();
await getTags();
}

Future<AppwriteRoom> createRoomObject(Document room, String userUid) async{
Future<AppwriteRoom> createRoomObject(Document room, String userUid) async {
// Get three particpant data to use for memberAvatar widget
var participantCollectionRef = await databases.listDocuments(
databaseId: masterDatabaseId,
Expand All @@ -35,7 +37,9 @@ class RoomsController extends GetxController {
List<String> memberAvatarUrls = [];
for (var p in participantCollectionRef.documents) {
Document participantDoc = await databases.getDocument(
databaseId: userDatabaseID, collectionId: usersCollectionID, documentId: p.data["uid"]);
databaseId: userDatabaseID,
collectionId: usersCollectionID,
documentId: p.data["uid"]);
memberAvatarUrls.add(participantDoc.data["profileImageUrl"]);
}

Expand All @@ -60,8 +64,8 @@ class RoomsController extends GetxController {

// Get active rooms and add it to rooms list
rooms = [];
var roomsCollectionRef =
await databases.listDocuments(databaseId: masterDatabaseId, collectionId: roomsCollectionId);
var roomsCollectionRef = await databases.listDocuments(
databaseId: masterDatabaseId, collectionId: roomsCollectionId);

for (var room in roomsCollectionRef.documents) {
AppwriteRoom appwriteRoom = await createRoomObject(room, userUid);
Expand All @@ -78,7 +82,9 @@ class RoomsController extends GetxController {
Future getRoomById(String roomId) async {
try {
Document room = await databases.getDocument(
databaseId: masterDatabaseId, collectionId: roomsCollectionId, documentId: roomId);
databaseId: masterDatabaseId,
collectionId: roomsCollectionId,
documentId: roomId);
String userUid = Get.find<AuthStateController>().uid!;

AppwriteRoom appwriteRoom = await createRoomObject(room, userUid);
Expand All @@ -88,20 +94,68 @@ class RoomsController extends GetxController {
}
}

Future<void> getTags() async {
try {
isLoading.value = true;
// Get active room tags and add it to tags list
var roomsCollectionRef = await databases.listDocuments(
databaseId: masterDatabaseId, collectionId: roomsCollectionId);
for (var doc in roomsCollectionRef.documents) {
tagsList.add(doc.data["tags"]);
}
log("Tags: $tagsList");
update();
} catch (e) {
log(e.toString());
} finally {
isLoading.value = false;
}
}

Future<void> getRoomsbyTags(List tagList) async {
try {
isLoading.value = true;
String userUid = Get.find<AuthStateController>().uid!;
// Get active rooms by tags and add it to rooms list
rooms = [];
var roomsCollectionRef = await databases.listDocuments(
databaseId: masterDatabaseId,
collectionId: roomsCollectionId,
queries: [
Query.equal(
"tags", "[${tagList.map((e) => '"$e"').toList().join(',')}]")
]);

for (var room in roomsCollectionRef.documents) {
AppwriteRoom appwriteRoom = await createRoomObject(room, userUid);
rooms.add(appwriteRoom);
}
log("Rooms: ${rooms.map((e) => e.name).toList()}");
update();
} catch (e) {
log(e.toString());
} finally {
isLoading.value = false;
}
}

Future<void> joinRoom({required AppwriteRoom room}) async {
try {
// Display Loading Dialog
Get.dialog(
Center(
child: LoadingAnimationWidget.threeRotatingDots(color: Colors.amber, size: Get.pixelRatio * 20),
child: LoadingAnimationWidget.threeRotatingDots(
color: Colors.amber, size: Get.pixelRatio * 20),
),
barrierDismissible: false,
name: "Loading Dialog");

// Get the token and livekit url and join livekit room
AuthStateController authStateController = Get.find<AuthStateController>();
String myDocId =
await RoomService.joinRoom(roomId: room.id, userId: authStateController.uid!, isAdmin: room.isUserAdmin);
String myDocId = await RoomService.joinRoom(
roomId: room.id,
userId: authStateController.uid!,
isAdmin: room.isUserAdmin);
room.myDocId = myDocId;

// Close the loading dialog
Expand Down
40 changes: 39 additions & 1 deletion lib/views/screens/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import 'package:custom_refresh_indicator/custom_refresh_indicator.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:loading_animation_widget/loading_animation_widget.dart';
import 'package:multi_select_flutter/multi_select_flutter.dart';
import 'package:resonate/controllers/rooms_controller.dart';
import 'package:resonate/utils/app_images.dart';
import 'package:resonate/utils/colors.dart';
import 'package:resonate/utils/ui_sizes.dart';

import '../widgets/room_tile.dart';
Expand Down Expand Up @@ -34,7 +36,43 @@ class HomeScreen extends StatelessWidget {
child: Column(
children: [
SizedBox(
height: UiSizes.height_12,
height: UiSizes.height_10,
),
MultiSelectDialogField(
itemsTextStyle: const TextStyle(color: Colors.white),
selectedColor: AppColor.yellowMaterialColor,
selectedItemsTextStyle:
const TextStyle(color: AppColor.bgBlackColor),
backgroundColor: AppColor.bgBlackColor,
title: const Text(
"Select Tags to filter",
style: TextStyle(color: Colors.white),
),
listType: MultiSelectListType.CHIP,
items: roomsController.tagsList
.map((e) => MultiSelectItem(
e,
e
.toString()
.replaceAll("[", " ")
.replaceAll("]", " ")))
.toList(),
buttonIcon: const Icon(Icons.filter_list_outlined),
buttonText: const Text("Filter by Tags"),
confirmText: const Text(
"Apply",
style: TextStyle(color: AppColor.yellowColor),
),
cancelText: const Text(
"Cancel",
style: TextStyle(color: AppColor.yellowColor),
),
searchable: true,
onConfirm: (results) {
for (var tags in results) {
roomsController.getRoomsbyTags(tags);
}
},
),
Visibility(
visible: roomsController.rooms.isEmpty,
Expand Down
38 changes: 19 additions & 19 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.17.2"
version: "1.17.1"
connectivity_plus:
dependency: transitive
description:
Expand Down Expand Up @@ -828,18 +828,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.2.0"
meta:
dependency: transitive
description:
Expand All @@ -856,6 +856,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.4"
multi_select_flutter:
dependency: "direct main"
description:
name: multi_select_flutter
sha256: "503857b415d390d29159df8a9d92d83c6aac17aaf1c307fb7bcfc77d097d20ed"
url: "https://pub.dev"
source: hosted
version: "4.1.3"
nested:
dependency: transitive
description:
Expand Down Expand Up @@ -1137,10 +1145,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -1201,10 +1209,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "0.5.1"
textfield_tags:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1357,14 +1365,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
web_socket_channel:
dependency: transitive
description:
Expand Down Expand Up @@ -1430,5 +1430,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.1.0-185.0.dev <4.0.0"
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ dependencies:
stop_watch_timer: ^3.0.1
flutter_onboarding_slider: ^1.0.10
get_storage: ^2.1.1
multi_select_flutter: ^4.1.3

dev_dependencies:
flutter_test:
Expand Down