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

Merge branch 'dev' of github.com:refilc/naplo into dev

Browse Source
This commit is contained in:
Kima 2024-04-28 15:48:05 +02:00
commit 95cad1ed70
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
refilc/android/gradlew vendored Normal file → Executable file
View File

8
refilc/lib/helpers/subject.dart
View File

@ -99,7 +99,7 @@ class SubjectIcon {
cupertino: CupertinoIcons.music_note, cupertino: CupertinoIcons.music_note,
material: Icons.music_note_outlined), material: Icons.music_note_outlined),
name: "music.note"); name: "music.note");
} else if (RegExp("^tes(i|tneveles)|sport").hasMatch(name)) { } else if (RegExp("^tes(i|tneveles)|sport|edzeselmelet").hasMatch(name)) {
return SubjectIconData( return SubjectIconData(
data: createIcon( data: createIcon(
cupertino: CupertinoIcons.sportscourt, cupertino: CupertinoIcons.sportscourt,
@ -124,7 +124,8 @@ class SubjectIcon {
cupertino: CupertinoIcons.arrow_3_trianglepath, cupertino: CupertinoIcons.arrow_3_trianglepath,
material: Icons.eco_outlined), material: Icons.eco_outlined),
name: "arrow.3.trianglepath"); name: "arrow.3.trianglepath");
} else if (RegExp("(hit|erkolcs)tan|vallas|etika").hasMatch(name)) { } else if (RegExp("(hit|erkolcs)tan|vallas|etika|bibliaismeret")
.hasMatch(name)) {
return SubjectIconData( return SubjectIconData(
data: createIcon( data: createIcon(
cupertino: CupertinoIcons.heart, cupertino: CupertinoIcons.heart,
@ -195,7 +196,8 @@ class SubjectIcon {
cupertino: CupertinoIcons.bubble_left, cupertino: CupertinoIcons.bubble_left,
material: Icons.psychology_outlined), material: Icons.psychology_outlined),
name: "bubble.left"); name: "bubble.left");
} else if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name) || } else if (RegExp("osztaly(fonoki|kozosseg)|kozossegi|neveles")
.hasMatch(name) ||
name == "ofo") { name == "ofo") {
return SubjectIconData( return SubjectIconData(
data: createIcon( data: createIcon(

2
refilc_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart
View File

@ -29,6 +29,7 @@ class SubjectIconGallery extends StatelessWidget {
SubjectIconItem("Fizika"), SubjectIconItem("Fizika"),
SubjectIconItem("Ének"), SubjectIconItem("Ének"),
SubjectIconItem("Testnevelés"), SubjectIconItem("Testnevelés"),
SubjectIconItem("Edzéselmélet"),
SubjectIconItem("Kémia"), SubjectIconItem("Kémia"),
SubjectIconItem("Biológia"), SubjectIconItem("Biológia"),
SubjectIconItem("Természetismeret"), SubjectIconItem("Természetismeret"),
@ -46,6 +47,7 @@ class SubjectIconGallery extends StatelessWidget {
SubjectIconItem("Tánc"), SubjectIconItem("Tánc"),
SubjectIconItem("Filozófia"), SubjectIconItem("Filozófia"),
SubjectIconItem("Osztályfőnöki"), SubjectIconItem("Osztályfőnöki"),
SubjectIconItem("Közösségi nevelés"),
SubjectIconItem("Gazdaság"), SubjectIconItem("Gazdaság"),
SubjectIconItem("Szorgalom"), SubjectIconItem("Szorgalom"),
SubjectIconItem("Magatartás"), SubjectIconItem("Magatartás"),