Merge pull request #597 from Gaurav-Kushwaha-1225/OverflowIssues

UI Overflow Issues Resolved
CCExtractor · Aug 28, 2024 · 2eb3761 · 2eb3761
2 parents d89dff6 + 476e97e
commit 2eb3761
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/lib/app/modules/home/views/home_view.dart b/lib/app/modules/home/views/home_view.dart
@@ -312,7 +312,7 @@ class HomeView extends GetView<HomeController> {
                                                 ),
                                                 Container(
                                                   height: 35,
-                                                  width: 340,
+                                                  width: MediaQuery.of(context).size.width / 1.2,
                                                   child: Row(
                                                     children: [
                                                       Obx(() {
@@ -360,9 +360,12 @@ class HomeView extends GetView<HomeController> {
                                                           ),
 
                                                           // Delete button
+                                                          SizedBox(
+                                                            width: 30 * controller.scalingFactor.value,
+                                                          ),
                                                           Obx(
-                                                            () => IconButton(
-                                                              onPressed:
+                                                            () => InkWell(
+                                                              onTap:
                                                                   () async {
                                                                 // Deleting the alarms
                                                                 await controller
@@ -391,21 +394,21 @@ class HomeView extends GetView<HomeController> {
                                                                 controller
                                                                     .refreshUpcomingAlarms();
                                                               },
-                                                              icon: const Icon(
+                                                              child:  Icon(
                                                                 Icons.delete,
+                                                                color: controller
+                                                                    .numberOfAlarmsSelected
+                                                                    .value >
+                                                                    0
+                                                                    ? Colors.red
+                                                                    : themeController.primaryTextColor.value.withOpacity(
+                                                                  0.75,
+                                                                ),
+                                                                size: 27 *
+                                                                    controller
+                                                                        .scalingFactor
+                                                                        .value,
                                                               ),
-                                                              color: controller
-                                                                          .numberOfAlarmsSelected
-                                                                          .value >
-                                                                      0
-                                                                  ? Colors.red
-                                                                  : themeController.primaryTextColor.value.withOpacity(
-                                                                          0.75,
-                                                                        ),
-                                                              iconSize: 27 *
-                                                                  controller
-                                                                      .scalingFactor
-                                                                      .value,
                                                             ),
                                                           ),
                                                         ],

diff --git a/lib/app/modules/home/views/profile_config.dart b/lib/app/modules/home/views/profile_config.dart
@@ -51,6 +51,7 @@ class _ProfileSelectState extends State<ProfileSelect> {
                               horizontal: 24 * controller.scalingFactor.value,
                               vertical: 4 * controller.scalingFactor.value,
                             ),
+                            constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 2 / 3),
                             decoration: BoxDecoration(
                                 gradient: LinearGradient(
                                   begin: Alignment.topLeft,
@@ -73,6 +74,7 @@ class _ProfileSelectState extends State<ProfileSelect> {
                                               ),
                                         fontSize:
                                           22 * controller.scalingFactor.value,
+                                    overflow: TextOverflow.ellipsis
                                     ),
                               )),
                         ),

diff --git a/lib/app/modules/settings/views/google_sign_in.dart b/lib/app/modules/settings/views/google_sign_in.dart
@@ -150,10 +150,8 @@ class GoogleSignIn extends StatelessWidget {
           child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Obx(
-                () => Container(width: Get.width*0.55,
-                child: SingleChildScrollView(scrollDirection: Axis.horizontal,
-                  child: Row(children: [
-                    Text(
+                () => Expanded(
+                    child: Text(
                       (controller.isUserLoggedIn.value)
                           ?
                           // 'Unlink ${controller.userModel!.email}'
@@ -164,9 +162,7 @@ class GoogleSignIn extends StatelessWidget {
                             overflow: TextOverflow.ellipsis,
                           ),
                     ),
-
-                  ],),
-            ),),
+                  ),
                 ),Obx(
                 () => IconButton(
                   onPressed: () => {