Quick UI bug fix because of flutter update

Vustron · Nov 18, 2023 · 19ba633 · 19ba633
1 parent 3c019da
commit 19ba633
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/lib/auth/signin.dart b/lib/auth/signin.dart
@@ -36,13 +36,13 @@ class _SignInState extends State<SignIn> {
       backgroundColor: Colors.grey[900],
       body: SingleChildScrollView(
         child: Container(
-          padding: EdgeInsets.symmetric(vertical: 50.0, horizontal: 50.0),
+          padding: EdgeInsets.symmetric(vertical: 10.0, horizontal: 50.0),
           child: Form(
             key: _formkey,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                SizedBox(height: 10.0),
+                SizedBox(height: 40.0),
                 Center(
                   child: CircleAvatar(
                     backgroundImage: AssetImage('assets/images/logo.png'),
@@ -243,7 +243,7 @@ class _SignInState extends State<SignIn> {
                     ),
                   ],
                 ),
-                SizedBox(height: 80.0),
+                SizedBox(height: 50.0),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [

diff --git a/lib/auth/signup.dart b/lib/auth/signup.dart
@@ -5,7 +5,6 @@ import 'package:google_fonts/google_fonts.dart';
 import '../controller/localAuth.dart';
 import 'package:social_auth_buttons/social_auth_buttons.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
-
 import 'signin.dart';
 
 class SignUp extends StatefulWidget {
@@ -33,13 +32,13 @@ class _SignUpState extends State<SignUp> {
       backgroundColor: Colors.grey[900],
       body: SingleChildScrollView(
         child: Container(
-          padding: EdgeInsets.symmetric(vertical: 50.0, horizontal: 50.0),
+          padding: EdgeInsets.symmetric(vertical: 10.0, horizontal: 50.0),
           child: Form(
             key: _formkey,
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                SizedBox(height: 10.0),
+                SizedBox(height: 40.0),
                 Center(
                   child: CircleAvatar(
                     backgroundImage: AssetImage('assets/images/logo.png'),
@@ -210,7 +209,7 @@ class _SignUpState extends State<SignUp> {
                     ),
                   ],
                 ),
-                SizedBox(height: 220.0),
+                SizedBox(height: 195.0),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [

diff --git a/lib/components/editProfileContent.dart b/lib/components/editProfileContent.dart
@@ -73,10 +73,8 @@ class _EditProfileState extends State<EditProfile> {
                 onPressed: () async {
                   if (_formKey.currentState!.validate()) {
                     EasyLoading.show(status: 'Updating user profile...');
-
                     await _auth.updateUserData(
                         _currentDisplayName, _currentEmail);
-
                     EasyLoading.showSuccess('Update Success!');
                     Navigator.pushNamed(context, '/profile');
                     EasyLoading.dismiss();
@@ -89,6 +87,7 @@ class _EditProfileState extends State<EditProfile> {
                   'Update',
                   style: GoogleFonts.zenDots(
                     fontSize: 14.0,
+                    color: Colors.white,
                     fontWeight: FontWeight.bold,
                   ),
                 ),

diff --git a/lib/components/worldtimeContent.dart b/lib/components/worldtimeContent.dart
@@ -157,25 +157,30 @@ class _WorldTimeContentState extends State<WorldTimeContent> {
                     return Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: <Widget>[
-                        if (!provider.isGoogleUser)
-                          SizedBox(
-                            width: 100,
-                            child: ElevatedButton.icon(
-                              onPressed: () => _showEditProfilePanel(),
-                              icon: Icon(Icons.settings),
-                              label: Text(
-                                'Edit',
-                                style: GoogleFonts.zenDots(fontSize: 8),
+                        SizedBox(
+                          width: 100,
+                          child: ElevatedButton.icon(
+                            onPressed: () => _showEditProfilePanel(),
+                            icon: Icon(
+                              Icons.settings,
+                              color: Colors.white,
+                            ),
+                            label: Text(
+                              'Edit',
+                              style: GoogleFonts.zenDots(
+                                fontSize: 10,
+                                color: Colors.white,
                               ),
-                              style: ButtonStyle(
-                                backgroundColor: MaterialStateProperty.all(
-                                  Colors.green,
-                                ),
+                            ),
+                            style: ButtonStyle(
+                              backgroundColor: MaterialStateProperty.all(
+                                Colors.green,
                               ),
                             ),
                           ),
+                        ),
                         SizedBox(
-                          width: 100,
+                          width: 121,
                           child: ElevatedButton.icon(
                             onPressed: () async {
                               try {
@@ -191,10 +196,16 @@ class _WorldTimeContentState extends State<WorldTimeContent> {
                                 EasyLoading.showError('Logout Failed: $e');
                               }
                             },
-                            icon: Icon(Icons.logout),
+                            icon: Icon(
+                              Icons.logout,
+                              color: Colors.white,
+                            ),
                             label: Text(
                               'Logout',
-                              style: GoogleFonts.zenDots(fontSize: 8),
+                              style: GoogleFonts.zenDots(
+                                fontSize: 10,
+                                color: Colors.white,
+                              ),
                             ),
                             style: ButtonStyle(
                               backgroundColor: MaterialStateProperty.all(
@@ -208,7 +219,7 @@ class _WorldTimeContentState extends State<WorldTimeContent> {
                   },
                 ),
               ),
-              SizedBox(height: 139),
+              SizedBox(height: 126),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [