From b8326762bfe148468158d5e579e7d6150ddc2304 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 4 Jul 2022 11:19:26 -0700 Subject: [PATCH 1/4] Fix Android Modal Menu --- lib/views/contactsview.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart index d09ea57b..f16b7a9e 100644 --- a/lib/views/contactsview.dart +++ b/lib/views/contactsview.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:cwtch/cwtch/cwtch.dart'; import 'package:cwtch/cwtch_icons_icons.dart'; import 'package:cwtch/models/appstate.dart'; @@ -289,7 +291,7 @@ class _ContactsViewState extends State { padding: MediaQuery.of(context).viewInsets, child: RepaintBoundary( child: Container( - height: 200, // bespoke value courtesy of the [TextField] docs + height: Platform.isAndroid ? 250 : 200, // bespoke value courtesy of the [TextField] docs child: Center( child: Padding( padding: EdgeInsets.all(2.0), @@ -306,7 +308,7 @@ class _ContactsViewState extends State { message: AppLocalizations.of(context)!.tooltipAddContact, child: ElevatedButton( style: ElevatedButton.styleFrom( - minimumSize: Size.fromWidth(double.infinity), + minimumSize: Size.fromWidth(399), maximumSize: Size.fromWidth(400), shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), ), @@ -328,7 +330,7 @@ class _ContactsViewState extends State { message: groupsEnabled ? AppLocalizations.of(context)!.addServerTooltip : AppLocalizations.of(context)!.thisFeatureRequiresGroupExpermientsToBeEnabled, child: ElevatedButton( style: ElevatedButton.styleFrom( - minimumSize: Size.fromWidth(double.infinity), + minimumSize: Size.fromWidth(399), maximumSize: Size.fromWidth(400), shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), ), @@ -353,7 +355,7 @@ class _ContactsViewState extends State { message: groupsEnabled ? AppLocalizations.of(context)!.createGroupTitle : AppLocalizations.of(context)!.thisFeatureRequiresGroupExpermientsToBeEnabled, child: ElevatedButton( style: ElevatedButton.styleFrom( - minimumSize: Size.fromWidth(double.infinity), + minimumSize: Size.fromWidth(399), maximumSize: Size.fromWidth(400), shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), ), From 6b9cf1f16417e2556a64a67295c43da920da419b Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 4 Jul 2022 11:31:49 -0700 Subject: [PATCH 2/4] Fix Modal for New/Import and Unlock on Android --- lib/views/profilemgrview.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/views/profilemgrview.dart b/lib/views/profilemgrview.dart index 9324432d..38f1fc87 100644 --- a/lib/views/profilemgrview.dart +++ b/lib/views/profilemgrview.dart @@ -206,7 +206,7 @@ class _ProfileMgrViewState extends State { padding: MediaQuery.of(context).viewInsets, child: RepaintBoundary( child: Container( - height: 200, // bespoke value courtesy of the [TextField] docs + height: Platform.isAndroid ? 250 : 200, // bespoke value courtesy of the [TextField] docs child: Center( child: Padding( padding: EdgeInsets.all(10.0), @@ -221,7 +221,7 @@ class _ProfileMgrViewState extends State { Expanded( child: ElevatedButton( style: ElevatedButton.styleFrom( - minimumSize: Size(double.infinity, 20), + minimumSize: Size(399, 20), maximumSize: Size(400, 20), shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), ), @@ -242,7 +242,7 @@ class _ProfileMgrViewState extends State { message: AppLocalizations.of(context)!.importProfileTooltip, child: ElevatedButton( style: ElevatedButton.styleFrom( - minimumSize: Size(double.infinity, 20), + minimumSize: Size(399, 20), maximumSize: Size(400, 20), shape: RoundedRectangleBorder( side: BorderSide(color: Provider.of(context).theme.defaultButtonActiveColor, width: 2.0), @@ -287,7 +287,7 @@ class _ProfileMgrViewState extends State { padding: MediaQuery.of(context).viewInsets, child: RepaintBoundary( child: Container( - height: 200, // bespoke value courtesy of the [TextField] docs + height: Platform.isAndroid ? 250 : 200, // bespoke value courtesy of the [TextField] docs child: Center( child: Padding( padding: EdgeInsets.all(10.0), From 61ee9491abbae46d050ed43152869098c1e7c4b4 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 4 Jul 2022 11:40:53 -0700 Subject: [PATCH 3/4] Fix Cut off Buttons in Android --- lib/views/addeditprofileview.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/views/addeditprofileview.dart b/lib/views/addeditprofileview.dart index aaa64b3e..93725fb2 100644 --- a/lib/views/addeditprofileview.dart +++ b/lib/views/addeditprofileview.dart @@ -279,8 +279,8 @@ class _AddEditProfileViewState extends State { ElevatedButton( onPressed: _createPressed, style: ElevatedButton.styleFrom( - minimumSize: Size(400, 50), - maximumSize: Size(800, 50), + minimumSize: Size(400, 75), + maximumSize: Size(800, 75), shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), ), child: Text( @@ -297,8 +297,8 @@ class _AddEditProfileViewState extends State { message: AppLocalizations.of(context)!.exportProfileTooltip, child: ElevatedButton.icon( style: ElevatedButton.styleFrom( - minimumSize: Size(400, 50), - maximumSize: Size(800, 50), + minimumSize: Size(400, 75), + maximumSize: Size(800, 75), shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), ), onPressed: () { @@ -328,8 +328,8 @@ class _AddEditProfileViewState extends State { message: AppLocalizations.of(context)!.enterCurrentPasswordForDelete, child: ElevatedButton.icon( style: ElevatedButton.styleFrom( - minimumSize: Size(400, 50), - maximumSize: Size(800, 50), + minimumSize: Size(400, 75), + maximumSize: Size(800, 75), shape: RoundedRectangleBorder( side: BorderSide(color: Provider.of(context).theme.defaultButtonActiveColor, width: 2.0), borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))), From 0dd9ecedac4cc39fabf3c546a01b42bfea6a8930 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 4 Jul 2022 12:07:55 -0700 Subject: [PATCH 4/4] update pubspec version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7c78a1e3..d12d5ae6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.8.0+33 +version: 1.8.0+34 environment: sdk: ">=2.15.0 <3.0.0"