hgeryy2004/firka
1
0
Fork 0
forked from firka/firka
Code Pull Requests Activity

Órarend kinézet javítás

Browse Source
This commit is contained in:
Ropoli Bálint
2025-10-09 20:56:59 +02:00
parent 6912e44b7e
commit 233f0c9ed0
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firka/lib/helpers/ui/common_bottom_sheets.dart
View File

@@ -142,7 +142,7 @@ Future<void> showLessonBottomSheet(
shadowColor: Colors.transparent,
color: appStyle.colors.a15p,
child: Padding(
padding: EdgeInsets.all(4),
padding: EdgeInsets.all(5),
child: Text(lesson.roomName ?? 'N/A',
style: appStyle.fonts.B_12R.apply(
color: appStyle.colors.secondary)),

8
firka/lib/ui/model/style.dart
View File

@@ -12,6 +12,7 @@ class FirkaFonts {
TextStyle B_16R;
TextStyle B_16SB;
TextStyle B_15SB;
TextStyle B_14R;
TextStyle B_14SB;
@@ -32,6 +33,7 @@ class FirkaFonts {
required this.H_16px_trimmed,
required this.B_16R,
required this.B_16SB,
required this.B_15SB,
required this.B_14R,
required this.B_14SB,
required this.B_12R,
@@ -189,6 +191,12 @@ final _defaultFonts = FirkaFonts(
fontVariations: [FontVariation("wght", 700)],
height: 1.3,
),
B_15SB: TextStyle(
fontSize: 15,
fontFamily: 'Figtree',
fontVariations: [FontVariation("wght", 700)],
height: 1.3,
),
B_12R: TextStyle(
fontSize: 12,
fontFamily: 'Figtree',

16
firka/lib/ui/phone/widgets/lesson.dart
View File

@@ -67,14 +67,14 @@ class LessonWidget extends StatelessWidget {
List<Widget> elements = [];
var subjectName = lesson.subject?.name ?? 'N/A';
if (subjectName.length >= 25) {
subjectName = "${subjectName.substring(0, 25 - 3)}...";
if (subjectName.length >= 19) {
subjectName = "${subjectName.substring(0, 19 - 3)}...";
}
subjectName = subjectName.firstUpper();
var roomName = lesson.roomName ?? '?';
if (roomName.length >= 8) {
roomName = "${roomName.substring(0, 8 - 3)}...";
var roomName = lesson.roomName ?? 'N/A';
if (roomName.length >= 11) {
roomName = "${roomName.substring(0, 11 - 3)}...";
}
elements.add(GestureDetector(
@@ -141,7 +141,7 @@ class LessonWidget extends StatelessWidget {
),
SizedBox(width: !showTests && test != null ? 16 : 8),
Text(subjectName,
style: appStyle.fonts.B_16SB
style: appStyle.fonts.B_15SB
.apply(color: appStyle.colors.textPrimary)),
],
right: [
@@ -153,7 +153,7 @@ class LessonWidget extends StatelessWidget {
: lesson.start
.toLocal()
.format(data.l10n, FormatMode.hmm),
style: appStyle.fonts.B_16R
style: appStyle.fonts.B_14R
.apply(color: appStyle.colors.textPrimary)),
placeholderMode == true
? SizedBox()
@@ -163,7 +163,7 @@ class LessonWidget extends StatelessWidget {
shadowColor: Colors.transparent,
color: appStyle.colors.a15p,
child: Padding(
padding: EdgeInsets.all(4),
padding: EdgeInsets.all(5),
child: Text(roomName,
style: appStyle.fonts.B_12R
.apply(color: appStyle.colors.secondary)),