Skip to content

Commit 6fa736f

Browse files
nitin-787nitin-787
authored
Merge pull request #132 from RathodBhakti/ref/code-improvements
[Refactor] Improved Code Quality
2 parents 2368e7a + 12ed823 commit 6fa736f

36 files changed

+173
-145
lines changed

‎lib/constants/routes.dart

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import 'package:flutter/material.dart';
22
import 'package:page_transition/page_transition.dart';
3-
import 'package:mynotes/views/chat/chat_room.dart';
4-
import 'package:mynotes/views/home/search_view.dart';
5-
import 'package:mynotes/views/notes/create_update_note_view.dart';
6-
import 'package:mynotes/views/profile/user_details.dart';
7-
import 'package:mynotes/views/profile/user_profile.dart';
3+
4+
import '/views/chat/chat_room.dart';
5+
import '/views/home/search_view.dart';
6+
import '/views/notes/create_update_note_view.dart';
7+
import '/views/profile/user_details.dart';
8+
import '/views/profile/user_profile.dart';
89

910
const createOrUpdateNoteRoute = '/notes/new-note';
1011
const searchRoute = '/constants/search-view';

‎lib/helper/loading/loading_screen.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import 'dart:async';
2+
23
import 'package:flutter/material.dart';
3-
import 'package:mynotes/helper/loading/loading_screen_controller.dart';
4+
5+
import '/helper/loading/loading_screen_controller.dart';
46

