Skip to content

Commit

Permalink
[dependencies] upgrade dependencies to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Mael Le Goff committed Mar 11, 2022
1 parent a956b80 commit 3890088
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 73 deletions.
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '9.3'
platform :ios, '10'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
38 changes: 32 additions & 6 deletions example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 51;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -68,7 +68,6 @@
5E936127F84FC7ACCE9E4B1D /* Pods-Runner.release.xcconfig */,
3FBEB4B11E40AFFF53EED524 /* Pods-Runner.profile.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -139,6 +138,7 @@
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
2429AC40B28B8167C3DF858E /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -155,7 +155,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1020;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -197,6 +197,23 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
2429AC40B28B8167C3DF858E /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
2D67C549E268C5158D0E3007 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -344,7 +361,10 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
Expand Down Expand Up @@ -476,7 +496,10 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
Expand All @@ -503,7 +526,10 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions example/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSPhotoLibraryUsageDescription</key>
<string>${PRODUCT_NAME} Library Access</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand All @@ -41,7 +43,5 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSPhotoLibraryUsageDescription</key>
<string>${PRODUCT_NAME} Library Access</string>
</dict>
</plist>
59 changes: 35 additions & 24 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ class _VideoPickerPageState extends State<VideoPickerPage> {

void _pickVideo() async {
final XFile? file = await _picker.pickVideo(source: ImageSource.gallery);
if (file != null) context.to(VideoEditor(file: File(file.path)));
if (file != null)
context.navigator.push(MaterialPageRoute<void>(
builder: (BuildContext context) =>
VideoEditor(file: File(file.path))));
}

@override
Expand All @@ -56,10 +59,12 @@ class _VideoPickerPageState extends State<VideoPickerPage> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
TextDesigned(
Text(
"Click on Pick Video to select video",
color: Colors.black,
size: 18.0,
style: TextStyle(
color: Colors.black,
fontSize: 18.0,
),
),
ElevatedButton(
onPressed: _pickVideo,
Expand Down Expand Up @@ -109,12 +114,13 @@ class _VideoEditorState extends State<VideoEditor> {
super.dispose();
}

void _openCropScreen() => context.to(CropScreen(controller: _controller));
void _openCropScreen() => context.navigator.push(MaterialPageRoute<void>(
builder: (BuildContext context) => CropScreen(controller: _controller)));

void _exportVideo() async {
_isExporting.value = true;
bool _firstStat = true;
//NOTE: To use [-crf 17] and [VideoExportPreset] you need ["min-gpl-lts"] package
//NOTE: To use `-crf 1` and [VideoExportPreset] you need `ffmpeg_kit_flutter_min_gpl` package (with `ffmpeg_kit` only it won't work)
await _controller.exportVideo(
// preset: VideoExportPreset.medium,
// customInstruction: "-crf 17",
Expand Down Expand Up @@ -281,11 +287,12 @@ class _VideoEditorState extends State<VideoEditor> {
backgroundColor: Colors.white,
title: ValueListenableBuilder(
valueListenable: _exportingProgress,
builder: (_, double value, __) =>
TextDesigned(
builder: (_, double value, __) => Text(
"Exporting video ${(value * 100).ceil()}%",
color: Colors.black,
bold: true,
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
),
),
Expand Down Expand Up @@ -358,14 +365,14 @@ class _VideoEditorState extends State<VideoEditor> {
return Padding(
padding: Margin.horizontal(height / 4),
child: Row(children: [
TextDesigned(formatter(Duration(seconds: pos.toInt()))),
Text(formatter(Duration(seconds: pos.toInt()))),
Expanded(child: SizedBox()),
OpacityTransition(
visible: _controller.isTrimming,
child: Row(mainAxisSize: MainAxisSize.min, children: [
TextDesigned(formatter(Duration(seconds: start.toInt()))),
Text(formatter(Duration(seconds: start.toInt()))),
SizedBox(width: 10),
TextDesigned(formatter(Duration(seconds: end.toInt()))),
Text(formatter(Duration(seconds: end.toInt()))),
]),
)
]),
Expand Down Expand Up @@ -400,16 +407,14 @@ class _VideoEditorState extends State<VideoEditor> {
alignment: Alignment.bottomCenter,
child: SwipeTransition(
visible: _exported,
direction: SwipeDirection.fromBottom,
axisAlignment: 1.0,
child: Container(
height: height,
width: double.infinity,
color: Colors.black.withOpacity(0.8),
child: Center(
child: TextDesigned(
_exportText,
bold: true,
),
child: Text(_exportText,
style: TextStyle(fontWeight: FontWeight.bold)),
),
),
),
Expand Down Expand Up @@ -460,11 +465,11 @@ class CropScreen extends StatelessWidget {
Row(children: [
Expanded(
child: SplashTap(
onTap: context.goBack,
onTap: context.navigator.pop,
child: Center(
child: TextDesigned(
child: Text(
"CANCEL",
bold: true,
style: TextStyle(fontWeight: FontWeight.bold),
),
),
),
Expand All @@ -483,10 +488,13 @@ class CropScreen extends StatelessWidget {
controller.minCrop = controller.cacheMinCrop;
controller.maxCrop = controller.cacheMaxCrop;
*/
context.goBack();
context.navigator.pop();
},
child: Center(
child: TextDesigned("OK", bold: true),
child: Text(
"OK",
style: TextStyle(fontWeight: FontWeight.bold),
),
),
),
),
Expand All @@ -510,7 +518,10 @@ class CropScreen extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.aspect_ratio, color: Colors.white),
TextDesigned(title, bold: true),
Text(
title,
style: TextStyle(fontWeight: FontWeight.bold),
),
],
),
),
Expand Down
12 changes: 4 additions & 8 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@ dependencies:
video_editor:
path: ../

