Skip to content
This repository was archived by the owner on Sep 18, 2025. It is now read-only.

Commit af0c815

Browse files
authored
improve lint ci (#160)
* improve lint ci * format files
1 parent 243f5e8 commit af0c815

File tree

27 files changed

+94
-76
lines changed

27 files changed

+94
-76
lines changed

.github/workflows/analyze.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ jobs:
1919
- name: Retrieve the secret and decode it to file
2020
env:
2121
FIREBASE_OPTIONS_BASE64: ${{ secrets.FIREBASE_OPTIONS_BASE64 }}
22+
GOOGLE_SERVICE_INFO_PLIST_BASE64: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_BASE64 }}
23+
FIREBASE_JSON_BASE64: ${{ secrets.FIREBASE_JSON_BASE64 }}
24+
GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
2225
run: |
2326
cd khelo
24-
echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
27+
echo $FIREBASE_OPTIONS_BASE64 | base64 --decode > lib/firebase_options.dart
28+
echo $GOOGLE_SERVICE_INFO_PLIST_BASE64 | base64 --decode > ios/Runner/GoogleService-Info.plist
29+
echo $FIREBASE_JSON_BASE64 | base64 --decode > firebase.json
30+
echo $GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > android/app/google-services.json
2531
2632
- name: Install dependencies
2733
run: |
@@ -32,7 +38,16 @@ jobs:
3238
3339
- name: Lint test
3440
run: |
35-
cd data && flutter analyze --fatal-infos
36-
cd ../style && flutter analyze --fatal-infos
37-
cd ../khelo && flutter analyze --fatal-infos
41+
cd khelo
42+
dart format . --set-exit-if-changed
43+
dart analyze --fatal-infos
44+
45+
cd ../data
46+
dart format . --set-exit-if-changed
47+
dart analyze --fatal-infos
48+
49+
cd ../style
50+
dart format . --set-exit-if-changed
51+
dart analyze --fatal-infos
52+
3853
cd ..

data/lib/api/ball_score/ball_score_model.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ class ExtraSummary with _$ExtraSummary {
224224
}
225225

