balint14/student-legacy
balint14/student-legacy
1
Fork 0
forked from firka/student-legacy
Code Pull Requests Activity

Merge pull request #8 from TMarccci/master

Browse Source 
I think I fixed this
This commit is contained in:
Márton Kiss 2023-06-09 16:55:05 +02:00 committed by GitHub
commit e31d0753d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 89 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart
View File

@ -27,7 +27,6 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
SystemChrome.setPreferredOrientations([
DeviceOrientation.landscapeLeft,
DeviceOrientation.landscapeRight,
]);
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
@ -51,10 +50,6 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
(a, b) => math.max(
a, b.where((l) => l.subject.id != "" || l.isEmpty).length));
final int minIndex = int.tryParse(everyLesson.first.lessonIndex) ?? 0;
final int maxIndex =
int.tryParse(everyLesson.last.lessonIndex) ?? maxLessonCount;
const prefixw = 40;
const padding = prefixw + 6 * 2;
final colw = (MediaQuery.of(context).size.width - padding) / days.length;
@ -68,26 +63,19 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
body: ListView.builder(
physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.symmetric(horizontal: 6.0, vertical: 24.0),
itemCount: maxIndex + 1,
itemCount: maxLessonCount + 1,
itemBuilder: (context, index) {
List<Widget> columns = [];
for (int dayIndex = -1; dayIndex < days.length; dayIndex++) {
final dayOffset = dayIndex == -1
? 0
: (int.tryParse(days[dayIndex].first.lessonIndex) ?? 0) -
minIndex;
final lessonIndex = index - 1;
if (dayIndex == -1) {
if (lessonIndex >= 0) {
if (index >= 1) {
columns.add(SizedBox(
width: prefixw.toDouble(),
height: 40.0,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: Text(
"${minIndex + lessonIndex}.",
(index).toString()+".",
style: TextStyle(
fontWeight: FontWeight.bold,
color: Theme.of(context).colorScheme.secondary),
@ -105,16 +93,12 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
.toList();
if (lessons.isEmpty) continue;
if (lessonIndex >= lessons.length) continue;
if (dayIndex >= days.length ||
(lessonIndex + dayOffset) >= lessons.length) {
columns.add(SizedBox(width: colw));
continue;
}
final dayOffset = int.tryParse(lessons.first.lessonIndex) ?? 0;
if (lessonIndex == -1 && dayIndex >= 0) {
columns.add(SizedBox(
if (index == 0 && dayIndex >= 0) {
columns.add(
SizedBox(
width: colw,
height: 40.0,
child: Text(
@ -122,39 +106,50 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
.format(lessons.first.date)
.capital(),
style: const TextStyle(
fontSize: 24.0, fontWeight: FontWeight.bold),
fontSize: 24.0,
fontWeight: FontWeight.bold,
),
));
),
),
);
continue;
}
if (lessons[lessonIndex].isEmpty) {
columns.add(SizedBox(
width: colw,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(FeatherIcons.slash,
size: 18.0,
color: AppColors.of(context).text.withOpacity(.3)),
const SizedBox(width: 8.0),
Text(
"Lyukas óra",
style: TextStyle(
color: AppColors.of(context).text.withOpacity(.3)),
),
],
),
));
continue;
}
final lessonIndex = index - dayOffset;
if (dayOffset > 0 && lessonIndex < dayOffset) {
if (lessonIndex < 0 || lessonIndex >= lessons.length) {
columns.add(SizedBox(width: colw));
continue;
}
columns.add(SizedBox(
if (lessons[lessonIndex].isEmpty) {
columns.add(
SizedBox(
width: colw,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
FeatherIcons.slash,
size: 18.0,
color: AppColors.of(context).text.withOpacity(.3),
),
const SizedBox(width: 8.0),
Text(
"Lyukas óra",
style: TextStyle(
color: AppColors.of(context).text.withOpacity(.3),
),
),
],
),
),
);
continue;
}
columns.add(
SizedBox(
width: colw,
child: Column(
mainAxisSize: MainAxisSize.min,
@ -165,25 +160,24 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
Icon(
SubjectIcon.resolveVariant(
context: context,
subject: lessons[lessonIndex - dayOffset].subject),
subject: lessons[lessonIndex].subject,
),
size: 18.0,
color: AppColors.of(context).text.withOpacity(.7),
),
const SizedBox(width: 8.0),
Expanded(
child: Text(
lessons[lessonIndex - dayOffset].subject.renamedTo ??
lessons[lessonIndex - dayOffset]
.subject
.name
.capital(),
lessons[lessonIndex].subject.renamedTo ??
lessons[lessonIndex].subject.name.capital(),
maxLines: 1,
style: TextStyle(
fontStyle: lessons[lessonIndex - dayOffset]
fontStyle: lessons[lessonIndex]
.subject
.isRenamed
? FontStyle.italic
: null),
: null,
),
overflow: TextOverflow.clip,
softWrap: false,
),
@ -194,15 +188,17 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
Padding(
padding: const EdgeInsets.only(left: 26.0),
child: Text(
lessons[lessonIndex - dayOffset].room,
lessons[lessonIndex].room,
style: TextStyle(
color: AppColors.of(context).text.withOpacity(.5),
overflow: TextOverflow.ellipsis),
overflow: TextOverflow.ellipsis,
),
),
),
],
),
));
),
);
}
return Row(