clean du merge

lib/common_widget/info.dart

@@ -3,7 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
 
 class Info extends StatelessWidget {
-  Info({Key? key}) : super(key: key);
+  const Info({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:smartfit_app_mobile/modele/user.dart';
-import 'package:smartfit_app_mobile/view/main_tab/main_tab_view.dart';
+import 'package:smartfit_app_mobile/view/login/signup_view.dart';
 import 'package:smartfit_app_mobile/common/colo_extension.dart';
 
 void main() {
@@ -36,7 +36,7 @@ class MyApp extends StatelessWidget {
           primaryColor: TColor.primaryColor1,
           fontFamily: "Poppins"),
       //home: const StartedView(),
-      home: const MainTabView(),
+      home: const SignUpView(),
     );
   }
 }

lib/view/activity/activity.dart

@@ -0,0 +1,16 @@
+import 'package:responsive_builder/responsive_builder.dart';
+import 'package:smartfit_app_mobile/view/home/mobile/mobile_Activity_view.dart';
+import 'package:smartfit_app_mobile/view/home/web/web_Activity_view.dart';
+import 'package:flutter/material.dart';
+
+class Activity extends StatelessWidget {
+  const Activity({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return ScreenTypeLayout.builder(
+      mobile: (_) => const MobileActivity(),
+      desktop: (_) => const WebActivity(),
+    );
+  }
+}

lib/view/home/home_view.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:responsive_builder/responsive_builder.dart';
+import 'package:smartfit_app_mobile/view/home/mobile/mobile_homeview.dart';
+import 'package:smartfit_app_mobile/view/home/web/web_homeview.dart';
+
+class HomeView extends StatefulWidget {
+  const HomeView({super.key});
+
+  @override
+  State<HomeView> createState() => _HomeViewState();
+}
+
+class _HomeViewState extends State<HomeView> {
+  @override
+  Widget build(BuildContext context) {
+    return ScreenTypeLayout.builder(
+      mobile: (_) => const MobileHomeView(),
+      desktop: (_) => const WebHomeView(),
+    );
+  }
+}

lib/view/login/login_view.dart

@@ -0,0 +1,20 @@
+import 'package:responsive_builder/responsive_builder.dart';
+import 'package:smartfit_app_mobile/view/login/mobile/android_login_view.dart';
+import 'package:smartfit_app_mobile/view/login/web/web_login_view.dart';
+import 'package:flutter/material.dart';
+
+class LoginView extends StatefulWidget {
+  const LoginView({super.key});
+
+  @override
+  State<LoginView> createState() => _LoginViewState();
+}
+
+class _LoginViewState extends State<LoginView> {
+  @override
+  Widget build(BuildContext context) {
+    return ScreenTypeLayout.builder(
+        mobile: (_) => const MobileLoginView(),
+        desktop: (_) => const WebLoginView());
+  }
+}

lib/view/login/signup_view.dart

@@ -0,0 +1,21 @@
+import 'package:responsive_builder/responsive_builder.dart';
+import 'package:smartfit_app_mobile/view/login/mobile/android_signup_view.dart';
+import 'package:flutter/material.dart';
+import 'package:smartfit_app_mobile/view/login/web/web_signup_view.dart';
+
+class SignUpView extends StatefulWidget {
+  const SignUpView({super.key});
+
+  @override
+  State<SignUpView> createState() => _SignUpViewState();
+}
+
+class _SignUpViewState extends State<SignUpView> {
+  @override
+  Widget build(BuildContext context) {
+    return ScreenTypeLayout.builder(
+      mobile: (_) => const MobileSignUpView(),
+      desktop: (_) => const WebSignUpView(),
+    );
+  }
+}

lib/view/main_tab/main_tab_view.dart

@@ -4,7 +4,6 @@ import 'package:smartfit_app_mobile/common_widget/tab_button.dart';
 import 'package:smartfit_app_mobile/view/activity/activity.dart';
 import 'package:smartfit_app_mobile/view/home/home_view.dart';
 import 'package:flutter/material.dart';
-import 'package:smartfit_app_mobile/view/activity/list_activity.dart';
 import 'package:smartfit_app_mobile/view/map/my_map.dart';
 import 'package:smartfit_app_mobile/view/profile/profile_view.dart';
 

lib/view/profile/profile_view.dart

@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:smartfit_app_mobile/view/profile/mobile/mobile_profile_view.dart';
+import 'package:smartfit_app_mobile/view/profile/web/web_profile_view.dart';
+import 'package:responsive_builder/responsive_builder.dart';
+
+class ProfileView extends StatefulWidget {
+  const ProfileView({super.key});
+
+  @override
+  State<ProfileView> createState() => _ProfileViewState();
+}
+
+class _ProfileViewState extends State<ProfileView> {
+  @override
+  Widget build(BuildContext context) {
+    return ScreenTypeLayout.builder(
+      mobile: (_) => const MobileProfileView(),
+      desktop: (_) => const WebProfileView(),
+    );
+  }
+}

lib/view/test/page_test.dart

@@ -412,5 +412,4 @@ class _MyHomePageState extends State<MyHomePage> {
 }*/
 ========
 }
-*/*/
+*/
->>>>>>>> origin/master:lib/view/page_test.dart