Skip to content

Commit b00ff45

Browse files
fullenifulleni
committed
lint: misc
1 parent 7864a19 commit b00ff45

File tree

11 files changed

+28
-43
lines changed

11 files changed

+28
-43
lines changed

‎lib/account/view/saved_headlines_page.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ class SavedHeadlinesPage extends StatelessWidget {
103103
),
104104
trailing: trailingButton,
105105
);
106-
break;
107106
case HeadlineImageStyle.smallThumbnail:
108107
tile = HeadlineTileImageStart(
109108
headline: headline,
@@ -115,7 +114,6 @@ class SavedHeadlinesPage extends StatelessWidget {
115114
),
116115
trailing: trailingButton,
117116
);
118-
break;
119117
case HeadlineImageStyle.largeThumbnail:
120118
tile = HeadlineTileImageTop(
121119
headline: headline,
@@ -127,7 +125,6 @@ class SavedHeadlinesPage extends StatelessWidget {
127125
),
128126
trailing: trailingButton,
129127
);
130-
break;
131128
}
132129
return tile;
133130
},

‎lib/entity_details/bloc/entity_details_bloc.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
5757
);
5858

5959
dynamic entityToLoad = event.entity;
60-
EntityType? entityTypeToLoad = event.entityType;
60+
var entityTypeToLoad = event.entityType;
6161

6262
try {
6363
// 1. Determine/Fetch Entity
@@ -107,7 +107,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
107107
);
108108

109109
// 3. Determine isFollowing status
110-
bool isCurrentlyFollowing = false;
110+
var isCurrentlyFollowing = false;
111111
final currentAccountState = _accountBloc.state;
112112
if (currentAccountState.preferences != null) {
113113
if (entityTypeToLoad == EntityType.category &&
@@ -266,7 +266,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
266266
) {
267267
if (state.entity == null || state.entityType == null) return;
268268

269-
bool isCurrentlyFollowing = false;
269+
var isCurrentlyFollowing = false;
270270
final preferences = event.preferences;
271271

272272
if (state.entityType == EntityType.category && state.entity is Category) {

‎lib/entity_details/view/entity_details_page.dart

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class EntityDetailsPageArguments {
2929
}
3030

3131
class EntityDetailsPage extends StatelessWidget {
32-
const EntityDetailsPage({super.key, required this.args});
32+
const EntityDetailsPage({required this.args, super.key});
3333

3434
final EntityDetailsPageArguments args;
3535

@@ -61,7 +61,7 @@ class EntityDetailsPage extends StatelessWidget {
6161
}
6262

6363
class EntityDetailsView extends StatefulWidget {
64-
const EntityDetailsView({super.key, required this.args}); // Accept args
64+
const EntityDetailsView({required this.args, super.key}); // Accept args
6565

6666
final EntityDetailsPageArguments args; // Store args
6767

@@ -136,21 +136,21 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
136136
}
137137

138138
// At this point, state.entity should not be null if success or loading more
139-
final String appBarTitle =
139+
final appBarTitle =
140140
state.entity is Category
141141
? (state.entity as Category).name
142142
: state.entity is Source
143143
? (state.entity as Source).name
144144
: l10n.detailsPageTitle;
145145

146-
final String? description =
146+
final description =
147147
state.entity is Category
148148
? (state.entity as Category).description
149149
: state.entity is Source
150150
? (state.entity as Source).description
151151
: null;
152152

153-
final String? entityIconUrl =
153+
final entityIconUrl =
154154
(state.entity is Category &&
155155
(state.entity as Category).iconUrl != null)
156156
? (state.entity as Category).iconUrl
@@ -320,7 +320,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
320320
? (state.entity as Source).id
321321
: null,
322322
);
323-
break;
324323
case HeadlineImageStyle.smallThumbnail:
325324
tile = HeadlineTileImageStart(
326325
headline: headline,
@@ -339,7 +338,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
339338
? (state.entity as Source).id
340339
: null,
341340
);
342-
break;
343341
case HeadlineImageStyle.largeThumbnail:
344342
tile = HeadlineTileImageTop(
345343
headline: headline,
@@ -358,7 +356,6 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
358356
? (state.entity as Source).id
359357
: null,
360358
);
361-
break;
362359
}
363360
return tile;
364361
},

‎lib/headline-details/view/headline_details_page.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import 'package:ht_main/router/routes.dart';
1616
import 'package:ht_main/shared/shared.dart';
1717
import 'package:ht_shared/ht_shared.dart'
1818
show
19+
Category,
1920
Headline,
2021
HeadlineImageStyle,
21-
Category,
2222
Source; // Added Category, Source
2323
import 'package:intl/intl.dart';
2424
import 'package:share_plus/share_plus.dart'; // Import share_plus
@@ -404,7 +404,7 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
404404
onTap: () {
405405
context.push(
406406
Routes.sourceDetails,
407-
extra: EntityDetailsPageArguments(entity: headline.source!),
407+
extra: EntityDetailsPageArguments(entity: headline.source),
408408
);
409409
},
410410
child: Chip(
@@ -473,7 +473,7 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
473473
onTap: () {
474474
context.push(
475475
Routes.categoryDetails,
476-
extra: EntityDetailsPageArguments(entity: headline.category!),
476+
extra: EntityDetailsPageArguments(entity: headline.category),
477477
);
478478
},
479479
child: Chip(
@@ -551,7 +551,6 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
551551
extra: similarHeadline,
552552
),
553553
);
554-
break;
555554
case HeadlineImageStyle.smallThumbnail:
556555
tile = HeadlineTileImageStart(
557556
headline: similarHeadline,
@@ -562,7 +561,6 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
562561
extra: similarHeadline,
563562
),
564563
);
565-
break;
566564
case HeadlineImageStyle.largeThumbnail:
567565
tile = HeadlineTileImageTop(
568566
headline: similarHeadline,
@@ -573,13 +571,12 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
573571
extra: similarHeadline,
574572
),
575573
);
576-
break;
577574
}
578575
return tile;
579576
},
580577
),
581578
);
582-
}, childCount: loadedState.similarHeadlines.length),
579+
}, childCount: loadedState.similarHeadlines.length,),
583580
),
584581
_ => const SliverToBoxAdapter(child: SizedBox.shrink()),
585582
};

