From e04c6ab6452cc799631a9ad1082e59288f4e78a3 Mon Sep 17 00:00:00 2001 From: "khaled.njim" Date: Thu, 5 Dec 2024 20:45:23 +0100 Subject: [PATCH] fixup! TW-1846 Update file picker send screen style --- .../chat/send_file_dialog/send_file_dialog_style.dart | 2 -- lib/presentation/mixins/media_picker_mixin.dart | 4 ++-- lib/presentation/style/media_picker_style.dart | 2 +- pubspec.lock | 8 ++++---- pubspec.yaml | 3 ++- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/pages/chat/send_file_dialog/send_file_dialog_style.dart b/lib/pages/chat/send_file_dialog/send_file_dialog_style.dart index abafc4faa2..e25177681b 100644 --- a/lib/pages/chat/send_file_dialog/send_file_dialog_style.dart +++ b/lib/pages/chat/send_file_dialog/send_file_dialog_style.dart @@ -77,6 +77,4 @@ class SendFileDialogStyle { ); static const double errorSubHeaderWidth = 340; - - static const double heightOfBottomSheet = 400; } diff --git a/lib/presentation/mixins/media_picker_mixin.dart b/lib/presentation/mixins/media_picker_mixin.dart index 2140926858..1bbd717b41 100644 --- a/lib/presentation/mixins/media_picker_mixin.dart +++ b/lib/presentation/mixins/media_picker_mixin.dart @@ -96,11 +96,11 @@ mixin MediaPickerMixin on CommonMediaPickerMixin { }); return await linagora_image_picker.ImagePicker.showImagesGridBottomSheet( - heightOfBottomSheet: SendFileDialogStyle.heightOfBottomSheet, context: context, controller: imagePickerController, backgroundImageCamera: MediaPickerStyle.cameraIcon, initialChildSize: MediaPickerStyle.initialChildSize, + minChildSize: MediaPickerStyle.initialChildSize, permissionStatus: permissionStatusPhotos, gridPadding: MediaPickerStyle.gridPadding, assetBackgroundColor: LinagoraSysColors.material().background, @@ -139,7 +139,7 @@ mixin MediaPickerMixin on CommonMediaPickerMixin { return Container( padding: MediaPickerStyle.itemPickerPadding, decoration: BoxDecoration( - color: Colors.white, + color: LinagoraSysColors.material().surface, border: Border( top: BorderSide( color: Theme.of(context) diff --git a/lib/presentation/style/media_picker_style.dart b/lib/presentation/style/media_picker_style.dart index ae146c43f0..7107d64a68 100644 --- a/lib/presentation/style/media_picker_style.dart +++ b/lib/presentation/style/media_picker_style.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class MediaPickerStyle { static const AssetImage cameraIcon = AssetImage("assets/verification.png"); - static const initialChildSize = 0.6; + static const initialChildSize = 0.5; static const EdgeInsets gridPadding = EdgeInsets.only(bottom: 150); diff --git a/pubspec.lock b/pubspec.lock index 13640d3026..e5abffc789 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1786,8 +1786,8 @@ packages: dependency: "direct main" description: path: "." - ref: master - resolved-ref: f5e0f2d0f9450dda58c72233f72fb48cf7d2769b + ref: LA-1846_Update_image_picker_design + resolved-ref: ef91e6d3e53418cd744fe60bd6a8c36bbe30fff0 url: "git@github.com:linagora/linagora-design-flutter.git" source: git version: "0.0.1" @@ -3227,10 +3227,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.2.5" volume_controller: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 460e830be2..b2755b11fb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,7 +29,8 @@ dependencies: linagora_design_flutter: git: url: git@github.com:linagora/linagora-design-flutter.git - ref: master + ref: LA-1846_Update_image_picker_design + flutter_matrix_html: git: url: https://github.com/linagora/flutter_matrix_html.git