diff --git a/filcnaplo/android/app/src/main/AndroidManifest.xml b/filcnaplo/android/app/src/main/AndroidManifest.xml index ad93e0a..0795b31 100644 --- a/filcnaplo/android/app/src/main/AndroidManifest.xml +++ b/filcnaplo/android/app/src/main/AndroidManifest.xml @@ -18,6 +18,34 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml new file mode 100644 index 0000000..62d6723 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_check.xml @@ -0,0 +1,13 @@ + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml new file mode 100644 index 0000000..01e9d40 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_left.xml @@ -0,0 +1,13 @@ + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml new file mode 100644 index 0000000..c1e9015 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_chevron_right.xml @@ -0,0 +1,13 @@ + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml new file mode 100644 index 0000000..cc3690b --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_droplet.xml @@ -0,0 +1,13 @@ + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml new file mode 100644 index 0000000..273720c --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_navigation_2.xml @@ -0,0 +1,13 @@ + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml new file mode 100644 index 0000000..f2365a8 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-nodpi/ic_refresh_cw.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml new file mode 100644 index 0000000..785445c --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml new file mode 100644 index 0000000..007e287 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml new file mode 100644 index 0000000..860b811 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_bg.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml new file mode 100644 index 0000000..6466eba --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml new file mode 100644 index 0000000..426d5c1 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_elmarad.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml new file mode 100644 index 0000000..6e5cbff --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/card_layout_tile_helyetesitett.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png b/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png new file mode 100644 index 0000000..7f61c65 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/drawable-xhdpi/timetable_widget_preview.png differ diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml new file mode 100644 index 0000000..8a99162 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml new file mode 100644 index 0000000..2551ee3 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_bottom_dark.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml new file mode 100644 index 0000000..e0e9376 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml new file mode 100644 index 0000000..4bbd0bb --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_card_top_dark.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml new file mode 100644 index 0000000..a8f281e --- /dev/null +++ b/filcnaplo/android/app/src/main/res/drawable-xhdpi/widget_scroll_style.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf b/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf new file mode 100644 index 0000000..6e079f6 Binary files /dev/null and b/filcnaplo/android/app/src/main/res/font/montserrat_medium.ttf differ diff --git a/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml b/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml new file mode 100644 index 0000000..f0a315a --- /dev/null +++ b/filcnaplo/android/app/src/main/res/layout/home_widget_test.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/timetable_item.xml b/filcnaplo/android/app/src/main/res/layout/timetable_item.xml new file mode 100644 index 0000000..8d107fe --- /dev/null +++ b/filcnaplo/android/app/src/main/res/layout/timetable_item.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml new file mode 100644 index 0000000..84794a2 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/layout/widget_timetable.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values-night-v31/themes.xml b/filcnaplo/android/app/src/main/res/values-night-v31/themes.xml new file mode 100644 index 0000000..f253c9d --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values-night-v31/themes.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values-v21/styles.xml b/filcnaplo/android/app/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..82ee08b --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values-v21/styles.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values-v31/styles.xml b/filcnaplo/android/app/src/main/res/values-v31/styles.xml new file mode 100644 index 0000000..5ec5068 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values-v31/styles.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values-v31/themes.xml b/filcnaplo/android/app/src/main/res/values-v31/themes.xml new file mode 100644 index 0000000..badd306 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values-v31/themes.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values/attrs.xml b/filcnaplo/android/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..7781ac8 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values/attrs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values/colors.xml b/filcnaplo/android/app/src/main/res/values/colors.xml index 4366078..f8c4ff9 100644 --- a/filcnaplo/android/app/src/main/res/values/colors.xml +++ b/filcnaplo/android/app/src/main/res/values/colors.xml @@ -1,4 +1,67 @@ #1F5B50 + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + #FFE1F5FE + #FF81D4FA + #FF039BE5 + #FF01579B + + #ffE8E8E8 + #000000 + #B9B9B9 + #B9B9B9 + #888C8F + #ffF4F9FF + #ffFFFFFF + #ffFF3B30 + #40FF3B30 + #ffFF9500 + #ffFFCC00 + #40FFD60A + #ff34C759 + #ff247665 + #ff5AC8FA + #ff007AFF + #ff5856D6 + #ffAF52DE + #ffFF2D55 + + + + #000 + #FFFFFFFF + #B9B9B9 + #93979A + #A1A5A8 + #ff000000 + #ff141516 + #ffFF453A + #40FF453A + #ffFF9F0A + #ffFFD60A + #40FFD60A + #ff32D74B + #ff29826F + #ff64D2FF + #ff0A84FF + #ff5E5CE6 + #ffBF5AF2 + #ffFF375F + + #FF64B5F6 + #FF81C784 + #FFDCE775 + #FFFFF176 + #FFFF8A65 + #FFE57373 + #FFF06292 + #FFBA68C8 \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values/dimens.xml b/filcnaplo/android/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..4db8c59 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + + + + 0dp + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values/strings.xml b/filcnaplo/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..3a76198 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + + Órarend Widget + Add widget + Mindig lásd, milyen órád lesz, a kezdőképernyőd kényelméből. + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values/styles.xml b/filcnaplo/android/app/src/main/res/values/styles.xml index c8a5e60..034b277 100644 --- a/filcnaplo/android/app/src/main/res/values/styles.xml +++ b/filcnaplo/android/app/src/main/res/values/styles.xml @@ -16,4 +16,14 @@ + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/values/themes.xml b/filcnaplo/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f6846b8 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/filcnaplo/android/app/src/main/res/xml/home_widget_test_info.xml b/filcnaplo/android/app/src/main/res/xml/home_widget_test_info.xml new file mode 100644 index 0000000..bd311e0 --- /dev/null +++ b/filcnaplo/android/app/src/main/res/xml/home_widget_test_info.xml @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/filcnaplo/lib/api/providers/sync.dart b/filcnaplo/lib/api/providers/sync.dart index 817a7ea..0636e0e 100644 --- a/filcnaplo/lib/api/providers/sync.dart +++ b/filcnaplo/lib/api/providers/sync.dart @@ -1,5 +1,7 @@ // ignore_for_file: use_build_context_synchronously +import 'dart:io'; + import 'package:filcnaplo/api/providers/database_provider.dart'; import 'package:filcnaplo/api/providers/status_provider.dart'; import 'package:filcnaplo/api/providers/user_provider.dart'; @@ -69,7 +71,7 @@ Future syncAll(BuildContext context) { Future updateWidget() async { try { - return HomeWidget.updateWidget(name: 'WidgetTimetable.widget_timetable'); + return HomeWidget.updateWidget(name: 'widget_timetable.WidgetTimetable'); } on PlatformException catch (exception) { debugPrint('Error Updating Widget. $exception'); } @@ -81,6 +83,6 @@ Future syncAll(BuildContext context) { lock = false; // Update Widget - updateWidget(); + if (Platform.isAndroid) updateWidget(); }); } diff --git a/filcnaplo/lib/database/init.dart b/filcnaplo/lib/database/init.dart index 09d125b..7ea23bc 100644 --- a/filcnaplo/lib/database/init.dart +++ b/filcnaplo/lib/database/init.dart @@ -18,6 +18,8 @@ const settingsDB = DatabaseStruct("settings", { "x_filc_id": String, "graph_class_avg": int, "presentation_mode": int, "bell_delay": int, "bell_delay_enabled": int, "grade_opening_fun": int, "icon_pack": String, "premium_scopes": String, "premium_token": String, "last_account_id": String, }); +// DON'T FORGET TO UPDATE DEFAULT VALUES IN `initDB` MIGRATION OR ELSE PARENTS WILL COMPLAIN ABOUT THEIR CHILDREN MISSING +// YOU'VE BEEN WARNED!!! const usersDB = DatabaseStruct("users", { "id": String, "name": String, "username": String, "password": String, "institute_code": String, "student": String, "role": int, "nickname": String // premium only @@ -60,7 +62,7 @@ Future initDB(DatabaseProvider database) async { await migrateDB( db, struct: usersDB, - defaultValues: {"role": 0}, + defaultValues: {"role": 0, "nickname": ""}, ); await migrateDB(db, struct: userDataDB, defaultValues: { "grades": "[]", "timetable": "[]", "exams": "[]", "homework": "[]", "messages": "[]", "notes": "[]", "events": "[]", "absences": "[]",