From af850b03ad24c812cfff1cb2e79560cd4949a7b1 Mon Sep 17 00:00:00 2001 From: delanierlucas Date: Tue, 1 Nov 2022 12:17:13 +0100 Subject: [PATCH] dismissible discovery --- .../assets/images/EmptyDiscovery-Hint.png | Bin 16832 -> 16732 bytes .../dafl_project_flutter/lib/model/user.dart | 6 +++- .../lib/views/pages/main/p_conversation.dart | 1 + .../lib/views/pages/main/w_discovery.dart | 7 ++-- .../lib/views/pages/main/w_messages.dart | 2 +- .../lib/views/pages/sign_in/p_sign_in.dart | 33 +++++++++++------- 6 files changed, 33 insertions(+), 16 deletions(-) diff --git a/Sources/dafl_project_flutter/assets/images/EmptyDiscovery-Hint.png b/Sources/dafl_project_flutter/assets/images/EmptyDiscovery-Hint.png index 4cf47a23bb87f6aaa512f414d0b3a555bccc9fc3..8fd7351780fc8db3dbcf2452208e565398e85b0b 100644 GIT binary patch literal 16732 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⋖U|< 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 Yj>RgM-ZfSL4_sjIboFyt=akR{04C|6`~Uy| diff --git a/Sources/dafl_project_flutter/lib/model/user.dart b/Sources/dafl_project_flutter/lib/model/user.dart index b39ed09..2951e1d 100644 --- a/Sources/dafl_project_flutter/lib/model/user.dart +++ b/Sources/dafl_project_flutter/lib/model/user.dart @@ -1,4 +1,5 @@ import 'package:dafl_project_flutter/main.dart'; +import 'package:dafl_project_flutter/model/message.dart'; import 'conversation.dart'; import 'music.dart'; @@ -19,10 +20,13 @@ class User{ User.fromDatabase(this.idDafl, this.usernameDafl); - //lists Set likedUsers={}; List Discovery=[]; + List waitingConv=[]; + List confirmConv=[]; + + Music currentSong = Music('Couleurs','Khali','https://khaligidilit.com/assets/images/cover-LAI%CC%88LA-Khali.jpeg'); List Spots=[ Music('Couleurs','Khali','https://khaligidilit.com/assets/images/cover-LAI%CC%88LA-Khali.jpeg'), diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart index 81be0e6..30580f7 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart @@ -48,6 +48,7 @@ class _ConversationPageState extends State { height: height*0.92, width: double.infinity, child: ListView( + reverse: true, scrollDirection: Axis.vertical, children: [ Message('Adolescebat autem obstinatum propositum erga haec et similia multa scrutanda, stimulos admovente regina, quae abrupte mariti fortunas trudebat in exitium praeceps, cum eum potius lenitate feminea ad veritatis humanitatisque viam reducere utilia suadendo deberet, ut in Gordianorum actibus factitasse Maximini truculenti illius imperatoris rettulimus coniugem.', 0), 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 0028281..4926b0f 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 @@ -83,7 +83,7 @@ class _DiscoveryListState extends State { itemBuilder: (context, index){ int itemCount = MyApp().controller.currentUser.Discovery.length ?? 0; int reversedIndex = itemCount - 1 - index; - return Container( + return Dismissible(key: Key(MyApp().controller.currentUser.Discovery[reversedIndex].name), child: Container( margin: EdgeInsets.fromLTRB(0, 10, 0, 0), padding: EdgeInsets.fromLTRB(30, 0, 30, 0), child: Column( @@ -123,7 +123,10 @@ class _DiscoveryListState extends State { ], ) - ); + ), onDismissed: (direction) { + MyApp().controller.currentUser.Discovery.removeAt(reversedIndex); + }, + background: Container(color: Colors.red,),); } ), onRefresh: () async { refreshList(); diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart index 3c5db1a..6b9e4ea 100644 --- a/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart +++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart @@ -134,7 +134,7 @@ class MessagesButtonWidget extends StatelessWidget{ Container( color: Colors.transparent, - margin: EdgeInsets.fromLTRB(0, 5, 0, 0), + margin: EdgeInsets.fromLTRB(0, 0, 0, 0), child: Row( children: [ Container( 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 d646b4d..d6413fa 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,4 +1,5 @@ import 'dart:ui'; +import 'package:dafl_project_flutter/views/pages/main/p_main.dart'; import 'package:flutter/material.dart'; import 'package:page_transition/page_transition.dart'; import '../../../main.dart'; @@ -169,18 +170,7 @@ class _SignInPageState extends State { highlightColor: Colors.grey.shade100, splashColor: Color(0xFF406DE1), onTap: (){ - if(passwordTextField.text != "" && userNameTextField.text != ""){ - MyApp().controller.changeCurrentUser(MyApp().controller.createUser(userNameTextField.text, passwordTextField.text)); - Navigator.of(context).push( - PageTransition( - type: PageTransitionType.fade, - childCurrent: widget, - child: Splash()), - ); - } - else{ - print('probleme connexion'); - } + checkInformations(userNameTextField.text, passwordTextField.text); }, child:Ink( child: Align( @@ -237,4 +227,23 @@ class _SignInPageState extends State { ), ); } + + void checkInformations(String username,String password){ + if(username ==""){ + errorNotify(2, context); + } + else if(password ==""){ + errorNotify(4, context); + } + else{ + MyApp().controller.changeCurrentUser(MyApp().controller.createUser(userNameTextField.text, passwordTextField.text)); + Navigator.of(context).push( + PageTransition( + type: PageTransitionType.fade, + childCurrent: widget, + child: Splash()), + ); + + } + } }