Merge branch 'refilc:dev' into dev
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 754 KiB |
|
Before Width: | Height: | Size: 181 KiB After Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 735 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 181 KiB After Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 881 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 809 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 746 B |
|
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 658 KiB |
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 491 KiB |
|
Before Width: | Height: | Size: 133 KiB After Width: | Height: | Size: 27 KiB |
@@ -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 ||
|
||||
|
||||
@@ -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,
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -3,7 +3,7 @@ description: "Egy nem hivatalos e-KRÉTA kliens, diákoktól diákoknak."
|
||||
homepage: https://refilc.hu
|
||||
publish_to: "none"
|
||||
|
||||
version: 5.0.0+252
|
||||
version: 5.0.0+253
|
||||
|
||||
environment:
|
||||
sdk: ">=2.17.0 <=3.3.2"
|
||||
|
||||