Merge branch 'main' into prod/festapp

vkh-cr · Nov 1, 2024 · 59c0a3d · 59c0a3d
2 parents 7df67fc + b954974
commit 59c0a3d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/components/dataGrid/DataGridHelper.dart b/lib/components/dataGrid/DataGridHelper.dart
@@ -49,9 +49,9 @@ class DataGridHelper
         },
     );}
 
-  static Widget mapIconRenderer(rendererContext, List<IconModel> icons) {
+  static Widget mapIconRenderer(BuildContext context, rendererContext, List<IconModel> icons) {
     int? value = rendererContext.cell.value;
-    return iconToRow(rendererContext, value, icons);
+    return iconToRow(context, value, icons);
   }
 
   static Widget iconToRow(BuildContext context, int? id, List<IconModel> icons) {

diff --git a/lib/pages/AdministrationPage.dart b/lib/pages/AdministrationPage.dart
@@ -446,7 +446,7 @@ class _AdministrationPageState extends State<AdministrationPage> with SingleTick
                     type: PlutoColumnType.select(mapIcons, builder: (icon) {
                       return DataGridHelper.iconToRow(context, icon, svgIcons);
                     }),
-                    renderer: (rendererContext) => DataGridHelper.mapIconRenderer(rendererContext, svgIcons),
+                    renderer: (rendererContext) => DataGridHelper.mapIconRenderer(context, rendererContext, svgIcons),
                   ),
                   PlutoColumn(
                       width: 150,

diff --git a/lib/pages/SettingsPage.dart b/lib/pages/SettingsPage.dart
@@ -191,7 +191,7 @@ class _SettingsPageState extends State<SettingsPage> {
                           context: context,
                           label: "Install App".tr(),
                           onPressed: _canInstallPWA ? handleInstallButtonPress : null,
-                          color: _canInstallPWA ? ThemeConfig.seed1 : Colors.grey,
+                          color: _canInstallPWA ? ThemeConfig.blackColor(context) : Colors.grey,
                           textColor: Colors.white,
                         ),
                         if (!_isPlatformSupported)
@@ -208,7 +208,7 @@ class _SettingsPageState extends State<SettingsPage> {
                             padding: const EdgeInsets.only(top: 8.0),
                             child: Text(
                               "The app is already installed.",
-                              style: TextStyle(fontSize: 16, color: ThemeConfig.seed1),
+                              style: TextStyle(fontSize: 16, color: ThemeConfig.blackColor(context)),
                               textAlign: TextAlign.center,
                             ).tr(),
                           ),

diff --git a/lib/pages/UserPage.dart b/lib/pages/UserPage.dart
@@ -393,7 +393,7 @@ class _UserPageState extends State<UserPage> {
                       ).tr(),
                     )),
                 const SizedBox(
-                  height: 16,
+                  height: 8,
                 ),
                 Container(
                     alignment: Alignment.topCenter,