57
class LoadingScreen {
68
factory LoadingScreen() => _shared;

‎lib/helper/loading/shimmer_loading.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'package:flutter/material.dart';
2-
import 'package:mynotes/config/size_config.dart';
3-
import 'package:mynotes/constants/colors.dart';
42
import 'package:shimmer/shimmer.dart';
53
import 'package:velocity_x/velocity_x.dart';
64

5+
import '/config/size_config.dart';
6+
import '/constants/colors.dart';
7+
78
class SkeletonNotes extends StatelessWidget {
89
const SkeletonNotes({
910
Key? key,

‎lib/main.dart

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
3-
import 'package:mynotes/constants/routes.dart';
4-
import 'package:mynotes/helper/loading/loading_screen.dart';
5-
import 'package:mynotes/services/auth/bloc/auth_bloc.dart';
6-
import 'package:mynotes/services/auth/bloc/auth_event.dart';
7-
import 'package:mynotes/services/auth/bloc/auth_state.dart';
8-
import 'package:mynotes/services/auth/firebase_auth_provider.dart';
9-
import 'package:mynotes/views/login_view.dart';
10-
import 'package:mynotes/views/forgot_password_view.dart';
11-
import 'package:mynotes/views/home/home.dart';
12-
import 'package:mynotes/views/register_view.dart';
13-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
14-
import 'package:mynotes/views/verify_email_view.dart';
15-
import 'package:mynotes/extentions/buildcontext/loc.dart';
163
import 'package:overlay_support/overlay_support.dart';
4+
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
5+
6+
import '/constants/routes.dart';
7+
import '/helper/loading/loading_screen.dart';
8+
import '/services/auth/bloc/auth_bloc.dart';
9+
import '/services/auth/bloc/auth_event.dart';
10+
import '/services/auth/bloc/auth_state.dart';
11+
import '/services/auth/firebase_auth_provider.dart';
12+
import '/views/login_view.dart';
13+
import '/views/forgot_password_view.dart';
14+
import '/views/home/home.dart';
15+
import '/views/register_view.dart';
16+
import '/views/verify_email_view.dart';
17+
import '/extentions/buildcontext/loc.dart';
1718

1819
void main() {
1920
WidgetsFlutterBinding.ensureInitialized();

‎lib/services/auth/auth_provider.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:mynotes/services/auth/auth_user.dart';
1+
import '/services/auth/auth_user.dart';
22

33
abstract class AuthProvider {
44
Future<void> initialize();

‎lib/services/auth/auth_serivce.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:mynotes/services/auth/auth_provider.dart';
2-
import 'package:mynotes/services/auth/auth_user.dart';
3-
import 'package:mynotes/services/auth/firebase_auth_provider.dart';
1+
import '/services/auth/auth_provider.dart';
2+
import '/services/auth/auth_user.dart';
3+
import '/services/auth/firebase_auth_provider.dart';
44

55
class AuthService implements AuthProvider {
66
final AuthProvider provider;

‎lib/services/auth/bloc/auth_bloc.dart

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import 'package:bloc/bloc.dart';
2-
import 'package:mynotes/services/auth/auth_provider.dart';
3-
import 'package:mynotes/services/auth/bloc/auth_event.dart';
4-
import 'package:mynotes/services/auth/bloc/auth_state.dart';
5-
import 'package:mynotes/services/auth/google_auth.dart';
2+
3+
import '/services/auth/auth_provider.dart';
4+
import '/services/auth/bloc/auth_event.dart';
5+
import '/services/auth/bloc/auth_state.dart';
6+
import '/services/auth/google_auth.dart';
67

78
class AuthBloc extends Bloc<AuthEvent, AuthState> {
89
AuthBloc(AuthProvider provider)

‎lib/services/auth/bloc/auth_state.dart

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import 'package:flutter/foundation.dart' show immutable;
2-
import 'package:mynotes/services/auth/auth_user.dart';
32
import 'package:equatable/equatable.dart';
43

4+
import '/services/auth/auth_user.dart';
5+
56
@immutable
67
abstract class AuthState {
78
final bool isLoading;
@@ -44,23 +45,17 @@ class AuthStateLoggedIn extends AuthState {
4445
}
4546

4647
class AuthStateLoggedInWithGmail extends AuthState {
47-
4848
const AuthStateLoggedInWithGmail({
49-
5049
required bool isLoading,
5150
}) : super(isLoading: isLoading);
5251
}
5352

54-
55-
5653
class AuthStateNeedsVerification extends AuthState {
5754
const AuthStateNeedsVerification({
5855
required bool isLoading,
5956
}) : super(isLoading: isLoading);
6057
}
6158

62-
63-
6459
class AuthStateLoggedOut extends AuthState with EquatableMixin {
6560
final Exception? exception;
6661
const AuthStateLoggedOut({

‎lib/services/auth/firebase_auth_provider.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import 'package:firebase_core/firebase_core.dart';
22
import 'package:mynotes/firebase_options.dart';
3-
import 'package:mynotes/services/auth/auth_user.dart';
4-
import 'package:mynotes/services/auth/auth_provider.dart';
5-
import 'package:mynotes/services/auth/auth_exception.dart';
63
import 'package:firebase_auth/firebase_auth.dart'
74
show FirebaseAuth, FirebaseAuthException;
85

6+
import '/services/auth/auth_user.dart';
7+
import '/services/auth/auth_provider.dart';
8+
import '/services/auth/auth_exception.dart';
9+
910
class FirebaseAuthProvider implements AuthProvider {
1011
@override
1112
Future<void> initialize() async {

‎lib/services/cloud/cloud_note.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import 'package:cloud_firestore/cloud_firestore.dart';
2-
import 'package:mynotes/services/cloud/cloud_storage_constants.dart';
32
import 'package:flutter/cupertino.dart';
43

4+
import '/services/cloud/cloud_storage_constants.dart';
5+
56
@immutable
67
class CloudNote {
78
final String documentId;

‎lib/services/cloud/firebase_cloud_storgae.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import 'package:cloud_firestore/cloud_firestore.dart';
44
import 'package:firebase_auth/firebase_auth.dart';
55
import 'package:firebase_storage/firebase_storage.dart';
66
import 'package:intl/intl.dart';
7-
import 'package:mynotes/services/cloud/cloud_note.dart';
8-
import 'package:mynotes/services/cloud/cloud_storage_constants.dart';
9-
import 'package:mynotes/services/cloud/cloud_storage_exception.dart';
7+
8+
import '/services/cloud/cloud_note.dart';
9+
import '/services/cloud/cloud_storage_constants.dart';
10+
import '/services/cloud/cloud_storage_exception.dart';
1011

1112
class FirebaseCloudStorage {
1213
final notes = FirebaseFirestore.instance.collection('notes');

‎lib/utilities/dialogs/cannot_share_empty_not_dialog.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:mynotes/extentions/buildcontext/loc.dart';
3-
import 'package:mynotes/utilities/dialogs/generic_dialog.dart';
2+
3+
import '/extentions/buildcontext/loc.dart';
4+
import '/utilities/dialogs/generic_dialog.dart';
45

56
Future<void> showCannotShareEmptyNoteDialog(BuildContext context) {
67
return showGenericDialog<void>(

‎lib/utilities/dialogs/comming_soon.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import 'package:flutter/material.dart';
2+
23
import 'package:google_fonts/google_fonts.dart';
3-
import 'package:mynotes/config/size_config.dart';
4-
import 'package:mynotes/constants/colors.dart';
5-
import 'package:mynotes/widget/popup.dart';
4+
5+
import '/config/size_config.dart';
6+
import '/constants/colors.dart';
7+
import '/widget/popup.dart';
68

79
commingSoon(BuildContext context) {
810
showDialog(

‎lib/utilities/dialogs/delete_dialog.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/cupertino.dart';
2-
import 'package:mynotes/extentions/buildcontext/loc.dart';
3-
import 'package:mynotes/utilities/dialogs/generic_dialog.dart';
2+
3+
import '/extentions/buildcontext/loc.dart';
4+
import '/utilities/dialogs/generic_dialog.dart';
45

56
Future<bool> showDeleteDialog(BuildContext context) {
67
return showGenericDialog<bool>(

‎lib/utilities/dialogs/error_dialog.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:mynotes/extentions/buildcontext/loc.dart';
3-
import 'package:mynotes/utilities/dialogs/generic_dialog.dart';
2+
3+
import '/extentions/buildcontext/loc.dart';
4+
import '/utilities/dialogs/generic_dialog.dart';
45

56
Future<void> showErrorDialog(
67
BuildContext context,

‎lib/utilities/dialogs/logout_dialog.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/cupertino.dart';
2-
import 'package:mynotes/extentions/buildcontext/loc.dart';
3-
import 'package:mynotes/utilities/dialogs/generic_dialog.dart';
2+
3+
import '/extentions/buildcontext/loc.dart';
4+
import '/utilities/dialogs/generic_dialog.dart';
45

56
Future<bool> showLogOutDialog(BuildContext context) {
67
return showGenericDialog<bool>(

‎lib/utilities/dialogs/password_reset.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart';
2-
import 'package:mynotes/extentions/buildcontext/loc.dart';
3-
import 'package:mynotes/utilities/dialogs/generic_dialog.dart';
2+
3+
import '/extentions/buildcontext/loc.dart';
4+
import '/utilities/dialogs/generic_dialog.dart';
45

56
Future<void> showPasswordResetSentDialog(BuildContext context) {
67
return showGenericDialog(

‎lib/utilities/internet_snak_bar.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import 'package:flutter/material.dart';
22
import 'package:google_fonts/google_fonts.dart';
33
import 'package:lottie/lottie.dart';
4-
import 'package:mynotes/config/size_config.dart';
5-
import 'package:mynotes/constants/colors.dart';
64
import 'package:overlay_support/overlay_support.dart';
75

6+
import '/config/size_config.dart';
7+
import '/constants/colors.dart';
8+
89
class InternetSnackBar {
910
static void showTopSnackBar(BuildContext context) {
1011
// cusotom bottom snackbar

‎lib/views/chat/chat_home_page.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import 'package:flutter/material.dart';
22
import 'package:google_fonts/google_fonts.dart';
3-
import 'package:mynotes/config/size_config.dart';
4-
import 'package:mynotes/constants/colors.dart';
5-
import 'package:mynotes/constants/routes.dart';
3+
4+
import '/config/size_config.dart';
5+
import '/constants/colors.dart';
6+
import '/constants/routes.dart';
67

78
class ChatView extends StatelessWidget {
89
const ChatView({

‎lib/views/chat/chat_room.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_iconly/flutter_iconly.dart';
33
import 'package:google_fonts/google_fonts.dart';
4-
import 'package:mynotes/config/size_config.dart';
5-
import 'package:mynotes/constants/colors.dart';
4+
5+
import '/config/size_config.dart';
6+
import '/constants/colors.dart';
67

78
class ChatRoom extends StatelessWidget {
89
const ChatRoom({super.key});

‎lib/views/forgot_password_view.dart

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
33
import 'package:google_fonts/google_fonts.dart';
4-
import 'package:mynotes/config/size_config.dart';
5-
import 'package:mynotes/constants/colors.dart';
6-
import 'package:mynotes/extentions/buildcontext/loc.dart';
7-
import 'package:mynotes/services/auth/bloc/auth_bloc.dart';
8-
import 'package:mynotes/services/auth/bloc/auth_event.dart';
9-
import 'package:mynotes/services/auth/bloc/auth_state.dart';
10-
import 'package:mynotes/utilities/dialogs/error_dialog.dart';
11-
import 'package:mynotes/utilities/dialogs/password_reset.dart';
4+
5+
import '/config/size_config.dart';
6+
import '/constants/colors.dart';
7+
import '/extentions/buildcontext/loc.dart';
8+
import '/services/auth/bloc/auth_bloc.dart';
9+
import '/services/auth/bloc/auth_event.dart';
10+
import '/services/auth/bloc/auth_state.dart';
11+
import '/utilities/dialogs/error_dialog.dart';
12+
import '/utilities/dialogs/password_reset.dart';
1213

1314
class ForgotPasswordView extends StatefulWidget {
1415
const ForgotPasswordView({Key? key}) : super(key: key);

‎lib/views/home/home.dart

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import 'package:connectivity_plus/connectivity_plus.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
44
import 'package:google_fonts/google_fonts.dart';
5-
import 'package:mynotes/config/size_config.dart';
6-
import 'package:mynotes/constants/colors.dart';
7-
import 'package:mynotes/constants/routes.dart';
8-
import 'package:mynotes/services/auth/bloc/auth_event.dart';
9-
import 'package:mynotes/utilities/internet_snak_bar.dart';
10-
import 'package:mynotes/views/login_view.dart';
11-
import 'package:mynotes/widget/slider.dart';
12-
import '../../services/auth/bloc/auth_bloc.dart';
5+
6+
import '/config/size_config.dart';
7+
import '/constants/colors.dart';
8+
import '/constants/routes.dart';
9+
import '/services/auth/bloc/auth_event.dart';
10+
import '/utilities/internet_snak_bar.dart';
11+
import '/views/login_view.dart';
12+
import '/widget/slider.dart';
13+
import '/services/auth/bloc/auth_bloc.dart';
1314

1415
class NewNotesView extends StatefulWidget {
1516
const NewNotesView({super.key});

‎lib/views/home/search_view.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import 'package:cloud_firestore/cloud_firestore.dart';
22
import 'package:flutter/material.dart';
33
import 'package:google_fonts/google_fonts.dart';
44
import 'package:iconsax/iconsax.dart';
5-
import 'package:mynotes/config/size_config.dart';
6-
import 'package:mynotes/constants/colors.dart';
7-
import 'package:mynotes/widget/download.dart';
85
import 'package:velocity_x/velocity_x.dart';
96

7+
import '/config/size_config.dart';
8+
import '/constants/colors.dart';
9+
import '/widget/download.dart';
10+
1011
class SearchView extends StatefulWidget {
1112
const SearchView({super.key});
1213

‎lib/views/login_view.dart

+10-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ import 'package:flutter/material.dart';
33
import 'package:flutter_bloc/flutter_bloc.dart';
44
import 'package:google_fonts/google_fonts.dart';
55
import 'package:iconsax/iconsax.dart';
6-
import 'package:mynotes/config/size_config.dart';
7-
import 'package:mynotes/constants/colors.dart';
8-
import 'package:mynotes/extentions/buildcontext/loc.dart';
9-
import 'package:mynotes/services/auth/auth_exception.dart';
10-
import 'package:mynotes/services/auth/bloc/auth_bloc.dart';
11-
import 'package:mynotes/services/auth/bloc/auth_event.dart';
12-
import 'package:mynotes/services/auth/bloc/auth_state.dart';
13-
import 'package:mynotes/utilities/dialogs/error_dialog.dart';
14-
import 'package:mynotes/utilities/internet_snak_bar.dart';
6+
7+
import '/config/size_config.dart';
8+
import '/constants/colors.dart';
9+
import '/extentions/buildcontext/loc.dart';
10+
import '/services/auth/auth_exception.dart';
11+
import '/services/auth/bloc/auth_bloc.dart';
12+
import '/services/auth/bloc/auth_event.dart';
13+
import '/services/auth/bloc/auth_state.dart';
14+
import '/utilities/dialogs/error_dialog.dart';
15+
import '/utilities/internet_snak_bar.dart';
1516

1617
class LoginView extends StatefulWidget {
1718
const LoginView({Key? key}) : super(key: key);

‎lib/views/notes/create_update_note_view.dart

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ import 'package:flutter_svg/svg.dart';
88
import 'package:google_fonts/google_fonts.dart';
99
import 'package:iconsax/iconsax.dart';
1010
import 'package:image_picker/image_picker.dart';
11-
import 'package:mynotes/config/size_config.dart';
12-
import 'package:mynotes/constants/colors.dart';
13-
import 'package:mynotes/extentions/buildcontext/loc.dart';
14-
import 'package:mynotes/services/auth/auth_serivce.dart';
15-
import 'package:mynotes/utilities/dialogs/cannot_share_empty_not_dialog.dart';
16-
import 'package:mynotes/utilities/generic/get_argumnets.dart';
17-
import 'package:mynotes/services/cloud/cloud_note.dart';
18-
import 'package:mynotes/services/cloud/firebase_cloud_storgae.dart';
1911
import 'package:share_plus/share_plus.dart';
2012

13+
import '/config/size_config.dart';
14+
import '/constants/colors.dart';
15+
import '/extentions/buildcontext/loc.dart';
16+
import '/services/auth/auth_serivce.dart';
17+
import '/utilities/dialogs/cannot_share_empty_not_dialog.dart';
18+
import '/utilities/generic/get_argumnets.dart';
19+
import '/services/cloud/cloud_note.dart';
20+
import '/services/cloud/firebase_cloud_storgae.dart';
21+
2122
class CreateUpdateNoteView extends StatefulWidget {
2223
const CreateUpdateNoteView({Key? key}) : super(key: key);
2324

0 commit comments

Comments
 (0)