devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

almost finished new subjects page

Browse Source
This commit is contained in:
Kima
2023-12-30 23:47:09 +01:00
parent e62fd40f88
commit 6297b9cc24
4 changed files with 145 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filcnaplo_mobile_ui/lib/common/average_display.dart
View File

@@ -23,12 +23,12 @@ class AverageDisplay extends StatelessWidget {
return Container(
width: border ? 57.0 : 54.0,
padding: EdgeInsets.symmetric(
horizontal: 8.0 - (border ? 2 : 0), vertical: 6.0 - (border ? 2 : 0)),
horizontal: 6.0 - (border ? 2 : 0), vertical: 5.0 - (border ? 2 : 0)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(45.0),
border: border
? Border.fromBorderSide(
BorderSide(color: color.withOpacity(.5), width: 3.0))
BorderSide(color: color.withOpacity(.5), width: 1.0))
: null,
color: !border ? color.withOpacity(average == 0.0 ? .15 : .25) : null,
),
@@ -36,7 +36,7 @@ class AverageDisplay extends StatelessWidget {
average == 0.0 ? "-" : averageText,
textAlign: TextAlign.center,
style: TextStyle(
color: color, fontWeight: FontWeight.w600, fontSize: 14.0),
color: color, fontWeight: FontWeight.w600, fontSize: 15.0),
maxLines: 1,
),
);

16
filcnaplo_mobile_ui/lib/common/widgets/grade/grade_subject_tile.dart
View File

@@ -4,6 +4,7 @@ import 'package:filcnaplo/theme/colors/colors.dart';
import 'package:filcnaplo/utils/format.dart';
import 'package:filcnaplo_kreta_api/models/subject.dart';
import 'package:filcnaplo_mobile_ui/common/average_display.dart';
import 'package:filcnaplo_mobile_ui/common/round_border_icon.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -44,9 +45,18 @@ class GradeSubjectTile extends StatelessWidget {
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
visualDensity: VisualDensity.compact,
onTap: onTap,
leading: Icon(
SubjectIcon.resolveVariant(subject: subject, context: context),
color: textColor.withOpacity(.75)),
leading: RoundBorderIcon(
icon: Icon(
SubjectIcon.resolveVariant(
context: context,
subject: subject,
),
size: 22.0,
weight: 2.5,
),
padding: 5.0,
width: 1.0,
),
title: Text(
subject.renamedTo ?? subject.name.capital(),
maxLines: 2,