Fix search filter page

assets/translations/en.json

@@ -5,7 +5,8 @@
     "cancel": "Cancel",
     "delete": "Delete",
     "add": "Add",
-    "reset": "Reset",
+    "reset": "Clear",
+    "reset_all": "Clear All",
     "search": "Search",
     "upload": "Upload",
     "edit": "Edit",
@@ -14,7 +15,9 @@
     "no_result": "No result.",
     "select_all": "Select All",
     "unselect_all": "Unselect All",
-    "no_info": "No information"
+    "no_info": "No information",
+    "all_selected": "All Selected",
+    "num_selected": " Selected"
   },
   "semester": {
     "spring": "Spring",

assets/translations/ko.json

@@ -6,6 +6,7 @@
     "delete": "삭제",
     "add": "추가하기",
     "reset": "초기화",
+    "reset_all": "전체 초기화",
     "search": "검색",
     "upload": "업로드",
     "edit": "수정",
@@ -14,7 +15,9 @@
     "no_result": "검색 결과가 없습니다.",
     "select_all": "모두 선택",
     "unselect_all": "모두 해제",
-    "no_info": "정보 없음"
+    "no_info": "정보 없음",
+    "all_selected": "전체 선택됨",
+    "num_selected": "개 선택됨"
   },
   "semester": {
     "spring": "봄",

lib/main.dart

@@ -103,6 +103,12 @@ class OTLFirebaseApp extends StatelessWidget {
         SystemUiOverlayStyle(statusBarColor: Colors.transparent));
 
     return MaterialApp(
+      builder: (context, child) {
+        return ScrollConfiguration(
+          behavior: NoEndOfScrollBehavior(),
+          child: child ?? Container(),
+        );
+      },
       localizationsDelegates: context.localizationDelegates,
       supportedLocales: context.supportedLocales,
       locale: context.locale,
@@ -160,3 +166,11 @@ class OTLFirebaseApp extends StatelessWidget {
     );
   }
 }
+
+class NoEndOfScrollBehavior extends ScrollBehavior {
+  @override
+  Widget buildOverscrollIndicator(
+      BuildContext context, Widget child, ScrollableDetails details) {
+    return child;
+  }
+}

lib/models/filter.dart

@@ -14,5 +14,5 @@ class CodeLabelPair {
   final String code;
   final String label;
   bool selected;
-  CodeLabelPair({required this.code, this.label = "", this.selected = true});
+  CodeLabelPair({required this.code, this.label = "", this.selected = false});
 }

lib/pages/course_search_page.dart

