From 50e24bde17b65a526848d6d9920075d69f03d68b Mon Sep 17 00:00:00 2001 From: Kima Date: Thu, 8 Jun 2023 20:07:17 +0200 Subject: [PATCH] added disable fading to all filter/tab bars --- .../lib/pages/absences/absences_page.dart | 14 +++++++++----- .../lib/pages/grades/grade_subject_view.dart | 6 ++---- .../lib/pages/messages/messages_page.dart | 16 ++++++++++------ .../lib/ui/mobile/settings/theme.dart | 1 + 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart b/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart index f63df3c..dc2218d 100755 --- a/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart +++ b/filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart @@ -182,11 +182,15 @@ class _AbsencesPageState extends State fontWeight: FontWeight.bold), ), ), - bottom: FilterBar(items: [ - Tab(text: "Absences".i18n), - Tab(text: "Delays".i18n), - Tab(text: "Misses".i18n), - ], controller: _tabController, disableFading: true), + bottom: FilterBar( + items: [ + Tab(text: "Absences".i18n), + Tab(text: "Delays".i18n), + Tab(text: "Misses".i18n), + ], + controller: _tabController, + disableFading: true, + ), ), ], body: TabBarView( diff --git a/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart b/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart index 26d985c..22a9d0b 100755 --- a/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart +++ b/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart @@ -20,9 +20,6 @@ import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_pro import 'package:filcnaplo_mobile_ui/pages/grades/grades_count.dart'; import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart'; import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.dart'; -import 'package:filcnaplo_premium/models/premium_scopes.dart'; -import 'package:filcnaplo_premium/providers/premium_provider.dart'; -import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_expandable_fab/flutter_expandable_fab.dart'; @@ -75,8 +72,9 @@ class _GradeSubjectViewState extends State { final gradeDates = subjectGrades.map((e) => e.date.millisecondsSinceEpoch); final maxGradeDate = gradeDates.fold(0, max); final minGradeDate = gradeDates.fold(0, min); - if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds) + if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds) { return false; // naplo/#78 + } return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1; } diff --git a/filcnaplo_mobile_ui/lib/pages/messages/messages_page.dart b/filcnaplo_mobile_ui/lib/pages/messages/messages_page.dart index b2c4da5..c064bef 100755 --- a/filcnaplo_mobile_ui/lib/pages/messages/messages_page.dart +++ b/filcnaplo_mobile_ui/lib/pages/messages/messages_page.dart @@ -90,12 +90,16 @@ class _MessagesPageState extends State fontWeight: FontWeight.bold), ), ), - bottom: FilterBar(items: [ - Tab(text: "Inbox".i18n), - Tab(text: "Sent".i18n), - Tab(text: "Trash".i18n), - Tab(text: "Draft".i18n), - ], controller: tabController), + bottom: FilterBar( + items: [ + Tab(text: "Inbox".i18n), + Tab(text: "Sent".i18n), + Tab(text: "Trash".i18n), + Tab(text: "Draft".i18n), + ], + controller: tabController, + disableFading: true, + ), ), ], body: TabBarView( diff --git a/filcnaplo_premium/lib/ui/mobile/settings/theme.dart b/filcnaplo_premium/lib/ui/mobile/settings/theme.dart index d64efe0..8aaa65f 100644 --- a/filcnaplo_premium/lib/ui/mobile/settings/theme.dart +++ b/filcnaplo_premium/lib/ui/mobile/settings/theme.dart @@ -307,6 +307,7 @@ class _PremiumCustomAccentColorSettingState controller: _testTabController, padding: EdgeInsets.zero, censored: true, + disableFading: true, ), ), Padding(