Skip to content

Commit 7ef6526

Browse files
committedNov 4, 2024
fix: fixed inconsistencies of the home screen i.e room and upcoming room
1 parent 8cc02e7 commit 7ef6526

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed
 

‎lib/controllers/single_room_controller.dart

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:get/get.dart';
77

88
import 'package:resonate/controllers/auth_state_controller.dart';
99
import 'package:resonate/controllers/livekit_controller.dart';
10+
import 'package:resonate/controllers/rooms_controller.dart';
1011
import 'package:resonate/models/appwrite_room.dart';
1112
import 'package:resonate/models/participant.dart';
1213
import 'package:resonate/routes/app_routes.dart';
@@ -19,6 +20,7 @@ import '../utils/constants.dart';
1920

2021
class SingleRoomController extends GetxController {
2122
AuthStateController auth = Get.find<AuthStateController>();
23+
final RoomsController roomsController = Get.put(RoomsController());
2224
RxBool isLoading = false.obs;
2325
late Rx<Participant> me = Participant(
2426
uid: auth.uid!,

‎lib/views/screens/home_screen.dart

+10-7
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ class HomeScreen extends StatefulWidget {
1919
State<HomeScreen> createState() => _HomeScreenState();
2020
}
2121

22-
final RoomsController roomsController = Get.put(RoomsController());
2322

24-
final UpcomingRoomsController upcomingRoomsController =
23+
class _HomeScreenState extends State<HomeScreen> {
24+
final UpcomingRoomsController upcomingRoomsController =
2525
Get.put(UpcomingRoomsController());
26+
final RoomsController roomsController = Get.put(RoomsController());
2627

27-
class _HomeScreenState extends State<HomeScreen> {
2828
Future<void> pullToRefreshData() async {
2929
await upcomingRoomsController.getUpcomingRooms();
3030
await roomsController.getRooms();
@@ -64,15 +64,15 @@ class _HomeScreenState extends State<HomeScreen> {
6464
color: Theme.of(context).colorScheme.primary,
6565
size: Get.pixelRatio * 20,
6666
))
67-
: const LiveRoomListView()
67+
: LiveRoomListView()
6868
: upcomingRoomsController.isLoading.value
6969
? Center(
7070
child:
7171
LoadingAnimationWidget.fourRotatingDots(
7272
color: Theme.of(context).colorScheme.primary,
7373
size: Get.pixelRatio * 20,
7474
))
75-
: const UpcomingRoomsListView()),
75+
: UpcomingRoomsListView()),
7676
)),
7777
),
7878
],
@@ -127,7 +127,9 @@ class CustomAppBarLiveRoom extends StatelessWidget {
127127
}
128128

129129
class UpcomingRoomsListView extends StatelessWidget {
130-
const UpcomingRoomsListView({super.key});
130+
UpcomingRoomsListView({super.key});
131+
final UpcomingRoomsController upcomingRoomsController =
132+
Get.put(UpcomingRoomsController());
131133

132134
@override
133135
Widget build(BuildContext context) {
@@ -154,7 +156,8 @@ class UpcomingRoomsListView extends StatelessWidget {
154156
}
155157

156158
class LiveRoomListView extends StatelessWidget {
157-
const LiveRoomListView({super.key});
159+
LiveRoomListView({super.key});
160+
final RoomsController roomsController = Get.put(RoomsController());
158161

159162
@override
160163
Widget build(BuildContext context) {

‎lib/views/screens/room_screen.dart

+1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ class RoomScreenState extends State<RoomScreen> {
164164
alignment: Alignment.bottomCenter,
165165
child: Container(
166166
height: MediaQuery.of(context).size.height * 0.07,
167+
width: double.infinity,
167168
decoration: BoxDecoration(
168169
borderRadius: BorderRadiusDirectional.circular(24),
169170
color: Theme.of(context).colorScheme.surface),

‎lib/views/widgets/live_room_tile.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import 'package:flutter/material.dart';
2+
import 'package:get/get.dart';
3+
import 'package:resonate/controllers/rooms_controller.dart';
24
import 'package:resonate/models/appwrite_room.dart';
3-
import 'package:resonate/views/screens/home_screen.dart';
45
import 'package:share_plus/share_plus.dart';
56

67
class CustomLiveRoomTile extends StatelessWidget {
78
final AppwriteRoom appwriteRoom;
89

9-
const CustomLiveRoomTile({super.key, required this.appwriteRoom});
10+
CustomLiveRoomTile({super.key, required this.appwriteRoom});
11+
final RoomsController roomsController = Get.put(RoomsController());
1012

1113
@override
1214
Widget build(BuildContext context) {

‎lib/views/widgets/upcomming_room_tile.dart

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import 'package:cached_network_image/cached_network_image.dart';
22
import 'package:flutter/material.dart';
3+
import 'package:get/get.dart';
4+
import 'package:resonate/controllers/upcomming_rooms_controller.dart';
35
import 'package:resonate/models/appwrite_upcomming_room.dart';
46
import 'package:resonate/utils/extensions/datetime_extension.dart';
5-
import 'package:resonate/views/screens/home_screen.dart';
67

78
class UpCommingListTile extends StatelessWidget {
8-
const UpCommingListTile({super.key, required this.appwriteUpcommingRoom});
9+
UpCommingListTile({super.key, required this.appwriteUpcommingRoom});
910
final AppwriteUpcommingRoom appwriteUpcommingRoom;
11+
final UpcomingRoomsController upcomingRoomsController =
12+
Get.put(UpcomingRoomsController());
1013

1114
@override
1215
Widget build(BuildContext context) {

0 commit comments

Comments
 (0)
Please sign in to comment.