diff --git a/Sources/dafl_project_flutter/.metadata b/Sources/dafl_project_flutter/.metadata
index 700134a..e1179a6 100644
--- a/Sources/dafl_project_flutter/.metadata
+++ b/Sources/dafl_project_flutter/.metadata
@@ -21,6 +21,18 @@ migration:
- platform: ios
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ - platform: linux
+ create_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ base_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ - platform: macos
+ create_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ base_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ - platform: web
+ create_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ base_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ - platform: windows
+ create_revision: 18a827f3933c19f51862dde3fa472197683249d6
+ base_revision: 18a827f3933c19f51862dde3fa472197683249d6
# User provided section
diff --git a/Sources/dafl_project_flutter/android/.gitignore b/Sources/dafl_project_flutter/android/.gitignore
deleted file mode 100644
index 6f56801..0000000
--- a/Sources/dafl_project_flutter/android/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
-
-# Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
-**/*.keystore
-**/*.jks
diff --git a/Sources/dafl_project_flutter/android/app/src/debug/AndroidManifest.xml b/Sources/dafl_project_flutter/android/app/src/debug/AndroidManifest.xml
deleted file mode 100644
index 9066d9d..0000000
--- a/Sources/dafl_project_flutter/android/app/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/Sources/dafl_project_flutter/android/app/src/profile/AndroidManifest.xml b/Sources/dafl_project_flutter/android/app/src/profile/AndroidManifest.xml
deleted file mode 100644
index 9066d9d..0000000
--- a/Sources/dafl_project_flutter/android/app/src/profile/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/Sources/dafl_project_flutter/assets/fonts/CustomIcons.ttf b/Sources/dafl_project_flutter/assets/fonts/CustomIcons.ttf
new file mode 100644
index 0000000..4a2de6e
Binary files /dev/null and b/Sources/dafl_project_flutter/assets/fonts/CustomIcons.ttf differ
diff --git a/Sources/dafl_project_flutter/ios/.gitignore b/Sources/dafl_project_flutter/ios/.gitignore
deleted file mode 100644
index 7a7f987..0000000
--- a/Sources/dafl_project_flutter/ios/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3
diff --git a/Sources/dafl_project_flutter/lib/main.dart b/Sources/dafl_project_flutter/lib/main.dart
index b858580..8b4cab8 100644
--- a/Sources/dafl_project_flutter/lib/main.dart
+++ b/Sources/dafl_project_flutter/lib/main.dart
@@ -24,7 +24,7 @@ class MyApp extends StatelessWidget {
child: MaterialApp(
debugShowCheckedModeBanner: false,
title: 'Flutter Demo',
- home: MainHomePage(),
+ home: HomePage(),
),
);
}
@@ -205,13 +205,12 @@ class _SplashState extends State {
@override
void initState() {
- // TODO: implement initState
super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
Timer(Duration(seconds: 2), () {
Navigator.pushReplacement(context,
MaterialPageRoute(builder:
- (context) =>MainMainPage()
+ (context) =>MainPage()
)
);
});
diff --git a/Sources/dafl_project_flutter/lib/presentation/custom_icons_icons.dart b/Sources/dafl_project_flutter/lib/presentation/custom_icons_icons.dart
new file mode 100644
index 0000000..a715b0b
--- /dev/null
+++ b/Sources/dafl_project_flutter/lib/presentation/custom_icons_icons.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/widgets.dart';
+
+class CustomIcons {
+ CustomIcons._();
+
+ static const _kFontFam = 'CustomIcons';
+ static const String? _kFontPkg = null;
+
+ static const IconData podium_outline = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData spot = IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData podium = IconData(0xe803, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData spot_outline = IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+}
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 46ffd77..737d33c 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
@@ -3,12 +3,12 @@ import 'package:flutter/material.dart';
import '../sign_in/p_sign_in.dart';
import '../sign_up/p_sign_up.dart';
-class MainHomePage extends StatefulWidget {
+class HomePage extends StatefulWidget {
@override
- State createState() => _MainHomePage();
+ State createState() => _HomePageState();
}
-class _MainHomePage extends State {
+class _HomePageState extends State {
@override
Widget build(BuildContext context) {
double height = MediaQuery.of(context).size.height;
@@ -68,7 +68,7 @@ class _MainHomePage extends State {
reverseDuration: Duration(milliseconds: 300),
type: PageTransitionType.rightToLeftJoined,
childCurrent: widget,
- child: MainSignUpPage()),
+ child: SignUpPage()),
);
},
child: Text("S’INSCRIRE MAINTENANT",
@@ -85,7 +85,7 @@ class _MainHomePage extends State {
reverseDuration: Duration(milliseconds: 300),
type: PageTransitionType.rightToLeftJoined,
childCurrent: widget,
- child: MainSignInPage()),
+ child: SignInPage()),
);
},
child: Container(
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 f088c82..bbdb13e 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,27 +1,28 @@
+import 'package:dafl_project_flutter/presentation/custom_icons_icons.dart';
import 'package:flutter/material.dart';
import './w_settings.dart';
import './w_spot.dart';
import './w_discovery.dart';
import './w_profile.dart';
-class MainMainPage extends StatefulWidget {
- const MainMainPage({Key? key}) : super(key: key);
+class MainPage extends StatefulWidget {
+ const MainPage({Key? key}) : super(key: key);
@override
- State createState() => _MainMainPageState();
+ State createState() => _MainPageState();
}
-class _MainMainPageState extends State {
+class _MainPageState extends State {
int _index = 2;
int get index => _index;
final screens = [
- MainProfilPage(),
- DiscoveryPage(),
- Spots(),
+ ProfilWidget(),
+ DiscoveryWidget(),
+ SpotsWidget(),
Center(child: Text('Tops'),),
Center(child: Text('Messages'),),
- ParametrePage(),
+ SettingsWidget(),
];
@override
Widget build(BuildContext context) {
@@ -45,13 +46,13 @@ class _MainMainPageState extends State {
selectedIndex: index,
height: height*0.1,
onDestinationSelected: (index) =>
- setState(() => this._index = index),
+ setState(() => _index = index),
backgroundColor: Color(0xFF232123),
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(Icons.bookmark_border, color: Colors.grey), selectedIcon: Icon(Icons.bookmark_border, color: Colors.white), label: 'Spots',),
- NavigationDestination(icon: Icon(Icons.bookmark_border, color: Colors.grey,), label: 'Tops', selectedIcon: Icon(Icons.bookmark_border, color: Colors.white,),),
+ NavigationDestination(icon: Icon(CustomIcons.spot, color: Colors.grey), selectedIcon: Icon(CustomIcons.spot_outline, color: Colors.white), label: 'Spots',),
+ NavigationDestination(icon: Icon(CustomIcons.podium_outline, 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 e1a34d7..6eef2c1 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
@@ -17,20 +17,20 @@ class User{
-class DaflCard extends StatefulWidget {
+class CardWidget extends StatefulWidget {
final String urlImage;
final bool isFront;
- const DaflCard({
+ const CardWidget({
Key? key,
required this.urlImage,
required this.isFront,
}) : super(key: key);
@override
- State createState() => _DaflCardState();
+ State createState() => _CardWidgetState();
}
-class _DaflCardState extends State{
+class _CardWidgetState extends State{
@override
void initState() {
super.initState();
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 a2c118e..0939e2b 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,14 +1,14 @@
import 'package:fluttericon/font_awesome5_icons.dart';
import 'package:flutter/material.dart';
-class DiscoveryPage extends StatefulWidget {
- const DiscoveryPage({Key? key}) : super(key: key);
+class DiscoveryWidget extends StatefulWidget {
+ const DiscoveryWidget({Key? key}) : super(key: key);
@override
- State createState() => _DiscoveryPageState();
+ State createState() => _DiscoveryWidgetState();
}
-class _DiscoveryPageState extends State {
+class _DiscoveryWidgetState extends State {
@override
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
index 3df6659..b38784c 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
@@ -2,14 +2,14 @@ import './w_settings.dart';
import './w_spot.dart';
import 'package:flutter/material.dart';
-class MainProfilPage extends StatefulWidget {
- const MainProfilPage({Key? key}) : super(key: key);
+class ProfilWidget extends StatefulWidget {
+ const ProfilWidget({Key? key}) : super(key: key);
@override
- State createState() => _MainProfilPageState();
+ State createState() => _ProfilWidgetState();
}
-class _MainProfilPageState extends State {
+class _ProfilWidgetState extends State {
@override
@@ -94,7 +94,7 @@ class _MainProfilPageState extends State {
),// background// foreground
),
onPressed: () {
- Navigator.push(context,MaterialPageRoute(builder: (context)=> Destination()));
+ Navigator.push(context,MaterialPageRoute(builder: (context)=> DisplayInfoWidget()));
},
child: Row(
children: [
@@ -189,7 +189,7 @@ class _MainProfilPageState extends State {
),// background// foreground
),
onPressed: () {
- Navigator.push(context,MaterialPageRoute(builder: (context)=> ParametrePage()));
+ Navigator.push(context,MaterialPageRoute(builder: (context)=> SettingsWidget()));
},
child: Row(
children: [
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 5d1391a..19db674 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,13 +1,13 @@
import 'package:flutter/material.dart';
-class ParametrePage extends StatefulWidget {
- const ParametrePage({Key? key}) : super(key: key);
+class SettingsWidget extends StatefulWidget {
+ const SettingsWidget({Key? key}) : super(key: key);
@override
- State createState() => _ParametrePageState();
+ State createState() => _SettingsWidgetState();
}
-class _ParametrePageState extends State {
+class _SettingsWidgetState extends State {
@override
Widget build(BuildContext context) {
double height = MediaQuery.of(context).size.height;
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 f1fd131..bca1061 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
@@ -7,14 +7,14 @@ import '../../../main.dart';
import 'package:rive/rive.dart';
import 'package:animations/animations.dart';
-class Spots extends StatefulWidget {
- const Spots({Key? key}) : super(key: key);
+class SpotsWidget extends StatefulWidget {
+ const SpotsWidget({Key? key}) : super(key: key);
@override
- State createState() => _SpotsState();
+ State createState() => _SpotsWidgetState();
}
-class _SpotsState extends State {
+class _SpotsWidgetState extends State {
final user = User(
chanteur: 'Khali',
@@ -60,10 +60,10 @@ class _SpotsState extends State {
closedElevation: 0,
transitionDuration: Duration(milliseconds: 400),
closedBuilder: (context, openWidget){
- return PreviewInfo();
+ return PreviewInfoWidget();
},
openBuilder: (context, closeWidget){
- return Destination();
+ return DisplayInfoWidget();
},
),
),
@@ -167,7 +167,7 @@ class _SpotsState extends State {
return Stack(
children: urlImages
- .map((urlImage) => DaflCard(
+ .map((urlImage) => CardWidget(
urlImage: urlImage,
isFront: urlImages.last == urlImage,
))
@@ -179,7 +179,7 @@ class _SpotsState extends State {
-class Destination extends StatelessWidget{
+class DisplayInfoWidget extends StatelessWidget{
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -654,7 +654,7 @@ class Destination extends StatelessWidget{
}
}
-class PreviewInfo extends StatelessWidget{
+class PreviewInfoWidget extends StatelessWidget{
@override
Widget build(BuildContext context) {
double height = MediaQuery.of(context).size.height;
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 ded3e36..2ead9e9 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
@@ -4,14 +4,14 @@ import 'package:page_transition/page_transition.dart';
import '../../../main.dart';
import '../sign_up/p_sign_up.dart';
-class MainSignInPage extends StatefulWidget {
- const MainSignInPage({Key? key}) : super(key: key);
+class SignInPage extends StatefulWidget {
+ const SignInPage({Key? key}) : super(key: key);
@override
- State createState() => _MainSignInPageState();
+ State createState() => _SignInPageState();
}
-class _MainSignInPageState extends State {
+class _SignInPageState extends State {
var boxColor = Colors.white;
@override
@@ -209,7 +209,7 @@ class _MainSignInPageState extends State {
PageTransition(
type: PageTransitionType.fade,
childCurrent: widget,
- child: MainSignUpPage()),
+ child: SignUpPage()),
);
},
child: Text(' s’inscrire', style: TextStyle(color: Color(0xFF406DE1), fontWeight: FontWeight.normal, fontSize: 16),
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 4290770..167928d 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
@@ -3,14 +3,14 @@ import 'package:page_transition/page_transition.dart';
import '../home/p_home.dart';
import '../sign_in/p_sign_in.dart';
-class MainSignUpPage extends StatefulWidget {
- const MainSignUpPage({Key? key}) : super(key: key);
+class SignUpPage extends StatefulWidget {
+ const SignUpPage({Key? key}) : super(key: key);
@override
- State createState() => _MainSignUpPageState();
+ State createState() => _SignUpPageState();
}
-class _MainSignUpPageState extends State {
+class _SignUpPageState extends State {
Color boxColor = Colors.white;
bool isHovering = false;
@@ -238,7 +238,7 @@ class _MainSignUpPageState extends State {
reverseDuration: Duration(milliseconds: 300),
type: PageTransitionType.leftToRightJoined,
childCurrent: widget,
- child: MainHomePage()),
+ child: HomePage()),
);
},
child:Ink(
@@ -279,7 +279,7 @@ class _MainSignUpPageState extends State {
PageTransition(
type: PageTransitionType.fade,
childCurrent: widget,
- child: MainSignInPage()),
+ child: SignInPage()),
);
},
child: Text(' se connecter', style: TextStyle(color: Color(0xFF406DE1), fontWeight: FontWeight.normal, fontSize: 16),
diff --git a/Sources/dafl_project_flutter/pubspec.yaml b/Sources/dafl_project_flutter/pubspec.yaml
index 2bd77ba..7f5cd52 100644
--- a/Sources/dafl_project_flutter/pubspec.yaml
+++ b/Sources/dafl_project_flutter/pubspec.yaml
@@ -75,6 +75,7 @@ flutter:
# To add assets to your application, add an assets section, like this:
assets:
- assets/images/
+ - assets/fonts/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware
@@ -101,5 +102,8 @@ flutter:
- family: Silkscreen
fonts:
- asset: assets/fonts/Silkscreen-Regular.ttf
+ - family: CustomIcons
+ fonts:
+ - asset: assets/fonts/CustomIcons.ttf
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages