From b4f831e2eac5628a43e44399ff5f01ff3323ee5b Mon Sep 17 00:00:00 2001 From: Yurin Andrey Date: Thu, 10 Sep 2026 21:05:36 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=86=D0=B2=D0=B5=D1=82=20=D1=84=D0=BE=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=B0=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app.dart | 1 + lib/ui/unn_mobile_colors.dart | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/app.dart b/lib/app.dart index 7026a1fa..8b67e932 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -40,6 +40,7 @@ class UnnMobile extends StatelessWidget { UnnMobileColors( scheduleDayHighlight: Color(0xFFEEEEEE), scheduleSubjectHighlight: Color(0xFFFFF6E8), + scheduleAlternatingColor: Color(0x0F00BBAE), scheduleSubjectTypeColors: { SubjectType.lecture: Color(0xFF1CA49C), SubjectType.practice: Color(0xFFCD7255), diff --git a/lib/ui/unn_mobile_colors.dart b/lib/ui/unn_mobile_colors.dart index 80fb901c..0ec0e4d2 100644 --- a/lib/ui/unn_mobile_colors.dart +++ b/lib/ui/unn_mobile_colors.dart @@ -8,6 +8,7 @@ import 'package:unn_mobile/core/models/schedule/subject_type.dart'; class UnnMobileColors extends ThemeExtension { final Color? scheduleDayHighlight; final Color? scheduleSubjectHighlight; + final Color? scheduleAlternatingColor; final Map? scheduleSubjectTypeColors; final Color? ligtherTextColor; final Color? idkWhatColor; @@ -15,6 +16,7 @@ class UnnMobileColors extends ThemeExtension { const UnnMobileColors({ required this.scheduleDayHighlight, required this.scheduleSubjectHighlight, + required this.scheduleAlternatingColor, required this.scheduleSubjectTypeColors, required this.ligtherTextColor, required this.idkWhatColor, @@ -24,6 +26,7 @@ class UnnMobileColors extends ThemeExtension { ThemeExtension copyWith({ Color? scheduleDayHighlight, Color? scheduleSubjectHighlight, + Color? scheduleAlternatingColor, Map? scheduleSubjectTypeColors, Color? ligtherTextColor, Color? idkWhatColor, @@ -32,6 +35,8 @@ class UnnMobileColors extends ThemeExtension { scheduleDayHighlight: scheduleDayHighlight ?? this.scheduleDayHighlight, scheduleSubjectHighlight: scheduleSubjectHighlight ?? this.scheduleSubjectHighlight, + scheduleAlternatingColor: + scheduleAlternatingColor ?? this.scheduleAlternatingColor, scheduleSubjectTypeColors: scheduleSubjectTypeColors ?? this.scheduleSubjectTypeColors, ligtherTextColor: ligtherTextColor ?? this.ligtherTextColor, @@ -60,6 +65,11 @@ class UnnMobileColors extends ThemeExtension { otherColors.scheduleSubjectHighlight, t, ), + scheduleAlternatingColor: Color.lerp( + scheduleAlternatingColor, + otherColors.scheduleAlternatingColor, + t, + ), scheduleSubjectTypeColors: Map.fromIterables( scheduleSubjectTypeColors!.keys, scheduleSubjectTypeColors!.keys.map((SubjectType key) { @@ -101,7 +111,7 @@ extension ThemeDataExtension on ThemeData { return extraColors.scheduleSubjectHighlight!; } - return isEven ? colorScheme.surfaceContainerHighest : colorScheme.surface; + return isEven ? extraColors.scheduleAlternatingColor! : colorScheme.surface; } UnnMobileColors? get unnMobileColors => extension(); From b29bdca14d07b1c256b6731fb5a0277519220419 Mon Sep 17 00:00:00 2001 From: UNN MOBILE runner Date: Thu, 10 Sep 2026 18:08:03 +0000 Subject: [PATCH 2/4] Change version in pubspec --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index fb05f749..25345910 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: unn_mobile description: A mobile application for UNN Portal website publish_to: 'none' -version: 0.6.1+426 +version: 0.6.1+427 environment: sdk: '>=3.1.2 <4.0.0' From c83544e18a46ad265c71b8a5850fb45cdd555d5e Mon Sep 17 00:00:00 2001 From: Yurin Andrey Date: Thu, 10 Sep 2026 22:57:51 +0300 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=86=D0=B2=D0=B5=D1=82=20=D1=84=D0=BE=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=20=D1=87=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=B0=D1=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b4f831e2eac5628a43e44399ff5f01ff3323ee5b. --- lib/app.dart | 1 - lib/ui/unn_mobile_colors.dart | 12 +----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index 8b67e932..7026a1fa 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -40,7 +40,6 @@ class UnnMobile extends StatelessWidget { UnnMobileColors( scheduleDayHighlight: Color(0xFFEEEEEE), scheduleSubjectHighlight: Color(0xFFFFF6E8), - scheduleAlternatingColor: Color(0x0F00BBAE), scheduleSubjectTypeColors: { SubjectType.lecture: Color(0xFF1CA49C), SubjectType.practice: Color(0xFFCD7255), diff --git a/lib/ui/unn_mobile_colors.dart b/lib/ui/unn_mobile_colors.dart index 0ec0e4d2..80fb901c 100644 --- a/lib/ui/unn_mobile_colors.dart +++ b/lib/ui/unn_mobile_colors.dart @@ -8,7 +8,6 @@ import 'package:unn_mobile/core/models/schedule/subject_type.dart'; class UnnMobileColors extends ThemeExtension { final Color? scheduleDayHighlight; final Color? scheduleSubjectHighlight; - final Color? scheduleAlternatingColor; final Map? scheduleSubjectTypeColors; final Color? ligtherTextColor; final Color? idkWhatColor; @@ -16,7 +15,6 @@ class UnnMobileColors extends ThemeExtension { const UnnMobileColors({ required this.scheduleDayHighlight, required this.scheduleSubjectHighlight, - required this.scheduleAlternatingColor, required this.scheduleSubjectTypeColors, required this.ligtherTextColor, required this.idkWhatColor, @@ -26,7 +24,6 @@ class UnnMobileColors extends ThemeExtension { ThemeExtension copyWith({ Color? scheduleDayHighlight, Color? scheduleSubjectHighlight, - Color? scheduleAlternatingColor, Map? scheduleSubjectTypeColors, Color? ligtherTextColor, Color? idkWhatColor, @@ -35,8 +32,6 @@ class UnnMobileColors extends ThemeExtension { scheduleDayHighlight: scheduleDayHighlight ?? this.scheduleDayHighlight, scheduleSubjectHighlight: scheduleSubjectHighlight ?? this.scheduleSubjectHighlight, - scheduleAlternatingColor: - scheduleAlternatingColor ?? this.scheduleAlternatingColor, scheduleSubjectTypeColors: scheduleSubjectTypeColors ?? this.scheduleSubjectTypeColors, ligtherTextColor: ligtherTextColor ?? this.ligtherTextColor, @@ -65,11 +60,6 @@ class UnnMobileColors extends ThemeExtension { otherColors.scheduleSubjectHighlight, t, ), - scheduleAlternatingColor: Color.lerp( - scheduleAlternatingColor, - otherColors.scheduleAlternatingColor, - t, - ), scheduleSubjectTypeColors: Map.fromIterables( scheduleSubjectTypeColors!.keys, scheduleSubjectTypeColors!.keys.map((SubjectType key) { @@ -111,7 +101,7 @@ extension ThemeDataExtension on ThemeData { return extraColors.scheduleSubjectHighlight!; } - return isEven ? extraColors.scheduleAlternatingColor! : colorScheme.surface; + return isEven ? colorScheme.surfaceContainerHighest : colorScheme.surface; } UnnMobileColors? get unnMobileColors => extension(); From 2d4faa57e28f02f0f401111acd5bd4eee75b3461 Mon Sep 17 00:00:00 2001 From: Yurin Andrey Date: Thu, 10 Sep 2026 23:02:54 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=86=D0=B2=D0=B5=D1=82=20=D1=84=D0=BE=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ui/unn_mobile_colors.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ui/unn_mobile_colors.dart b/lib/ui/unn_mobile_colors.dart index 80fb901c..95bfe0bc 100644 --- a/lib/ui/unn_mobile_colors.dart +++ b/lib/ui/unn_mobile_colors.dart @@ -101,7 +101,7 @@ extension ThemeDataExtension on ThemeData { return extraColors.scheduleSubjectHighlight!; } - return isEven ? colorScheme.surfaceContainerHighest : colorScheme.surface; + return isEven ? colorScheme.primary.withAlpha(20) : colorScheme.surface; } UnnMobileColors? get unnMobileColors => extension();