Skip to content

Fixed some Issues #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
om-khandwala wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fixed some Issues #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f813aac
Resolves Issue #31 hide confirm password
om-khandwala Jan 14, 2023
d4f88c8
Resolves Issue # 40 tags not visible if long
om-khandwala Feb 1, 2023
9c20718
Resolves Issue # 36 overflow in group name
om-khandwala Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/screens/email_login.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class _EmailLoginPageState extends State<EmailLogin> {
setState(() {
isPasswordVisible = !isPasswordVisible;
});
},
}, hint: "Password",
),
],
),
Expand Down
19 changes: 12 additions & 7 deletions lib/screens/email_signup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class EmailSignup extends StatefulWidget {

class _EmailSignupState extends State<EmailSignup> {
bool passwordVisibility = true;
bool confirmPasswordVisibility = true;
final TextEditingController _nameController = TextEditingController();
final TextEditingController _emailController = TextEditingController();
final TextEditingController _passwordController = TextEditingController();
Expand Down Expand Up @@ -159,20 +160,24 @@ class _EmailSignupState extends State<EmailSignup> {
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: [
Expand Down Expand Up @@ -208,10 +213,10 @@ class _EmailSignupState extends State<EmailSignup> {
)
],
),
),
]),
),
),
),
);
));
}
}
25 changes: 16 additions & 9 deletions lib/screens/homescreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
),
],
),
);
Expand Down
5 changes: 4 additions & 1 deletion lib/widgets/my_password_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -41,7 +44,7 @@ class MyPasswordField extends StatelessWidget {
),
),
contentPadding: EdgeInsets.all(20),
hintText: 'Password',
hintText: hint,
hintStyle: const TextStyle(
color: Colors.grey,
fontSize: 15,
Expand Down
30 changes: 13 additions & 17 deletions lib/widgets/tags.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
)
);
}
}