Skip to content

Commit cc966c0

Browse files
authored
➕ Use wechat_picker_library (#234)
1 parent 414b7dc commit cc966c0

13 files changed

+30
-94
lines changed

.github/workflows/runnable.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,4 @@ jobs:
7171
- run: dart --version
7272
- run: flutter --version
7373
- run: flutter pub get
74-
- run: sudo echo "y" | sudo $ANDROID_HOME/tools/bin/sdkmanager "ndk;21.4.7075529"
7574
- run: cd example; flutter build apk --debug

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ that can be found in the LICENSE file. -->
66

77
See the [Migration Guide](guides/migration_guide.md) for breaking changes between versions.
88

9+
## 4.2.0-dev.4
10+
11+
### Improvements
12+
13+
- Use `wechat_picker_library`.
14+
915
## 4.2.0-dev.3
1016

1117
### Improvements

lib/src/constants/styles.dart

Lines changed: 0 additions & 8 deletions
This file was deleted.

lib/src/internals/extensions.dart

Lines changed: 0 additions & 19 deletions
This file was deleted.

lib/src/constants/constants.dart renamed to lib/src/internals/singleton.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import '../delegates/camera_picker_text_delegate.dart';
66

77
export 'package:photo_manager/photo_manager.dart';
88

9-
final class Constants {
10-
const Constants._();
9+
final class Singleton {
10+
const Singleton._();
1111

1212
static CameraPickerTextDelegate textDelegate =
1313
const CameraPickerTextDelegate();

lib/src/states/camera_picker_state.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ import 'package:flutter/material.dart';
1313
import 'package:flutter/semantics.dart';
1414
import 'package:flutter/services.dart';
1515
import 'package:sensors_plus/sensors_plus.dart';
16+
import 'package:wechat_picker_library/wechat_picker_library.dart';
1617

1718
import '../constants/config.dart';
18-
import '../constants/constants.dart';
19+
import '../internals/singleton.dart';
1920
import '../constants/enums.dart';
20-
import '../constants/styles.dart';
2121
import '../delegates/camera_picker_text_delegate.dart';
22-
import '../internals/extensions.dart';
2322
import '../internals/methods.dart';
2423
import '../widgets/camera_focus_point.dart';
2524
import '../widgets/camera_picker.dart';
@@ -204,9 +203,9 @@ class CameraPickerState extends State<CameraPicker>
204203
/// If there's no theme provided from the user, use [CameraPicker.themeData] .
205204
/// 如果用户未提供主题,通过 [CameraPicker.themeData] 创建。
206205
late final ThemeData theme =
207-
pickerConfig.theme ?? CameraPicker.themeData(wechatThemeColor);
206+
pickerConfig.theme ?? CameraPicker.themeData(defaultThemeColorWeChat);
208207

209-
CameraPickerTextDelegate get textDelegate => Constants.textDelegate;
208+
CameraPickerTextDelegate get textDelegate => Singleton.textDelegate;
210209

211210
/// If controller methods were failed to called for camera descriptions,
212211
/// it will be recorded as invalid and never gets called again.
@@ -225,7 +224,7 @@ class CameraPickerState extends State<CameraPicker>
225224
void initState() {
226225
super.initState();
227226
ambiguate(WidgetsBinding.instance)?.addObserver(this);
228-
Constants.textDelegate = widget.pickerConfig.textDelegate ??
227+
Singleton.textDelegate = widget.pickerConfig.textDelegate ??
229228
cameraPickerTextDelegateFromLocale(widget.locale);
230229
initCameras();
231230
initAccelerometerSubscription();

lib/src/states/camera_picker_viewer_state.dart

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ import 'package:flutter/material.dart';
1010
import 'package:flutter/semantics.dart';
1111
import 'package:path/path.dart' as path;
1212
import 'package:video_player/video_player.dart';
13+
import 'package:wechat_picker_library/wechat_picker_library.dart';
1314

14-
import '../constants/constants.dart';
15+
import '../internals/singleton.dart';
1516
import '../constants/enums.dart';
16-
import '../constants/styles.dart';
1717
import '../constants/type_defs.dart';
18-
import '../internals/extensions.dart';
1918
import '../internals/methods.dart';
2019
import '../widgets/camera_picker.dart';
2120
import '../widgets/camera_picker_viewer.dart';
@@ -25,8 +24,8 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
2524
/// 播放器是否在播放
2625
final ValueNotifier<bool> isPlaying = ValueNotifier<bool>(false);
2726

28-
late final ThemeData theme =
29-
widget.pickerConfig.theme ?? CameraPicker.themeData(wechatThemeColor);
27+
late final ThemeData theme = widget.pickerConfig.theme ??
28+
CameraPicker.themeData(defaultThemeColorWeChat);
3029

3130
/// Construct an [File] instance through [previewXFile].
3231
/// 通过 [previewXFile] 构建 [File] 实例。
@@ -253,9 +252,9 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
253252
}
254253
return MergeSemantics(
255254
child: Semantics(
256-
label: Constants.textDelegate.sActionPreviewHint,
255+
label: Singleton.textDelegate.sActionPreviewHint,
257256
image: true,
258-
onTapHint: Constants.textDelegate.sActionPreviewHint,
257+
onTapHint: Singleton.textDelegate.sActionPreviewHint,
259258
sortKey: const OrdinalSortKey(1),
260259
child: builder,
261260
),
@@ -276,7 +275,7 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
276275
onPressed: createAssetEntityAndPop,
277276
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
278277
child: Text(
279-
Constants.textDelegate.confirm,
278+
Singleton.textDelegate.confirm,
280279
style: TextStyle(
281280
color: theme.textTheme.bodyLarge?.color,
282281
fontSize: 17,
@@ -352,7 +351,7 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
352351
child: AnimatedOpacity(
353352
duration: kThemeAnimationDuration,
354353
opacity: isSavingEntity ? 1 : 0,
355-
child: _WechatLoading(tip: Constants.textDelegate.saving),
354+
child: _WechatLoading(tip: Singleton.textDelegate.saving),
356355
),
357356
);
358357
}
@@ -362,7 +361,7 @@ class CameraPickerViewerState extends State<CameraPickerViewer> {
362361
if (hasErrorWhenInitializing) {
363362
return Center(
364363
child: Text(
365-
Constants.textDelegate.loadFailed,
364+
Singleton.textDelegate.loadFailed,
366365
style: const TextStyle(inherit: false),
367366
),
368367
);

lib/src/widgets/builder/tween_animation_builder_2.dart

Lines changed: 0 additions & 41 deletions
This file was deleted.

lib/src/widgets/camera_focus_point.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
7-
import 'builder/tween_animation_builder_2.dart';
6+
import 'package:wechat_picker_library/wechat_picker_library.dart';
87

98
final class CameraFocusPoint extends StatelessWidget {
109
const CameraFocusPoint({

lib/src/widgets/camera_picker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:flutter/material.dart';
99
import 'package:flutter/services.dart';
1010

1111
import '../constants/config.dart';
12-
import '../constants/constants.dart';
12+
import '../internals/singleton.dart';
1313
import '../states/camera_picker_state.dart';
1414

1515
import 'camera_picker_page_route.dart';

0 commit comments

Comments
 (0)