From 7ccb4b9a120921391a8c9717bc60f83eab3adad0 Mon Sep 17 00:00:00 2001 From: AugustoVSoares Date: Fri, 28 Feb 2025 23:33:35 +0000 Subject: [PATCH 1/4] Fix for #1494 . --- .../lib/view/academic_path/academic_path.dart | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/uni_app/lib/view/academic_path/academic_path.dart b/packages/uni_app/lib/view/academic_path/academic_path.dart index d0968d1af..f56ea5925 100644 --- a/packages/uni_app/lib/view/academic_path/academic_path.dart +++ b/packages/uni_app/lib/view/academic_path/academic_path.dart @@ -43,12 +43,24 @@ class AcademicPathPageViewState extends GeneralPageViewState controller: tabController, dividerHeight: 1, tabs: [ - TabIcon(icon: UniIcons.course, text: S.of(context).courses), - TabIcon( - icon: UniIcons.lecture, - text: S.of(context).schedule, - ), - TabIcon(icon: UniIcons.exam, text: S.of(context).exams), + Tab(child: + Row(children: + [const Icon(UniIcons.courses), + Expanded(child: Text(S.of(context).courses, overflow: TextOverflow.ellipsis),),],),), + Tab(child: + Row(children: + [const Icon(UniIcons.lecture), + Expanded(child: Text(S.of(context).lectures, overflow: TextOverflow.ellipsis),),],),), + Tab(child: + Row(children: + [const Icon(UniIcons.exam), + Expanded(child: Text(S.of(context).exams, overflow: TextOverflow.ellipsis),),],),), + /* OLD CODE: + TabIcon(icon: UniIcons.course, text: Text(S.of(context).courses, overflow: TextOverflow.ellipsis),), TabIcon( + icon: UniIcons.lecture, + text: S.of(context).schedule, + ), + TabIcon(icon: UniIcons.exam, text: S.of(context).exams),*/ ], ); } From e32ffc85c61e0e0e13dc49c1eb2ebcaea607df54 Mon Sep 17 00:00:00 2001 From: AugustoVSoares Date: Wed, 5 Mar 2025 22:23:51 +0000 Subject: [PATCH 2/4] removed old code left as comment. --- packages/uni_app/lib/view/academic_path/academic_path.dart | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/uni_app/lib/view/academic_path/academic_path.dart b/packages/uni_app/lib/view/academic_path/academic_path.dart index f56ea5925..7cd45ab5c 100644 --- a/packages/uni_app/lib/view/academic_path/academic_path.dart +++ b/packages/uni_app/lib/view/academic_path/academic_path.dart @@ -55,12 +55,6 @@ class AcademicPathPageViewState extends GeneralPageViewState Row(children: [const Icon(UniIcons.exam), Expanded(child: Text(S.of(context).exams, overflow: TextOverflow.ellipsis),),],),), - /* OLD CODE: - TabIcon(icon: UniIcons.course, text: Text(S.of(context).courses, overflow: TextOverflow.ellipsis),), TabIcon( - icon: UniIcons.lecture, - text: S.of(context).schedule, - ), - TabIcon(icon: UniIcons.exam, text: S.of(context).exams),*/ ], ); } From 1615a373f2ecd070a20803b86fec5a3f15f200e6 Mon Sep 17 00:00:00 2001 From: AugustoVSoares Date: Wed, 5 Mar 2025 22:25:36 +0000 Subject: [PATCH 3/4] removed useless import. --- packages/uni_app/lib/view/academic_path/academic_path.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/uni_app/lib/view/academic_path/academic_path.dart b/packages/uni_app/lib/view/academic_path/academic_path.dart index 7cd45ab5c..aa77c3aca 100644 --- a/packages/uni_app/lib/view/academic_path/academic_path.dart +++ b/packages/uni_app/lib/view/academic_path/academic_path.dart @@ -8,7 +8,6 @@ import 'package:uni/view/academic_path/exam_page.dart'; import 'package:uni/view/academic_path/schedule_page.dart'; import 'package:uni/view/common_widgets/pages_layouts/general/general.dart'; import 'package:uni_ui/icons.dart'; -import 'package:uni_ui/tabs/tab_icon.dart'; class AcademicPathPageView extends StatefulWidget { const AcademicPathPageView({super.key}); From 143cd2c772aa16c93712759e364c9186872307e3 Mon Sep 17 00:00:00 2001 From: AugustoVSoares Date: Sun, 9 Mar 2025 21:36:49 +0000 Subject: [PATCH 4/4] Formatted file. --- .../lib/view/academic_path/academic_path.dart | 51 ++++++++++++++----- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/packages/uni_app/lib/view/academic_path/academic_path.dart b/packages/uni_app/lib/view/academic_path/academic_path.dart index aa77c3aca..d7fb32f43 100644 --- a/packages/uni_app/lib/view/academic_path/academic_path.dart +++ b/packages/uni_app/lib/view/academic_path/academic_path.dart @@ -42,18 +42,45 @@ class AcademicPathPageViewState extends GeneralPageViewState controller: tabController, dividerHeight: 1, tabs: [ - Tab(child: - Row(children: - [const Icon(UniIcons.courses), - Expanded(child: Text(S.of(context).courses, overflow: TextOverflow.ellipsis),),],),), - Tab(child: - Row(children: - [const Icon(UniIcons.lecture), - Expanded(child: Text(S.of(context).lectures, overflow: TextOverflow.ellipsis),),],),), - Tab(child: - Row(children: - [const Icon(UniIcons.exam), - Expanded(child: Text(S.of(context).exams, overflow: TextOverflow.ellipsis),),],),), + Tab( + child: Row( + children: [ + const Icon(UniIcons.courses), + Expanded( + child: Text( + S.of(context).courses, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ), + Tab( + child: Row( + children: [ + const Icon(UniIcons.lecture), + Expanded( + child: Text( + S.of(context).lectures, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ), + Tab( + child: Row( + children: [ + const Icon(UniIcons.exam), + Expanded( + child: Text( + S.of(context).exams, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ), ], ); }