diff --git a/filcnaplo/assets/launch_icons/refilc_concept.png b/filcnaplo/assets/launch_icons/refilc_concept.png new file mode 100644 index 0000000..bc031ab Binary files /dev/null and b/filcnaplo/assets/launch_icons/refilc_concept.png differ diff --git a/filcnaplo/assets/launch_icons/refilc_overcomplicated.png b/filcnaplo/assets/launch_icons/refilc_overcomplicated.png new file mode 100644 index 0000000..de1f125 Binary files /dev/null and b/filcnaplo/assets/launch_icons/refilc_overcomplicated.png differ diff --git a/filcnaplo/assets/launch_icons/refilc_pride.png b/filcnaplo/assets/launch_icons/refilc_pride.png new file mode 100644 index 0000000..2b1a305 Binary files /dev/null and b/filcnaplo/assets/launch_icons/refilc_pride.png differ diff --git a/filcnaplo/lib/database/init.dart b/filcnaplo/lib/database/init.dart index 47ce105..de52114 100644 --- a/filcnaplo/lib/database/init.dart +++ b/filcnaplo/lib/database/init.dart @@ -34,7 +34,7 @@ const settingsDB = DatabaseStruct("settings", { "renamed_subjects_italics": int, "renamed_teachers_enabled": int, "renamed_teachers_italics": int, "live_activity_color": String, - "welcome_message": String, + "welcome_message": String, "app_icon": String, }); // DON'T FORGET TO UPDATE DEFAULT VALUES IN `initDB` MIGRATION OR ELSE PARENTS WILL COMPLAIN ABOUT THEIR CHILDREN MISSING // YOU'VE BEEN WARNED!!! diff --git a/filcnaplo/lib/models/settings.dart b/filcnaplo/lib/models/settings.dart index 9bbb2df..0499e65 100644 --- a/filcnaplo/lib/models/settings.dart +++ b/filcnaplo/lib/models/settings.dart @@ -79,6 +79,7 @@ class SettingsProvider extends ChangeNotifier { bool _renamedTeachersItalics; Color _liveActivityColor; String _welcomeMessage; + String _appIcon; SettingsProvider({ DatabaseProvider? database, @@ -126,6 +127,7 @@ class SettingsProvider extends ChangeNotifier { required bool renameTeachersItalics, required Color liveActivityColor, required String welcomeMessage, + required String appIcon, }) : _database = database, _language = language, _startPage = startPage, @@ -170,7 +172,8 @@ class SettingsProvider extends ChangeNotifier { _renamedTeachersEnabled = renameTeachersEnabled, _renamedTeachersItalics = renameTeachersItalics, _liveActivityColor = liveActivityColor, - _welcomeMessage = welcomeMessage; + _welcomeMessage = welcomeMessage, + _appIcon = appIcon; factory SettingsProvider.fromMap(Map map, {required DatabaseProvider database}) { @@ -235,6 +238,7 @@ class SettingsProvider extends ChangeNotifier { renameTeachersItalics: map["renamed_teachers_italics"] == 1, liveActivityColor: Color(map["live_activity_color"]), welcomeMessage: map["welcome_message"], + appIcon: map["app_icon"], ); } @@ -287,6 +291,7 @@ class SettingsProvider extends ChangeNotifier { "renamed_teachers_italics": _renamedTeachersItalics ? 1 : 0, "live_activity_color": _liveActivityColor.value, "welcome_message": _welcomeMessage, + "app_icon": _appIcon, }; } @@ -343,6 +348,7 @@ class SettingsProvider extends ChangeNotifier { renameTeachersItalics: false, liveActivityColor: const Color(0xFF676767), welcomeMessage: '', + appIcon: 'refilc_default', ); } @@ -394,6 +400,7 @@ class SettingsProvider extends ChangeNotifier { bool get renamedTeachersItalics => _renamedTeachersItalics; Color get liveActivityColor => _liveActivityColor; String get welcomeMessage => _welcomeMessage; + String get appIcon => _appIcon; Future update({ bool store = true, @@ -441,6 +448,7 @@ class SettingsProvider extends ChangeNotifier { bool? renamedTeachersItalics, Color? liveActivityColor, String? welcomeMessage, + String? appIcon, }) async { if (language != null && language != _language) _language = language; if (startPage != null && startPage != _startPage) _startPage = startPage; @@ -568,6 +576,10 @@ class SettingsProvider extends ChangeNotifier { if (welcomeMessage != null && welcomeMessage != _welcomeMessage) { _welcomeMessage = welcomeMessage; } + if (appIcon != null && appIcon != _appIcon) { + _appIcon = appIcon; + } + // store or not if (store) await _database?.store.storeSettings(this); notifyListeners(); } diff --git a/filcnaplo_premium b/filcnaplo_premium index 10be5fa..a3a8c7a 160000 --- a/filcnaplo_premium +++ b/filcnaplo_premium @@ -1 +1 @@ -Subproject commit 10be5fafd592abe7739b8c92eb70809118589b62 +Subproject commit a3a8c7a84dd3f2499a9d66f775cb43d06a95b6b7