idk, git is weird

refilc/lib/ui/widgets/lesson/lesson_tile.dart

@@ -17,11 +17,16 @@ import 'package:provider/provider.dart';
 import 'lesson_tile.i18n.dart';
 
 class LessonTile extends StatelessWidget {
-  const LessonTile(this.lesson, {super.key, this.onTap, this.swapDesc = false});
+  const LessonTile(this.lesson,
+      {super.key,
+      this.onTap,
+      this.swapDesc = false,
+      this.subjectPageView = false});
 
   final Lesson lesson;
   final bool swapDesc;
   final void Function()? onTap;
+  final bool subjectPageView;
 
   @override
   Widget build(BuildContext context) {
@@ -147,7 +152,8 @@ class LessonTile extends StatelessWidget {
                   contentPadding: const EdgeInsets.symmetric(horizontal: 4.0),
                   shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(12.0)),
-                  title: Text(
+                  title: !subjectPageView
+                      ? Text(
                           !lesson.isEmpty
                               ? lesson.subject.renamedTo ??
                                   lesson.subject.name.capital()
@@ -166,8 +172,23 @@ class LessonTile extends StatelessWidget {
                                       settingsProvider.renamedSubjectsItalics
                                   ? FontStyle.italic
                                   : null),
+                        )
+                      : Transform.translate(
+                          offset: const Offset(0, -2.0),
+                          child: Text(
+                            "${DateFormat("H:mm").format(lesson.start)}-${DateFormat("H:mm").format(lesson.end)}",
+                            textAlign: TextAlign.start,
+                            style: TextStyle(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 14.0,
+                              color: fill
+                                  ? accent.withOpacity(.9)
+                                  : AppColors.of(context).text.withOpacity(.9),
                             ),
-                  subtitle: Column(
+                          ),
+                        ),
+                  subtitle: !subjectPageView
+                      ? Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             // Row(
@@ -213,7 +234,8 @@ class LessonTile extends StatelessWidget {
                                 ),
                               ),
                           ],
-                  ),
+                        )
+                      : null,
 
                   // subtitle: description != ""
                   //     ? Text(
