Skip to content

Commit bdc27f9

Browse files
AntoinegtirAntoinegtir
committed
📐 reorganize architecture
1 parent 6dbbf22 commit bdc27f9

19 files changed

+48
-40
lines changed

‎client/lib/auth/signup.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import 'package:rebeal/permission/contact.dart';
55
import 'package:rebeal/animation/animation.dart';
66
import 'package:rebeal/helper/utility.dart';
77
import 'package:provider/provider.dart';
8-
import '../model/user.dart';
9-
import '../state/authState.dart';
8+
import '../model/user.module.dart';
9+
import '../state/auth.state.dart';
1010
import '../widget/custom/rippleButton.dart';
1111

1212
class Signup extends StatefulWidget {

‎client/lib/camera/camera.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
66
import 'package:flutter/services.dart';
77
import 'package:iconsax/iconsax.dart';
88
import 'package:provider/provider.dart';
9-
import 'package:rebeal/model/post.dart';
10-
import 'package:rebeal/model/user.dart';
11-
import 'package:rebeal/state/authState.dart';
9+
import 'package:rebeal/model/post.module.dart';
10+
import 'package:rebeal/model/user.module.dart';
11+
import 'package:rebeal/state/auth.state.dart';
1212
import '../main.dart';
1313
import 'package:firebase_database/firebase_database.dart';
1414
import 'package:firebase_storage/firebase_storage.dart';

‎client/lib/common/splash.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
22
import 'package:provider/provider.dart';
33
import 'package:rebeal/auth/name.dart';
44
import 'package:rebeal/helper/enum.dart';
5-
import 'package:rebeal/state/authState.dart';
5+
import 'package:rebeal/state/auth.state.dart';
66
import 'package:rebeal/pages/home.dart';
7-
import 'package:rebeal/state/profile_state.dart';
7+
import 'package:rebeal/state/profile.state.dart';
88

99
class SplashPage extends StatefulWidget {
1010
const SplashPage({super.key});

‎client/lib/helper/shared_prefrence_helper.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:convert';
22
import 'package:shared_preferences/shared_preferences.dart';
3-
import '../model/user.dart';
3+
import '../model/user.module.dart';
44

55
class SharedPreferenceHelper {
66
SharedPreferenceHelper._internal();

‎client/lib/model/post.dart ‎client/lib/model/post.module.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore_for_file: avoid_print
22

33
import 'package:flutter/src/widgets/basic.dart';
4-
import 'package:rebeal/model/user.dart';
4+
import 'package:rebeal/model/user.module.dart';
55

66
class PostModel {
77
String? key;

‎client/lib/model/user.dart ‎client/lib/model/user.module.dart

File renamed without changes.

‎client/lib/notification/notification.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:provider/provider.dart';
33
import 'package:rebeal/common/splash.dart';
4-
import 'package:rebeal/state/authState.dart';
4+
import 'package:rebeal/state/auth.state.dart';
55
import '../widget/custom/rippleButton.dart';
66

77
class NotifcationTest extends StatefulWidget {

‎client/lib/pages/edit.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter/cupertino.dart';
66
import 'package:flutter/material.dart';
77
import 'package:image_picker/image_picker.dart';
88
import 'package:provider/provider.dart';
9-
import 'package:rebeal/state/authState.dart';
9+
import 'package:rebeal/state/auth.state.dart';
1010
import 'package:image_cropper/image_cropper.dart';
1111

1212
class EditProfilePage extends StatefulWidget {

‎client/lib/pages/feed.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import 'package:flutter/cupertino.dart';
44
import 'package:flutter/material.dart';
55
import 'package:flutter/services.dart';
66
import 'package:provider/provider.dart';
7-
import 'package:rebeal/model/user.dart';
8-
import 'package:rebeal/state/authState.dart';
9-
import 'package:rebeal/state/searchState.dart';
7+
import 'package:rebeal/model/user.module.dart';
8+
import 'package:rebeal/state/auth.state.dart';
9+
import 'package:rebeal/state/search.state.dart';
1010
import 'package:rebeal/widget/list.dart';
1111
import 'package:rebeal/widget/share.dart';
1212
import '../styles/color.dart';

‎client/lib/pages/home.dart

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import 'package:flutter/rendering.dart';
55
import 'package:flutter/services.dart';
66
import 'package:provider/provider.dart';
77
import 'package:rebeal/camera/camera.dart';
8-
import 'package:rebeal/model/post.dart';
9-
import 'package:rebeal/model/user.dart';
10-
import 'package:rebeal/state/authState.dart';
11-
import 'package:rebeal/state/post.dart';
12-
import 'package:rebeal/state/searchState.dart';
8+
import 'package:rebeal/model/post.module.dart';
9+
import 'package:rebeal/model/user.module.dart';
10+
import 'package:rebeal/state/auth.state.dart';
11+
import 'package:rebeal/state/post.state.dart';
12+
import 'package:rebeal/state/search.state.dart';
1313
import 'package:rebeal/styles/color.dart';
1414
import 'package:rebeal/pages/myprofile.dart';
1515
import 'package:rebeal/widget/feedpost.dart';
@@ -192,7 +192,7 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
192192
tabs: [
193193
FadeInUp(
194194
child: Padding(
195-
padding: EdgeInsets.only(left: 20),
195+
padding: EdgeInsets.only(left: 10),
196196
child: Tab(
197197
child: Text(
198198
'My Friends',
@@ -207,7 +207,7 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
207207
padding: EdgeInsets.only(right: 0),
208208
child: Tab(
209209
child: Text(
210-
'Friends of Friends',
210+
'Friends',
211211
style: TextStyle(
212212
fontSize: 15,
213213
fontWeight: FontWeight.w600,

‎client/lib/pages/myprofile.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:animate_do/animate_do.dart';
22
import 'package:cached_network_image/cached_network_image.dart';
33
import 'package:flutter/material.dart';
44
import 'package:provider/provider.dart';
5-
import 'package:rebeal/state/authState.dart';
5+
import 'package:rebeal/state/auth.state.dart';
66
import 'package:rebeal/pages/settings.dart';
77
import 'package:rebeal/widget/memories.dart';
88
import 'package:rebeal/widget/share.dart';

‎client/lib/pages/profile.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import 'package:cached_network_image/cached_network_image.dart';
66
import 'package:flutter/cupertino.dart';
77
import 'package:flutter/material.dart';
88
import 'package:provider/provider.dart';
9-
import 'package:rebeal/model/post.dart';
10-
import 'package:rebeal/state/post.dart';
11-
import 'package:rebeal/state/profile_state.dart';
9+
import 'package:rebeal/model/post.module.dart';
10+
import 'package:rebeal/state/post.state.dart';
11+
import 'package:rebeal/state/profile.state.dart';
1212
import 'package:rebeal/styles/color.dart';
1313
import 'package:share_plus/share_plus.dart';
1414

15-
import '../model/user.dart';
15+
import '../model/user.module.dart';
1616

1717
class ProfilePage extends StatefulWidget {
1818
const ProfilePage({Key? key, required this.profileId, this.scaffoldKey})

‎client/lib/pages/settings.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart';
44
import 'package:flutter/material.dart';
55
import 'package:provider/provider.dart';
66
import 'package:rebeal/helper/utility.dart';
7-
import 'package:rebeal/state/authState.dart';
7+
import 'package:rebeal/state/auth.state.dart';
88
import 'package:rebeal/styles/color.dart';
99
import 'package:share_plus/share_plus.dart';
1010

‎client/lib/state/app.state.dart

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import 'package:flutter/material.dart';
2+
3+
class AppStates extends ChangeNotifier {
4+
bool _isBusy = false;
5+
bool get isbusy => _isBusy;
6+
7+
set isBusy(bool value) {
8+
if (value != _isBusy) {
9+
_isBusy = value;
10+
notifyListeners();
11+
}
12+
}
13+
}

‎client/lib/state/appState.dart

-5
This file was deleted.

‎client/lib/state/authState.dart ‎client/lib/state/auth.state.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'package:flutter/material.dart';
88
import 'package:rebeal/helper/enum.dart';
99
import 'package:rebeal/helper/shared_prefrence_helper.dart';
1010
import 'package:rebeal/helper/utility.dart';
11-
import 'package:rebeal/model/user.dart';
12-
import 'package:rebeal/state/appState.dart';
11+
import 'package:rebeal/model/user.module.dart';
12+
import 'package:rebeal/state/app.state.dart';
1313
import '../common/locator.dart';
1414
import 'package:path/path.dart' as path;
1515

‎client/lib/state/post.dart ‎client/lib/state/post.state.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import 'dart:async';
22
import 'package:firebase_database/firebase_database.dart';
33
import 'package:firebase_database/firebase_database.dart' as dabase;
44
import 'package:rebeal/helper/utility.dart';
5-
import 'package:rebeal/model/user.dart';
6-
import 'package:rebeal/state/appState.dart';
7-
import '../model/post.dart';
5+
import 'package:rebeal/model/user.module.dart';
6+
import 'package:rebeal/state/app.state.dart';
7+
import '../model/post.module.dart';
88

99
class PostState extends AppStates {
1010
bool isBusy = false;

‎client/lib/state/profile_state.dart ‎client/lib/state/profile.state.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:firebase_database/firebase_database.dart' as dabase;
55
import 'package:flutter/foundation.dart';
66
import 'package:rebeal/helper/enum.dart';
77
import 'package:rebeal/helper/utility.dart';
8-
import 'package:rebeal/model/user.dart';
8+
import 'package:rebeal/model/user.module.dart';
99

1010
class ProfileState extends ChangeNotifier {
1111
ProfileState(this.profileId) {

‎client/lib/state/searchState.dart ‎client/lib/state/search.state.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:firebase_database/firebase_database.dart';
22
import 'package:rebeal/helper/enum.dart';
33
import 'package:rebeal/helper/utility.dart';
4-
import 'package:rebeal/model/user.dart';
5-
import 'appState.dart';
4+
import 'package:rebeal/model/user.module.dart';
5+
import 'app.state.dart';
66

77
class SearchState extends AppStates {
88
bool isBusy = false;

0 commit comments

Comments
 (0)