From fe2215d7b7b856eff4759d0983804c5d1959b305 Mon Sep 17 00:00:00 2001 From: zypherift Date: Sat, 27 Apr 2024 20:23:17 +0200 Subject: [PATCH] hate regex, love regex, attach more classnames to icons --- refilc/android/gradlew | 0 refilc/lib/helpers/subject.dart | 8 +++++--- .../lib/screens/settings/debug/subject_icon_gallery.dart | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 refilc/android/gradlew diff --git a/refilc/android/gradlew b/refilc/android/gradlew old mode 100644 new mode 100755 diff --git a/refilc/lib/helpers/subject.dart b/refilc/lib/helpers/subject.dart index 2f67ae3..7aa8e9d 100644 --- a/refilc/lib/helpers/subject.dart +++ b/refilc/lib/helpers/subject.dart @@ -99,7 +99,7 @@ class SubjectIcon { cupertino: CupertinoIcons.music_note, material: Icons.music_note_outlined), name: "music.note"); - } else if (RegExp("^tes(i|tneveles)|sport").hasMatch(name)) { + } else if (RegExp("^tes(i|tneveles)|sport|edzeselmelet").hasMatch(name)) { return SubjectIconData( data: createIcon( cupertino: CupertinoIcons.sportscourt, @@ -124,7 +124,8 @@ class SubjectIcon { cupertino: CupertinoIcons.arrow_3_trianglepath, material: Icons.eco_outlined), 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( data: createIcon( cupertino: CupertinoIcons.heart, @@ -195,7 +196,8 @@ class SubjectIcon { cupertino: CupertinoIcons.bubble_left, material: Icons.psychology_outlined), name: "bubble.left"); - } else if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name) || + } else if (RegExp("osztaly(fonoki|kozosseg)|kozossegi|neveles") + .hasMatch(name) || name == "ofo") { return SubjectIconData( data: createIcon( diff --git a/refilc_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart b/refilc_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart index 82a4ca3..f6a4484 100644 --- a/refilc_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart +++ b/refilc_mobile_ui/lib/screens/settings/debug/subject_icon_gallery.dart @@ -29,6 +29,7 @@ class SubjectIconGallery extends StatelessWidget { SubjectIconItem("Fizika"), SubjectIconItem("Ének"), SubjectIconItem("Testnevelés"), + SubjectIconItem("Edzéselmélet"), SubjectIconItem("Kémia"), SubjectIconItem("Biológia"), SubjectIconItem("Természetismeret"), @@ -46,6 +47,7 @@ class SubjectIconGallery extends StatelessWidget { SubjectIconItem("Tánc"), SubjectIconItem("Filozófia"), SubjectIconItem("Osztályfőnöki"), + SubjectIconItem("Közösségi nevelés"), SubjectIconItem("Gazdaság"), SubjectIconItem("Szorgalom"), SubjectIconItem("Magatartás"),