From 664aaefd8a8bb0411072078243e127651b0d6aca Mon Sep 17 00:00:00 2001 From: Prayas-Agrawal Date: Sun, 28 Jan 2024 18:30:29 +0530 Subject: [PATCH 1/5] FIX: Lost&Found: Loading Posts #48 --- lib/src/routes/lostandfoundfeedpage.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/src/routes/lostandfoundfeedpage.dart b/lib/src/routes/lostandfoundfeedpage.dart index 82a9ed84..7e85da18 100644 --- a/lib/src/routes/lostandfoundfeedpage.dart +++ b/lib/src/routes/lostandfoundfeedpage.dart @@ -168,6 +168,14 @@ class _LostpageState extends State { stream: lnFPostBloc.lostAndFoundPosts, builder: (BuildContext context, AsyncSnapshot> snapshot) { + if (snapshot.connectionState == + ConnectionState.waiting) { + return Center( + child: CircularProgressIndicatorExtended( + label: Text("Getting the latest posts"), + ), + ); + } if (snapshot.data?.length != 0) { return ListView.builder( primary: false, @@ -178,7 +186,7 @@ class _LostpageState extends State { return Center( child: CircularProgressIndicatorExtended( - label: Text("Loading..."), + label: Text("Loading..."), )); } From 10b75243a9fe247add6718c8cd2f6f30aca5aafd Mon Sep 17 00:00:00 2001 From: Prayas-Agrawal Date: Sun, 28 Jan 2024 18:38:02 +0530 Subject: [PATCH 2/5] FIX: Buy&Sell: Loading Posts --- lib/src/routes/buynsell_page.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/src/routes/buynsell_page.dart b/lib/src/routes/buynsell_page.dart index 687b28a3..dd8cdf5d 100644 --- a/lib/src/routes/buynsell_page.dart +++ b/lib/src/routes/buynsell_page.dart @@ -204,6 +204,14 @@ class _SellpageState extends State { stream: buynSellPostBloc.buynsellposts, builder: (BuildContext context, AsyncSnapshot> snapshot) { + if (snapshot.connectionState == + ConnectionState.waiting) { + return Center( + child: CircularProgressIndicatorExtended( + label: Text("Getting the latest posts"), + ), + ); + } return ListView.builder( primary: false, shrinkWrap: true, From aeffd7963eeceb3033f268b590a7fff4ed37114d Mon Sep 17 00:00:00 2001 From: Prayas-Agrawal Date: Sun, 28 Jan 2024 20:19:08 +0530 Subject: [PATCH 3/5] reset to master --- lib/src/routes/buynsell_page.dart | 8 -------- lib/src/routes/lostandfoundfeedpage.dart | 8 -------- 2 files changed, 16 deletions(-) diff --git a/lib/src/routes/buynsell_page.dart b/lib/src/routes/buynsell_page.dart index dd8cdf5d..687b28a3 100644 --- a/lib/src/routes/buynsell_page.dart +++ b/lib/src/routes/buynsell_page.dart @@ -204,14 +204,6 @@ class _SellpageState extends State { stream: buynSellPostBloc.buynsellposts, builder: (BuildContext context, AsyncSnapshot> snapshot) { - if (snapshot.connectionState == - ConnectionState.waiting) { - return Center( - child: CircularProgressIndicatorExtended( - label: Text("Getting the latest posts"), - ), - ); - } return ListView.builder( primary: false, shrinkWrap: true, diff --git a/lib/src/routes/lostandfoundfeedpage.dart b/lib/src/routes/lostandfoundfeedpage.dart index 7e85da18..96e31249 100644 --- a/lib/src/routes/lostandfoundfeedpage.dart +++ b/lib/src/routes/lostandfoundfeedpage.dart @@ -168,14 +168,6 @@ class _LostpageState extends State { stream: lnFPostBloc.lostAndFoundPosts, builder: (BuildContext context, AsyncSnapshot> snapshot) { - if (snapshot.connectionState == - ConnectionState.waiting) { - return Center( - child: CircularProgressIndicatorExtended( - label: Text("Getting the latest posts"), - ), - ); - } if (snapshot.data?.length != 0) { return ListView.builder( primary: false, From 0b0237d0c79421a0864fcba003f03bc48a6cd0dc Mon Sep 17 00:00:00 2001 From: Prayas-Agrawal Date: Sun, 28 Jan 2024 21:02:16 +0530 Subject: [PATCH 4/5] FIX: Add the hostel number in the mess widget #56 --- lib/src/routes/messpage.dart | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/src/routes/messpage.dart b/lib/src/routes/messpage.dart index ab3c5997..be79bbd4 100644 --- a/lib/src/routes/messpage.dart +++ b/lib/src/routes/messpage.dart @@ -96,8 +96,16 @@ class _MessPageState extends State { ?..sort((h1, h2) => h1.compareTo(h2)); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, - children: - currMess?.map(_buildSingleDayMess).toList() ?? [], + children: [ + Padding( + padding: const EdgeInsets.only(bottom: 28.0), + child: Text( + "Hostel ${currHostel}", + style: theme.textTheme.headline5, + ), + ), + ...currMess?.map(_buildSingleDayMess).toList() ?? [] + ], ); } else { return Center( From fb05341cce9774fd1363b93452a849b5f8b6b135 Mon Sep 17 00:00:00 2001 From: Prayas-Agrawal Date: Sun, 28 Jan 2024 23:54:05 +0530 Subject: [PATCH 5/5] update widget as well --- .../src/main/java/app/insti/flutter/MessMenuWidget.java | 3 ++- android/app/src/main/res/layout/mess_menu_widget.xml | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/java/app/insti/flutter/MessMenuWidget.java b/android/app/src/main/java/app/insti/flutter/MessMenuWidget.java index 119551c5..079e1739 100644 --- a/android/app/src/main/java/app/insti/flutter/MessMenuWidget.java +++ b/android/app/src/main/java/app/insti/flutter/MessMenuWidget.java @@ -80,6 +80,7 @@ private static void displayMenu(CharSequence hostel) { private static void displayMessMenu(HostelMessMenu hostelMessMenu) { MessMenu todaysMenu = hostelMessMenu.getSortedMessMenus().get(0); MessMenu tomsMenu = hostelMessMenu.getSortedMessMenus().get(1); + String name = hostelMessMenu.getName(); int day = todaysMenu.getDay(); @@ -128,7 +129,7 @@ private static void displayMessMenu(HostelMessMenu hostelMessMenu) { } views.setTextViewText(R.id.day_text_view, generateDayString(day)); - + views.setTextViewText(R.id.hostel_name, name); views.setTextViewText(R.id.meal_name_text_view, mealType); views.setTextViewText(R.id.meal_time_text_view, mealTime); views.setTextViewText(R.id.meal_text_view, menu); diff --git a/android/app/src/main/res/layout/mess_menu_widget.xml b/android/app/src/main/res/layout/mess_menu_widget.xml index ad52cd02..b6cf14d8 100644 --- a/android/app/src/main/res/layout/mess_menu_widget.xml +++ b/android/app/src/main/res/layout/mess_menu_widget.xml @@ -7,7 +7,14 @@ android:padding= "10dp" > - +