‎lib/headlines-feed/view/headlines_feed_page.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
240240
extra: headline,
241241
),
242242
);
243-
break;
244243
case HeadlineImageStyle.smallThumbnail:
245244
tile = HeadlineTileImageStart(
246245
headline: headline,
@@ -251,7 +250,6 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
251250
extra: headline,
252251
),
253252
);
254-
break;
255253
case HeadlineImageStyle.largeThumbnail:
256254
tile = HeadlineTileImageTop(
257255
headline: headline,
@@ -262,7 +260,6 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
262260
extra: headline,
263261
),
264262
);
265-
break;
266263
}
267264
return tile;
268265
},

‎lib/headlines-search/bloc/headlines_search_bloc.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,22 @@ class HeadlinesSearchBloc
143143
response = await _headlinesRepository.readAllByQuery({
144144
'q': searchTerm,
145145
'model': modelType.toJson(),
146-
}, limit: _limit);
146+
}, limit: _limit,);
147147
case SearchModelType.category:
148148
response = await _categoryRepository.readAllByQuery({
149149
'q': searchTerm,
150150
'model': modelType.toJson(),
151-
}, limit: _limit);
151+
}, limit: _limit,);
152152
case SearchModelType.source:
153153
response = await _sourceRepository.readAllByQuery({
154154
'q': searchTerm,
155155
'model': modelType.toJson(),
156-
}, limit: _limit);
156+
}, limit: _limit,);
157157
case SearchModelType.country:
158158
response = await _countryRepository.readAllByQuery({
159159
'q': searchTerm,
160160
'model': modelType.toJson(),
161-
}, limit: _limit);
161+
}, limit: _limit,);
162162
}
163163
emit(
164164
HeadlinesSearchSuccess(

‎lib/headlines-search/view/headlines_search_page.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
295295
extra: headline,
296296
),
297297
);
298-
break;
299298
case HeadlineImageStyle.smallThumbnail:
300299
tile = HeadlineTileImageStart(
301300
headline: headline,
@@ -306,7 +305,6 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
306305
extra: headline,
307306
),
308307
);
309-
break;
310308
case HeadlineImageStyle.largeThumbnail:
311309
tile = HeadlineTileImageTop(
312310
headline: headline,
@@ -317,7 +315,6 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
317315
extra: headline,
318316
),
319317
);
320-
break;
321318
}
322319
return tile;
323320
case SearchModelType.category:

‎lib/shared/localization/ar_timeago_messages.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ class ArTimeagoMessages implements timeago.LookupMessages {
1616
@override
1717
String aboutAMinute(int minutes) => 'منذ 1د';
1818
@override
19-
String minutes(int minutes) => 'منذ ${minutes}د';
19+
String minutes(int minutes) => 'منذ $minutesد';
2020

2121
@override
2222
String aboutAnHour(int minutes) => 'منذ 1س';
2323
@override
24-
String hours(int hours) => 'منذ ${hours}س';
24+
String hours(int hours) => 'منذ $hoursس';
2525

2626
@override
2727
String aDay(int hours) => 'منذ 1ي'; // Or 'أمس' if preferred for exactly 1 day
2828
@override
29-
String days(int days) => 'منذ ${days}ي';
29+
String days(int days) => 'منذ $daysي';
3030

3131
@override
3232
String aboutAMonth(int days) => 'منذ 1ش';
3333
@override
34-
String months(int months) => 'منذ ${months}ش';
34+
String months(int months) => 'منذ $monthsش';
3535

3636
@override
3737
String aboutAYear(int year) => 'منذ 1سنة'; // Using سنة for year
3838
@override
39-
String years(int years) => 'منذ ${years}سنوات'; // Standard plural
39+
String years(int years) => 'منذ $yearsسنوات'; // Standard plural
4040

4141
@override
4242
String wordSeparator() => ' ';

‎lib/shared/shared.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ library;
66

77
export 'constants/constants.dart';
88
export 'theme/theme.dart';
9-
export 'widgets/widgets.dart';
109
export 'utils/utils.dart'; // Added export for utils
10+
export 'widgets/widgets.dart';

‎lib/shared/widgets/headline_tile_image_start.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class HeadlineTileImageStart extends StatelessWidget {
6969
fit: BoxFit.cover,
7070
loadingBuilder: (context, child, loadingProgress) {
7171
if (loadingProgress == null) return child;
72-
return Container(
72+
return ColoredBox(
7373
color: colorScheme.surfaceContainerHighest,
7474
child: const Center(
7575
child: CircularProgressIndicator(
@@ -79,7 +79,7 @@ class HeadlineTileImageStart extends StatelessWidget {
7979
);
8080
},
8181
errorBuilder:
82-
(context, error, stackTrace) => Container(
82+
(context, error, stackTrace) => ColoredBox(
8383
color: colorScheme.surfaceContainerHighest,
8484
child: Icon(
8585
Icons.broken_image_outlined,
@@ -88,7 +88,7 @@ class HeadlineTileImageStart extends StatelessWidget {
8888
),
8989
),
9090
)
91-
: Container(
91+
: ColoredBox(
9292
color: colorScheme.surfaceContainerHighest,
9393
child: Icon(
9494
Icons.image_not_supported_outlined,

0 commit comments

Comments
 (0)