226226
extension BallScoreModelData on BallScoreModel? {
227-
double get formattedOver => double.parse("${(this?.over_number ?? 1) - 1}.${this?.ball_number ?? 0}");
227+
double get formattedOver =>
228+
double.parse("${(this?.over_number ?? 1) - 1}.${this?.ball_number ?? 0}");
228229

229230
bool? isLegalDelivery() {
230231
if (this == null) {

data/lib/api/leaderboard/leaderboard_model.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ enum LeaderboardField {
8080
}
8181
}
8282

83-
int getMinScoreToGetFeatured(){
84-
switch(this){
83+
int getMinScoreToGetFeatured() {
84+
switch (this) {
8585
case LeaderboardField.batting:
8686
return 50;
8787
case LeaderboardField.bowling:

data/lib/api/match_event/match_event_model.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class MatchEventMilestone with _$MatchEventMilestone {
9090
_$MatchEventMilestoneFromJson(json);
9191

9292
factory MatchEventMilestone.fromFireStore(
93-
DocumentSnapshot<Map<String, dynamic>> snapshot,
94-
SnapshotOptions? options,
95-
) =>
93+
DocumentSnapshot<Map<String, dynamic>> snapshot,
94+
SnapshotOptions? options,
95+
) =>
9696
MatchEventMilestone.fromJson(snapshot.data()!);
97-
}
97+
}

data/lib/api/network/client.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ final rawDioProvider = Provider((ref) {
2828

2929
extension HttpExtensions on http.Client {
3030
Future<http.Response> req(Endpoint endpoint) async {
31-
3231
final request = http.Request(
3332
endpoint.method.name,
3433
Uri.parse('${DataConfig.instance.apiBaseUrl}${endpoint.path}'),

data/lib/api/partnership/partnership_model.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class PartnershipModel with _$PartnershipModel {
2626
_$PartnershipModelFromJson(json);
2727

2828
factory PartnershipModel.fromFireStore(
29-
DocumentSnapshot<Map<String, dynamic>> snapshot,
30-
SnapshotOptions? options,
31-
) =>
29+
DocumentSnapshot<Map<String, dynamic>> snapshot,
30+
SnapshotOptions? options,
31+
) =>
3232
PartnershipModel.fromJson(snapshot.data()!);
3333
}
3434

@@ -45,4 +45,4 @@ class PartnershipPlayer with _$PartnershipPlayer {
4545

4646
factory PartnershipPlayer.fromJson(Map<String, dynamic> json) =>
4747
_$PartnershipPlayerFromJson(json);
48-
}
48+
}

data/lib/service/auth/auth_service.dart

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1+
import 'package:firebase_auth/firebase_auth.dart';
12
import 'package:firebase_messaging/firebase_messaging.dart';
23
import 'package:flutter/cupertino.dart';
4+
import 'package:flutter_riverpod/flutter_riverpod.dart';
35

6+
import '../../api/user/user_models.dart';
47
import '../../errors/app_error.dart';
58
import '../../extensions/string_extensions.dart';
69
import '../../storage/app_preferences.dart';
710
import '../../storage/provider/preferences_provider.dart';
811
import '../user/user_service.dart';
9-
import 'package:firebase_auth/firebase_auth.dart';
10-
import 'package:flutter_riverpod/flutter_riverpod.dart';
11-
12-
import '../../api/user/user_models.dart';
1312

1413
final firebaseAuthProvider = Provider((ref) => FirebaseAuth.instance);
1514

@@ -61,21 +60,19 @@ class AuthService {
6160
verificationCompleted: (phoneAuthCredential) async {
6261
final userCredential =
6362
await _auth.signInWithCredential(phoneAuthCredential);
64-
_onVerificationSuccess(countryCode, phoneNumber, userCredential);
65-
onVerificationCompleted != null
66-
? onVerificationCompleted(phoneAuthCredential, userCredential)
67-
: null;
63+
await _onVerificationSuccess(
64+
countryCode,
65+
phoneNumber,
66+
userCredential,
67+
);
68+
onVerificationCompleted?.call(phoneAuthCredential, userCredential);
6869
},
6970
verificationFailed: (FirebaseAuthException e) =>
70-
onVerificationFailed != null
71-
? onVerificationFailed(AppError.fromError(e, e.stackTrace))
72-
: null,
71+
onVerificationFailed?.call(AppError.fromError(e, e.stackTrace)),
7372
codeSent: (String verificationId, int? resendToken) =>
74-
onCodeSent != null ? onCodeSent(verificationId, resendToken) : null,
73+
onCodeSent?.call(verificationId, resendToken),
7574
codeAutoRetrievalTimeout: (verificationId) =>
76-
onCodeAutoRetrievalTimeout != null
77-
? onCodeAutoRetrievalTimeout(verificationId)
78-
: null,
75+
onCodeAutoRetrievalTimeout?.call(verificationId),
7976
);
8077
} catch (error, stack) {
8178
throw AppError.fromError(error, stack);

data/lib/service/team/team_service.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,8 @@ class TeamService {
240240
.where(
241241
FireStoreConst.nameLowercase,
242242
isLessThan: '${searchKey.caseAndSpaceInsensitive}z',
243-
).orderBy(FireStoreConst.id);
243+
)
244+
.orderBy(FireStoreConst.id);
244245

245246
if (lastTeamId != null && lastTeamId.isNotEmpty) {
246247
query = query.startAfter([lastTeamId]);

data/lib/storage/provider/preferences_provider.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
22
import 'package:shared_preferences/shared_preferences.dart';
33

44
final sharedPreferencesProvider =
5-
Provider<SharedPreferences>((ref) => throw UnimplementedError());
5+
Provider<SharedPreferences>((ref) => throw UnimplementedError());
66

77
StateNotifierProvider<PreferenceNotifier<T>, T> createPrefProvider<T>({
88
required String prefKey,
99
required T defaultValue,
1010
}) {
1111
return StateNotifierProvider<PreferenceNotifier<T>, T>(
12-
(ref) => PreferenceNotifier<T>(
12+
(ref) => PreferenceNotifier<T>(
1313
ref.watch(sharedPreferencesProvider).get(prefKey) as T? ?? defaultValue,
14-
(curr) {
14+
(curr) {
1515
final prefs = ref.watch(sharedPreferencesProvider);
1616
if (curr == null) {
1717
prefs.remove(prefKey);
@@ -35,9 +35,9 @@ class PreferenceNotifier<T> extends StateNotifier<T> {
3535
Function(T curr)? onUpdate;
3636

3737
PreferenceNotifier(
38-
super.value,
39-
this.onUpdate,
40-
);
38+
super.value,
39+
this.onUpdate,
40+
);
4141

4242
@override
4343
set state(T value) {
@@ -47,4 +47,4 @@ class PreferenceNotifier<T> extends StateNotifier<T> {
4747

4848
@override
4949
T get state => super.state;
50-
}
50+
}

data/lib/utils/combine_latest.dart

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@ Stream<(T1, T2, T3)> combineLatest3<T1, T2, T3>(
1818
}
1919

2020
Stream<(T1, T2, T3, T4)> combineLatest4<T1, T2, T3, T4>(
21-
Stream<T1> stream1,
22-
Stream<T2> stream2,
23-
Stream<T3> stream3,
24-
Stream<T4> stream4,
25-
) {
21+
Stream<T1> stream1,
22+
Stream<T2> stream2,
23+
Stream<T3> stream3,
24+
Stream<T4> stream4,
25+
) {
2626
final firstThree = combineLatest3(stream1, stream2, stream3);
2727
return combineLatest2(firstThree, stream4)
2828
.map((tuple) => (tuple.$1.$1, tuple.$1.$2, tuple.$1.$3, tuple.$2));
2929
}
3030

3131
Stream<(T1, T2, T3, T4, T5)> combineLatest5<T1, T2, T3, T4, T5>(
32-
Stream<T1> stream1,
33-
Stream<T2> stream2,
34-
Stream<T3> stream3,
35-
Stream<T4> stream4,
36-
Stream<T5> stream5,
37-
) {
32+
Stream<T1> stream1,
33+
Stream<T2> stream2,
34+
Stream<T3> stream3,
35+
Stream<T4> stream4,
36+
Stream<T5> stream5,
37+
) {
3838
final firstFour = combineLatest4(stream1, stream2, stream3, stream4);
3939
return combineLatest2(firstFour, stream5).map(
40-
(tuple) => (tuple.$1.$1, tuple.$1.$2, tuple.$1.$3, tuple.$1.$4, tuple.$2),
40+
(tuple) => (tuple.$1.$1, tuple.$1.$2, tuple.$1.$3, tuple.$1.$4, tuple.$2),
4141
);
42-
}
42+
}

0 commit comments

Comments
 (0)