Merge pull request 'changed border color and tender tablet sizes' (#29) from login_changes into main

Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/29

lib/views/login/pages/login_desktop_page.dart

@@ -18,8 +18,6 @@ class LoginDesktopPage extends StatelessWidget {
     return Scaffold(
       backgroundColor: AppColors.backgroundColor,
       body: Center(
-        child: SingleChildScrollView(
-          padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceAround,
           children: [
@@ -53,8 +51,7 @@ class LoginDesktopPage extends StatelessWidget {
                         isPassword: true,
                         obscureText: viewModel.obscurePassword,
                         fieldHeight: 60.0.h(),
-                          onToggleVisibility:
+                        onToggleVisibility: viewModel.togglePasswordVisibility,
-                              viewModel.togglePasswordVisibility,
                         borderRedus: 12,
                       ),
                       SizedBox(height: 32.0.h()),
@@ -74,8 +71,7 @@ class LoginDesktopPage extends StatelessWidget {
                                     await viewModel.login();
                                     if (viewModel.loggedInUser != null) {
                                       HomeRouteData().go(context);
-                                      } else if (viewModel.errorMessage !=
+                                    } else if (viewModel.errorMessage != null) {
-                                          null) {
                                       ScaffoldMessenger.of(
                                         context,
                                       ).showSnackBar(
@@ -98,15 +94,14 @@ class LoginDesktopPage extends StatelessWidget {
               padding: EdgeInsets.symmetric(vertical: 20.0.h()),
               child: Image.asset(
                 AssetsManager.webLoginImage,
-                  width: 796.0.w(),
+                width: 796.0,
-                  height: 944.0.h(),
+                height: 944.0,
-                  fit: BoxFit.fitHeight,
+                fit: BoxFit.fitWidth,
               ),
             ),
           ],
         ),
       ),
-      ),
     );
   }
 }

lib/views/login/widgets/login_textfield.dart

@@ -68,7 +68,9 @@ class LoginTextField extends StatelessWidget {
                       width: 24.0.w(),
                       height: 24.0.h(),
                       colorFilter: ColorFilter.mode(
-                        focusNode.hasFocus ? AppColors.grey80 : AppColors.grey60,
+                        focusNode.hasFocus
+                            ? AppColors.grey80
+                            : AppColors.grey60,
                         BlendMode.srcIn,
                       ),
                     ),
@@ -76,6 +78,11 @@ class LoginTextField extends StatelessWidget {
                   : null,
           border: OutlineInputBorder(
             borderRadius: BorderRadius.circular(borderRedus ?? 12.0.w()),
+            borderSide: BorderSide(color: AppColors.grey40),
+          ),
+          enabledBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(borderRedus ?? 12.0.w()),
+            borderSide: BorderSide(color: AppColors.grey40),
           ),
           focusedBorder: OutlineInputBorder(
             borderSide: BorderSide(color: AppColors.borderBlue),

lib/views/tenders/pages/t_tenders_page.dart

@@ -14,7 +14,11 @@ class TabletTendersPage extends StatelessWidget {
 
         body: SingleChildScrollView(
           child: Padding(
-            padding: EdgeInsets.symmetric(vertical: 24.0.h()),
+            padding: EdgeInsets.only(
+              left: 24.0.w(),
+              right: 24.0.w(),
+              top: 128.0.h(),
+            ),
             child: MainTendersSlider(),
           ),
         ),