Skip to content

Commit

Permalink
feat: add support for merging four videos (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
BBarisKilic authored May 10, 2024
2 parents 2d3b8bf + 1a4bd10 commit 9f50c57
Show file tree
Hide file tree
Showing 21 changed files with 505 additions and 91 deletions.
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.22" apply false
id "org.jetbrains.kotlin.android" version "1.8.0" apply false
}

include ":app"
62 changes: 61 additions & 1 deletion lib/src/core/l10n/app_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,30 @@ abstract class AppLocalizations {
/// **'Cancel'**
String get cancel;

/// No description provided for @cancelled.
///
/// In en, this message translates to:
/// **'Cancelled'**
String get cancelled;

/// No description provided for @cancelledMessage.
///
/// In en, this message translates to:
/// **'The video merge process has been cancelled!'**
String get cancelledMessage;

/// No description provided for @close.
///
/// In en, this message translates to:
/// **'Close'**
String get close;

/// No description provided for @confirm.
///
/// In en, this message translates to:
/// **'Confirm'**
String get confirm;

/// No description provided for @contactUs.
///
/// In en, this message translates to:
Expand Down Expand Up @@ -290,10 +308,16 @@ abstract class AppLocalizations {
/// **'Failed to initialise FFmpeg! Please try again later.'**
String get failedToInitFFmpegMessage;

/// No description provided for @failedToLaunchGalleryMessage.
///
/// In en, this message translates to:
/// **'Failed to launch gallery! Please grant the required permissions.'**
String get failedToLaunchGalleryMessage;

/// No description provided for @failedToMergeVideosMessage.
///
/// In en, this message translates to:
/// **'Failed to merge videos! Please try again later.'**
/// **'Failed to merge videos! Please try with different configurations.'**
String get failedToMergeVideosMessage;

/// No description provided for @failedToSaveVideoMessage.
Expand Down Expand Up @@ -386,6 +410,12 @@ abstract class AppLocalizations {
/// **'More'**
String get more;

/// No description provided for @no.
///
/// In en, this message translates to:
/// **'No'**
String get no;

/// No description provided for @off.
///
/// In en, this message translates to:
Expand Down Expand Up @@ -440,6 +470,12 @@ abstract class AppLocalizations {
/// **'Playback Speed'**
String get playbackSpeed;

/// No description provided for @playbackSpeedWarningMessage.
///
/// In en, this message translates to:
/// **'Setting a custom playback speed will force re-encoding during the merge process and may take longer to complete.'**
String get playbackSpeedWarningMessage;

/// No description provided for @privacyPolicy.
///
/// In en, this message translates to:
Expand Down Expand Up @@ -470,6 +506,18 @@ abstract class AppLocalizations {
/// **'Resolution'**
String get resolution;

/// No description provided for @resolutionWarningMessage.
///
/// In en, this message translates to:
/// **'Setting a custom resolution will force re-encoding during the merge process and may take longer to complete.'**
String get resolutionWarningMessage;

/// No description provided for @saveCancellationConfirmMessage.
///
/// In en, this message translates to:
/// **'Are you sure you want to cancel the video merging process? Any progress will be lost.'**
String get saveCancellationConfirmMessage;

/// No description provided for @saveVideo.
///
/// In en, this message translates to:
Expand Down Expand Up @@ -548,11 +596,23 @@ abstract class AppLocalizations {
/// **'Video'**
String get video;

/// No description provided for @warning.
///
/// In en, this message translates to:
/// **'Warning'**
String get warning;

/// No description provided for @yellow.
///
/// In en, this message translates to:
/// **'Yellow'**
String get yellow;

/// No description provided for @yes.
///
/// In en, this message translates to:
/// **'Yes'**
String get yes;
}

class _AppLocalizationsDelegate
Expand Down
36 changes: 35 additions & 1 deletion lib/src/core/l10n/app_localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get cancel => 'Cancel';

@override
String get cancelled => 'Cancelled';

@override
String get cancelledMessage => 'The video merge process has been cancelled!';

@override
String get close => 'Close';

@override
String get confirm => 'Confirm';

@override
String get contactUs => 'Contact Us';

Expand Down Expand Up @@ -120,9 +129,13 @@ class AppLocalizationsEn extends AppLocalizations {
String get failedToInitFFmpegMessage =>
'Failed to initialise FFmpeg! Please try again later.';

@override
String get failedToLaunchGalleryMessage =>
'Failed to launch gallery! Please grant the required permissions.';

@override
String get failedToMergeVideosMessage =>
'Failed to merge videos! Please try again later.';
'Failed to merge videos! Please try with different configurations.';

@override
String get failedToSaveVideoMessage =>
Expand Down Expand Up @@ -173,6 +186,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get more => 'More';

@override
String get no => 'No';

@override
String get off => 'Off';

Expand Down Expand Up @@ -202,6 +218,10 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get playbackSpeed => 'Playback Speed';

@override
String get playbackSpeedWarningMessage =>
'Setting a custom playback speed will force re-encoding during the merge process and may take longer to complete.';

@override
String get privacyPolicy => 'Privacy Policy';

Expand All @@ -217,6 +237,14 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get resolution => 'Resolution';

@override
String get resolutionWarningMessage =>
'Setting a custom resolution will force re-encoding during the merge process and may take longer to complete.';

@override
String get saveCancellationConfirmMessage =>
'Are you sure you want to cancel the video merging process? Any progress will be lost.';

@override
String get saveVideo => 'Save Video';

Expand Down Expand Up @@ -260,6 +288,12 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get video => 'Video';

@override
String get warning => 'Warning';

@override
String get yellow => 'Yellow';

@override
String get yes => 'Yes';
}
14 changes: 12 additions & 2 deletions lib/src/core/l10n/arb/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
"blue": "Blue",
"brown": "Brown",
"cancel": "Cancel",
"cancelled": "Cancelled",
"cancelledMessage": "The video merge process has been cancelled!",
"close": "Close",
"confirm": "Confirm",
"contactUs": "Contact Us",
"copyrightMessage": "Copyright © 2024 BBK Development",
"couldNotChangeVolumeMessage": "Could not change the volume of the video! Please try again later.",
Expand All @@ -33,7 +36,8 @@
"error": "Error",
"errorMessage": "An error occurred while merging the videos. Please try again!",
"failedToInitFFmpegMessage": "Failed to initialise FFmpeg! Please try again later.",
"failedToMergeVideosMessage": "Failed to merge videos! Please try again later.",
"failedToLaunchGalleryMessage": "Failed to launch gallery! Please grant the required permissions.",
"failedToMergeVideosMessage": "Failed to merge videos! Please try with different configurations.",
"failedToSaveVideoMessage": "Failed to save merged video! Please grant the required permissions.",
"firstAspectRatioTooltip": "Videos will use the aspect ratio of the first video.",
"firstVideo": "First video",
Expand All @@ -49,6 +53,7 @@
"merging": "Merging",
"mergingMessage": "Merging videos in a fast and efficient way. This process may take a while so please be patient!",
"more": "More",
"no": "No",
"off": "Off",
"on": "On",
"openPicker": "Open Picker",
Expand All @@ -58,11 +63,14 @@
"permissionDeniedMessage": "Permission denied! Please grant the required permissions.",
"pink": "Pink",
"playbackSpeed": "Playback Speed",
"playbackSpeedWarningMessage": "Setting a custom playback speed will force re-encoding during the merge process and may take longer to complete.",
"privacyPolicy": "Privacy Policy",
"purple": "Purple",
"rateUs": "Rate Us",
"red": "Red",
"resolution": "Resolution",
"resolutionWarningMessage": "Setting a custom resolution will force re-encoding during the merge process and may take longer to complete.",
"saveCancellationConfirmMessage": "Are you sure you want to cancel the video merging process? Any progress will be lost.",
"saveVideo": "Save Video",
"saving": "Saving",
"savingMessage": "Saving the merged video to your device. Hang tight, this won't take long!",
Expand All @@ -76,5 +84,7 @@
"twoVideosRequiredMessage": "At least two videos are required to merge!",
"unsavedChangesMessage": "You have unsaved changes. Are you sure you want to leave this page?",
"video": "Video",
"yellow": "Yellow"
"warning": "Warning",
"yellow": "Yellow",
"yes": "Yes"
}
Loading

0 comments on commit 9f50c57

Please sign in to comment.