@@ -108,7 +108,7 @@ class _CourseSearchPageState extends State<CourseSearchPage> {
                       context.read<CourseSearchModel>().resetCourseFilter();
                     },
                     child: Text(
-                      "common.reset".tr(),
+                      "common.reset_all".tr(),
                       style: bodyBold.copyWith(color: OTLColor.pinksMain),
                     ),
                     style: ButtonStyle(

lib/pages/lecture_search_page.dart

@@ -108,7 +108,7 @@ class _LectureSearchPageState extends State<LectureSearchPage> {
                       context.read<LectureSearchModel>().resetLectureFilter();
                     },
                     child: Text(
-                      "common.reset".tr(),
+                      "common.reset_all".tr(),
                       style: bodyBold.copyWith(color: OTLColor.pinksMain),
                     ),
                     style: ButtonStyle(

lib/pages/timetable_page.dart

@@ -74,9 +74,6 @@ class _TimetablePageState extends State<TimetablePage> {
                         GestureDetector(
                           behavior: HitTestBehavior.translucent,
                           onTap: () {
-                            context
-                                .read<LectureSearchModel>()
-                                .resetLectureFilter();
                             Navigator.push(
                                 context, buildLectureSearchPageRoute());
                           },

lib/providers/course_search_model.dart

@@ -121,7 +121,7 @@ class CourseSearchModel extends ChangeNotifier {
     _courseSearchText = '';
     _courseFilter.values.forEach((e) {
       if (e.isMultiSelect)
-        e.options.forEach((b) => b.forEach((c) => c.selected = true));
+        e.options.forEach((b) => b.forEach((c) => c.selected = false));
       else {
         e.options.forEach((b) => b.forEach((c) => c.selected = false));
         e.options.first.first.selected = true;
@@ -191,7 +191,7 @@ class CourseSearchModel extends ChangeNotifier {
       if (v.options.expand((i) => i).every((i) => i.selected == false)) {
         if (v.isMultiSelect == true)
           v.options.expand((i) => i).forEach((j) {
-            j.selected = true;
+            // j.selected = true;
           });
         else
           v.options.first.first.selected = true;
@@ -200,7 +200,7 @@ class CourseSearchModel extends ChangeNotifier {
     List<CodeLabelPair> dep = _courseFilter['departments']!
             .options
             .expand((i) => i)
-            .every((i) => i.selected == true)
+            .every((i) => i.selected == false)
         ? []
         : _courseFilter['departments']!
             .options
@@ -210,7 +210,7 @@ class CourseSearchModel extends ChangeNotifier {
     List<CodeLabelPair> typ = _courseFilter['types']!
             .options
             .expand((i) => i)
-            .every((i) => i.selected == true)
+            .every((i) => i.selected == false)
         ? []
         : _courseFilter['types']!
             .options
@@ -220,7 +220,7 @@ class CourseSearchModel extends ChangeNotifier {
     List<CodeLabelPair> lev = _courseFilter['levels']!
             .options
             .expand((i) => i)
-            .every((i) => i.selected == true)
+            .every((i) => i.selected == false)
         ? []
         : _courseFilter['levels']!
             .options

lib/providers/lecture_search_model.dart

@@ -105,7 +105,7 @@ class LectureSearchModel extends ChangeNotifier {
     _lectureSearchText = '';
     _lectureFilter.values.forEach((e) {
       if (e.isMultiSelect)
-        e.options.forEach((b) => b.forEach((c) => c.selected = true));
+        e.options.forEach((b) => b.forEach((c) => c.selected = false));
       else {
         e.options.forEach((b) => b.forEach((c) => c.selected = false));
         e.options.first.first.selected = true;
@@ -212,7 +212,7 @@ class LectureSearchModel extends ChangeNotifier {
       if (v.options.expand((i) => i).every((i) => i.selected == false)) {
         if (v.isMultiSelect == true)
           v.options.expand((i) => i).forEach((j) {
-            j.selected = true;
+            // j.selected = true;
           });
         else
           v.options.first.first.selected = true;
@@ -221,7 +221,7 @@ class LectureSearchModel extends ChangeNotifier {
     List<CodeLabelPair> dep = _lectureFilter['departments']!
             .options
             .expand((i) => i)
-            .every((i) => i.selected == true)
+            .every((i) => i.selected == false)
         ? []
         : _lectureFilter['departments']!
             .options
@@ -231,7 +231,7 @@ class LectureSearchModel extends ChangeNotifier {
     List<CodeLabelPair> typ = _lectureFilter['types']!
             .options
             .expand((i) => i)
-            .every((i) => i.selected == true)
+            .every((i) => i.selected == false)
         ? []
         : _lectureFilter['types']!
             .options
@@ -241,7 +241,7 @@ class LectureSearchModel extends ChangeNotifier {
     List<CodeLabelPair> lev = _lectureFilter['levels']!
             .options
             .expand((i) => i)
-            .every((i) => i.selected == true)
+            .every((i) => i.selected == false)
         ? []
         : _lectureFilter['levels']!
             .options

lib/widgets/search_filter_panel.dart

@@ -1,5 +1,4 @@
 import 'dart:math' as math;
-
 import 'package:easy_localization/easy_localization.dart' as _;
 import 'package:flutter/material.dart';
 import 'package:otlplus/constants/color.dart';
@@ -95,40 +94,60 @@ class _SelectorState extends State<Selector> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Text(
-                  widget.title,
-                  style: titleBold,
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    Text(
+                      widget.title,
+                      style: titleBold,
+                    ),
+                    SizedBox(width: 8),
+                    Visibility(
+                      visible: widget.isMultiSelect,
+                      child: Text.rich(
+                        TextSpan(
+                          children: widget.selectList
+                                      .expand((i) => i)
+                                      .where((i) => i.selected)
+                                      .length ==
+                                  0
+                              ? [TextSpan(text: "common.all_selected".tr())]
+                              : [
+                                  TextSpan(
+                                    text: widget.selectList
+                                        .expand((i) => i)
+                                        .where((i) => i.selected)
+                                        .length
+                                        .toString(),
+                                  ),
+                                  TextSpan(text: "common.num_selected".tr()),
+                                ],
+                          style: bodyRegular,
+                        ),
+                      ),
+                    )
+                  ],
                 ),
                 Visibility(
-                  visible: widget.isMultiSelect,
+                  visible: widget.isMultiSelect &&
+                      !widget.selectList.every(
+                        (v) => v.every((w) => w.selected == false),
+                      ),
                   child: IconTextButton(
                     onTap: () {
-                      if (widget.selectList
-                          .every((v) => v.every((w) => w.selected == true))) {
-                        widget.selectList.forEach((v) {
-                          v.forEach((w) {
-                            widget.setFilter(w.code, false);
-                          });
-                        });
-                      } else {
-                        widget.selectList.forEach((v) {
-                          v.forEach((w) {
-                            widget.setFilter(w.code, true);
-                          });
+                      widget.selectList.forEach((v) {
+                        v.forEach((w) {
+                          widget.setFilter(w.code, false);
                         });
-                      }
+                      });
                     },
-                    text: widget.selectList.every(
-                      (v) => v.every((w) => w.selected == true),
-                    )
-                        ? "common.unselect_all".tr()
-                        : "common.select_all".tr(),
+                    text: "common.reset".tr(),
                     textStyle: bodyRegular.copyWith(
                       color: OTLColor.pinksMain,
                       decoration: TextDecoration.underline,
                     ),
                   ),
-                )
+                ),
               ],
             ),
           ),