From a0ed987c83fe8c17202a83b69bc116f6d0a9d740 Mon Sep 17 00:00:00 2001 From: RemRem Date: Wed, 15 Nov 2023 10:56:15 +0100 Subject: [PATCH] rename folder to lowercase + rewrite imports --- .metadata | 25 ++------ lib/{Modele => modele}/activity.dart | 0 .../Api => modele/api}/i_data_strategy.dart | 0 .../Api => modele/api}/request_api.dart | 2 +- lib/{Modele => modele}/manager_file.dart | 0 lib/{Modele => modele}/user.dart | 0 lib/{Modele => modele}/utile/login_user.dart | 2 +- lib/{Modele => modele}/utile/signup_user.dart | 2 +- lib/{View => view}/activity/activity.dart | 0 lib/{View => view}/home/activity_tracker.dart | 0 lib/{View => view}/home/home_view.dart | 4 +- .../home/mobile/mobile_Activity_view.dart | 0 .../home/mobile/mobile_homeview.dart | 0 .../home/notification_view.dart | 0 .../home/web/web_Activity_view.dart | 0 lib/{View => view}/home/web/web_homeview.dart | 0 lib/{View => view}/login/login_view.dart | 2 +- .../login/mobile}/android_login_view.dart | 0 .../login/mobile}/android_signup_view.dart | 0 lib/{View => view}/login/signup_view.dart | 2 +- .../login/web/web_login_view.dart | 0 .../login/web/web_signup_view.dart | 0 .../main_tab/main_tab_view.dart | 0 lib/{View => view}/main_tab/select_view.dart | 0 lib/{View => view}/map/my_map.dart | 0 lib/{View => view}/map/test.dart | 0 .../on_boarding/on_boarding_view.dart | 62 +++++++++---------- .../on_boarding/started_view.dart | 2 +- .../profile/mobile/mobile_profile_view.dart | 0 lib/{View => view}/profile/profile_view.dart | 0 .../profile/web/web_profile_view.dart | 0 lib/{View => view}/test/page_test.dart | 6 +- 32 files changed, 45 insertions(+), 64 deletions(-) rename lib/{Modele => modele}/activity.dart (100%) rename lib/{Modele/Api => modele/api}/i_data_strategy.dart (100%) rename lib/{Modele/Api => modele/api}/request_api.dart (99%) rename lib/{Modele => modele}/manager_file.dart (100%) rename lib/{Modele => modele}/user.dart (100%) rename lib/{Modele => modele}/utile/login_user.dart (94%) rename lib/{Modele => modele}/utile/signup_user.dart (87%) rename lib/{View => view}/activity/activity.dart (100%) rename lib/{View => view}/home/activity_tracker.dart (100%) rename lib/{View => view}/home/home_view.dart (79%) rename lib/{View => view}/home/mobile/mobile_Activity_view.dart (100%) rename lib/{View => view}/home/mobile/mobile_homeview.dart (100%) rename lib/{View => view}/home/notification_view.dart (100%) rename lib/{View => view}/home/web/web_Activity_view.dart (100%) rename lib/{View => view}/home/web/web_homeview.dart (100%) rename lib/{View => view}/login/login_view.dart (89%) rename lib/{View/login/Mobile => view/login/mobile}/android_login_view.dart (100%) rename lib/{View/login/Mobile => view/login/mobile}/android_signup_view.dart (100%) rename lib/{View => view}/login/signup_view.dart (90%) rename lib/{View => view}/login/web/web_login_view.dart (100%) rename lib/{View => view}/login/web/web_signup_view.dart (100%) rename lib/{View => view}/main_tab/main_tab_view.dart (100%) rename lib/{View => view}/main_tab/select_view.dart (100%) rename lib/{View => view}/map/my_map.dart (100%) rename lib/{View => view}/map/test.dart (100%) rename lib/{View => view}/on_boarding/on_boarding_view.dart (68%) rename lib/{View => view}/on_boarding/started_view.dart (99%) rename lib/{View => view}/profile/mobile/mobile_profile_view.dart (100%) rename lib/{View => view}/profile/profile_view.dart (100%) rename lib/{View => view}/profile/web/web_profile_view.dart (100%) rename lib/{View => view}/test/page_test.dart (98%) diff --git a/.metadata b/.metadata index acfc1cf..3408c2c 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e" + revision: "d211f42860350d914a5ad8102f9ec32764dc6d06" channel: "stable" project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - - platform: android - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - - platform: ios - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: linux - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - - platform: macos - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - - platform: web - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - - platform: windows - create_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e - base_revision: 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 # User provided section diff --git a/lib/Modele/activity.dart b/lib/modele/activity.dart similarity index 100% rename from lib/Modele/activity.dart rename to lib/modele/activity.dart diff --git a/lib/Modele/Api/i_data_strategy.dart b/lib/modele/api/i_data_strategy.dart similarity index 100% rename from lib/Modele/Api/i_data_strategy.dart rename to lib/modele/api/i_data_strategy.dart diff --git a/lib/Modele/Api/request_api.dart b/lib/modele/api/request_api.dart similarity index 99% rename from lib/Modele/Api/request_api.dart rename to lib/modele/api/request_api.dart index 5fd3783..0b50eeb 100644 --- a/lib/Modele/Api/request_api.dart +++ b/lib/modele/api/request_api.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:smartfit_app_mobile/Modele/Api/i_data_strategy.dart'; +import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart'; import 'package:http/http.dart' as http; import 'package:tuple/tuple.dart'; diff --git a/lib/Modele/manager_file.dart b/lib/modele/manager_file.dart similarity index 100% rename from lib/Modele/manager_file.dart rename to lib/modele/manager_file.dart diff --git a/lib/Modele/user.dart b/lib/modele/user.dart similarity index 100% rename from lib/Modele/user.dart rename to lib/modele/user.dart diff --git a/lib/Modele/utile/login_user.dart b/lib/modele/utile/login_user.dart similarity index 94% rename from lib/Modele/utile/login_user.dart rename to lib/modele/utile/login_user.dart index 261e75c..f10314c 100644 --- a/lib/Modele/utile/login_user.dart +++ b/lib/modele/utile/login_user.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:crypto/crypto.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:smartfit_app_mobile/Modele/Api/request_api.dart'; +import 'package:smartfit_app_mobile/modele/api/request_api.dart'; import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart'; import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:tuple/tuple.dart'; diff --git a/lib/Modele/utile/signup_user.dart b/lib/modele/utile/signup_user.dart similarity index 87% rename from lib/Modele/utile/signup_user.dart rename to lib/modele/utile/signup_user.dart index dd678b4..d398b8c 100644 --- a/lib/Modele/utile/signup_user.dart +++ b/lib/modele/utile/signup_user.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crypto/crypto.dart'; -import 'package:smartfit_app_mobile/Modele/Api/request_api.dart'; +import 'package:smartfit_app_mobile/modele/api/request_api.dart'; import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart'; import 'package:tuple/tuple.dart'; diff --git a/lib/View/activity/activity.dart b/lib/view/activity/activity.dart similarity index 100% rename from lib/View/activity/activity.dart rename to lib/view/activity/activity.dart diff --git a/lib/View/home/activity_tracker.dart b/lib/view/home/activity_tracker.dart similarity index 100% rename from lib/View/home/activity_tracker.dart rename to lib/view/home/activity_tracker.dart diff --git a/lib/View/home/home_view.dart b/lib/view/home/home_view.dart similarity index 79% rename from lib/View/home/home_view.dart rename to lib/view/home/home_view.dart index 3779dbd..0b6f1cb 100644 --- a/lib/View/home/home_view.dart +++ b/lib/view/home/home_view.dart @@ -1,7 +1,7 @@ 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'; +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}); diff --git a/lib/View/home/mobile/mobile_Activity_view.dart b/lib/view/home/mobile/mobile_Activity_view.dart similarity index 100% rename from lib/View/home/mobile/mobile_Activity_view.dart rename to lib/view/home/mobile/mobile_Activity_view.dart diff --git a/lib/View/home/mobile/mobile_homeview.dart b/lib/view/home/mobile/mobile_homeview.dart similarity index 100% rename from lib/View/home/mobile/mobile_homeview.dart rename to lib/view/home/mobile/mobile_homeview.dart diff --git a/lib/View/home/notification_view.dart b/lib/view/home/notification_view.dart similarity index 100% rename from lib/View/home/notification_view.dart rename to lib/view/home/notification_view.dart diff --git a/lib/View/home/web/web_Activity_view.dart b/lib/view/home/web/web_Activity_view.dart similarity index 100% rename from lib/View/home/web/web_Activity_view.dart rename to lib/view/home/web/web_Activity_view.dart diff --git a/lib/View/home/web/web_homeview.dart b/lib/view/home/web/web_homeview.dart similarity index 100% rename from lib/View/home/web/web_homeview.dart rename to lib/view/home/web/web_homeview.dart diff --git a/lib/View/login/login_view.dart b/lib/view/login/login_view.dart similarity index 89% rename from lib/View/login/login_view.dart rename to lib/view/login/login_view.dart index 55fe3bb..dc272ab 100644 --- a/lib/View/login/login_view.dart +++ b/lib/view/login/login_view.dart @@ -1,5 +1,5 @@ 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/mobile/android_login_view.dart'; import 'package:smartfit_app_mobile/view/login/web/web_login_view.dart'; import 'package:flutter/material.dart'; diff --git a/lib/View/login/Mobile/android_login_view.dart b/lib/view/login/mobile/android_login_view.dart similarity index 100% rename from lib/View/login/Mobile/android_login_view.dart rename to lib/view/login/mobile/android_login_view.dart diff --git a/lib/View/login/Mobile/android_signup_view.dart b/lib/view/login/mobile/android_signup_view.dart similarity index 100% rename from lib/View/login/Mobile/android_signup_view.dart rename to lib/view/login/mobile/android_signup_view.dart diff --git a/lib/View/login/signup_view.dart b/lib/view/login/signup_view.dart similarity index 90% rename from lib/View/login/signup_view.dart rename to lib/view/login/signup_view.dart index a94d65b..1b651c3 100644 --- a/lib/View/login/signup_view.dart +++ b/lib/view/login/signup_view.dart @@ -1,5 +1,5 @@ import 'package:responsive_builder/responsive_builder.dart'; -import 'package:smartfit_app_mobile/view/login/Mobile/android_signup_view.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'; diff --git a/lib/View/login/web/web_login_view.dart b/lib/view/login/web/web_login_view.dart similarity index 100% rename from lib/View/login/web/web_login_view.dart rename to lib/view/login/web/web_login_view.dart diff --git a/lib/View/login/web/web_signup_view.dart b/lib/view/login/web/web_signup_view.dart similarity index 100% rename from lib/View/login/web/web_signup_view.dart rename to lib/view/login/web/web_signup_view.dart diff --git a/lib/View/main_tab/main_tab_view.dart b/lib/view/main_tab/main_tab_view.dart similarity index 100% rename from lib/View/main_tab/main_tab_view.dart rename to lib/view/main_tab/main_tab_view.dart diff --git a/lib/View/main_tab/select_view.dart b/lib/view/main_tab/select_view.dart similarity index 100% rename from lib/View/main_tab/select_view.dart rename to lib/view/main_tab/select_view.dart diff --git a/lib/View/map/my_map.dart b/lib/view/map/my_map.dart similarity index 100% rename from lib/View/map/my_map.dart rename to lib/view/map/my_map.dart diff --git a/lib/View/map/test.dart b/lib/view/map/test.dart similarity index 100% rename from lib/View/map/test.dart rename to lib/view/map/test.dart diff --git a/lib/View/on_boarding/on_boarding_view.dart b/lib/view/on_boarding/on_boarding_view.dart similarity index 68% rename from lib/View/on_boarding/on_boarding_view.dart rename to lib/view/on_boarding/on_boarding_view.dart index 02e6008..1c59bf0 100644 --- a/lib/View/on_boarding/on_boarding_view.dart +++ b/lib/view/on_boarding/on_boarding_view.dart @@ -16,15 +16,12 @@ class _OnBoardingViewState extends State { @override void initState() { - super.initState(); controller.addListener(() { - selectPage = controller.page?.round() ?? 0; + selectPage = controller.page?.round() ?? 0; - setState(() { - - }); + setState(() {}); }); } @@ -39,7 +36,7 @@ class _OnBoardingViewState extends State { "title": "Persévérez", "subtitle": "Continuez à persévérer pour atteindre vos objectifs. La douleur n'est que temporaire. Si vous abandonnez maintenant, vous souffrirez éternellement.", - "image": "assets/img/on_2.svg" + "image": "assets/img/on_2.svg" }, { "title": "Laissez-nous piloter, mettez simplement votre Suunto", @@ -51,7 +48,6 @@ class _OnBoardingViewState extends State { @override Widget build(BuildContext context) { - return Scaffold( backgroundColor: TColor.white, body: Stack( @@ -62,52 +58,52 @@ class _OnBoardingViewState extends State { itemCount: pageArr.length, itemBuilder: (context, index) { var pObj = pageArr[index] as Map? ?? {}; - return OnBoardingPage(pObj: pObj) ; + return OnBoardingPage(pObj: pObj); }), - SizedBox( width: 120, height: 120, child: Stack( alignment: Alignment.center, children: [ - SizedBox( width: 70, height: 70, child: CircularProgressIndicator( color: TColor.primaryColor1, - value: (selectPage + 1) / 3 , + value: (selectPage + 1) / 3, strokeWidth: 2, ), ), - Container( - margin: const EdgeInsets.symmetric(horizontal: 30, vertical: 30), + margin: + const EdgeInsets.symmetric(horizontal: 30, vertical: 30), width: 60, height: 60, - decoration: BoxDecoration(color: TColor.primaryColor1, borderRadius: BorderRadius.circular(35)), - child: IconButton(icon: Icon( Icons.navigate_next, color: TColor.white, ), onPressed: (){ - - if(selectPage < 2) { - selectPage = selectPage + 1; - controller.animateToPage(selectPage, duration: const Duration(milliseconds: 200), curve: Curves.bounceInOut); - setState(() { - - }); - - }else{ - Navigator.push(context, + decoration: BoxDecoration( + color: TColor.primaryColor1, + borderRadius: BorderRadius.circular(35)), + child: IconButton( + icon: Icon( + Icons.navigate_next, + color: TColor.white, + ), + onPressed: () { + if (selectPage < 2) { + selectPage = selectPage + 1; + controller.animateToPage(selectPage, + duration: const Duration(milliseconds: 200), + curve: Curves.bounceInOut); + setState(() {}); + } else { + Navigator.push( + context, MaterialPageRoute( - builder: (context) => const SignUpView() - ) - ); + builder: (context) => const SignUpView())); } - - },), + }, + ), ), - - ], ), ) @@ -115,4 +111,4 @@ class _OnBoardingViewState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/View/on_boarding/started_view.dart b/lib/view/on_boarding/started_view.dart similarity index 99% rename from lib/View/on_boarding/started_view.dart rename to lib/view/on_boarding/started_view.dart index d091d59..710c905 100644 --- a/lib/View/on_boarding/started_view.dart +++ b/lib/view/on_boarding/started_view.dart @@ -65,4 +65,4 @@ class _StartedViewState extends State { )), ); } -} \ No newline at end of file +} diff --git a/lib/View/profile/mobile/mobile_profile_view.dart b/lib/view/profile/mobile/mobile_profile_view.dart similarity index 100% rename from lib/View/profile/mobile/mobile_profile_view.dart rename to lib/view/profile/mobile/mobile_profile_view.dart diff --git a/lib/View/profile/profile_view.dart b/lib/view/profile/profile_view.dart similarity index 100% rename from lib/View/profile/profile_view.dart rename to lib/view/profile/profile_view.dart diff --git a/lib/View/profile/web/web_profile_view.dart b/lib/view/profile/web/web_profile_view.dart similarity index 100% rename from lib/View/profile/web/web_profile_view.dart rename to lib/view/profile/web/web_profile_view.dart diff --git a/lib/View/test/page_test.dart b/lib/view/test/page_test.dart similarity index 98% rename from lib/View/test/page_test.dart rename to lib/view/test/page_test.dart index d3a098f..9ac922e 100644 --- a/lib/View/test/page_test.dart +++ b/lib/view/test/page_test.dart @@ -7,9 +7,9 @@ import 'package:path_provider/path_provider.dart'; import 'package:file_picker/file_picker.dart'; import 'package:provider/provider.dart'; import 'dart:io'; -import 'package:smartfit_app_mobile/Modele/Api/i_data_strategy.dart'; -import 'package:smartfit_app_mobile/Modele/manager_file.dart'; -import 'package:smartfit_app_mobile/Modele/user.dart'; +import 'package:smartfit_app_mobile/modele/api/i_data_strategy.dart'; +import 'package:smartfit_app_mobile/modele/manager_file.dart'; +import 'package:smartfit_app_mobile/modele/user.dart'; import 'package:smartfit_app_mobile/modele/api/request_api.dart'; import 'package:tuple/tuple.dart';