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.

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

UC classes page redesign #1438

Open
wants to merge 15 commits into
base: ui/redesign
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,180 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:uni/model/entities/course_units/course_unit_class.dart';
import 'package:uni/model/providers/startup/session_provider.dart';
import 'package:uni/view/course_unit_info/widgets/course_unit_info_card.dart';
import 'package:uni/view/course_unit_info/widgets/course_unit_student_row.dart';
import 'package:uni/view/course_unit_info/widgets/course_unit_student_tile.dart';
import 'package:uni_ui/theme.dart';

class CourseUnitClassesView extends StatelessWidget {
class CourseUnitClassesView extends StatefulWidget {
const CourseUnitClassesView(this.classes, {super.key});

final List<CourseUnitClass> classes;

@override
_CourseUnitClassesViewState createState() => _CourseUnitClassesViewState();
}

class _CourseUnitClassesViewState extends State<CourseUnitClassesView> {
static const double _itemWidth = 140;
static const Duration _scrollDuration = Duration(milliseconds: 300);

late int selectedIndex;
final ScrollController _scrollController = ScrollController();

@override
void initState() {
super.initState();
final sessionProvider = context.read<SessionProvider>();
final studentNumber = int.tryParse(
sessionProvider.state!.username.replaceAll(RegExp(r'\D'), ''),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Care for the ! operator. Make sure sessionProvider.state is not null.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was referring to the sessionProvider.state!.username.replaceAll(RegExp(r'\D'), '') one

) ??
0;
pedroafmonteiro marked this conversation as resolved.
Show resolved Hide resolved

selectedIndex = widget.classes.indexWhere(
(courseClass) => courseClass.students.any(
(student) => student.number == studentNumber,
),
);

if (selectedIndex == -1) {
selectedIndex = 0;
}

WidgetsBinding.instance.addPostFrameCallback((_) {
_scrollToSelectedClass();
});
}

void _scrollToSelectedClass() {
final screenWidth = MediaQuery.of(context).size.width;
final offset =
(_itemWidth * selectedIndex) - (screenWidth - _itemWidth) / 2;

_scrollController.animateTo(
offset < 0 ? 0 : offset,
duration: _scrollDuration,
curve: Curves.easeInOut,
);
}

void _handleClassTap(int index) {
setState(() => selectedIndex = index);
_scrollToSelectedClass();
}

@override
void dispose() {
_scrollController.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
final session = context.read<SessionProvider>().state!;
final cards = <CourseUnitInfoCard>[];
for (final courseUnitClass in classes) {
final isMyClass = courseUnitClass.students
.where(
(student) =>
student.number ==
(int.tryParse(
session.username.replaceAll(RegExp(r'\D'), ''),
) ??
0),
)
.isNotEmpty;
cards.add(
CourseUnitInfoCard(
isMyClass
? '${courseUnitClass.className} *'
: courseUnitClass.className,
Column(
children: courseUnitClass.students
.map((student) => CourseUnitStudentRow(student, session))
.toList(),
),
final sessionProvider = context.read<SessionProvider>();
final studentNumber = int.tryParse(
sessionProvider.state!.username.replaceAll(RegExp(r'\D'), ''),
) ??
0;
pedroafmonteiro marked this conversation as resolved.
Show resolved Hide resolved

return SingleChildScrollView(
child: Column(
children: [
_buildClassSelector(studentNumber),
_buildStudentList(sessionProvider),
],
),
);
}

Widget _buildClassSelector(int studentNumber) {
return Padding(
padding: const EdgeInsets.only(bottom: 20),
child: SizedBox(
height: 55,
child: ListView.builder(
controller: _scrollController,
scrollDirection: Axis.horizontal,
itemCount: widget.classes.length,
itemBuilder: (context, index) {
final courseUnitClass = widget.classes[index];
final isMyClass = courseUnitClass.students
.any((student) => student.number == studentNumber);
final isSelected = index == selectedIndex;

return ConstrainedBox(
constraints: const BoxConstraints(
minWidth: _itemWidth,
maxWidth: _itemWidth,
),
child: GestureDetector(
onTap: () => _handleClassTap(index),
child: Container(
margin:
const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
decoration: BoxDecoration(
color: isSelected
? lightTheme.colorScheme.primary
: lightTheme.colorScheme.secondary,
borderRadius: BorderRadius.circular(25),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
spreadRadius: 2,
blurRadius: 5,
offset: const Offset(0, 2),
),
],
),
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 10,
),
alignment: Alignment.center,
child: Text(
isMyClass
? '${courseUnitClass.className} *'
: courseUnitClass.className,
style: isSelected
? lightTheme.textTheme.labelMedium?.copyWith(
color: lightTheme.colorScheme.onPrimary,
)
DGoiana marked this conversation as resolved.
Show resolved Hide resolved
: lightTheme.textTheme.labelMedium,
textAlign: TextAlign.center,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
),
);
},
),
);
}
),
);
}

return Container(
padding: const EdgeInsets.only(left: 10, right: 10),
child: ListView(children: cards),
Widget _buildStudentList(SessionProvider session) {
final currentClass = widget.classes[selectedIndex];
return Padding(
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 8),
child: GridView.builder(
key: ValueKey(currentClass.className),
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
crossAxisSpacing: 20,
mainAxisSpacing: 5,
childAspectRatio: 0.60,
),
itemCount: currentClass.students.length,
itemBuilder: (context, index) {
final student = currentClass.students[index];
return CourseUnitStudentTile(
student,
session.state!,
key: ValueKey('${currentClass.className}_${student.number}'),
);
},
),
);
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import 'package:flutter/material.dart';
import 'package:uni/model/entities/course_units/course_unit_class.dart';
import 'package:uni/model/providers/startup/profile_provider.dart';
import 'package:uni/session/flows/base/session.dart';
import 'package:uni_ui/theme.dart';

class CourseUnitStudentTile extends StatelessWidget {
const CourseUnitStudentTile(this.student, this.session, {super.key});

final CourseUnitStudent student;
final Session session;

@override
Widget build(BuildContext context) {
final userImage = ProfileProvider.fetchOrGetCachedProfilePicture(
session,
studentNumber: student.number,
);
return FutureBuilder(
builder: (context, snapshot) {
final names = student.name.split(RegExp(r'\s+'));
final firstName = names.first;
final lastName = names.last;

return Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
decoration: ShapeDecoration(
shape: const ContinuousRectangleBorder(
pedroafmonteiro marked this conversation as resolved.
Show resolved Hide resolved
borderRadius: BorderRadius.all(Radius.circular(50)),
),
image: DecorationImage(
fit: BoxFit.cover,
image: snapshot.hasData && snapshot.data!.lengthSync() > 0
? FileImage(snapshot.data!) as ImageProvider
: const AssetImage(
'assets/images/profile_placeholder.png',
),
),
),
child: AspectRatio(
aspectRatio: 1,
child: Container(),
),
),
const SizedBox(height: 8),
LayoutBuilder(
builder: (context, constraints) {
return Container(
width: constraints.maxWidth,
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Column(
children: [
Text(
firstName,
overflow: TextOverflow.fade,
style: lightTheme.textTheme.titleLarge?.copyWith(
color: grayText,
),
textAlign: TextAlign.center,
),
Text(
lastName,
overflow: TextOverflow.ellipsis,
style: lightTheme.textTheme.titleLarge?.copyWith(
color: grayText,
),
textAlign: TextAlign.center,
),
],
),
);
},
),
],
);
},
future: userImage,
);
}
}
Loading