Skip to content

Commit

Permalink
ui: Add new SVG icons for left and right arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
0niel committed Sep 7, 2024
1 parent 35f298f commit e80f547
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 26 deletions.
4 changes: 4 additions & 0 deletions assets/icons/hugeicons/square-arrow-left-01-round.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/icons/hugeicons/square-arrow-right-01-round.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions lib/gen/assets.gen.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions lib/schedule/widgets/calendar/calendar_header.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hugeicons/hugeicons.dart';
import 'package:intl/intl.dart';
import 'package:rtu_mirea_app/gen/assets.gen.dart';
import 'package:rtu_mirea_app/presentation/theme.dart';
import 'package:rtu_mirea_app/presentation/typography.dart';
import 'package:table_calendar/table_calendar.dart';
Expand Down Expand Up @@ -216,9 +218,8 @@ class _CalendarWeeksHeader extends StatelessWidget {
padding: EdgeInsets.zero,
backgroundColor: Colors.transparent,
),
child: Icon(
Icons.arrow_back_ios_rounded,
size: 18,
child: HugeIcon(
icon: HugeIcons.strokeRoundedArrowLeft01,
color: AppTheme.colorsOf(context).active,
),
onPressed: () {
Expand Down Expand Up @@ -282,9 +283,8 @@ class _CalendarWeeksHeader extends StatelessWidget {
curve: Curves.easeIn,
);
},
child: Icon(
Icons.arrow_forward_ios_rounded,
size: 18,
child: HugeIcon(
icon: HugeIcons.strokeRoundedArrowRight01,
color: AppTheme.colorsOf(context).active,
),
),
Expand Down
38 changes: 19 additions & 19 deletions lib/schedule/widgets/lesson_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';
import 'package:hugeicons/hugeicons.dart';
import 'package:rtu_mirea_app/presentation/typography.dart';
import 'package:rtu_mirea_app/presentation/theme.dart';
import 'package:rtu_mirea_app/schedule/models/models.dart';
Expand Down Expand Up @@ -81,7 +82,7 @@ class LessonCard extends StatelessWidget {
.join(', ');
}

Widget _buildCommentAlert(List<ScheduleComment> comments) {
Widget _buildCommentAlert(BuildContext context, List<ScheduleComment> comments) {
final comment = comments.firstWhereOrNull(
(comment) => lesson.dates.contains(comment.lessonDate) && comment.lessonBells == lesson.lessonBells,
);
Expand All @@ -99,8 +100,9 @@ class LessonCard extends StatelessWidget {
),
child: Row(
children: [
const FaIcon(
FontAwesomeIcons.comment,
HugeIcon(
icon: HugeIcons.strokeRoundedComment01,
color: AppTheme.colorsOf(context).deactive,
size: 16,
),
const SizedBox(
Expand Down Expand Up @@ -216,16 +218,13 @@ class LessonCard extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 2),
child: FaIcon(
FontAwesomeIcons.mapLocation,
size: 12,
color: AppTheme.colorsOf(context).deactive,
),
HugeIcon(
icon: HugeIcons.strokeRoundedUniversity,
size: 16,
color: AppTheme.colorsOf(context).deactive,
),
const SizedBox(
width: 6.5,
width: 6,
),
Expanded(
child: Text(
Expand All @@ -252,9 +251,9 @@ class LessonCard extends StatelessWidget {
children: [
Padding(
padding: const EdgeInsets.only(top: 2),
child: FaIcon(
FontAwesomeIcons.users,
size: 12,
child: HugeIcon(
icon: HugeIcons.strokeRoundedUserGroup,
size: 16,
color: AppTheme.colorsOf(context).deactive,
),
),
Expand All @@ -278,13 +277,14 @@ class LessonCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(left: 2, right: 8, top: 3),
child: FaIcon(
FontAwesomeIcons.userTie,
size: 12,
padding: const EdgeInsets.only(top: 3),
child: HugeIcon(
icon: HugeIcons.strokeRoundedTeacher,
size: 16,
color: AppTheme.colorsOf(context).deactive,
),
),
const SizedBox(width: 6),
Expanded(
child: Text(
lesson.teachers.map((e) => e.name).join(', '),
Expand All @@ -308,7 +308,7 @@ class LessonCard extends StatelessWidget {
return ch;
},
),
_buildCommentAlert(state.comments),
_buildCommentAlert(context, state.comments),
_buildGroupIndicator()
],
),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: rtu_mirea_app
description: Mobile application for students of RTU MIREA
publish_to: 'none'

version: 1.5.8+103
version: 1.5.8+104

environment:
sdk: ">=3.1.1"
Expand Down

0 comments on commit e80f547

Please sign in to comment.