Pre-release bug fixes (#888)

* Fix Exchange picker UI issue

* Fixate local_auth_android version

* Remove shared pref android package override since it's fixed
This commit is contained in:
Omar Hatem 2023-04-19 16:38:07 +02:00 committed by GitHub
parent 5ad67b62a5
commit 27961f2f25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 69 additions and 52 deletions

View file

@ -33,62 +33,71 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AlertBackground( return AlertBackground(
child: Center( child: Column(
child: Column( children: [
mainAxisSize: MainAxisSize.min, Expanded(
children: <Widget>[ child: Stack(
if (widget.title.isNotEmpty) alignment: Alignment.center,
Container( children: [
padding: EdgeInsets.symmetric(horizontal: 24), Column(
child: Text( mainAxisSize: MainAxisSize.min,
widget.title, children: <Widget>[
textAlign: TextAlign.center, if (widget.title.isNotEmpty)
style: TextStyle( Container(
fontSize: 18, padding: EdgeInsets.symmetric(horizontal: 24),
fontFamily: 'Lato', child: Text(
fontWeight: FontWeight.bold, widget.title,
decoration: TextDecoration.none, textAlign: TextAlign.center,
color: Colors.white, style: TextStyle(
), fontSize: 18,
), fontFamily: 'Lato',
), fontWeight: FontWeight.bold,
Padding( decoration: TextDecoration.none,
padding: EdgeInsets.only(left: 24, right: 24, top: 24), color: Colors.white,
child: ClipRRect( ),
borderRadius: BorderRadius.all(Radius.circular(30)),
child: Container(
color: Theme.of(context).accentTextTheme.headline6!.color!,
child: ConstrainedBox(
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.65,
maxWidth: ResponsiveLayoutUtil.kPopupWidth,
), ),
child: Column( ),
mainAxisSize: MainAxisSize.min, Padding(
children: [ padding: EdgeInsets.only(left: 24, right: 24, top: 24),
Flexible( child: ClipRRect(
child: Stack( borderRadius: BorderRadius.all(Radius.circular(30)),
alignment: Alignment.center, child: Container(
children: <Widget>[ color: Theme.of(context).accentTextTheme.headline6!.color!,
items.length > 3 child: ConstrainedBox(
? Scrollbar( constraints: BoxConstraints(
controller: controller, maxHeight: MediaQuery.of(context).size.height * 0.65,
child: itemsList(), maxWidth: ResponsiveLayoutUtil.kPopupWidth,
)
: itemsList(),
],
),
), ),
], child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: Stack(
alignment: Alignment.center,
children: <Widget>[
items.length > 3
? Scrollbar(
controller: controller,
child: itemsList(),
)
: itemsList(),
],
),
),
],
),
),
), ),
), ),
), ),
), ],
), ),
SizedBox(height: ResponsiveLayoutUtil.kPopupSpaceHeight), SizedBox(height: ResponsiveLayoutUtil.kPopupSpaceHeight),
AlertCloseButton(), AlertCloseButton(),
], ],
), ),
),
],
), ),
); );
} }

View file

@ -10,6 +10,7 @@ import cw_monero
import device_info_plus import device_info_plus
import devicelocale import devicelocale
import flutter_secure_storage_macos import flutter_secure_storage_macos
import in_app_review
import package_info import package_info
import path_provider_foundation import path_provider_foundation
import platform_device_id import platform_device_id
@ -25,6 +26,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin")) DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin"))
InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))
FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
PlatformDeviceIdMacosPlugin.register(with: registry.registrar(forPlugin: "PlatformDeviceIdMacosPlugin")) PlatformDeviceIdMacosPlugin.register(with: registry.registrar(forPlugin: "PlatformDeviceIdMacosPlugin"))

View file

@ -26,6 +26,8 @@ PODS:
- flutter_secure_storage_macos (3.3.1): - flutter_secure_storage_macos (3.3.1):
- FlutterMacOS - FlutterMacOS
- FlutterMacOS (1.0.0) - FlutterMacOS (1.0.0)
- in_app_review (0.2.0):
- FlutterMacOS
- package_info (0.0.1): - package_info (0.0.1):
- FlutterMacOS - FlutterMacOS
- path_provider_foundation (0.0.1): - path_provider_foundation (0.0.1):
@ -53,6 +55,7 @@ DEPENDENCIES:
- devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`) - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
- flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
- FlutterMacOS (from `Flutter/ephemeral`) - FlutterMacOS (from `Flutter/ephemeral`)
- in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`)
- package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`) - package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`)
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos`)
- platform_device_id (from `Flutter/ephemeral/.symlinks/plugins/platform_device_id/macos`) - platform_device_id (from `Flutter/ephemeral/.symlinks/plugins/platform_device_id/macos`)
@ -79,6 +82,8 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
FlutterMacOS: FlutterMacOS:
:path: Flutter/ephemeral :path: Flutter/ephemeral
in_app_review:
:path: Flutter/ephemeral/.symlinks/plugins/in_app_review/macos
package_info: package_info:
:path: Flutter/ephemeral/.symlinks/plugins/package_info/macos :path: Flutter/ephemeral/.symlinks/plugins/package_info/macos
path_provider_foundation: path_provider_foundation:
@ -103,6 +108,7 @@ SPEC CHECKSUMS:
devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225 devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
flutter_secure_storage_macos: 6ceee8fbc7f484553ad17f79361b556259df89aa flutter_secure_storage_macos: 6ceee8fbc7f484553ad17f79361b556259df89aa
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
in_app_review: a850789fad746e89bce03d4aeee8078b45a53fd0
package_info: 6eba2fd8d3371dda2d85c8db6fe97488f24b74b2 package_info: 6eba2fd8d3371dda2d85c8db6fe97488f24b74b2
path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9 path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
platform_device_id: 3e414428f45df149bbbfb623e2c0ca27c545b763 platform_device_id: 3e414428f45df149bbbfb623e2c0ca27c545b763

View file

@ -9,7 +9,6 @@ dependencies:
qr_flutter: ^4.0.0 qr_flutter: ^4.0.0
uuid: 3.0.6 uuid: 3.0.6
shared_preferences: ^2.0.15 shared_preferences: ^2.0.15
shared_preferences_android: 2.1.0
flutter_secure_storage: flutter_secure_storage:
git: git:
url: https://github.com/cake-tech/flutter_secure_storage.git url: https://github.com/cake-tech/flutter_secure_storage.git
@ -33,6 +32,7 @@ dependencies:
hive: ^2.2.3 hive: ^2.2.3
hive_flutter: ^1.1.0 hive_flutter: ^1.1.0
local_auth: ^2.1.0 local_auth: ^2.1.0
local_auth_android: 1.0.21
package_info: ^2.0.0 package_info: ^2.0.0
#package_info_plus: ^1.4.2 #package_info_plus: ^1.4.2
devicelocale: devicelocale: