From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F12BD9151C for ; Thu, 8 Sep 2022 11:56:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A37451ADEA for ; Thu, 8 Sep 2022 11:55:59 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 8 Sep 2022 11:55:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 37A654456F for ; Thu, 8 Sep 2022 11:55:53 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 8 Sep 2022 11:55:44 +0200 Message-Id: <20220908095550.2913416-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220908095550.2913416-1-d.csapak@proxmox.com> References: <20220908095550.2913416-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.092 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pve-devel] [PATCH pve-flutter-frontend 04/10] move to OutlinedButton from OutlineButton X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Sep 2022 09:56:23 -0000 flutter 3.0 removed OutlineButton in favor of OutlinedButton. also change the default text color to white, and drop an unnecessary padding in one case Signed-off-by: Dominik Csapak --- lib/main.dart | 10 ++++++++++ .../firstWelcomeScreen/pve_welcome_faq.dart | 8 +++++--- .../firstWelcomeScreen/pve_welcome_last.dart | 18 ++++++++++-------- lib/widgets/pve_cd_selector_widget.dart | 7 ++++--- lib/widgets/pve_guest_backup_widget.dart | 9 ++++----- lib/widgets/pve_main_navigation_drawer.dart | 4 ++-- .../pve_task_log_expansiontile_widget.dart | 4 ++-- 7 files changed, 37 insertions(+), 23 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index fca91c6..d467626 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -117,6 +117,11 @@ class MyApp extends StatelessWidget { textButtonTheme: TextButtonThemeData( style: TextButton.styleFrom(primary: ProxmoxColors.grey), ), + outlinedButtonTheme: OutlinedButtonThemeData( + style: OutlinedButton.styleFrom( + foregroundColor: Colors.black, + ), + ), fontFamily: "Open Sans", primaryTextTheme: TextTheme( headline6: @@ -149,6 +154,11 @@ class MyApp extends StatelessWidget { textButtonTheme: TextButtonThemeData( style: TextButton.styleFrom(primary: ProxmoxColors.greyTint80), ), + outlinedButtonTheme: OutlinedButtonThemeData( + style: OutlinedButton.styleFrom( + foregroundColor: Colors.white, + ), + ), fontFamily: "Open Sans", primaryTextTheme: TextTheme( headline6: diff --git a/lib/widgets/firstWelcomeScreen/pve_welcome_faq.dart b/lib/widgets/firstWelcomeScreen/pve_welcome_faq.dart index 2e0e44e..470d118 100644 --- a/lib/widgets/firstWelcomeScreen/pve_welcome_faq.dart +++ b/lib/widgets/firstWelcomeScreen/pve_welcome_faq.dart @@ -42,14 +42,16 @@ class PveWelcomePageFAQ extends StatelessWidget { text: 'Currently only the following 3rd party Spice client works:'), Center( - child: OutlineButton( + child: OutlinedButton( onPressed: () => { launch( 'https://play.google.com/store/apps/details?id=com.undatech.opaque') }, child: Text('Opague'), - borderSide: BorderSide(color: ProxmoxColors.supportGrey), - textColor: Colors.white, + style: OutlinedButton.styleFrom( + side: BorderSide(color: ProxmoxColors.supportGrey), + foregroundColor: Colors.white, + ), ), ), ], diff --git a/lib/widgets/firstWelcomeScreen/pve_welcome_last.dart b/lib/widgets/firstWelcomeScreen/pve_welcome_last.dart index 5f135e0..3a6391e 100644 --- a/lib/widgets/firstWelcomeScreen/pve_welcome_last.dart +++ b/lib/widgets/firstWelcomeScreen/pve_welcome_last.dart @@ -57,23 +57,25 @@ class PveWelcomePageLast extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - OutlineButton( + OutlinedButton( onPressed: () => {launch('https://forum.proxmox.com')}, child: Text('Forum'), - borderSide: - BorderSide(color: ProxmoxColors.supportGrey), - textColor: Colors.white, + style: OutlinedButton.styleFrom( + side: BorderSide(color: ProxmoxColors.supportGrey), + foregroundColor: Colors.white, + ), ), - OutlineButton( + OutlinedButton( onPressed: () => { launch( 'https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-user') }, child: Text('User Mailing List'), - borderSide: - BorderSide(color: ProxmoxColors.supportGrey), - textColor: Colors.white, + style: OutlinedButton.styleFrom( + side: BorderSide(color: ProxmoxColors.supportGrey), + foregroundColor: Colors.white, + ), ), ], ), diff --git a/lib/widgets/pve_cd_selector_widget.dart b/lib/widgets/pve_cd_selector_widget.dart index c7600fe..cac5288 100644 --- a/lib/widgets/pve_cd_selector_widget.dart +++ b/lib/widgets/pve_cd_selector_widget.dart @@ -29,9 +29,10 @@ class PveCdSelector extends StatelessWidget { onChanged: (value) => cdBloc.events.add(ChangeValue(value)), ), if (state.value == CdType.iso) - OutlineButton( - borderSide: - state.hasError ? BorderSide(color: Colors.red) : null, + OutlinedButton( + style: OutlinedButton.styleFrom( + side: state.hasError ? BorderSide(color: Colors.red) : null, + ), child: Text((state.file == null || state.file!.isEmpty) ? "Choose File" : state.file!), diff --git a/lib/widgets/pve_guest_backup_widget.dart b/lib/widgets/pve_guest_backup_widget.dart index 72a81c4..b766efb 100644 --- a/lib/widgets/pve_guest_backup_widget.dart +++ b/lib/widgets/pve_guest_backup_widget.dart @@ -258,13 +258,12 @@ class PveGuestBackupContent extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(8.0), child: ListView(children: [ - OutlineButton.icon( - padding: EdgeInsets.symmetric(horizontal: 8), + OutlinedButton.icon( onPressed: null, icon: Icon(Icons.restore), label: Text("Restore"), ), - OutlineButton.icon( + OutlinedButton.icon( onPressed: () async { final guard = await (_showConfirmDialog( context, @@ -279,7 +278,7 @@ class PveGuestBackupContent extends StatelessWidget { icon: Icon(Icons.delete), label: Text("Remove"), ), - OutlineButton.icon( + OutlinedButton.icon( onPressed: () => _showConfigurationDialog(context, fBloc, volid), icon: Icon(Icons.featured_play_list), @@ -462,7 +461,7 @@ class _PveBackupFormState extends State { return null; }, ), - OutlineButton.icon( + OutlinedButton.icon( onPressed: enableSubmitButton ? () { //TODO remove when async validation is implemented diff --git a/lib/widgets/pve_main_navigation_drawer.dart b/lib/widgets/pve_main_navigation_drawer.dart index 57ad0ce..757d05e 100644 --- a/lib/widgets/pve_main_navigation_drawer.dart +++ b/lib/widgets/pve_main_navigation_drawer.dart @@ -130,14 +130,14 @@ class PveMainNavigationDrawer extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - OutlineButton( + OutlinedButton( child: Text("new VM"), onPressed: () { Navigator.pushNamed(context, '/qemu/create'); }, ), // TODO General new button or distinct ones?? - OutlineButton( + OutlinedButton( child: Text("new CT"), onPressed: null, ) diff --git a/lib/widgets/pve_task_log_expansiontile_widget.dart b/lib/widgets/pve_task_log_expansiontile_widget.dart index 03ed1bf..dabe309 100644 --- a/lib/widgets/pve_task_log_expansiontile_widget.dart +++ b/lib/widgets/pve_task_log_expansiontile_widget.dart @@ -108,13 +108,13 @@ class _PveTaskExpansionTileState extends State { ButtonBar( children: [ if (widget.showMorePage != null) - OutlineButton.icon( + OutlinedButton.icon( onPressed: () => Navigator.of(context).push( _createTaskLogRoute(taskLogBloc, widget.showMorePage)), icon: Icon(Icons.format_list_bulleted), label: Text('More Tasks'), ), - OutlineButton.icon( + OutlinedButton.icon( onPressed: () => showTaskLogBottomSheet(context, taskLogBloc.apiClient, widget.task.node, widget.task.upid), icon: Icon(Icons.article), -- 2.30.2