From 37e94609e1d493b43e89d1ceedd1924794d485ba Mon Sep 17 00:00:00 2001
From: CryptoFish <YankeeDoodlePigeon@protonmail.com>
Date: Wed, 25 Jan 2023 17:32:53 +0100
Subject: [PATCH 1/2] add constrain to row childs

---
 .../pillars_widgets/pillars_list_widget.dart  | 56 ++++++++++---------
 .../layout_scaffold/card_scaffold.dart        | 44 ++++++++-------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart b/lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart
index 552e4c2c..c93e9dc2 100644
--- a/lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart
+++ b/lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart
@@ -402,33 +402,37 @@ class _PillarsListWidgetState extends State<PillarsListWidget> {
               width: 5.0,
             ),
           ),
-          pillarItem.isRevocable
-              ? CancelTimer(
-                  Duration(
-                    seconds: pillarItem.revokeCooldown,
-                  ),
-                  AppColors.znnColor,
-                  onTimeFinishedCallback: () {
-                    model.refreshResults();
-                  },
-                )
-              : CancelTimer(
-                  Duration(
-                    seconds: pillarItem.revokeCooldown,
+          Expanded(
+            child: pillarItem.isRevocable
+                ? CancelTimer(
+                    Duration(
+                      seconds: pillarItem.revokeCooldown,
+                    ),
+                    AppColors.znnColor,
+                    onTimeFinishedCallback: () {
+                      model.refreshResults();
+                    },
+                  )
+                : CancelTimer(
+                    Duration(
+                      seconds: pillarItem.revokeCooldown,
+                    ),
+                    AppColors.errorColor,
+                    onTimeFinishedCallback: () {
+                      model.refreshResults();
+                    },
                   ),
-                  AppColors.errorColor,
-                  onTimeFinishedCallback: () {
-                    model.refreshResults();
-                  },
-                ),
-          StandardTooltipIcon(
-            pillarItem.isRevocable
-                ? 'Revocation window is open'
-                : 'Until revocation window opens',
-            Icons.help,
-            iconColor: pillarItem.isRevocable
-                ? AppColors.znnColor
-                : AppColors.errorColor,
+          ),
+          Expanded(
+            child: StandardTooltipIcon(
+              pillarItem.isRevocable
+                  ? 'Revocation window is open'
+                  : 'Until revocation window opens',
+              Icons.help,
+              iconColor: pillarItem.isRevocable
+                  ? AppColors.znnColor
+                  : AppColors.errorColor,
+            ),
           ),
         ],
       ),
diff --git a/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart b/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
index e7e37c81..743f0c71 100644
--- a/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
+++ b/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
@@ -162,9 +162,11 @@ class _CardScaffoldState<T> extends State<CardScaffold<T>> {
               const SizedBox(
                 width: 5.0,
               ),
-              Text(
-                'Discreet mode',
-                style: Theme.of(context).textTheme.bodyText1,
+              Expanded(
+                child: Text(
+                  'Discreet mode',
+                  style: Theme.of(context).textTheme.bodyText1,
+                ),
               ),
               const Spacer(),
               Switch(
@@ -219,22 +221,26 @@ class _CardScaffoldState<T> extends State<CardScaffold<T>> {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: <Widget>[
-        Padding(
-          padding: const EdgeInsets.all(14.0),
-          child: Row(
-            children: [
-              Text(
-                title,
-                style: Theme.of(context).textTheme.bodyText1!.copyWith(
-                      fontSize: widget.titleFontSize,
-                      height: 1.0,
-                    ),
-              ),
-              const SizedBox(
-                width: 5.0,
-              ),
-              widget.titleIcon != null ? widget.titleIcon! : Container(),
-            ],
+        Expanded(
+          child: Padding(
+            padding: const EdgeInsets.all(14.0),
+            child: Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    title,
+                    style: Theme.of(context).textTheme.bodyText1!.copyWith(
+                          fontSize: widget.titleFontSize,
+                          height: 1.0,
+                        ),
+                  ),
+                ),
+                const SizedBox(
+                  width: 5.0,
+                ),
+                widget.titleIcon != null ? widget.titleIcon! : Container(),
+              ],
+            ),
           ),
         ),
         Row(

From 259568d78b9b0c033c3b867f9bed4a9e26621ab1 Mon Sep 17 00:00:00 2001
From: CryptoFish <YankeeDoodlePigeon@protonmail.com>
Date: Thu, 9 Feb 2023 10:43:38 +0100
Subject: [PATCH 2/2] Fix deprecated text theme

---
 lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart b/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
index 2b851128..fa900c2c 100644
--- a/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
+++ b/lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
@@ -165,7 +165,7 @@ class _CardScaffoldState<T> extends State<CardScaffold<T>> {
               Expanded(
                 child: Text(
                   'Discreet mode',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
               ),
               const Spacer(),