diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 279019c..7ae99d3 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -198,6 +198,13 @@
+
+
+
+
+
+
+
@@ -541,6 +548,7 @@
+
diff --git a/Sources/dafl_project_flutter/ios/Podfile.lock b/Sources/dafl_project_flutter/ios/Podfile.lock
index 6d41903..fb54b7d 100644
--- a/Sources/dafl_project_flutter/ios/Podfile.lock
+++ b/Sources/dafl_project_flutter/ios/Podfile.lock
@@ -5,6 +5,8 @@ PODS:
- fluttertoast (0.0.2):
- Flutter
- Toast
+ - home_indicator (0.0.1):
+ - Flutter
- path_provider_ios (0.0.1):
- Flutter
- Toast (4.0.0)
@@ -15,6 +17,7 @@ DEPENDENCIES:
- Flutter (from `Flutter`)
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+ - home_indicator (from `.symlinks/plugins/home_indicator/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- vibration (from `.symlinks/plugins/vibration/ios`)
@@ -29,6 +32,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_native_splash/ios"
fluttertoast:
:path: ".symlinks/plugins/fluttertoast/ios"
+ home_indicator:
+ :path: ".symlinks/plugins/home_indicator/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
vibration:
@@ -38,6 +43,7 @@ SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
fluttertoast: 74526702fea2c060ea55dde75895b7e1bde1c86b
+ home_indicator: 60c6a4b60d17173cd164c112eb9be37055b23af8
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
vibration: 7d883d141656a1c1a6d8d238616b2042a51a1241
diff --git a/Sources/dafl_project_flutter/lib/controller/controller.dart b/Sources/dafl_project_flutter/lib/controller/controller.dart
index 053e331..f4f943b 100644
--- a/Sources/dafl_project_flutter/lib/controller/controller.dart
+++ b/Sources/dafl_project_flutter/lib/controller/controller.dart
@@ -40,12 +40,12 @@ class Controller{
void changeUsernameCourant(String newName){
if(newName !=null){
- this.currentUser?.usernameDafl = newName;
+ this.currentUser.usernameDafl = newName;
}
}
void changePasswordCourant(String newPass){
if(newPass !=null){
- this.currentUser?.passwDafl = newPass;
+ this.currentUser.passwDafl = newPass;
}
}
}
diff --git a/Sources/dafl_project_flutter/lib/main.dart b/Sources/dafl_project_flutter/lib/main.dart
index 697a4bb..637078d 100644
--- a/Sources/dafl_project_flutter/lib/main.dart
+++ b/Sources/dafl_project_flutter/lib/main.dart
@@ -1,4 +1,5 @@
import 'dart:async';
+import 'dart:io';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:vibration/vibration.dart';
import 'dart:math';
@@ -9,6 +10,7 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:rive/rive.dart' as riv;
import '../controller/controller.dart';
+import 'package:home_indicator/home_indicator.dart';
import '../model/music.dart';
import 'model/music.dart';
import 'model/spot.dart';
@@ -22,12 +24,11 @@ void main() {
class MyApp extends StatelessWidget {
Controller controller = Controller();
-
// This widget is the root of your application.
@override
Widget build(BuildContext context){
Paint.enableDithering = true;
- SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+ SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.top]);
return ChangeNotifierProvider(
create: (context) => CardProvider(),
child: MaterialApp(
@@ -159,8 +160,8 @@ class CardProvider extends ChangeNotifier{
_position -= Offset(0, -_screenSize.height);
_discovery_card();
print("discovery");
- if(MyApp().controller.currentUser.Discovery.contains(MyApp().controller.currentUser.Spots2?.last.music)){
- MyApp().controller.currentUser.Discovery.remove(MyApp().controller.currentUser.Spots2?.last.music);
+ if(MyApp().controller.currentUser.Discovery.contains(MyApp().controller.currentUser.Spots2.last.music)){
+ MyApp().controller.currentUser.Discovery.remove(MyApp().controller.currentUser.Spots2.last.music);
Fluttertoast.showToast(
msg: 'Supprimer',
toastLength: Toast.LENGTH_SHORT,
@@ -203,109 +204,114 @@ class CardProvider extends ChangeNotifier{
maxWidth: 600,
maxHeight: double.infinity,
),
- builder: (context) => buildSheet(),);
+ builder: (context) => buildSheet(context),);
notifyListeners();
}
- Widget buildSheet(){
+ Widget buildSheet(context){
final messageTextField = TextEditingController();
- return Container(
- height: 550,
- width: 350,
- decoration: BoxDecoration(
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.4),
- offset: const Offset(
- 0,
- 0,
+ return SingleChildScrollView(
+ padding:
+ EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+ child: Container(
+ height: 500,
+ width: 380,
+ decoration: BoxDecoration(
+ boxShadow: [
+ BoxShadow(
+ color: Colors.black.withOpacity(0.4),
+ offset: const Offset(
+ 0,
+ 0,
+ ),
+ blurRadius: 10.0,
+ spreadRadius: 2.0,
),
- blurRadius: 10.0,
- spreadRadius: 2.0,
+ BoxShadow(
+ color: Colors.white.withOpacity(0.3),
+ offset: const Offset(0.0, 0.0),
+ blurRadius: 0.0,
+ spreadRadius: 0.0,
+ ),//BoxShadow//BoxShadow
+ ],
+ color: Color(0xFF232123),
+ borderRadius: BorderRadius.only(
+ topRight: Radius.circular(30),
+ topLeft: Radius.circular(30),
),
- BoxShadow(
- color: Colors.white.withOpacity(0.3),
- offset: const Offset(0.0, 0.0),
- blurRadius: 0.0,
- spreadRadius: 0.0,
- ),//BoxShadow//BoxShadow
- ],
- color: Color(0xFF232123),
- borderRadius: BorderRadius.only(
- topRight: Radius.circular(30),
- topLeft: Radius.circular(30),
),
- ),
- child: Padding(
- padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
- child: Column(
- children: [
-
- Container(
- height: 5,
- width: 130,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(20),
- color: Color(0xFF8A8A8A),
- ),
- ),
- SizedBox(height: 30,),
- Container(
- width: double.infinity,
- height: 300,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(20),
- color: Color(0xFF302C30),
+ child: Padding(
+ padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
+ child: Column(
+ children: [
+
+ Container(
+ height: 5,
+ width: 130,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(20),
+ color: Color(0xFF8A8A8A),
+ ),
),
- child: Padding(
- padding: EdgeInsets.all(20),
- child: TextField(
- controller: messageTextField,
- maxLength: 300,
- style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(1) ,fontSize: 17, fontWeight: FontWeight.w200),
- expands: true,
- maxLines: null,
- textInputAction: TextInputAction.send,
- decoration: InputDecoration(
- hintStyle: TextStyle(
- color: Colors.white,
+ SizedBox(height: 30,),
+ Container(
+ width: double.infinity,
+ height: 300,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(20),
+ color: Color(0xFF302C30),
+ ),
+ child: Padding(
+ padding: EdgeInsets.all(20),
+ child: TextField(
+ keyboardAppearance: Brightness.dark,
+ controller: messageTextField,
+ maxLength: 300,
+ style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(1) ,fontSize: 17, fontWeight: FontWeight.w200),
+ expands: true,
+ maxLines: null,
+ textInputAction: TextInputAction.send,
+ decoration: InputDecoration(
+ hintStyle: TextStyle(
+ color: Colors.white,
+ ),
+ border: InputBorder.none,
+ hintText: "Mon message",
),
- border: InputBorder.none,
- hintText: "Mon message",
),
),
),
- ),
- SizedBox(height: 20,),
- SizedBox(
- width: double.infinity,
- height: 70,
- child: ElevatedButton(
- onPressed: () {
- sendMessage(messageTextField.text, MyApp().controller.currentUser.Spots2.last.user);
- },
- style: ElevatedButton.styleFrom(
- primary: Color(0xFF3F1DC3),
- textStyle: TextStyle(
- fontSize: 20,
- fontWeight: FontWeight.bold),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(17)
+ SizedBox(height: 20,),
+ SizedBox(
+ width: double.infinity,
+ height: 70,
+ child: ElevatedButton(
+ onPressed: () {
+ sendMessage(messageTextField.text, MyApp().controller.currentUser.Spots2.last.user);
+ },
+ style: ElevatedButton.styleFrom(
+ primary: Color(0xFF3F1DC3),
+ textStyle: TextStyle(
+ fontSize: 20,
+ fontWeight: FontWeight.bold),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(17)
+ ),
+ ),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ Text("Envoyer"),
+ Opacity(opacity: 0.2,
+ child: Image.asset("assets/images/send_logo.png",),)
+ ],
),
),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.end,
- children: [
- Text("Envoyer"),
- Opacity(opacity: 0.2,
- child: Image.asset("assets/images/send_logo.png",),)
- ],
- ),
- ),
- )
- ],
+ )
+ ],
+ ),
),
- ),
+ ),
);
diff --git a/Sources/dafl_project_flutter/lib/model/user.dart b/Sources/dafl_project_flutter/lib/model/user.dart
index 56a269f..55eafc6 100644
--- a/Sources/dafl_project_flutter/lib/model/user.dart
+++ b/Sources/dafl_project_flutter/lib/model/user.dart
@@ -43,11 +43,11 @@ class User{
Map conversations={};
void addDiscovery(Music newmusic){
- if(MyApp().controller?.currentUser?.Discovery == null){
+ if(MyApp().controller.currentUser.Discovery == null){
}
else{
- MyApp().controller.currentUser?.Discovery.add(newmusic);
+ MyApp().controller.currentUser.Discovery.add(newmusic);
}
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 781c451..ac896cf 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
@@ -54,7 +54,7 @@ class _HomePageState extends State {
);
},
child: Text("S’INSCRIRE MAINTENANT",
- style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold),
+ style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold,fontFamily: "DMSans"),
textAlign: TextAlign.center,
),
),),
@@ -74,7 +74,7 @@ class _HomePageState extends State {
child: Align(
alignment: Alignment.center,
child: Text("SE CONNECTER",
- style: TextStyle(color: Colors.white ,fontSize: 17, fontWeight: FontWeight.bold),
+ style: TextStyle(color: Colors.white ,fontFamily: "DMSans",fontSize: 17, fontWeight: FontWeight.bold),
textAlign: TextAlign.center,
),
),
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 f16a930..be59dd0 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
@@ -164,14 +164,7 @@ class _ConversationPageState extends State {
color: Color(0xFF141414),
height: height*0.92,
width: double.infinity,
- child: /*ListView(
- reverse: true,
- scrollDirection: Axis.vertical,
- children: [
- messages;
- ],
- ),*/
- ListView.builder(
+ child: ListView.builder(
controller: listScrollController,
physics: BouncingScrollPhysics(),
itemCount: messages.length,
@@ -269,119 +262,127 @@ class _ConversationPageState extends State {
Widget buildSheet(){
String dropdownValue = list.first;
final messageTextField = TextEditingController();
- return Container(
- height: 550,
- width: double.infinity,
- decoration: BoxDecoration(
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.4),
- offset: const Offset(
- 0,
- 0,
+ return SingleChildScrollView(
+ padding:
+ EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+ child:Container(
+ height: 500,
+ width: double.infinity,
+ decoration: BoxDecoration(
+ boxShadow: [
+ BoxShadow(
+ color: Colors.black.withOpacity(0.4),
+ offset: const Offset(
+ 0,
+ 0,
+ ),
+ blurRadius: 10.0,
+ spreadRadius: 2.0,
),
- blurRadius: 10.0,
- spreadRadius: 2.0,
+ BoxShadow(
+ color: Colors.white.withOpacity(0.3),
+ offset: const Offset(0.0, 0.0),
+ blurRadius: 0.0,
+ spreadRadius: 0.0,
+ ),//BoxShadow//BoxShadow
+ ],
+ color: Color(0xFF232123),
+ borderRadius: BorderRadius.only(
+ topRight: Radius.circular(30),
+ topLeft: Radius.circular(30),
),
- BoxShadow(
- color: Colors.white.withOpacity(0.3),
- offset: const Offset(0.0, 0.0),
- blurRadius: 0.0,
- spreadRadius: 0.0,
- ),//BoxShadow//BoxShadow
- ],
- color: Color(0xFF232123),
- borderRadius: BorderRadius.only(
- topRight: Radius.circular(30),
- topLeft: Radius.circular(30),
),
- ),
- child: Padding(
- padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
+ child: Padding(
+ padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
- Container(
- height: 5,
- width: 130,
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(20),
- color: Color(0xFF8A8A8A),
- ),
- ),
- Padding(padding: EdgeInsets.fromLTRB(0, 20, 0, 20),
- child: Text('Signaler', style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.w500),),),
- Container(
- padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
- width: double.infinity,
- decoration: BoxDecoration(
- color: Colors.grey.shade900,
- borderRadius: BorderRadius.circular(15),
+ Container(
+ height: 5,
+ width: 130,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(20),
+ color: Color(0xFF8A8A8A),
+ ),
),
- child: Column(
- children: [
- Text('Vous êtes sur le point de signaler cet utilisateur. Veuillez renseigner le motif du signalement.', style: TextStyle(color: Colors.grey), textAlign: TextAlign.center,),
- Padding(padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
- child: DropdownButtonReason(),),
- ],
- ),),
- Padding(padding: EdgeInsets.fromLTRB(0, 20, 0, 20),
- child: Column(
- children: [
- Container(
- padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
- width: double.infinity,
- decoration: BoxDecoration(
- color: Colors.grey.withOpacity(0.07),
- borderRadius: BorderRadius.circular(15),
+ Padding(padding: EdgeInsets.fromLTRB(0, 20, 0, 20),
+ child: Text('Signaler', style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.w500),),),
+ Container(
+ padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
+ width: double.infinity,
+ decoration: BoxDecoration(
+ color: Colors.grey.shade900,
+ borderRadius: BorderRadius.circular(15),
+ ),
+ child: Column(
+ children: [
+ Text('Vous êtes sur le point de signaler cet utilisateur. Veuillez renseigner le motif du signalement.', style: TextStyle(color: Colors.grey), textAlign: TextAlign.center,),
+ Padding(padding: EdgeInsets.fromLTRB(0, 20, 0, 10),
+ child: DropdownButtonReason(),),
+ ],
+ ),),
+ Padding(padding: EdgeInsets.fromLTRB(0, 20, 0, 20),
+ child: Column(
+ children: [
+ Container(
+ padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
+ width: double.infinity,
+ decoration: BoxDecoration(
+ color: Colors.grey.withOpacity(0.07),
+ borderRadius: BorderRadius.circular(15),
+ ),
+ child: TextField(
+ keyboardAppearance: Brightness.dark,
+ onTap: (){
+ },
+ style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(1) ,fontSize: 17, fontWeight: FontWeight.w200),
+ maxLines: 3,
+ textInputAction: TextInputAction.done,
+ decoration: InputDecoration(
+ hintText: '* Commentaires',
+ hintStyle: TextStyle(
+ fontSize: 15,
+ color: Colors.white,
+ ),
+ border: InputBorder.none,
+ ),
+ ),),
+ ],
+ )),
+ Spacer(),
+ Padding(padding: EdgeInsets.fromLTRB(0, 0, 0, 50),
+ child: SizedBox(
+ width: double.infinity,
+ height: 70,
+ child: ElevatedButton(
+ onPressed: () {
+ },
+ style: ElevatedButton.styleFrom(
+ primary: Colors.red,
+ textStyle: TextStyle(
+ fontSize: 20,
+ fontWeight: FontWeight.bold),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(17)
+ ),
),
- child: TextField(
- style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(1) ,fontSize: 17, fontWeight: FontWeight.w200),
- maxLines: 3,
- textInputAction: TextInputAction.done,
- decoration: InputDecoration(
- hintText: '* Commentaires',
- hintStyle: TextStyle(
- fontSize: 15,
- color: Colors.white,
+ child: Stack(
+ children: [
+ Positioned(
+ top: -10,
+ right: 0,
+ child: Icon(Icons.report,size: 100,color: Colors.white.withOpacity(0.2),)),
+ Center(child: Text("Envoyer le signalement"),),
+ ],
),
- border: InputBorder.none,
),
),),
- ],
- )),
- Spacer(),
- Padding(padding: EdgeInsets.fromLTRB(0, 0, 0, 50),
- child: SizedBox(
- width: double.infinity,
- height: 70,
- child: ElevatedButton(
- onPressed: () {
- },
- style: ElevatedButton.styleFrom(
- primary: Colors.red,
- textStyle: TextStyle(
- fontSize: 20,
- fontWeight: FontWeight.bold),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(17)
- ),
- ),
- child: Row(
- crossAxisAlignment: CrossAxisAlignment.center,
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Text("Envoyer le signalement"),
- ],
- ),
- ),
- ),),
- ],
+ ],
+ ),
),
- ),
- );
+ ) ,);
}
}
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 4a083b9..c66bd71 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
@@ -41,11 +41,11 @@ class _MainPageState extends State {
),
child: ConstrainedBox(
constraints: BoxConstraints(
- minHeight: height*0.1,
+ minHeight: 100,
maxHeight: 100,
),
child: NavigationBar(
- animationDuration: Duration(seconds: 1),
+ animationDuration: Duration(microseconds: 800),
selectedIndex: index,
height: height*0.1,
onDestinationSelected: (index) =>
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 cb1fc71..57635cb 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
@@ -79,9 +79,9 @@ class _DiscoveryListState extends State {
}
Widget build(BuildContext context) {
return RefreshIndicator(child: ListView.builder(
- itemCount: MyApp().controller.currentUser.Discovery.length ?? 0,
+ itemCount: MyApp().controller.currentUser.Discovery.length,
itemBuilder: (context, index){
- int itemCount = MyApp().controller.currentUser.Discovery.length ?? 0;
+ int itemCount = MyApp().controller.currentUser.Discovery.length;
int reversedIndex = itemCount - 1 - index;
return Dismissible(
key: Key(MyApp().controller.currentUser.Discovery[reversedIndex].name),
@@ -113,8 +113,8 @@ class _DiscoveryListState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- Text(MyApp().controller.currentUser?.Discovery[reversedIndex].name ?? '',style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(1) ,fontSize: 20, fontWeight: FontWeight.w800),),
- Text(MyApp().controller.currentUser?.Discovery[reversedIndex].artist ?? '',style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(0.6) ,fontSize: 16, fontWeight: FontWeight.w400),),
+ Text(MyApp().controller.currentUser.Discovery[reversedIndex].name,style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(1) ,fontSize: 20, fontWeight: FontWeight.w800),),
+ Text(MyApp().controller.currentUser.Discovery[reversedIndex].artist,style: TextStyle(fontFamily: 'DMSans', color: Colors.white.withOpacity(0.6) ,fontSize: 16, fontWeight: FontWeight.w400),),
],
),),
@@ -128,7 +128,7 @@ class _DiscoveryListState extends State {
), onDismissed: (direction) {
if(direction == DismissDirection.startToEnd)
- MyApp().controller.currentUser?.Discovery.removeAt(reversedIndex);
+ MyApp().controller.currentUser.Discovery.removeAt(reversedIndex);
},
background: Container(decoration: BoxDecoration(
image: DecorationImage(image: AssetImage("assets/images/delete_background.png"), fit: BoxFit.cover),
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 d62f9e9..c25f7d9 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
@@ -56,7 +56,7 @@ class _MainPageProfilState extends State {
margin: EdgeInsets.fromLTRB(30, 50, 0, 0),
child: Text(
"Profil",
- style: TextStyle(fontSize: 25, fontWeight: FontWeight.w600, color: Colors.white),),
+ style: TextStyle(fontSize: 25, fontWeight: FontWeight.w600, color: Colors.white, fontFamily: "DMSans"),),
),
Container(
margin: EdgeInsets.fromLTRB(0, 10, 0, 10),
@@ -76,7 +76,7 @@ class _MainPageProfilState extends State {
),
child: Center(
- child: Text(username![0] ?? '',
+ child: Text(username![0],
style: TextStyle(color: Colors.white ,fontSize: 60, fontWeight: FontWeight.w500),
textAlign: TextAlign.center,
),
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 ab0daa5..5c26591 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
@@ -10,8 +10,8 @@ class SettingsWidget extends StatefulWidget {
}
class _SettingsWidgetState extends State {
- final userNameTextField = TextEditingController(text: MyApp().controller.currentUser?.usernameDafl);
- final passwordTextField = TextEditingController(text: MyApp().controller.currentUser?.passwDafl);
+ final userNameTextField = TextEditingController(text: MyApp().controller.currentUser.usernameDafl);
+ final passwordTextField = TextEditingController(text: MyApp().controller.currentUser.passwDafl);
@override
Widget build(BuildContext context) {
double height = MediaQuery.of(context).size.height;
@@ -58,6 +58,7 @@ class _SettingsWidgetState extends State {
SizedBox(
width: 230,
child: TextField(
+ keyboardAppearance: Brightness.dark,
controller: userNameTextField,
style: TextStyle(color: Colors.white),
decoration: InputDecoration(
@@ -111,6 +112,7 @@ class _SettingsWidgetState extends State {
SizedBox(
width: 230,
child: TextField(
+ keyboardAppearance: Brightness.dark,
controller: passwordTextField,
obscureText: true,
style: TextStyle(color: Colors.white),
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 50d9e3a..be80471 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
@@ -74,6 +74,7 @@ class _SignInPageState extends State {
),
Padding(padding: EdgeInsets.fromLTRB(50, 0, 20, 0),
child: TextField(
+ keyboardAppearance: Brightness.dark,
controller: userNameTextField,
decoration: InputDecoration(
border: InputBorder.none,
@@ -118,6 +119,7 @@ class _SignInPageState extends State {
),Padding(padding: EdgeInsets.fromLTRB(50, 0, 20, 0),
child: TextField(
+ keyboardAppearance: Brightness.dark,
controller: passwordTextField,
obscureText: true,
decoration: InputDecoration(
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 e09ee2a..23572b2 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
@@ -75,6 +75,7 @@ class _SignUpPageState extends State {
),
Padding(padding: EdgeInsets.fromLTRB(50, 0, 20, 0),
child: TextField(
+ keyboardAppearance: Brightness.dark,
controller: userNameTextField,
decoration: InputDecoration(
border: InputBorder.none,
@@ -119,6 +120,7 @@ class _SignUpPageState extends State {
),Padding(padding: EdgeInsets.fromLTRB(50, 0, 20, 0),
child: TextField(
+ keyboardAppearance: Brightness.dark,
controller: passwordTextField,
obscureText: true,
decoration: InputDecoration(
diff --git a/Sources/dafl_project_flutter/pubspec.lock b/Sources/dafl_project_flutter/pubspec.lock
index 1ffe1de..d30318a 100644
--- a/Sources/dafl_project_flutter/pubspec.lock
+++ b/Sources/dafl_project_flutter/pubspec.lock
@@ -191,6 +191,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
+ home_indicator:
+ dependency: "direct main"
+ description:
+ name: home_indicator
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.2"
html:
dependency: transitive
description:
diff --git a/Sources/dafl_project_flutter/pubspec.yaml b/Sources/dafl_project_flutter/pubspec.yaml
index 12d9cee..ea03465 100644
--- a/Sources/dafl_project_flutter/pubspec.yaml
+++ b/Sources/dafl_project_flutter/pubspec.yaml
@@ -46,6 +46,7 @@ dependencies:
postgresql2: ^1.0.3
path_provider: ^2.0.11
font_awesome_flutter: ^10.2.1
+ home_indicator: ^2.0.2
dev_dependencies:
flutter_test: