diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index fd8ffb40..63398c9b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -177,7 +177,6 @@
-
-
-
\ No newline at end of file
diff --git a/lib/pages/common/publish/common_rich_text_pub_page.dart b/lib/pages/common/publish/common_rich_text_pub_page.dart
index cbaf4444..8f103c51 100644
--- a/lib/pages/common/publish/common_rich_text_pub_page.dart
+++ b/lib/pages/common/publish/common_rich_text_pub_page.dart
@@ -148,18 +148,17 @@ abstract class CommonRichTextPubPageState
}
Future onCropImage(int index) async {
- final theme = Theme.of(context);
+ late final colorScheme = ColorScheme.of(context);
CroppedFile? croppedFile = await ImageCropper().cropImage(
sourcePath: pathList[index],
uiSettings: [
AndroidUiSettings(
toolbarTitle: '裁剪',
- toolbarColor: theme.colorScheme.secondaryContainer,
- toolbarWidgetColor: theme.colorScheme.onSecondaryContainer,
- ),
- IOSUiSettings(
- title: '裁剪',
+ toolbarColor: colorScheme.secondaryContainer,
+ toolbarWidgetColor: colorScheme.onSecondaryContainer,
+ statusBarLight: colorScheme.brightness.isLight,
),
+ IOSUiSettings(title: '裁剪'),
],
);
if (croppedFile != null) {
diff --git a/lib/pages/fav_create/view.dart b/lib/pages/fav_create/view.dart
index a2d886f3..8a703f5a 100644
--- a/lib/pages/fav_create/view.dart
+++ b/lib/pages/fav_create/view.dart
@@ -2,6 +2,7 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
import 'package:PiliPlus/http/fav.dart';
import 'package:PiliPlus/http/msg.dart';
import 'package:PiliPlus/models_new/fav/fav_folder/list.dart';
+import 'package:PiliPlus/utils/extension.dart';
import 'package:PiliPlus/utils/fav_utils.dart';
import 'package:PiliPlus/utils/image_utils.dart';
import 'package:cached_network_image/cached_network_image.dart';
@@ -121,21 +122,18 @@ class _CreateFavPageState extends State {
toolbarTitle: '裁剪',
toolbarColor: theme.colorScheme.secondaryContainer,
toolbarWidgetColor: theme.colorScheme.onSecondaryContainer,
- aspectRatioPresets: [
- CropAspectRatioPreset.ratio16x9,
- ],
+ statusBarLight: theme.colorScheme.brightness.isLight,
+ aspectRatioPresets: [CropAspectRatioPreset.ratio16x9],
lockAspectRatio: true,
hideBottomControls: true,
initAspectRatio: CropAspectRatioPreset.ratio16x9,
),
IOSUiSettings(
title: '裁剪',
- aspectRatioPresets: [
- CropAspectRatioPreset.ratio16x9,
- ],
- aspectRatioLockEnabled: false,
- resetAspectRatioEnabled: false,
- aspectRatioPickerButtonHidden: true,
+ // aspectRatioPresets: [CropAspectRatioPreset.ratio16x9],
+ // aspectRatioLockEnabled: false,
+ // resetAspectRatioEnabled: false,
+ // aspectRatioPickerButtonHidden: true,
),
],
);
diff --git a/lib/pages/member_profile/view.dart b/lib/pages/member_profile/view.dart
index 2d2c3569..cba140b7 100644
--- a/lib/pages/member_profile/view.dart
+++ b/lib/pages/member_profile/view.dart
@@ -495,9 +495,8 @@ class _EditProfilePageState extends State {
toolbarTitle: '裁剪',
toolbarColor: theme.colorScheme.secondaryContainer,
toolbarWidgetColor: theme.colorScheme.onSecondaryContainer,
- aspectRatioPresets: [
- CropAspectRatioPresetCustom(),
- ],
+ statusBarLight: theme.colorScheme.brightness.isLight,
+ aspectRatioPresets: [CropAspectRatioPresetCustom()],
lockAspectRatio: true,
hideBottomControls: true,
cropStyle: CropStyle.circle,
@@ -505,9 +504,7 @@ class _EditProfilePageState extends State {
),
IOSUiSettings(
title: '裁剪',
- aspectRatioPresets: [
- CropAspectRatioPresetCustom(),
- ],
+ aspectRatioPresets: [CropAspectRatioPresetCustom()],
cropStyle: CropStyle.circle,
aspectRatioLockEnabled: true,
resetAspectRatioEnabled: false,
diff --git a/pubspec.lock b/pubspec.lock
index 1ba2f075..e65aabb0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -912,10 +912,10 @@ packages:
dependency: "direct main"
description:
name: image_cropper
- sha256: "4e9c96c029eb5a23798da1b6af39787f964da6ffc78fd8447c140542a9f7c6fc"
+ sha256: d104cc1f90b0d38ac309f7ec240b8f55f2c6e76d1bfae05e23917bfea631e725
url: "https://pub.dev"
source: hosted
- version: "9.1.0"
+ version: "10.0.0+1"
image_cropper_for_web:
dependency: transitive
description:
@@ -928,10 +928,10 @@ packages:
dependency: transitive
description:
name: image_cropper_platform_interface
- sha256: "6ca6b81769abff9a4dcc3bbd3d75f5dfa9de6b870ae9613c8cd237333a4283af"
+ sha256: "2d8db8f4b638e448fa89a1e77cd8f053b4547472bd3ae073169e86626d03afef"
url: "https://pub.dev"
source: hosted
- version: "7.1.0"
+ version: "7.2.0"
image_picker:
dependency: "direct main"
description:
@@ -1387,10 +1387,10 @@ packages:
dependency: transitive
description:
name: pool
- sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+ sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
url: "https://pub.dev"
source: hosted
- version: "1.5.1"
+ version: "1.5.2"
posix:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8d2d156e..c135e8fc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -187,7 +187,7 @@ dependencies:
intl: ^0.20.2
archive: ^4.0.0
flutter_svg: ^2.0.14
- image_cropper: ^9.1.0
+ image_cropper: ^10.0.0+1
#解压直播消息
brotli: ^0.6.0
expandable: ^5.0.1