Merge branch 'refilc:dev' into dev

This commit is contained in:
Geryy
2024-05-03 17:25:59 +02:00
committed by GitHub
38 changed files with 679 additions and 335 deletions

View File

@@ -187,7 +187,7 @@ class AppTheme {
accentColor == AccentColor.ogfilc) ||
!settings.newColors
? accent
: ColorsUtils().lighten(accent, amount: 0.3);
: ColorsUtils().lighten(accent, amount: 0.22);
// Color newScaffoldBg = ColorsUtils().lighten(accent, amount: 0.4);
Color newTertiary = (accentColor == AccentColor.adaptive ||
accentColor == AccentColor.custom ||

View File

@@ -27,6 +27,7 @@ class LessonTile extends StatelessWidget {
this.currentLessonIndicator = true,
this.padding,
this.contentPadding,
this.showSubTiles = true,
});
final Lesson lesson;
@@ -37,6 +38,7 @@ class LessonTile extends StatelessWidget {
final bool currentLessonIndicator;
final EdgeInsetsGeometry? padding;
final EdgeInsetsGeometry? contentPadding;
final bool showSubTiles;
@override
Widget build(BuildContext context) {
@@ -149,7 +151,8 @@ class LessonTile extends StatelessWidget {
child: PanelTitle(title: Text(lesson.name)),
),
child: Padding(
padding: EdgeInsets.only(bottom: subtiles.isEmpty ? 0.0 : 12.0),
padding: EdgeInsets.only(
bottom: (subtiles.isNotEmpty && showSubTiles) ? 12.0 : 0.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -446,7 +449,7 @@ class LessonTile extends StatelessWidget {
),
// Homework & Exams
...subtiles,
if (showSubTiles) ...subtiles,
],
),
),