From 7572f08eef54e6d22201f2bed0797fa4e9acaea6 Mon Sep 17 00:00:00 2001 From: felixmielcarek Date: Wed, 19 Oct 2022 19:41:07 +0200 Subject: [PATCH] Correction des imports. --- Sources/dafl_project_flutter/lib/main.dart | 11 +-- .../lib/views/assets/icons/icons.dart | 2 +- .../lib/views/pages/home/p_home.dart | 11 +-- .../lib/views/pages/main/p_main.dart | 21 ++--- .../lib/views/pages/main/w_card.dart | 6 +- .../lib/views/pages/main/w_discovery.dart | 8 +- .../lib/views/pages/main/w_profil.dart | 9 +- .../lib/views/pages/main/w_settings.dart | 2 - .../lib/views/pages/main/w_spot.dart | 14 +-- .../lib/views/pages/sign_in/p_sign_in.dart | 10 +-- .../lib/views/pages/sign_up/p_sign_up.dart | 8 +- Sources/dafl_project_flutter/pubspec.lock | 90 +++++++++++++++++++ Sources/dafl_project_flutter/pubspec.yaml | 6 ++ 13 files changed, 128 insertions(+), 70 deletions(-) diff --git a/Sources/dafl_project_flutter/lib/main.dart b/Sources/dafl_project_flutter/lib/main.dart index 4997267..dd3a800 100644 --- a/Sources/dafl_project_flutter/lib/main.dart +++ b/Sources/dafl_project_flutter/lib/main.dart @@ -1,17 +1,14 @@ import 'dart:async'; -import 'dart:math'; -import 'package:daflmusic/mainPage/main_mainpage.dart'; +import 'package:fluttertoast/fluttertoast.dart'; +import 'dart:math'; +import './views/pages/home/p_home.dart'; +import './views/pages/main/p_main.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:daflmusic/signInPage/main_signIn_page.dart'; -import 'package:daflmusic/homePage/main_homepage.dart'; -import 'package:daflmusic/signUpPage/main_signUp_page.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:rive/rive.dart'; - void main() { runApp(MyApp()); } diff --git a/Sources/dafl_project_flutter/lib/views/assets/icons/icons.dart b/Sources/dafl_project_flutter/lib/views/assets/icons/icons.dart index e12b998..64ba0f4 100644 --- a/Sources/dafl_project_flutter/lib/views/assets/icons/icons.dart +++ b/Sources/dafl_project_flutter/lib/views/assets/icons/icons.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; class CustomIcons { - MyFlutterApp._(); + CustomIcons._(); static const _kFontFam = 'CustomIcons'; static const String? _kFontPkg = null; diff --git a/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart b/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart index 477276a..c4421fe 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart @@ -1,12 +1,9 @@ -import 'dart:io'; - +import 'package:page_transition/page_transition.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:page_transition/page_transition.dart'; -import 'package:daflmusic/signInPage/main_signIn_page.dart'; -import 'package:daflmusic/homePage/main_homepage.dart'; -import 'package:daflmusic/signUpPage/main_signUp_page.dart'; -import 'package:animations/animations.dart'; + +import '../sign_in/p_sign_in.dart'; +import '../sign_up/p_sign_up.dart'; class MainHomePage extends StatefulWidget { @override diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart b/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart index 27cd149..2c137fc 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart @@ -1,15 +1,10 @@ -import 'package:daflmusic/icons.dart'; -import 'package:daflmusic/widgets/spots.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:page_transition/page_transition.dart'; -import 'package:daflmusic/signInPage/main_signIn_page.dart'; -import 'package:daflmusic/homePage/main_homepage.dart'; -import 'package:daflmusic/signUpPage/main_signUp_page.dart'; - -import '../discoveryPage/discoveryPage.dart'; -import '../profilPage/MainProfilPage.dart'; -import '../profilPage/parametre_page.dart'; +import '../../assets/icons/icons.dart'; +import './w_settings.dart'; +import './w_spot.dart'; +import './w_discovery.dart'; +import './w_profil.dart'; +import 'package:flutter/cupertino.dart'; class MainMainPage extends StatefulWidget { const MainMainPage({Key? key}) : super(key: key); @@ -57,8 +52,8 @@ class _MainMainPageState extends State { destinations: [ NavigationDestination(icon: Icon(Icons.person_outline, color: Colors.grey,), label: 'Profil', selectedIcon: Icon(Icons.person, color: Colors.white,),), NavigationDestination(icon: Icon(Icons.bookmark_border, color: Colors.grey,), selectedIcon: Icon(Icons.bookmark, color: Colors.white,), label: 'Discovery'), - NavigationDestination(icon: Icon(MyFlutterApp.Spots_outline, color: Colors.grey), selectedIcon: Icon(MyFlutterApp.Spots, color: Colors.white), label: 'Spots',), - NavigationDestination(icon: Icon(MyFlutterApp.podium_outine, color: Colors.grey,), label: 'Tops', selectedIcon: Icon(MyFlutterApp.podium, color: Colors.white,),), + NavigationDestination(icon: Icon(CustomIcons.Spots_outline, color: Colors.grey), selectedIcon: Icon(CustomIcons.Spots, color: Colors.white), label: 'Spots',), + NavigationDestination(icon: Icon(CustomIcons.podium_outine, color: Colors.grey,), label: 'Tops', selectedIcon: Icon(CustomIcons.podium, color: Colors.white,),), NavigationDestination(icon: Icon(Icons.mail_outline, color: Colors.grey,), label: 'Messages', selectedIcon: Icon(Icons.email, color: Colors.white,),), ], ), diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_card.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_card.dart index 02912fc..e1a34d7 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_card.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_card.dart @@ -1,8 +1,8 @@ import 'dart:math'; - -import 'package:daflmusic/main.dart'; import 'package:flutter/material.dart'; +import '../../../main.dart'; import 'package:provider/provider.dart'; + class User{ final String chanteur; final String titre; @@ -35,7 +35,7 @@ class _DaflCardState extends State{ void initState() { super.initState(); - WidgetsBinding.instance!.addPostFrameCallback((_) { + WidgetsBinding.instance.addPostFrameCallback((_) { final size = MediaQuery.of(context).size; final provider = Provider.of(context, listen: false); diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart index c2ddaca..a2c118e 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart @@ -1,9 +1,5 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:fluttericon/font_awesome5_icons.dart'; -import 'package:provider/provider.dart'; - -import '../main.dart'; +import 'package:flutter/material.dart'; class DiscoveryPage extends StatefulWidget { const DiscoveryPage({Key? key}) : super(key: key); @@ -17,8 +13,6 @@ class _DiscoveryPageState extends State { @override Widget build(BuildContext context) { - double height = MediaQuery.of(context).size.height; - double width = MediaQuery.of(context).size.width; return Scaffold( backgroundColor: Color(0xFF141414), resizeToAvoidBottomInset: false, diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_profil.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_profil.dart index abd2f0a..c862712 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_profil.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_profil.dart @@ -1,10 +1,6 @@ -import 'package:daflmusic/profilPage/parametre_page.dart'; -import 'package:flutter/cupertino.dart'; +import './w_settings.dart'; +import './w_spot.dart'; import 'package:flutter/material.dart'; -import 'package:page_transition/page_transition.dart'; - -import '../icons.dart'; -import '../widgets/spots.dart'; class MainProfilPage extends StatefulWidget { const MainProfilPage({Key? key}) : super(key: key); @@ -19,7 +15,6 @@ class _MainProfilPageState extends State { @override Widget build(BuildContext context) { double height = MediaQuery.of(context).size.height; - double width = MediaQuery.of(context).size.width; return Container( color: Color(0xFF141414), diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart index d9aa065..5d1391a 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart @@ -1,5 +1,3 @@ -import 'package:daflmusic/mainPage/main_mainpage.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class ParametrePage extends StatefulWidget { diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_spot.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_spot.dart index 936b1df..f1fd131 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_spot.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_spot.dart @@ -1,17 +1,11 @@ import 'dart:ui'; - -import 'package:animations/animations.dart'; -import 'package:daflmusic/homePage/main_homepage.dart'; -import 'package:daflmusic/main.dart'; -import 'package:daflmusic/mainPage/main_mainpage.dart'; -import 'package:daflmusic/widgets/DaflCard.dart'; -import 'package:flutter/cupertino.dart'; +import './w_card.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/src/painting/gradient.dart' as gradiant; import 'package:provider/provider.dart'; -import 'package:fluttertoast/fluttertoast.dart'; +import '../../../main.dart'; import 'package:rive/rive.dart'; -import 'package:flutter/src/painting/gradient.dart' as gradiant; - +import 'package:animations/animations.dart'; class Spots extends StatefulWidget { const Spots({Key? key}) : super(key: key); diff --git a/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart b/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart index b3f5755..ded3e36 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart @@ -1,12 +1,8 @@ -import 'package:daflmusic/mainPage/main_mainpage.dart'; -import 'package:flutter/cupertino.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; -import 'package:daflmusic/signInPage/main_signIn_page.dart'; -import 'package:daflmusic/homePage/main_homepage.dart'; -import 'package:daflmusic/signUpPage/main_signUp_page.dart'; import 'package:page_transition/page_transition.dart'; - -import '../main.dart'; +import '../../../main.dart'; +import '../sign_up/p_sign_up.dart'; class MainSignInPage extends StatefulWidget { const MainSignInPage({Key? key}) : super(key: key); diff --git a/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart b/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart index 4fb6fc7..4290770 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart @@ -1,11 +1,7 @@ -import 'dart:io'; - -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:page_transition/page_transition.dart'; -import 'package:daflmusic/signInPage/main_signIn_page.dart'; -import 'package:daflmusic/homePage/main_homepage.dart'; -import 'package:daflmusic/signUpPage/main_signUp_page.dart'; +import '../home/p_home.dart'; +import '../sign_in/p_sign_in.dart'; class MainSignUpPage extends StatefulWidget { const MainSignUpPage({Key? key}) : super(key: key); diff --git a/Sources/dafl_project_flutter/pubspec.lock b/Sources/dafl_project_flutter/pubspec.lock index 9295504..59717b3 100644 --- a/Sources/dafl_project_flutter/pubspec.lock +++ b/Sources/dafl_project_flutter/pubspec.lock @@ -1,6 +1,13 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + animations: + dependency: "direct main" + description: + name: animations + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.7" async: dependency: transitive description: @@ -67,6 +74,53 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + fluttericon: + dependency: "direct main" + description: + name: fluttericon + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + fluttertoast: + dependency: "direct main" + description: + name: fluttertoast + url: "https://pub.dartlang.org" + source: hosted + version: "8.1.1" + graphs: + dependency: transitive + description: + name: graphs + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + http: + dependency: transitive + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.13.5" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.2" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.4" lints: dependency: transitive description: @@ -95,6 +149,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + page_transition: + dependency: "direct main" + description: + name: page_transition + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.9" path: dependency: transitive description: @@ -102,6 +170,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.2" + provider: + dependency: "direct main" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.4" + rive: + dependency: "direct main" + description: + name: rive + url: "https://pub.dartlang.org" + source: hosted + version: "0.9.1" sky_engine: dependency: transitive description: flutter @@ -149,6 +231,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.4.12" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" vector_math: dependency: transitive description: @@ -158,3 +247,4 @@ packages: version: "2.1.2" sdks: dart: ">=2.18.2 <3.0.0" + flutter: ">=3.0.0" diff --git a/Sources/dafl_project_flutter/pubspec.yaml b/Sources/dafl_project_flutter/pubspec.yaml index 104c23b..c24be82 100644 --- a/Sources/dafl_project_flutter/pubspec.yaml +++ b/Sources/dafl_project_flutter/pubspec.yaml @@ -36,6 +36,12 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 + page_transition: ^2.0.9 + provider: ^6.0.4 + fluttericon: ^2.0.0 + rive: ^0.9.1 + animations: ^2.0.7 + fluttertoast: ^8.1.1 dev_dependencies: flutter_test: