diff --git a/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/Contents.json b/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/Contents.json index 0417004..1373340 100644 --- a/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,13 +1,14 @@ -{ - "images" : [ - { - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} +{ + "images" : [ + { + "filename" : "reFilc_Logo.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/reFilc_Logo.png b/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/reFilc_Logo.png new file mode 100644 index 0000000..fad3d44 Binary files /dev/null and b/filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/reFilc_Logo.png differ diff --git a/filcnaplo/ios/livecard/lesson_model.swift b/filcnaplo/ios/livecard/lesson_model.swift index b5fecb3..16d44d7 100644 --- a/filcnaplo/ios/livecard/lesson_model.swift +++ b/filcnaplo/ios/livecard/lesson_model.swift @@ -13,7 +13,7 @@ class LessonData { var nextRoom: String init?() { - let sharedDefault = UserDefaults(suiteName: "group.filcnaplo.livecard")! + let sharedDefault = UserDefaults(suiteName: "group.refilc.livecard")! self.icon = sharedDefault.string(forKey: "icon")! self.index = sharedDefault.string(forKey: "index")! diff --git a/filcnaplo/ios/livecard/livecard.swift b/filcnaplo/ios/livecard/livecard.swift index cbccc8c..d3e4f2f 100644 --- a/filcnaplo/ios/livecard/livecard.swift +++ b/filcnaplo/ios/livecard/livecard.swift @@ -68,8 +68,6 @@ struct LockScreenLiveActivityView: View { .monospacedDigit() .padding(.trailing, CGFloat(24)) } - .activitySystemActionForegroundColor(.teal) - .activityBackgroundTint(.teal) } } diff --git a/filcnaplo/lib/api/providers/live_card_provider.dart b/filcnaplo/lib/api/providers/live_card_provider.dart index 96f0a85..ce2927c 100644 --- a/filcnaplo/lib/api/providers/live_card_provider.dart +++ b/filcnaplo/lib/api/providers/live_card_provider.dart @@ -44,7 +44,7 @@ class LiveCardProvider extends ChangeNotifier { required SettingsProvider settings, }) : _timetable = timetable, _settings = settings { - _liveActivitiesPlugin.init(appGroupId: "group.filcnaplo.livecard"); + _liveActivitiesPlugin.init(appGroupId: "group.refilc.livecard"); _liveActivitiesPlugin.getAllActivitiesIds().then((value) { _latestActivityId = value.isNotEmpty ? value.first : null; }); diff --git a/filcnaplo_kreta_api/lib/providers/grade_provider.dart b/filcnaplo_kreta_api/lib/providers/grade_provider.dart index a85153b..227aee0 100644 --- a/filcnaplo_kreta_api/lib/providers/grade_provider.dart +++ b/filcnaplo_kreta_api/lib/providers/grade_provider.dart @@ -22,8 +22,7 @@ class GradeProvider with ChangeNotifier { // Public List get grades => _grades; - DateTime get lastSeenDate => - _settings.gradeOpeningFun ? _lastSeen : DateTime(3000); + DateTime get lastSeenDate => _settings.gradeOpeningFun ? _lastSeen : DateTime(3000); String get groups => _groups; List get groupAverages => _groupAvg; @@ -67,9 +66,7 @@ class GradeProvider with ChangeNotifier { _groupAvg = await userQuery.getGroupAverages(userId: userId); notifyListeners(); DateTime lastSeenDB = await userQuery.lastSeenGrade(userId: userId); - if (lastSeenDB.millisecondsSinceEpoch == 0 || - lastSeenDB.year == 0 || - !_settings.gradeOpeningFun) { + if (lastSeenDB.millisecondsSinceEpoch == 0 || lastSeenDB.year == 0 || !_settings.gradeOpeningFun) { _lastSeen = DateTime.now(); await seenAll(); } else { @@ -81,25 +78,13 @@ class GradeProvider with ChangeNotifier { // good student mode, renamed subjects Future convertBySettings() async { - Map renamedSubjects = _settings.renamedSubjectsEnabled - ? await _database.userQuery.renamedSubjects(userId: _user.user!.id) - : {}; + Map renamedSubjects = _settings.renamedSubjectsEnabled ? await _database.userQuery.renamedSubjects(userId: _user.user!.id) : {}; for (Grade grade in _grades) { - //grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null; - grade.subject.renamedTo = null; - if (renamedSubjects.isNotEmpty) { - grade.subject.name = - renamedSubjects[grade.subject.id] ?? grade.subject.name; - } - grade.value.value = - _settings.goodStudent ? 5 : grade.json!["SzamErtek"] ?? 0; - grade.value.valueName = _settings.goodStudent - ? "Jeles".i18n - : grade.json!["SzovegesErtek"].i18n ?? ""; - grade.value.shortName = _settings.goodStudent - ? "Jeles".i18n - : grade.json!["SzovegesErtekelesRovidNev"].i18n ?? ""; + grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null; + grade.value.value = _settings.goodStudent ? 5 : grade.json!["SzamErtek"] ?? 0; + grade.value.valueName = _settings.goodStudent ? "Jeles".i18n : grade.json!["SzovegesErtek"].i18n ?? ""; + grade.value.shortName = _settings.goodStudent ? "Jeles".i18n : grade.json!["SzovegesErtekelesRovidNev"] ?? ""; } notifyListeners(); @@ -118,16 +103,12 @@ class GradeProvider with ChangeNotifier { if (grades.isNotEmpty || _grades.isNotEmpty) await store(grades); List? groupsJson = await _kreta.getAPI(KretaAPI.groups(iss)); - if (groupsJson == null || groupsJson.isEmpty) - throw "Cannot fetch Groups for User ${user.id}"; + if (groupsJson == null || groupsJson.isEmpty) throw "Cannot fetch Groups for User ${user.id}"; _groups = (groupsJson[0]["OktatasNevelesiFeladat"] ?? {})["Uid"] ?? ""; - List? groupAvgJson = - await _kreta.getAPI(KretaAPI.groupAverages(iss, _groups)); - if (groupAvgJson == null) - throw "Cannot fetch Class Averages for User ${user.id}"; - final groupAvgs = - groupAvgJson.map((e) => GroupAverage.fromJson(e)).toList(); + List? groupAvgJson = await _kreta.getAPI(KretaAPI.groupAverages(iss, _groups)); + if (groupAvgJson == null) throw "Cannot fetch Class Averages for User ${user.id}"; + final groupAvgs = groupAvgJson.map((e) => GroupAverage.fromJson(e)).toList(); await storeGroupAvg(groupAvgs); } @@ -151,4 +132,4 @@ class GradeProvider with ChangeNotifier { await _database.userStore.storeGroupAverages(groupAvgs, userId: userId); notifyListeners(); } -} +} \ No newline at end of file diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart index ae014bf..758050f 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart @@ -634,7 +634,7 @@ class _SettingsScreenState extends State ? Theme.of(context).colorScheme.secondary : AppColors.of(context).text.withOpacity(.25), ), - const SizedBox(width: 24.0), + const SizedBox(width: 14.0), Expanded( child: Text( "graph_class_avg".i18n, @@ -679,7 +679,7 @@ class _SettingsScreenState extends State ? Theme.of(context).colorScheme.secondary : AppColors.of(context).text.withOpacity(.25), ), - const SizedBox(width: 24.0), + const SizedBox(width: 14.0), Expanded( child: Text( "news".i18n, @@ -724,7 +724,7 @@ class _SettingsScreenState extends State ? Theme.of(context).colorScheme.secondary : AppColors.of(context).text.withOpacity(.25), ), - const SizedBox(width: 24.0), + const SizedBox(width: 14.0), Expanded( child: Text( "surprise_grades".i18n,