Skip to content

FIX: Add the hostel number in the mess widget #56 #60

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

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

FIX: Add the hostel number in the mess widget #56 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
664aaef
FIX: Lost&Found: Loading Posts #48
Prayas-Agrawal Jan 28, 2024
10b7524
FIX: Buy&Sell: Loading Posts
Prayas-Agrawal Jan 28, 2024
aeffd79
reset to master
Prayas-Agrawal Jan 28, 2024
0b0237d
FIX: Add the hostel number in the mess widget #56
Prayas-Agrawal Jan 28, 2024
fb05341
update widget as well
Prayas-Agrawal Jan 28, 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
3 changes: 2 additions & 1 deletion android/app/src/main/java/app/insti/flutter/MessMenuWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down
9 changes: 8 additions & 1 deletion android/app/src/main/res/layout/mess_menu_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
android:padding= "10dp"
>


<TextView
android:id="@+id/hostel_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textSize="20sp"
android:textStyle="bold"
android:textAlignment="center"/>

<TextView
android:id="@+id/day_text_view"
Expand Down
2 changes: 1 addition & 1 deletion lib/src/routes/lostandfoundfeedpage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class _LostpageState extends State<LostPage> {
return Center(
child:
CircularProgressIndicatorExtended(
label: Text("Loading..."),
label: Text("Loading..."),
));
}

Expand Down
12 changes: 10 additions & 2 deletions lib/src/routes/messpage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,16 @@ class _MessPageState extends State<MessPage> {
?..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(
Expand Down