From 3298c6b1ea22e0729dc598e4e5ed521463c8cb53 Mon Sep 17 00:00:00 2001 From: prince Date: Wed, 1 May 2024 22:19:01 +0530 Subject: [PATCH 1/3] Added individual --- lib/Screens/chat_screen.dart | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/Screens/chat_screen.dart b/lib/Screens/chat_screen.dart index ed0b270..19737f9 100644 --- a/lib/Screens/chat_screen.dart +++ b/lib/Screens/chat_screen.dart @@ -40,6 +40,13 @@ class _chat_screenState extends State { icon: 'Icons.person', isGroup: true, time: '1:20', + ), + chatmodel( + currentMessage: 'padhi karlo yarr', + name: 'your dost', + icon: 'Icons.person', + isGroup: false, + time: '8:20', ) ]; @override From e05bbfa8514237eaa330e0f68b1ced27b01cebc6 Mon Sep 17 00:00:00 2001 From: prince Date: Wed, 1 May 2024 22:25:31 +0530 Subject: [PATCH 2/3] Changed Background --- lib/Screens/chat_screen.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Screens/chat_screen.dart b/lib/Screens/chat_screen.dart index 19737f9..9fc274b 100644 --- a/lib/Screens/chat_screen.dart +++ b/lib/Screens/chat_screen.dart @@ -54,6 +54,7 @@ class _chat_screenState extends State { Widget build(BuildContext context) { return Scaffold( + backgroundColor: Colors.blueGrey, appBar: AppBar( automaticallyImplyLeading: false, title: Text('Chat Screen'), From 36986898ef2ade7ec5ef2c665665e573776bd56f Mon Sep 17 00:00:00 2001 From: prince Date: Wed, 1 May 2024 22:54:31 +0530 Subject: [PATCH 3/3] change in text color --- lib/Common_widgets/Custom_Box.dart | 4 ++-- lib/Screens/Login.dart | 8 ++++++-- lib/Screens/SignUp.dart | 20 +++++++++++++++----- lib/Screens/chat_screen.dart | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/Common_widgets/Custom_Box.dart b/lib/Common_widgets/Custom_Box.dart index 5407728..132e3c9 100644 --- a/lib/Common_widgets/Custom_Box.dart +++ b/lib/Common_widgets/Custom_Box.dart @@ -16,8 +16,8 @@ class Custom_Box extends StatefulWidget { final double left; final double right; final double bottom; - - Custom_Box({super.key, required this.controller,required this.prefixicon, this.prefixIconColor=Colors.blueAccent, required this.hintText,this.top=2.0, this.left=7, this.right=10,this.bottom=11}); + final TextStyle style; + Custom_Box({super.key, required this.controller,required this.prefixicon, this.prefixIconColor=Colors.blueAccent, required this.hintText,this.top=2.0, this.left=7, this.right=10,this.bottom=11,this.style = const TextStyle()}); @override State createState() => _Custom_BoxState(); diff --git a/lib/Screens/Login.dart b/lib/Screens/Login.dart index 7e302d2..38eb09f 100644 --- a/lib/Screens/Login.dart +++ b/lib/Screens/Login.dart @@ -50,14 +50,18 @@ class _LoginState extends State { prefixIconColor: Colors.blueAccent.shade700, controller:Usernamecontroller, prefixicon:Icon(Icons.person,size:35), - hintText:'Username'), + hintText:'Username', + style: TextStyle(color:Colors.red) + ), Custom_Box( top: 20, prefixIconColor: Colors.blueAccent.shade700, controller:passwordcontroller, prefixicon:Icon(Icons.password,size:35), - hintText:'Password '), + hintText:'Password ', + style: TextStyle(color:Colors.red) + ), SizedBox( height: 40, ), diff --git a/lib/Screens/SignUp.dart b/lib/Screens/SignUp.dart index 891a73c..e9ebbd5 100644 --- a/lib/Screens/SignUp.dart +++ b/lib/Screens/SignUp.dart @@ -58,28 +58,38 @@ class _SignUpState extends State { prefixIconColor: Colors.blueAccent.shade700, controller:nameController, prefixicon:Icon(Icons.person,size:35), - hintText:'Name'), + hintText:'Name', + style: TextStyle(color:Colors.red) + ), Custom_Box( prefixIconColor: Colors.blueAccent.shade700, controller:usernameController, prefixicon:Icon(Icons.account_box_outlined,size:35), - hintText:'Username'), + hintText:'Username', + style: TextStyle(color:Colors.red) + ), Custom_Box( prefixIconColor: Colors.blueAccent.shade700, controller:emailController, prefixicon:Icon(Icons.email_sharp,size:35), - hintText:'Email'), + hintText:'Email', + style: TextStyle(color:Colors.red) + ), Custom_Box( prefixIconColor: Colors.blueAccent.shade700, controller:passwordController, prefixicon:Icon(Icons.password,size:35), - hintText:'Password'), + hintText:'Password', + style: TextStyle(color:Colors.red) + ), Custom_Box( prefixIconColor: Colors.blueAccent.shade700, controller:confirmPasswordController, prefixicon:Icon(Icons.password,size:35), - hintText:'Confirm Password'), + hintText:'Confirm Password', + style: TextStyle(color:Colors.red) + ), SizedBox( height:9, ), diff --git a/lib/Screens/chat_screen.dart b/lib/Screens/chat_screen.dart index 9fc274b..ec1fbd4 100644 --- a/lib/Screens/chat_screen.dart +++ b/lib/Screens/chat_screen.dart @@ -54,8 +54,8 @@ class _chat_screenState extends State { Widget build(BuildContext context) { return Scaffold( - backgroundColor: Colors.blueGrey, appBar: AppBar( + backgroundColor: Colors.blueGrey, automaticallyImplyLeading: false, title: Text('Chat Screen'), backgroundColor: Colors.blueGrey,