improve lint ci (#160)

* improve lint ci * format files
canopas · Dec 24, 2024 · af0c815 · af0c815
1 parent 243f5e8
commit af0c815
Show file tree

Hide file tree

Showing 27 changed files with 94 additions and 76 deletions.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -19,9 +19,15 @@ jobs:
       - name: Retrieve the secret and decode it to file
         env:
           FIREBASE_OPTIONS_BASE64: ${{ secrets.FIREBASE_OPTIONS_BASE64 }}
+          GOOGLE_SERVICE_INFO_PLIST_BASE64: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_BASE64 }}
+          FIREBASE_JSON_BASE64: ${{ secrets.FIREBASE_JSON_BASE64 }}
+          GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
         run: |
           cd khelo
-          echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
+          echo $FIREBASE_OPTIONS_BASE64 | base64 --decode > lib/firebase_options.dart  
+          echo $GOOGLE_SERVICE_INFO_PLIST_BASE64 | base64 --decode > ios/Runner/GoogleService-Info.plist
+          echo $FIREBASE_JSON_BASE64 | base64 --decode > firebase.json
+          echo $GOOGLE_SERVICES_JSON_BASE64 | base64 --decode > android/app/google-services.json
 
       - name: Install dependencies
         run: |
@@ -32,7 +38,16 @@ jobs:
 
       - name: Lint test
         run: |
-          cd data && flutter analyze --fatal-infos
-          cd ../style && flutter analyze --fatal-infos
-          cd ../khelo && flutter analyze --fatal-infos
+          cd khelo
+          dart format . --set-exit-if-changed
+          dart analyze --fatal-infos
+
+          cd ../data
+          dart format . --set-exit-if-changed
+          dart analyze --fatal-infos
+
+          cd ../style
+          dart format . --set-exit-if-changed
+          dart analyze --fatal-infos
+
           cd ..
diff --git a/data/lib/api/ball_score/ball_score_model.dart b/data/lib/api/ball_score/ball_score_model.dart
@@ -224,7 +224,8 @@ class ExtraSummary with _$ExtraSummary {
 }
 
 extension BallScoreModelData on BallScoreModel? {
-  double get formattedOver => double.parse("${(this?.over_number ?? 1) - 1}.${this?.ball_number ?? 0}");
+  double get formattedOver =>
+      double.parse("${(this?.over_number ?? 1) - 1}.${this?.ball_number ?? 0}");
 
   bool? isLegalDelivery() {
     if (this == null) {

diff --git a/data/lib/api/leaderboard/leaderboard_model.dart b/data/lib/api/leaderboard/leaderboard_model.dart
@@ -80,8 +80,8 @@ enum LeaderboardField {
     }
   }
 
-  int getMinScoreToGetFeatured(){
-    switch(this){
+  int getMinScoreToGetFeatured() {
+    switch (this) {
       case LeaderboardField.batting:
         return 50;
       case LeaderboardField.bowling:

diff --git a/data/lib/api/match_event/match_event_model.dart b/data/lib/api/match_event/match_event_model.dart
@@ -90,8 +90,8 @@ class MatchEventMilestone with _$MatchEventMilestone {
       _$MatchEventMilestoneFromJson(json);
 
   factory MatchEventMilestone.fromFireStore(
-      DocumentSnapshot<Map<String, dynamic>> snapshot,
-      SnapshotOptions? options,
-      ) =>
+    DocumentSnapshot<Map<String, dynamic>> snapshot,
+    SnapshotOptions? options,
+  ) =>
       MatchEventMilestone.fromJson(snapshot.data()!);
-}
+}
diff --git a/data/lib/api/network/client.dart b/data/lib/api/network/client.dart
@@ -28,7 +28,6 @@ final rawDioProvider = Provider((ref) {
 
 extension HttpExtensions on http.Client {
   Future<http.Response> req(Endpoint endpoint) async {
-
     final request = http.Request(
       endpoint.method.name,
       Uri.parse('${DataConfig.instance.apiBaseUrl}${endpoint.path}'),

diff --git a/data/lib/api/partnership/partnership_model.dart b/data/lib/api/partnership/partnership_model.dart
@@ -26,9 +26,9 @@ class PartnershipModel with _$PartnershipModel {
       _$PartnershipModelFromJson(json);
 
   factory PartnershipModel.fromFireStore(
-      DocumentSnapshot<Map<String, dynamic>> snapshot,
-      SnapshotOptions? options,
-      ) =>
+    DocumentSnapshot<Map<String, dynamic>> snapshot,
+    SnapshotOptions? options,
+  ) =>
       PartnershipModel.fromJson(snapshot.data()!);
 }
 
@@ -45,4 +45,4 @@ class PartnershipPlayer with _$PartnershipPlayer {
 
   factory PartnershipPlayer.fromJson(Map<String, dynamic> json) =>
       _$PartnershipPlayerFromJson(json);
-}
+}
diff --git a/data/lib/service/auth/auth_service.dart b/data/lib/service/auth/auth_service.dart
@@ -1,15 +1,14 @@
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import '../../api/user/user_models.dart';
 import '../../errors/app_error.dart';
 import '../../extensions/string_extensions.dart';
 import '../../storage/app_preferences.dart';
 import '../../storage/provider/preferences_provider.dart';
 import '../user/user_service.dart';
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import '../../api/user/user_models.dart';
 
 final firebaseAuthProvider = Provider((ref) => FirebaseAuth.instance);
 
@@ -61,21 +60,19 @@ class AuthService {
         verificationCompleted: (phoneAuthCredential) async {
           final userCredential =
               await _auth.signInWithCredential(phoneAuthCredential);
-          _onVerificationSuccess(countryCode, phoneNumber, userCredential);
-          onVerificationCompleted != null
-              ? onVerificationCompleted(phoneAuthCredential, userCredential)
-              : null;
+          await _onVerificationSuccess(
+            countryCode,
+            phoneNumber,
+            userCredential,
+          );
+          onVerificationCompleted?.call(phoneAuthCredential, userCredential);
         },
         verificationFailed: (FirebaseAuthException e) =>
-            onVerificationFailed != null
-                ? onVerificationFailed(AppError.fromError(e, e.stackTrace))
-                : null,
+            onVerificationFailed?.call(AppError.fromError(e, e.stackTrace)),
         codeSent: (String verificationId, int? resendToken) =>
-            onCodeSent != null ? onCodeSent(verificationId, resendToken) : null,
+            onCodeSent?.call(verificationId, resendToken),
         codeAutoRetrievalTimeout: (verificationId) =>
-            onCodeAutoRetrievalTimeout != null
-                ? onCodeAutoRetrievalTimeout(verificationId)
-                : null,
+            onCodeAutoRetrievalTimeout?.call(verificationId),
       );
     } catch (error, stack) {
       throw AppError.fromError(error, stack);

diff --git a/data/lib/service/team/team_service.dart b/data/lib/service/team/team_service.dart
@@ -240,7 +240,8 @@ class TeamService {
           .where(
             FireStoreConst.nameLowercase,
             isLessThan: '${searchKey.caseAndSpaceInsensitive}z',
-          ).orderBy(FireStoreConst.id);
+          )
+          .orderBy(FireStoreConst.id);
 
       if (lastTeamId != null && lastTeamId.isNotEmpty) {
         query = query.startAfter([lastTeamId]);

diff --git a/data/lib/storage/provider/preferences_provider.dart b/data/lib/storage/provider/preferences_provider.dart
@@ -2,16 +2,16 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 final sharedPreferencesProvider =
-Provider<SharedPreferences>((ref) => throw UnimplementedError());
+    Provider<SharedPreferences>((ref) => throw UnimplementedError());
 
 StateNotifierProvider<PreferenceNotifier<T>, T> createPrefProvider<T>({
   required String prefKey,
   required T defaultValue,
 }) {
   return StateNotifierProvider<PreferenceNotifier<T>, T>(
-        (ref) => PreferenceNotifier<T>(
+    (ref) => PreferenceNotifier<T>(
       ref.watch(sharedPreferencesProvider).get(prefKey) as T? ?? defaultValue,
-          (curr) {
+      (curr) {
         final prefs = ref.watch(sharedPreferencesProvider);
         if (curr == null) {
           prefs.remove(prefKey);
@@ -35,9 +35,9 @@ class PreferenceNotifier<T> extends StateNotifier<T> {
   Function(T curr)? onUpdate;
 
   PreferenceNotifier(
-      super.value,
-      this.onUpdate,
-      );
+    super.value,
+    this.onUpdate,
+  );
 
   @override
   set state(T value) {
@@ -47,4 +47,4 @@ class PreferenceNotifier<T> extends StateNotifier<T> {
 
   @override
   T get state => super.state;
-}
+}
diff --git a/data/lib/utils/combine_latest.dart b/data/lib/utils/combine_latest.dart
@@ -18,25 +18,25 @@ Stream<(T1, T2, T3)> combineLatest3<T1, T2, T3>(
 }
 
 Stream<(T1, T2, T3, T4)> combineLatest4<T1, T2, T3, T4>(
-    Stream<T1> stream1,
-    Stream<T2> stream2,
-    Stream<T3> stream3,
-    Stream<T4> stream4,
-    ) {
+  Stream<T1> stream1,
+  Stream<T2> stream2,
+  Stream<T3> stream3,
+  Stream<T4> stream4,
+) {
   final firstThree = combineLatest3(stream1, stream2, stream3);
   return combineLatest2(firstThree, stream4)
       .map((tuple) => (tuple.$1.$1, tuple.$1.$2, tuple.$1.$3, tuple.$2));
 }
 
 Stream<(T1, T2, T3, T4, T5)> combineLatest5<T1, T2, T3, T4, T5>(
-    Stream<T1> stream1,
-    Stream<T2> stream2,
-    Stream<T3> stream3,
-    Stream<T4> stream4,
-    Stream<T5> stream5,
-    ) {
+  Stream<T1> stream1,
+  Stream<T2> stream2,
+  Stream<T3> stream3,
+  Stream<T4> stream4,
+  Stream<T5> stream5,
+) {
   final firstFour = combineLatest4(stream1, stream2, stream3, stream4);
   return combineLatest2(firstFour, stream5).map(
-        (tuple) => (tuple.$1.$1, tuple.$1.$2, tuple.$1.$3, tuple.$1.$4, tuple.$2),
+    (tuple) => (tuple.$1.$1, tuple.$1.$2, tuple.$1.$3, tuple.$1.$4, tuple.$2),
   );
-}
+}
diff --git a/khelo/lib/components/country_code_view.dart b/khelo/lib/components/country_code_view.dart
@@ -9,12 +9,12 @@ import 'package:twemoji_v2/twemoji_v2.dart';
 
 import '../gen/assets.gen.dart';
 
-
 class CountryCodeView extends StatelessWidget {
   final CountryCode countryCode;
   final Function(CountryCode) onCodeChange;
 
-  const CountryCodeView({super.key, required this.countryCode, required this.onCodeChange});
+  const CountryCodeView(
+      {super.key, required this.countryCode, required this.onCodeChange});
 
   @override
   Widget build(BuildContext context) {

diff --git a/khelo/lib/ui/flow/home/search/search_view_model.dart b/khelo/lib/ui/flow/home/search/search_view_model.dart
@@ -162,7 +162,8 @@ class SearchHomeViewNotifier extends StateNotifier<SearchHomeViewState> {
   void onChange() {
     final searchKey = state.searchController.text.toLowerCase().trim();
     if (searchKey.isEmpty) {
-      state = state.copyWith(matches: [], teams: [], tournaments: [], users: []);
+      state =
+          state.copyWith(matches: [], teams: [], tournaments: [], users: []);
       return;
     }
     _debounce?.cancel();

diff --git a/khelo/lib/ui/flow/matches/add_match/components/match_official_selection_view.dart b/khelo/lib/ui/flow/matches/add_match/components/match_official_selection_view.dart
@@ -33,7 +33,8 @@ class MatchOfficialSelectionView extends StatelessWidget {
                         type: official,
                         isWholeCellTappable: true,
                         user: state.officials
-                            .firstWhereOrNull((element) => element.type == official)
+                            .firstWhereOrNull(
+                                (element) => element.type == official)
                             ?.user,
                         onCardTap: () async {
                           final officials = await AppRoute.addMatchOfficials(

diff --git a/khelo/lib/ui/flow/matches/add_match/components/over_detail_view.dart b/khelo/lib/ui/flow/matches/add_match/components/over_detail_view.dart
@@ -80,7 +80,7 @@ class OverDetailView extends StatelessWidget {
     BuildContext context, {
     required String title,
     required Widget trailing,
-        VoidCallback? onTap,
+    VoidCallback? onTap,
   }) {
     return OnTapScale(
       onTap: onTap,

diff --git a/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart b/khelo/lib/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart
@@ -16,7 +16,7 @@ class UserDetailSheet extends StatelessWidget {
     BuildContext context,
     UserModel user, {
     String? actionButtonTitle,
-        VoidCallback? onButtonTap,
+    VoidCallback? onButtonTap,
   }) {
     HapticFeedback.mediumImpact();
     return showModalBottomSheet(

diff --git a/khelo/lib/ui/flow/matches/match_detail/components/match_detail_scorecard_view.dart b/khelo/lib/ui/flow/matches/match_detail/components/match_detail_scorecard_view.dart
@@ -254,7 +254,7 @@ class MatchDetailScorecardView extends ConsumerWidget {
     bool highlightRow = false,
     int? highlightColumnNumber,
     required List<String> data,
-        VoidCallback? onTap,
+    VoidCallback? onTap,
   }) {
     return Container(
       color: context.colorScheme.surface,

diff --git a/khelo/lib/ui/flow/matches/match_list_view_model.dart b/khelo/lib/ui/flow/matches/match_list_view_model.dart
@@ -49,7 +49,8 @@ class MatchListViewNotifier extends StateNotifier<MatchListViewState> {
           .streamUserRelatedMatches(
         userId: state.currentUserId!,
         limit: state.matches.length + 10,
-      ).listen((matches) {
+      )
+          .listen((matches) {
         state = state.copyWith(
           matches: matches,
           loading: false,

diff --git a/khelo/lib/ui/flow/score_board/components/match_complete_sheet.dart b/khelo/lib/ui/flow/score_board/components/match_complete_sheet.dart
@@ -117,7 +117,8 @@ class MatchCompleteSheet extends ConsumerWidget {
           ...state.allInnings.map(
             (inning) {
               final teamName = state.match?.teams
-                  .firstWhereOrNull((element) => element.team.id == inning.team_id)
+                  .firstWhereOrNull(
+                      (element) => element.team.id == inning.team_id)
                   ?.team
                   .name;
               return _teamScore(context, state,

diff --git a/khelo/lib/ui/flow/team/detail/components/team_detail_member_content.dart b/khelo/lib/ui/flow/team/detail/components/team_detail_member_content.dart
@@ -10,7 +10,6 @@ import 'package:style/animations/on_tap_scale.dart';
 import 'package:style/extensions/context_extensions.dart';
 import 'package:style/text/app_text_style.dart';
 
-
 class TeamDetailMemberContent extends ConsumerWidget {
   const TeamDetailMemberContent({super.key});
 

diff --git a/khelo/lib/ui/flow/team/detail/make_admin/make_team_admin_screen.dart b/khelo/lib/ui/flow/team/detail/make_admin/make_team_admin_screen.dart
@@ -122,8 +122,7 @@ class _MakeAdminScreenState extends ConsumerState<MakeTeamAdminScreen> {
                                     state.owner.id)
                                 ? context
                                     .l10n.team_detail_remove_ownership_title
-                                : context
-                                    .l10n.common_transfer_ownership,
+                                : context.l10n.common_transfer_ownership,
                             onTap: () async {
                               context.pop();
                               if (notifier.team.created_by_user.id !=
@@ -135,8 +134,8 @@ class _MakeAdminScreenState extends ConsumerState<MakeTeamAdminScreen> {
                               final newOwner =
                                   await SearchUserBottomSheet.show<UserModel>(
                                 context,
-                                emptyScreenTitle: context
-                                    .l10n.common_transfer_ownership,
+                                emptyScreenTitle:
+                                    context.l10n.common_transfer_ownership,
                                 emptyScreenDescription: context.l10n
                                     .team_detail_transfer_ownership_description,
                               );
@@ -163,8 +162,7 @@ class _MakeAdminScreenState extends ConsumerState<MakeTeamAdminScreen> {
                         UserDetailSheet.show(context, state.owner);
                       }
                     },
-                    trailing: Text(
-                        context.l10n.common_owner,
+                    trailing: Text(context.l10n.common_owner,
                         style: AppTextStyle.body2
                             .copyWith(color: context.colorScheme.primary)),
                   )

diff --git a/khelo/lib/ui/flow/team/search_team/search_team_view_model.dart b/khelo/lib/ui/flow/team/search_team/search_team_view_model.dart
@@ -149,7 +149,7 @@ class SearchTeamViewNotifier extends StateNotifier<SearchTeamState> {
     if (state.tournament == null || state.selectedTeam == null) {
       return;
     }
-    if(state.tournament!.team_ids.contains(state.selectedTeam!.id)) return;
+    if (state.tournament!.team_ids.contains(state.selectedTeam!.id)) return;
     try {
       final teamIds = state.tournament!.team_ids.toList();
       teamIds.add(state.selectedTeam!.id);

diff --git a/khelo/lib/ui/flow/team/team_list_screen.dart b/khelo/lib/ui/flow/team/team_list_screen.dart
@@ -87,8 +87,10 @@ class _TeamListScreenState extends ConsumerState<TeamListScreen>
                 final team = state.filteredTeams[index];
                 return TeamDetailCell(
                   team: team,
-                  showMoreOptionButton: team.isAdminOrOwner(state.currentUserId),
-                  onTap: () => AppRoute.teamDetail(teamId: team.id).push(context),
+                  showMoreOptionButton:
+                      team.isAdminOrOwner(state.currentUserId),
+                  onTap: () =>
+                      AppRoute.teamDetail(teamId: team.id).push(context),
                   onMoreOptionTap: () => _moreActionButton(context, team),
                 );
               }

diff --git a/khelo/lib/ui/flow/team/team_list_view_model.dart b/khelo/lib/ui/flow/team/team_list_view_model.dart
@@ -49,7 +49,8 @@ class TeamListViewNotifier extends StateNotifier<TeamListViewState> {
           .streamUserRelatedTeams(
         userId: state.currentUserId!,
         limit: state.teams.length + 10,
-      ).listen((teams) {
+      )
+          .listen((teams) {
         state = state.copyWith(
           teams: {...state.teams, ...teams}.toList(),
           loading: false,