@@ -237,8 +259,8 @@ class LessonTile extends StatelessWidget {
                             color: fill ? accent : AppColors.of(context).text,
                             width: 1.0,
                             icon: SizedBox(
-                              width: 25,
+                              width: subjectPageView ? 22 : 25,
-                              height: 25,
+                              height: subjectPageView ? 22 : 25,
                               child: Center(
                                 child: Padding(
                                   padding: const EdgeInsets.only(left: 3.0),
@@ -246,7 +268,7 @@ class LessonTile extends StatelessWidget {
                                     lesson.lessonIndex + lessonIndexTrailing,
                                     textAlign: TextAlign.center,
                                     style: TextStyle(
-                                      fontSize: 17.5,
+                                      fontSize: subjectPageView ? 15.5 : 17.5,
                                       fontWeight: FontWeight.w700,
                                       color: fill ? accent : null,
                                     ),
@@ -349,14 +371,17 @@ class LessonTile extends StatelessWidget {
                                 ),
                               ),
                             ),
+                            if (!subjectPageView)
                               const SizedBox(
                                 width: 10,
                               ),
+                            if (!subjectPageView)
                               Stack(
                                 alignment: Alignment.center,
                                 children: [
                                   // xix alignment hack :p
-                                const Opacity(opacity: 0, child: Text("EE:EE")),
+                                  const Opacity(
+                                      opacity: 0, child: Text("EE:EE")),
                                   Text(
                                     "${DateFormat("H:mm").format(lesson.start)}\n${DateFormat("H:mm").format(lesson.end)}",
                                     textAlign: TextAlign.center,

refilc_mobile_ui/lib/pages/grades/grade_subject_view.dart

@@ -4,7 +4,12 @@ import 'package:animations/animations.dart';
 import 'package:refilc/api/providers/database_provider.dart';
 import 'package:refilc/api/providers/user_provider.dart';
 import 'package:refilc/models/settings.dart';
+import 'package:refilc/ui/widgets/lesson/lesson_tile.dart';
 import 'package:refilc/utils/format.dart';
+import 'package:refilc_kreta_api/controllers/timetable_controller.dart';
+import 'package:refilc_kreta_api/models/exam.dart';
+import 'package:refilc_kreta_api/models/lesson.dart';
+import 'package:refilc_kreta_api/providers/exam_provider.dart';
 // import 'package:refilc_kreta_api/client/api.dart';
 // import 'package:refilc_kreta_api/client/client.dart';
 import 'package:refilc_kreta_api/providers/grade_provider.dart';
@@ -14,10 +19,13 @@ import 'package:refilc_kreta_api/models/grade.dart';
 import 'package:refilc_kreta_api/models/subject.dart';
 import 'package:refilc_mobile_ui/common/average_display.dart';
 import 'package:refilc_mobile_ui/common/bottom_sheet_menu/rounded_bottom_sheet.dart';
+import 'package:refilc_mobile_ui/common/filter_bar.dart';
 import 'package:refilc_mobile_ui/common/panel/panel.dart';
+import 'package:refilc_mobile_ui/common/splitted_panel/splitted_panel.dart';
 import 'package:refilc_mobile_ui/common/trend_display.dart';
 import 'package:refilc_mobile_ui/common/widgets/cretification/certification_tile.dart';
 import 'package:refilc/ui/widgets/grade/grade_tile.dart';
+import 'package:refilc_mobile_ui/common/widgets/exam/exam_viewable.dart';
 import 'package:refilc_mobile_ui/common/widgets/grade/grade_viewable.dart';
 import 'package:refilc_mobile_ui/common/hero_scrollview.dart';
 import 'package:refilc_mobile_ui/pages/grades/calculator/grade_calculator.dart';
@@ -53,12 +61,14 @@ class GradeSubjectView extends StatefulWidget {
   State<GradeSubjectView> createState() => _GradeSubjectViewState();
 }
 
-class _GradeSubjectViewState extends State<GradeSubjectView> {
+class _GradeSubjectViewState extends State<GradeSubjectView>
+    with TickerProviderStateMixin {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
   // Controllers
   PersistentBottomSheetController? _sheetController;
   final ScrollController _scrollController = ScrollController();
+  late TabController _tabController;
 
   List<Widget> gradeTiles = [];
 
@@ -68,6 +78,9 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
   late SettingsProvider settingsProvider;
   late DatabaseProvider dbProvider;
   late UserProvider user;
+  late ExamProvider examProvider;
+
+  late TimetableController _timetableController;
 
   late double average;
   late Widget gradeGraph;
@@ -79,6 +92,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
   List<Grade> getSubjectGrades(GradeSubject subject) => !gradeCalcMode
       ? gradeProvider.grades.where((e) => e.subject == subject).toList()
       : calculatorProvider.grades.where((e) => e.subject == subject).toList();
+  List<Exam> getSubjectExams(GradeSubject subject) =>
+      examProvider.exams.where((e) => e.subject == subject).toList();
 
   bool showGraph(List<Grade> subjectGrades) {
     if (gradeCalcMode) return true;
@@ -93,7 +108,11 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1;
   }
 
-  void buildTiles(List<Grade> subjectGrades) {
+  void buildTiles(
+    List<Grade> subjectGrades, {
+    List<Lesson>? nextWeekLessons,
+    List<Exam>? subjectExams,
+  }) {
     List<Widget> tiles = [];
 
     tiles.add(Panel(
@@ -128,34 +147,55 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
       ),
     ));
 
-    if (showGraph(subjectGrades)) {
+    tiles.addAll(
+      [
+        const SizedBox(
+          height: 5.0,
+        ),
+        FilterBar(
+          padding: EdgeInsets.zero,
+          items: [
+            Tab(text: "grades".i18n),
+            Tab(text: "timetable".i18n),
+            Tab(text: "exams".i18n),
+          ],
+          controller: _tabController,
+          disableFading: true,
+        ),
+      ],
+    );
+
+    if (showGraph(subjectGrades) && _tabController.index == 0) {
       tiles.add(gradeGraph);
     } else {
-      tiles.add(Container(height: 24.0));
+      tiles.add(Container(height: 20.0));
     }
 
+    if (_tabController.index == 0) {
       tiles.add(Padding(
         padding: const EdgeInsets.only(bottom: 24.0),
         child: Panel(
           child: GradesCount(grades: getSubjectGrades(widget.subject).toList()),
         ),
       ));
+    }
 
     // ignore: no_leading_underscores_for_local_identifiers
-    List<Widget> _gradeTiles = [];
+    List<Widget> _tiles = [];
 
     if (!gradeCalcMode) {
+      if (_tabController.index == 0) {
         subjectGrades.sort((a, b) => -a.date.compareTo(b.date));
 
-      _gradeTiles.add(const SizedBox(
+        _tiles.add(const SizedBox(
           height: 4.0,
         ));
 
         for (var grade in subjectGrades) {
           if (grade.type == GradeType.midYear) {
-          _gradeTiles.add(GradeViewable(grade));
+            _tiles.add(GradeViewable(grade));
           } else {
-          _gradeTiles.add(CertificationTile(
+            _tiles.add(CertificationTile(
               grade,
               padding: EdgeInsets.only(
                   bottom: 8.0,
@@ -165,20 +205,41 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
           }
         }
 
-      _gradeTiles.add(const SizedBox(
+        _tiles.add(const SizedBox(
           height: 4.0,
         ));
+      }
+      if (_tabController.index == 1) {
+        nextWeekLessons!.sort((a, b) => -a.date.compareTo(b.date));
+
+        for (var lesson in nextWeekLessons) {
+          _tiles.add(LessonTile(
+            lesson,
+            subjectPageView: true,
+          ));
+        }
+      }
+      if (_tabController.index == 2) {
+        subjectExams!.sort((a, b) => -a.writeDate.compareTo(b.writeDate));
+
+        for (var exam in subjectExams) {
+          _tiles.add(ExamViewable(
+            exam,
+            showSubject: false,
+          ));
+        }
+      }
     } else if (subjectGrades.isNotEmpty) {
-      _gradeTiles.add(const SizedBox(
+      _tiles.add(const SizedBox(
         height: 8.0,
       ));
 
       subjectGrades.sort((a, b) => -a.date.compareTo(b.date));
       for (var grade in subjectGrades) {
-        _gradeTiles.add(GradeTile(grade));
+        _tiles.add(GradeTile(grade));
       }
 
-      _gradeTiles.add(const SizedBox(
+      _tiles.add(const SizedBox(
         height: 8.0,
       ));
     }
@@ -197,14 +258,28 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
             child: child,
           );
         },
-        child: _gradeTiles.isNotEmpty
+        child: _tiles.isNotEmpty
+            ? (_tabController.index == 0
                 ? Panel(
                     key: ValueKey(gradeCalcMode),
                     title: Text(
                       gradeCalcMode ? "Ghost Grades".i18n : "Grades".i18n,
                     ),
                     child: Column(
-                  children: _gradeTiles,
+                      children: _tiles,
+                    ))
+                : _tabController.index == 1
+                    ? SplittedPanel(
+                        padding: EdgeInsets.zero,
+                        cardPadding: const EdgeInsets.only(
+                            left: 6.0, right: 12.0, top: 6.0, bottom: 6.0),
+                        title: Text("upcoming_lessons".i18n),
+                        children: _tiles,
+                      )
+                    : SplittedPanel(
+                        padding: EdgeInsets.zero,
+                        title: Text("exams".i18n),
+                        children: _tiles,
                       ))
             : const SizedBox(),
       ),
@@ -220,6 +295,15 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     super.initState();
     user = Provider.of<UserProvider>(context, listen: false);
     dbProvider = Provider.of<DatabaseProvider>(context, listen: false);
+
+    _tabController = TabController(length: 3, vsync: this);
+
+    _timetableController = TimetableController();
+    _timetableController.jump(_timetableController.currentWeek,
+        context: context, initial: true, skip: true);
+    if (DateTime.now().day > 5) {
+      _timetableController.next(context);
+    }
   }
 
   void fetchGoalPlans() async {
@@ -234,6 +318,13 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     gradeProvider = Provider.of<GradeProvider>(context);
     calculatorProvider = Provider.of<GradeCalculatorProvider>(context);
     settingsProvider = Provider.of<SettingsProvider>(context);
+    examProvider = Provider.of<ExamProvider>(context);
+
+    List<Lesson> nextWeekLessons = (_timetableController.days ?? [])
+        .expand((e) => e)
+        .where((e) => e.subject.id == widget.subject.id)
+        .toList();
+    List<Exam> subjectExams = getSubjectExams(widget.subject);
 
     List<Grade> subjectGrades = getSubjectGrades(widget.subject).toList();
     average = AverageHelper.averageEvals(subjectGrades);
@@ -266,7 +357,11 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     );
 
     if (!gradeCalcMode) {
-      buildTiles(subjectGrades);
+      buildTiles(
+        subjectGrades,
+        nextWeekLessons: nextWeekLessons,
+        subjectExams: subjectExams,
+      );
     } else {
       List<Grade> ghostGrades = calculatorProvider.ghosts
           .where((e) => e.subject == widget.subject)
@@ -398,6 +493,12 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
             title: widget.subject.renamedTo ?? widget.subject.name.capital(),
             italic: settingsProvider.renamedSubjectsItalics &&
                 widget.subject.isRenamed,
+            //   child: TabBarView(
+            //       physics: const BouncingScrollPhysics(),
+            //       controller: _tabController,
+            //       children: List.generate(
+            //           3, (index) => filterViewBuilder(context, index))),
+            // ),
             child: SubjectGradesContainer(
               child: CupertinoScrollbar(
                 child: ListView.builder(
@@ -408,10 +509,15 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
                   itemCount: gradeTiles.length,
                 ),
               ),
-              )),
+            ),
+          ),
         ));
   }
 
+  Widget filterViewBuilder(context, int activeData) {
+    return Container();
+  }
+
   void gradeCalc(BuildContext context) {
     // Scroll to the top of the page
     _scrollController.animateTo(100,

refilc_mobile_ui/lib/pages/grades/grades_page.i18n.dart

@@ -22,6 +22,11 @@ extension Localization on String {
           "data": "Data",
           "you_have_hw": "You have %s homework(s) to do",
           "grades_cnt": "Grade count: %s",
+          // v5
+          "upcoming_lessons": "Upcoming Lessons",
+          "exams": "Exams",
+          "timetable": "Timetable",
+          "grades": "Grades",
         },
         "hu_hu": {
           "Grades": "Tantárgyak",
@@ -41,6 +46,11 @@ extension Localization on String {
           "data": "Adatok",
           "you_have_hw": "%s házi feladat vár rád",
           "grades_cnt": "Jegyek száma: %s",
+          // v5
+          "upcoming_lessons": "Közelgő órák",
+          "exams": "Számonkérések",
+          "timetable": "Órarend",
+          "grades": "Jegyek",
         },
         "de_de": {
           "Grades": "Fächer",
@@ -60,6 +70,11 @@ extension Localization on String {
           "data": "Daten",
           "you_have_hw": "Du hast %s Hausaufgaben",
           "grades_cnt": "Anzahl der Noten: %s",
+          // v5
+          "upcoming_lessons": "Bevorstehende Lektionen",
+          "exams": "Prüfungen",
+          "timetable": "Stundenplan",
+          "grades": "Noten",
         },
       };
 

refilc_mobile_ui/lib/screens/settings/submenu/general_screen.dart

@@ -374,6 +374,7 @@ class GeneralSettingsScreenState extends State<GeneralSettingsScreen> {
                 isTransparent: true,
                 children: [
                   CustomSegmentedControl(
+                    key: const ValueKey('vibration_key'),
                     onChanged: (v) {
                       settingsProvider.update(
                         vibrate: v == 1