helpers: ^1.1.1
image_picker: ^0.8.4
cupertino_icons: ^1.0.2
video_player: ^2.2.6

dev_dependencies:
flutter_test:
sdk: flutter
helpers: ^1.1.4
image_picker: ^0.8.4+11
cupertino_icons: ^1.0.4
video_player: ^2.3.0

flutter:
uses-material-design: true
Expand Down
22 changes: 1 addition & 21 deletions example/test/widget_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,6 @@
// gestures. You can also use WidgetTester to find child widgets in the widget
// tree, read text, and verify that the values of widget properties are correct.

import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';

import 'package:example/main.dart';

void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame.
await tester.pumpWidget(MyApp());

// Verify that our counter starts at 0.
expect(find.text('0'), findsOneWidget);
expect(find.text('1'), findsNothing);

// Tap the '+' icon and trigger a frame.
await tester.tap(find.byIcon(Icons.add));
await tester.pump();

// Verify that our counter has incremented.
expect(find.text('0'), findsNothing);
expect(find.text('1'), findsOneWidget);
});
print("No test");
}
16 changes: 6 additions & 10 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
name: video_editor
version: 1.2.3
description: Video Editor allows trim, crop, rotate and scale video with a super
flexible UI Design.
description: A video editor that allows to trim, crop, rotate and scale video with a very flexible UI Design.
homepage: https://github.com/seel-channel/video_editor

environment:
sdk: ">=2.12.0 <3.0.0"
flutter: ">=1.17.0"

dependencies:
ffmpeg_kit_flutter_min_gpl: 4.5.1-LTS
flutter:
sdk: flutter
path: ^1.8.0
path_provider: ^2.0.2
video_player: ^2.2.6
video_thumbnail: ^0.4.3

dev_dependencies:
flutter_test:
sdk: flutter
ffmpeg_kit_flutter_min_gpl: 4.5.1-LTS
path: ^1.8.1
path_provider: ^2.0.9
video_player: ^2.3.0
video_thumbnail: ^0.4.6

0 comments on commit 3890088

Please sign in to comment.