From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 818BD1FF165 for <inbox@lore.proxmox.com>; Thu, 5 Jun 2025 10:23:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EBC3F13673; Thu, 5 Jun 2025 10:24:02 +0200 (CEST) From: Shan Shaji <s.shaji@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 5 Jun 2025 10:23:22 +0200 Message-Id: <20250605082322.57783-1-s.shaji@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.364 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [material.io, property.to] Subject: [pve-devel] [PATCH pve_flutter_frontend v2] ui: replace deprecated `onBackground` property X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> As of flutter v3.22, the `onBackground` property is deprecated. The material guidelines suggest using the `onSurface` property instead. https://m3.material.io/styles/color/roles#8562cf18-5cc0-44ae-b783-2e38bdb39585 For dark theme, the `onSurface` color and `onBackground` color is different so it's not possible to directly replace the `onBackground` with the `onSurface` property.To fix the issue, add a new `onSurfaceVariant` property to the theme and replace all instances of `onBackground` with `onSurfaceVariant`. Signed-off-by: Shan Shaji <s.shaji@proxmox.com> --- changes since v1: * rebased branch with the changes from master. lib/main.dart | 4 ++-- lib/widgets/proxmox_capacity_indicator.dart | 8 +++++--- lib/widgets/pve_file_selector_widget.dart | 14 +++++++++----- lib/widgets/pve_lxc_overview.dart | 2 +- lib/widgets/pve_qemu_overview.dart | 5 +++-- lib/widgets/pve_task_log_expansiontile_widget.dart | 2 +- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 94eac94..6a7c5a9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -109,7 +109,7 @@ class MyApp extends StatelessWidget { surface: ProxmoxColors.supportGreyTint50, onSurface: Colors.black, surfaceContainer: ProxmoxColors.supportGreyTint75, - onBackground: Colors.black, + onSurfaceVariant: Colors.black, ), indicatorColor: ProxmoxColors.orange, textButtonTheme: TextButtonThemeData( @@ -148,7 +148,7 @@ class MyApp extends StatelessWidget { secondary: ProxmoxColors.orange, secondaryContainer: ProxmoxColors.supportLightOrange, surfaceContainer: ProxmoxColors.grey, - onBackground: ProxmoxColors.supportGreyTint75, + onSurfaceVariant: ProxmoxColors.supportGreyTint75, ), indicatorColor: ProxmoxColors.orange, // flutter has a weird logic where it pulls colors from different diff --git a/lib/widgets/proxmox_capacity_indicator.dart b/lib/widgets/proxmox_capacity_indicator.dart index ad95c29..620cdc2 100644 --- a/lib/widgets/proxmox_capacity_indicator.dart +++ b/lib/widgets/proxmox_capacity_indicator.dart @@ -44,7 +44,7 @@ class ProxmoxCapacityIndicator extends StatelessWidget { ? Theme.of(context).colorScheme.onPrimary : Theme.of(context) .colorScheme - .onBackground + .onSurfaceVariant .withValues(alpha: 0.75))), ), Text(usedValue, @@ -54,7 +54,7 @@ class ProxmoxCapacityIndicator extends StatelessWidget { ? Theme.of(context).colorScheme.onPrimary : Theme.of(context) .colorScheme - .onBackground) + .onSurfaceVariant) .withValues(alpha: 0.66), fontWeight: FontWeight.bold)), ], @@ -64,7 +64,9 @@ class ProxmoxCapacityIndicator extends StatelessWidget { color: textColor ?? (selected ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground) + : Theme.of(context) + .colorScheme + .onSurfaceVariant) .withValues(alpha: 0.66), fontWeight: FontWeight.bold)) ], diff --git a/lib/widgets/pve_file_selector_widget.dart b/lib/widgets/pve_file_selector_widget.dart index 9770ff8..e1dea78 100644 --- a/lib/widgets/pve_file_selector_widget.dart +++ b/lib/widgets/pve_file_selector_widget.dart @@ -150,7 +150,7 @@ class PveFileSelectorWidget extends StatelessWidget { IconButton( color: Theme.of(context) .colorScheme - .onBackground, + .onSurfaceVariant, icon: const Icon(Icons.search), onPressed: () => fBloc!.events.add(ToggleSearch()), @@ -158,7 +158,7 @@ class PveFileSelectorWidget extends StatelessWidget { IconButton( color: Theme.of(context) .colorScheme - .onBackground, + .onSurfaceVariant, icon: Icon( state.gridView ? Icons.view_list @@ -270,7 +270,9 @@ class PveStorageCard extends StatelessWidget { style: TextStyle( color: isSelected ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context) + .colorScheme + .onSurfaceVariant, fontWeight: FontWeight.bold), ), Text( @@ -278,7 +280,9 @@ class PveStorageCard extends StatelessWidget { style: TextStyle( color: (isSelected ? Theme.of(context).colorScheme.onPrimary - : Theme.of(context).colorScheme.onBackground) + : Theme.of(context) + .colorScheme + .onSurfaceVariant) .withValues(alpha: 0.75), fontWeight: FontWeight.bold, ), @@ -307,7 +311,7 @@ class PveStorageCard extends StatelessWidget { style: TextStyle( color: Theme.of(context) .colorScheme - .onBackground + .onSurfaceVariant .withValues(alpha: 0.75), fontWeight: FontWeight.bold, ), diff --git a/lib/widgets/pve_lxc_overview.dart b/lib/widgets/pve_lxc_overview.dart index e8e6edb..4129084 100644 --- a/lib/widgets/pve_lxc_overview.dart +++ b/lib/widgets/pve_lxc_overview.dart @@ -91,7 +91,7 @@ class PveLxcOverview extends StatelessWidget { style: TextStyle( color: Theme.of(context) .colorScheme - .onBackground, + .onSurfaceVariant, ), ), ), diff --git a/lib/widgets/pve_qemu_overview.dart b/lib/widgets/pve_qemu_overview.dart index b019b0f..4d4bd05 100644 --- a/lib/widgets/pve_qemu_overview.dart +++ b/lib/widgets/pve_qemu_overview.dart @@ -110,8 +110,9 @@ class PveQemuOverview extends StatelessWidget { builder: (context, taskState) { if (taskState.tasks.isNotEmpty) { return PveTaskExpansionTile( - headerColor: - Theme.of(context).colorScheme.onBackground, + headerColor: Theme.of(context) + .colorScheme + .onSurfaceVariant, task: taskState.tasks.first, showMorePage: Provider<PveTaskLogBloc>( create: (context) => PveTaskLogBloc( diff --git a/lib/widgets/pve_task_log_expansiontile_widget.dart b/lib/widgets/pve_task_log_expansiontile_widget.dart index 4f087b5..2e0dba6 100644 --- a/lib/widgets/pve_task_log_expansiontile_widget.dart +++ b/lib/widgets/pve_task_log_expansiontile_widget.dart @@ -53,7 +53,7 @@ class _PveTaskExpansionTileState extends State<PveTaskExpansionTile> { final warningColor = Colors.orange.shade200; final headerColor = isExpanded ? (widget.headerColorExpanded ?? colorScheme.onSurface) - : (widget.headerColor ?? colorScheme.onBackground); + : (widget.headerColor ?? colorScheme.onSurfaceVariant); final taskText = widget.showMorePage != null ? 'Last Task' : 'Task'; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel