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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 35D1486C9E for ; Mon, 27 Dec 2021 15:07:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2AAE61A25F for ; Mon, 27 Dec 2021 15:07:08 +0100 (CET) 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 id 5BA041A256 for ; Mon, 27 Dec 2021 15:07:07 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 35C0845F89 for ; Mon, 27 Dec 2021 15:07:07 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 27 Dec 2021 15:07:04 +0100 Message-Id: <20211227140705.1531308-2-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211227140705.1531308-1-a.lauterer@proxmox.com> References: <20211227140705.1531308-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 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 Subject: [pve-devel] [PATCH login_manager 1/2] login_form: keep Continue button above Android softnav 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: Mon, 27 Dec 2021 14:07:08 -0000 By placing the items in a SafeArea we avoid having the "Continue" button behind the Android soft navigation buttons. Signed-off-by: Aaron Lauterer --- lib/proxmox_login_form.dart | 265 ++++++++++++++++++------------------ 1 file changed, 135 insertions(+), 130 deletions(-) diff --git a/lib/proxmox_login_form.dart b/lib/proxmox_login_form.dart index 2609f71..bb00b5c 100644 --- a/lib/proxmox_login_form.dart +++ b/lib/proxmox_login_form.dart @@ -232,152 +232,157 @@ class _ProxmoxLoginPageState extends State { child: ConstrainedBox( constraints: BoxConstraints.tightFor( height: MediaQuery.of(context).size.height), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: FutureBuilder?>( - future: _accessDomains, - builder: (context, snapshot) { - return Form( - key: _formKey, - onChanged: () { - setState(() { - _submittButtonEnabled = - _formKey.currentState!.validate(); - }); - }, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: Container( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'assets/images/proxmox_logo_symbol_wordmark.png', - package: 'proxmox_login_manager', - ), - ], + child: SafeArea( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: FutureBuilder?>( + future: _accessDomains, + builder: (context, snapshot) { + return Form( + key: _formKey, + onChanged: () { + setState(() { + _submittButtonEnabled = + _formKey.currentState!.validate(); + }); + }, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: Container( + child: Column( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Image.asset( + 'assets/images/proxmox_logo_symbol_wordmark.png', + package: 'proxmox_login_manager', + ), + ], + ), ), ), - ), - ProxmoxLoginForm( - originController: _originController, - originValidator: (value) { - if (value == null || value.isEmpty) { - return 'Please enter origin'; - } - if (value.startsWith('https://') || - value.startsWith('http://')) { - return 'Do not prefix with scheme'; - } - try { - Uri.https(value, ''); - return null; - } on FormatException catch (_) { - return 'Invalid URI'; - } - }, - usernameController: _usernameController, - passwordController: _passwordController, - accessDomains: snapshot.data, - selectedDomain: _selectedDomain, - onDomainChanged: (value) { - setState(() { - _selectedDomain = value; - }); - }, - onOriginSubmitted: _submittButtonEnabled - ? () { - final isValid = - _formKey.currentState!.validate(); - setState(() { - _submittButtonEnabled = isValid; - }); - if (isValid) { + ProxmoxLoginForm( + originController: _originController, + originValidator: (value) { + if (value == null || value.isEmpty) { + return 'Please enter origin'; + } + if (value.startsWith('https://') || + value.startsWith('http://')) { + return 'Do not prefix with scheme'; + } + try { + Uri.https(value, ''); + return null; + } on FormatException catch (_) { + return 'Invalid URI'; + } + }, + usernameController: _usernameController, + passwordController: _passwordController, + accessDomains: snapshot.data, + selectedDomain: _selectedDomain, + onDomainChanged: (value) { + setState(() { + _selectedDomain = value; + }); + }, + onOriginSubmitted: _submittButtonEnabled + ? () { + final isValid = + _formKey.currentState!.validate(); setState(() { - _accessDomains = - _getAccessDomains(); + _submittButtonEnabled = isValid; }); + if (isValid) { + setState(() { + _accessDomains = + _getAccessDomains(); + }); + } } - } - : null, - onPasswordSubmitted: _submittButtonEnabled - ? () { - final isValid = - _formKey.currentState!.validate(); - setState(() { - _submittButtonEnabled = isValid; - }); - if (isValid) { - _onLoginButtonPressed(); + : null, + onPasswordSubmitted: _submittButtonEnabled + ? () { + final isValid = + _formKey.currentState!.validate(); + setState(() { + _submittButtonEnabled = isValid; + }); + if (isValid) { + _onLoginButtonPressed(); + } } - } - : null, - ), - if (snapshot.hasData) - Expanded( - child: Align( - alignment: Alignment.bottomCenter, - child: Container( - width: MediaQuery.of(context).size.width, - child: FlatButton( - onPressed: _submittButtonEnabled - ? () { - final isValid = _formKey - .currentState! - .validate(); - setState(() { - _submittButtonEnabled = - isValid; - }); - if (isValid) { - _onLoginButtonPressed(); + : null, + ), + if (snapshot.hasData) + Expanded( + child: Align( + alignment: Alignment.bottomCenter, + child: Container( + width: + MediaQuery.of(context).size.width, + child: FlatButton( + onPressed: _submittButtonEnabled + ? () { + final isValid = _formKey + .currentState! + .validate(); + setState(() { + _submittButtonEnabled = + isValid; + }); + if (isValid) { + _onLoginButtonPressed(); + } } - } - : null, - color: ProxmoxColors.orange, - disabledColor: Colors.grey, - child: Text('Continue'), + : null, + color: ProxmoxColors.orange, + disabledColor: Colors.grey, + child: Text('Continue'), + ), ), ), ), - ), - if (!snapshot.hasData) - Expanded( - child: Align( - alignment: Alignment.bottomCenter, - child: Container( - width: MediaQuery.of(context).size.width, - child: FlatButton( - onPressed: _submittButtonEnabled - ? () { - final isValid = _formKey - .currentState! - .validate(); - setState(() { - _submittButtonEnabled = - isValid; - }); - if (isValid) { + if (!snapshot.hasData) + Expanded( + child: Align( + alignment: Alignment.bottomCenter, + child: Container( + width: + MediaQuery.of(context).size.width, + child: FlatButton( + onPressed: _submittButtonEnabled + ? () { + final isValid = _formKey + .currentState! + .validate(); setState(() { - _accessDomains = - _getAccessDomains(); + _submittButtonEnabled = + isValid; }); + if (isValid) { + setState(() { + _accessDomains = + _getAccessDomains(); + }); + } } - } - : null, - color: ProxmoxColors.orange, - child: Text('Continue'), - disabledColor: Colors.grey, + : null, + color: ProxmoxColors.orange, + child: Text('Continue'), + disabledColor: Colors.grey, + ), ), ), ), - ), - ], - ), - ); - }), + ], + ), + ); + }), + ), ), ), ), -- 2.30.2