fixed common_success_page.dart text scaling

egovernments · Dec 26, 2023 · 93d20d4 · 93d20d4
1 parent 739e291
commit 93d20d4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/frontend/mgramseva/lib/components/house_connection_and_bill/new_consumer_bill.dart b/frontend/mgramseva/lib/components/house_connection_and_bill/new_consumer_bill.dart
@@ -320,7 +320,7 @@ class NewConsumerBillState extends State<NewConsumerBill> {
                                                       : MediaQuery.of(context)
                                                               .size
                                                               .width /
-                                                          1.12,
+                                                          2.2,
                                                   child: OutlinedButton.icon(
                                                     onPressed: () => commonProvider
                                                         .getFileFromPDFBillService(

diff --git a/frontend/mgramseva/lib/widgets/button_group.dart b/frontend/mgramseva/lib/widgets/button_group.dart
@@ -32,20 +32,23 @@ class ButtonGroup extends StatelessWidget {
                   child: Row(
                     children: <Widget>[
                       Expanded(
-                          child: OutlinedButton.icon(
-                        onPressed: callBackIcon,
-                        style: ElevatedButton.styleFrom(padding:EdgeInsets.symmetric(vertical: 8),alignment: Alignment.center,side:BorderSide(
-                            width: 1,
-                            color: Theme.of(context).disabledColor),
-                          ),
-                        icon: (Image.asset('assets/png/whats_app.png', fit: BoxFit.fitHeight,)),
-                        label: Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 12),
-                          child: Text(
-                              ApplicationLocalizations.of(context)
-                                  .translate(i18.common.SHARE_BILL_PDF),
-                              style: Theme.of(context).textTheme.titleSmall)),
-                      )),
+                        child: Container(
+                          height: 48,
+                            child: OutlinedButton.icon(
+                          onPressed: callBackIcon,
+                          style: ElevatedButton.styleFrom(padding:EdgeInsets.symmetric(vertical: 5),alignment: Alignment.center,side:BorderSide(
+                              width: 1,
+                              color: Theme.of(context).disabledColor),
+                            ),
+                          icon: (Image.asset('assets/png/whats_app.png', fit: BoxFit.fitHeight,)),
+                          label: Padding(
+                            padding: const EdgeInsets.symmetric(vertical: 0),
+                            child: Text(
+                                ApplicationLocalizations.of(context)
+                                    .translate(i18.common.SHARE_BILL_PDF),
+                                style: Theme.of(context).textTheme.titleSmall)),
+                        )),
+                      ),
                       Expanded(child: ShortButton(label, callBack))
                     ],
                   ),

diff --git a/frontend/mgramseva/lib/widgets/common_success_page.dart b/frontend/mgramseva/lib/widgets/common_success_page.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:mgramseva/model/success_handler.dart';
 import 'package:mgramseva/utils/constants/i18_key_constants.dart';
@@ -112,6 +113,7 @@ class CommonSuccess extends StatelessWidget {
                                                 null
                                             ? successHandler.downloadLinkLabel!
                                             : ''),
+                                    textScaleFactor: MediaQuery.of(context).size.width>340?0.9:0.68,
                                     style: TextStyle(
                                         fontSize: 16,
                                         color: Theme.of(context).primaryColor)),
@@ -132,6 +134,7 @@ class CommonSuccess extends StatelessWidget {
                                             successHandler.printLabel != null
                                                 ? successHandler.printLabel!
                                                 : ''),
+                                    textScaleFactor: MediaQuery.of(context).size.width>340?0.9:0.68,
                                     style: TextStyle(
                                         fontSize: 16,
                                         color: Theme.of(context).primaryColor)),
@@ -146,6 +149,7 @@ class CommonSuccess extends StatelessWidget {
                                 label: Text(
                                   ApplicationLocalizations.of(context)
                                       .translate(i18.common.SHARE_BILL),
+                                  textScaleFactor: MediaQuery.of(context).size.width>340?0.9:0.68,
                                   style: TextStyle(
                                       fontSize: 16,
                                       color: Theme.of(context).primaryColor),

diff --git a/frontend/mgramseva/lib/widgets/no_login_success_page.dart b/frontend/mgramseva/lib/widgets/no_login_success_page.dart
@@ -89,6 +89,7 @@ class NoLoginSuccess extends StatelessWidget {
                                   successHandler.downloadLinkLabel != null
                                       ? successHandler.downloadLinkLabel!
                                       : ''),
+                              textScaleFactor: MediaQuery.of(context).size.width>340?0.9:0.68,
                               style: TextStyle(
                                   fontSize: 16,
                                   color: Theme.of(context).primaryColor)),
@@ -108,6 +109,7 @@ class NoLoginSuccess extends StatelessWidget {
                                   successHandler.printLabel != null
                                       ? successHandler.printLabel!
                                       : ''),
+                              textScaleFactor: MediaQuery.of(context).size.width>340?0.9:0.68,
                               style: TextStyle(
                                   fontSize: 16,
                                   color: Theme.of(context).primaryColor)),
@@ -122,6 +124,7 @@ class NoLoginSuccess extends StatelessWidget {
                           label: Text(
                             ApplicationLocalizations.of(context)
                                 .translate(i18.common.SHARE_BILL),
+                            textScaleFactor: MediaQuery.of(context).size.width>340?0.9:0.68,
                             style: TextStyle(
                                 fontSize: 16,
                                 color: Theme.of(context).primaryColor),