Skip to content

Commit 7f47d2b

Browse files
Merge pull request #293 from Solvro/feat/add-checmark-in-sci-club-detail-view
Feat/add checmark in sci club detail view
2 parents b820e5f + d922718 commit 7f47d2b

File tree

6 files changed

+33
-8
lines changed

6 files changed

+33
-8
lines changed

lib/config/ui_config.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ abstract class DetailViewsHeaderConfig {
8989
}
9090

9191
abstract class ScienceClubsViewConfig {
92+
static const source = "manual_entry";
9293
static const listSeparatorSize = 16.0;
9394
static const microPadding = 4.0;
9495
static const smallPadding = 16.0;
@@ -114,7 +115,6 @@ abstract class ScienceClubsViewConfig {
114115

115116
abstract class ScienceClubCardConfig {
116117
static const trailingPadding = 2.0;
117-
static const source = "manual_entry";
118118
}
119119

120120
abstract class ParkingsConfig {

lib/features/department_detail_view/widgets/science_clubs_section.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class _ScienceClubsList extends ConsumerWidget {
8383
? sciClub.cover?.filename_disk
8484
: sciClub.logo?.filename_disk,
8585
onClick: () async => ref.navigateSciClubsDetail(sciClub.id),
86-
showBadge: sciClub.source == ScienceClubCardConfig.source,
86+
showBadge: sciClub.source == ScienceClubsViewConfig.source,
8787
),
8888
);
8989
},

lib/features/home_view/widgets/science_clubs_section.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class _BuildScienceClubCard extends StatelessWidget {
105105
? sciClub.cover?.filename_disk
106106
: sciClub.logo?.filename_disk,
107107
onClick: () async => ref.navigateSciClubsDetail(sciClub.id),
108-
showBadge: sciClub.source == ScienceClubCardConfig.source,
108+
showBadge: sciClub.source == ScienceClubsViewConfig.source,
109109
);
110110
}
111111
}

lib/features/science_club_detail_view/repository/getScienceClubDetails.graphql

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ query GetScienceClubDetails($id: ID!) {
22
Scientific_Circles_by_id(id: $id) {
33
name
44
description
5+
source
56
cover {
67
filename_disk
78
}

lib/features/science_club_detail_view/science_club_detail_view.dart

+28-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ class ScienceClubDetailView extends StatelessWidget {
2525
@PathParam("id") required this.id,
2626
super.key,
2727
});
28+
2829
final String id;
30+
2931
@override
3032
Widget build(BuildContext context) {
3133
return Scaffold(
@@ -37,6 +39,7 @@ class ScienceClubDetailView extends StatelessWidget {
3739

3840
class _SciClubDetailDataView extends ConsumerWidget {
3941
const _SciClubDetailDataView(this.id);
42+
4043
final String id;
4144

4245
@override
@@ -57,11 +60,32 @@ class _SciClubDetailDataView extends ConsumerWidget {
5760
const SizedBox(height: 8),
5861
Padding(
5962
padding: const EdgeInsets.symmetric(horizontal: 24),
60-
child: Text(
61-
value.name,
62-
style: context.textTheme.headline,
63-
textAlign: TextAlign.center,
63+
child: RichText(
6464
maxLines: 2,
65+
overflow: TextOverflow.ellipsis,
66+
textAlign: TextAlign.center,
67+
text: TextSpan(
68+
text: value.name,
69+
style: context.textTheme.headline,
70+
children: [
71+
if (value.source == ScienceClubsViewConfig.source)
72+
WidgetSpan(
73+
baseline: TextBaseline.ideographic,
74+
alignment: PlaceholderAlignment.middle,
75+
child: SizedBox.square(
76+
dimension: 16,
77+
child: Padding(
78+
padding: const EdgeInsets.only(left: 4),
79+
child: Icon(
80+
Icons.verified_sharp,
81+
size: 12,
82+
color: context.colorTheme.orangePomegranade,
83+
),
84+
),
85+
),
86+
),
87+
],
88+
),
6589
),
6690
),
6791
const SizedBox(height: 12),

lib/features/science_clubs_view/widgets/science_club_card.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ScienceClubCard extends StatelessWidget {
2121
?.map((tag) => "#${tag?.Tags_id?.name}")
2222
.toList()
2323
.join(", "),
24-
showBadge: sciClub.source == ScienceClubCardConfig.source,
24+
showBadge: sciClub.source == ScienceClubsViewConfig.source,
2525
activeShadows: null,
2626
trailing: Padding(
2727
padding: const EdgeInsets.only(

0 commit comments

Comments
 (0)