From f813aac4edbc842c645b38cd6642e11ecfb09a7e Mon Sep 17 00:00:00 2001 From: omlay Date: Sat, 14 Jan 2023 23:33:31 +0530 Subject: [PATCH 1/3] Resolves Issue #31 hide confirm password --- lib/screens/email_login.dart | 2 +- lib/screens/email_signup.dart | 19 ++++++++++++------- lib/widgets/my_password_field.dart | 5 ++++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/screens/email_login.dart b/lib/screens/email_login.dart index 7dee0fb..5b184e9 100644 --- a/lib/screens/email_login.dart +++ b/lib/screens/email_login.dart @@ -130,7 +130,7 @@ class _EmailLoginPageState extends State { setState(() { isPasswordVisible = !isPasswordVisible; }); - }, + }, hint: "Password", ), ], ), diff --git a/lib/screens/email_signup.dart b/lib/screens/email_signup.dart index a6d5b14..7dc4a8a 100644 --- a/lib/screens/email_signup.dart +++ b/lib/screens/email_signup.dart @@ -16,6 +16,7 @@ class EmailSignup extends StatefulWidget { class _EmailSignupState extends State { bool passwordVisibility = true; + bool confirmPasswordVisibility = true; final TextEditingController _nameController = TextEditingController(); final TextEditingController _emailController = TextEditingController(); final TextEditingController _passwordController = TextEditingController(); @@ -159,20 +160,24 @@ class _EmailSignupState extends State { errorText: _passwordError, controller: _passwordController, isPasswordVisible: passwordVisibility, + hint: "Password", onTap: () { setState(() { passwordVisibility = !passwordVisibility; }); }, ), - MyTextField( + MyPasswordField( errorText: _confirmError, controller: _confirmController, - hintText: 'Confirm Password', - inputType: TextInputType.text, + isPasswordVisible: confirmPasswordVisibility, + hint: "Confirm Password" , + onTap: () { + setState(() { + confirmPasswordVisibility = !confirmPasswordVisibility; + }); + }, ), - ], - ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -208,10 +213,10 @@ class _EmailSignupState extends State { ) ], ), - ), + ]), ), ), ), - ); + )); } } diff --git a/lib/widgets/my_password_field.dart b/lib/widgets/my_password_field.dart index 2316d10..9527c17 100644 --- a/lib/widgets/my_password_field.dart +++ b/lib/widgets/my_password_field.dart @@ -1,15 +1,18 @@ import 'package:flutter/material.dart'; class MyPasswordField extends StatelessWidget { + const MyPasswordField({ Key? key, required this.isPasswordVisible, required this.onTap, required this.controller, + required this.hint, this.errorText, }) : super(key: key); final TextEditingController controller; final bool isPasswordVisible; + final String? hint; final void Function() onTap; final String? errorText; @@ -41,7 +44,7 @@ class MyPasswordField extends StatelessWidget { ), ), contentPadding: EdgeInsets.all(20), - hintText: 'Password', + hintText: hint, hintStyle: const TextStyle( color: Colors.grey, fontSize: 15, From d4f88c8b7e28f781f85cbf460a9393b9e0a03c90 Mon Sep 17 00:00:00 2001 From: omlay Date: Wed, 1 Feb 2023 20:22:14 +0530 Subject: [PATCH 2/3] Resolves Issue # 40 tags not visible if long --- lib/widgets/tags.dart | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/widgets/tags.dart b/lib/widgets/tags.dart index 0fdd6ee..acd3b07 100644 --- a/lib/widgets/tags.dart +++ b/lib/widgets/tags.dart @@ -8,22 +8,18 @@ class Tag extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - height: 42, - width: 100, - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 10), - decoration: const BoxDecoration( - color: Color.fromRGBO(82, 45, 174, 1), - borderRadius: BorderRadius.all(Radius.circular(36))), - child: Center( - child: FittedBox( - fit: BoxFit.fitWidth, - child: Text( - tagName, - style: GoogleFonts.inter(color: Colors.white, fontSize: 16), - ), - ), - ), - ); + return + Flexible( + child: Container( + padding: const EdgeInsets.symmetric(horizontal:12, vertical: 10), + decoration: const BoxDecoration( + color: Color.fromRGBO(82, 45, 174, 1), + borderRadius: BorderRadius.all(Radius.circular(36))), + child: Text( + tagName, + style: GoogleFonts.inter(color: Colors.white, fontSize: 16), + ) + ) + ); } } From 9c2071822edc2cdfe8122383cba592466d4d15e8 Mon Sep 17 00:00:00 2001 From: omlay Date: Wed, 1 Feb 2023 20:40:39 +0530 Subject: [PATCH 3/3] Resolves Issue # 36 overflow in group name --- lib/screens/homescreen.dart | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/screens/homescreen.dart b/lib/screens/homescreen.dart index 92c9db2..dd8bfba 100644 --- a/lib/screens/homescreen.dart +++ b/lib/screens/homescreen.dart @@ -65,7 +65,7 @@ class HomeScreen extends StatelessWidget { child: Row( children: [ Padding( - padding: const EdgeInsets.only(left: 12.0), + padding: const EdgeInsets.only(left: 10.0,), child: Container( width: 48.0, height: 48.0, @@ -92,14 +92,21 @@ class HomeScreen extends StatelessWidget { const SizedBox( width: 10, ), - Text( - displayGroups[index].name, - style: GoogleFonts.inter( - fontSize: 18, - fontWeight: FontWeight.w500, - color: Colors.grey[200], - ), - ) + Flexible( + child: Padding(padding:const EdgeInsets.only(right: 10.0,), + child:Text( + displayGroups[index].name, + style: GoogleFonts.inter( + fontSize: 18, + fontWeight: FontWeight.w500, + color: Colors.grey[200], + ) + ) + ) + ), + const SizedBox( + width: 10, + ), ], ), );