firka/student-legacy
firka/student-legacy
8
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added disable fading to all filter/tab bars

Browse Source
This commit is contained in:
Kima 2023-06-08 20:07:17 +02:00
parent 31f7c6a465
commit 50e24bde17
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart
View File

@ -182,11 +182,15 @@ class _AbsencesPageState extends State<AbsencesPage>
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
bottom: FilterBar(items: [ bottom: FilterBar(
Tab(text: "Absences".i18n), items: [
Tab(text: "Delays".i18n), Tab(text: "Absences".i18n),
Tab(text: "Misses".i18n), Tab(text: "Delays".i18n),
], controller: _tabController, disableFading: true), Tab(text: "Misses".i18n),
],
controller: _tabController,
disableFading: true,
),
), ),
], ],
body: TabBarView( body: TabBarView(

6
filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart
View File

@ -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/grades_count.dart';
import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart'; import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart';
import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.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/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_expandable_fab/flutter_expandable_fab.dart'; import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
@ -75,8 +72,9 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
final gradeDates = subjectGrades.map((e) => e.date.millisecondsSinceEpoch); final gradeDates = subjectGrades.map((e) => e.date.millisecondsSinceEpoch);
final maxGradeDate = gradeDates.fold(0, max); final maxGradeDate = gradeDates.fold(0, max);
final minGradeDate = gradeDates.fold(0, min); 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 false; // naplo/#78
}
return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1; return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1;
} }

16
filcnaplo_mobile_ui/lib/pages/messages/messages_page.dart
View File

@ -90,12 +90,16 @@ class _MessagesPageState extends State<MessagesPage>
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
bottom: FilterBar(items: [ bottom: FilterBar(
Tab(text: "Inbox".i18n), items: [
Tab(text: "Sent".i18n), Tab(text: "Inbox".i18n),
Tab(text: "Trash".i18n), Tab(text: "Sent".i18n),
Tab(text: "Draft".i18n), Tab(text: "Trash".i18n),
], controller: tabController), Tab(text: "Draft".i18n),
],
controller: tabController,
disableFading: true,
),
), ),
], ],
body: TabBarView( body: TabBarView(

1
filcnaplo_premium/lib/ui/mobile/settings/theme.dart
View File

@ -307,6 +307,7 @@ class _PremiumCustomAccentColorSettingState
controller: _testTabController, controller: _testTabController,
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
censored: true, censored: true,
disableFading: true,
), ),
), ),
Padding( Padding(