Merge pull request #3 from user5522/change-db

some fixes and improvements
user5522 · Dec 23, 2023 · 3c3c491 · 3c3c491
2 parents aae1233 + 0ed9412
commit 3c3c491
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 63 deletions.
diff --git a/.github/workflows/build-change-db.yml b/.github/workflows/build-change-db.yml
diff --git a/lib/components/settings/timetable_features.dart b/lib/components/settings/timetable_features.dart
@@ -31,14 +31,16 @@ class TimetableFeaturesOptions extends ConsumerWidget {
         ),
         SwitchListTile(
           title: const Text("Rotation Weeks"),
-          subtitle: const Text("Experimental"),
           value: rotationWeeks,
           onChanged: (bool value) {
             settings.updateRotationWeeks(value);
           },
         ),
         SwitchListTile(
-          title: const Text("AutoComplete Colors"),
+          title: const Text("Auto Complete Colors"),
+          subtitle: const Text(
+            "auto assigns colors from previously made subjects that have matching names",
+          ),
           value: autoCompleteColor,
           onChanged: (bool value) {
             settings.updateAutoCompleteColor(value);

diff --git a/lib/components/subject_management/subject_screen.dart b/lib/components/subject_management/subject_screen.dart
@@ -202,8 +202,8 @@ class SubjectScreen extends HookConsumerWidget {
                             color.value = Color(subjects
                                 .firstWhere(
                                   (subj) =>
-                                      label.value.toLowerCase() ==
-                                      subj.label.toLowerCase(),
+                                      label.value.toLowerCase().trim() ==
+                                      subj.label.toLowerCase().trim(),
                                   orElse: () => basicSubject,
                                 )
                                 .color);

diff --git a/lib/db/models.dart b/lib/db/models.dart
@@ -4,6 +4,7 @@ import 'package:timetable/constants/days.dart';
 import 'package:timetable/constants/rotation_weeks.dart';
 import 'package:timetable/db/converters/time_of_day_converter.dart';
 import 'package:timetable/db/database.dart';
+import 'package:timetable/models/overlapping_subjects.dart';
 
 class Subject extends Table {
   IntColumn get id => integer().autoIncrement()();
@@ -19,8 +20,12 @@ class Subject extends Table {
 
 class SubjNotifier extends StateNotifier<List<SubjectData>> {
   AppDatabase db;
+  List<List<SubjectData>> overlappingSubjects;
 
-  SubjNotifier(this.db) : super([]) {
+  SubjNotifier(
+    this.db,
+    this.overlappingSubjects,
+  ) : super([]) {
     getSubjects();
   }
 
@@ -55,6 +60,7 @@ class SubjNotifier extends StateNotifier<List<SubjectData>> {
 
   Future deleteSubject(SubjectData entry) async {
     db.subject.deleteWhere((t) => t.id.equals(entry.id));
+    overlappingSubjects.removeWhere((e) => e.contains(entry));
 
     state = await getSubjects();
   }
@@ -67,5 +73,6 @@ class SubjNotifier extends StateNotifier<List<SubjectData>> {
 }
 
 final subjProvider = StateNotifierProvider<SubjNotifier, List<SubjectData>>(
-  (ref) => SubjNotifier(ref.watch(AppDatabase.provider)),
+  (ref) => SubjNotifier(
+      ref.watch(AppDatabase.provider), ref.watch(overlappingSubjectsProvider)),
 );