Android 16 KB support

android/.gitignore

@@ -1,6 +1,7 @@
 # Gradle files
 .gradle/
 build/
+.kotlin
 
 # Local configuration file (sdk path, etc)
 local.properties

android/app/build.gradle

@@ -27,8 +27,8 @@ if (flutterVersionName == null) {
 
 android {
     namespace "com.feelsoftware.slidemix"
-    compileSdk 35
-    buildToolsVersion = '35.0.0'
+    compileSdk 36
+    buildToolsVersion = '36.0.0'
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -46,7 +46,7 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         resourceConfigurations += ['en', 'uk']
@@ -73,9 +73,9 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
 
-    implementation files('libs/ffmpeg-kit-full-gpl-6.0-2.aar')
+    implementation files('libs/ffmpeg-kit-gpl-6.0.aar')
 
     // To fix: ClassNotFoundException: Didn't find class "com.arthenica.smartexception.java.Exceptions" on path
     implementation files('libs/smart-exception-common-0.2.1.jar')

android/app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
             android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
+            android:screenOrientation="portrait"
             android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
@@ -25,6 +26,11 @@
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
+
+            <property
+                android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY"
+                android:value="true" />
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

android/gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4g
 android.useAndroidX=true
 android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true

l10n.yaml

@@ -1,3 +1,4 @@
+synthetic-package: false
 arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart

.dart_tool/flutter_gen/gen_l10n/app_localizations.dart → lib/l10n/app_localizations.dart

@@ -18,7 +18,7 @@ import 'app_localizations_uk.dart';
 /// `supportedLocales` list. For example:
 ///
 /// ```dart
-/// import 'gen_l10n/app_localizations.dart';
+/// import 'l10n/app_localizations.dart';
 ///
 /// return MaterialApp(
 ///   localizationsDelegates: AppLocalizations.localizationsDelegates,
@@ -62,15 +62,17 @@ import 'app_localizations_uk.dart';
 /// be consistent with the languages listed in the AppLocalizations.supportedLocales
 /// property.
 abstract class AppLocalizations {
-  AppLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+  AppLocalizations(String locale)
+    : localeName = intl.Intl.canonicalizedLocale(locale.toString());
 
   final String localeName;
 
   static AppLocalizations? of(BuildContext context) {
     return Localizations.of<AppLocalizations>(context, AppLocalizations);
   }
 
-  static const LocalizationsDelegate<AppLocalizations> delegate = _AppLocalizationsDelegate();
+  static const LocalizationsDelegate<AppLocalizations> delegate =
+      _AppLocalizationsDelegate();
 
   /// A list of this localizations delegate along with the default localizations
   /// delegates.
@@ -82,17 +84,18 @@ abstract class AppLocalizations {
   /// Additional delegates can be added by appending to this list in
   /// MaterialApp. This list does not have to be used at all if a custom list
   /// of delegates is preferred or required.
-  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
-    delegate,
-    GlobalMaterialLocalizations.delegate,
-    GlobalCupertinoLocalizations.delegate,
-    GlobalWidgetsLocalizations.delegate,
-  ];
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
+        delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ];
 
   /// A list of this localizations delegate's supported locales.
   static const List<Locale> supportedLocales = <Locale>[
     Locale('en'),
-    Locale('uk')
+    Locale('uk'),
   ];
 
   /// No description provided for @appName.
@@ -312,7 +315,8 @@ abstract class AppLocalizations {
   String get previewActionDelete;
 }
 
-class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
+class _AppLocalizationsDelegate
+    extends LocalizationsDelegate<AppLocalizations> {
   const _AppLocalizationsDelegate();
 
   @override
@@ -321,25 +325,26 @@ class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations>
   }
 
   @override
-  bool isSupported(Locale locale) => <String>['en', 'uk'].contains(locale.languageCode);
+  bool isSupported(Locale locale) =>
+      <String>['en', 'uk'].contains(locale.languageCode);
 
   @override
   bool shouldReload(_AppLocalizationsDelegate old) => false;
 }
 
 AppLocalizations lookupAppLocalizations(Locale locale) {
-
-
   // Lookup logic when only language code is specified.
   switch (locale.languageCode) {
-    case 'en': return AppLocalizationsEn();
-    case 'uk': return AppLocalizationsUk();
+    case 'en':
+      return AppLocalizationsEn();
+    case 'uk':
+      return AppLocalizationsUk();
   }
 
   throw FlutterError(
     'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
     'an issue with the localizations generation tool. Please file an issue '
     'on GitHub with a reproducible sample app and the gen-l10n configuration '
-    'that was used.'
+    'that was used.',
   );
 }

.dart_tool/flutter_gen/gen_l10n/app_localizations_en.dart → lib/l10n/app_localizations_en.dart

@@ -1,5 +1,5 @@
+// ignore: unused_import
 import 'package:intl/intl.dart' as intl;
-
 import 'app_localizations.dart';
 
 // ignore_for_file: type=lint
@@ -25,8 +25,10 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String notEnoughMediaToCreateMovie(int minMediaCountToProceed) {
-    final intl.NumberFormat minMediaCountToProceedNumberFormat = intl.NumberFormat.decimalPattern(localeName);
-    final String minMediaCountToProceedString = minMediaCountToProceedNumberFormat.format(minMediaCountToProceed);
+    final intl.NumberFormat minMediaCountToProceedNumberFormat =
+        intl.NumberFormat.decimalPattern(localeName);
+    final String minMediaCountToProceedString =
+        minMediaCountToProceedNumberFormat.format(minMediaCountToProceed);
 
     return 'Add $minMediaCountToProceedString or more media to create your movie';
   }
@@ -41,7 +43,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get leaveCreationAlertSecondary => 'leave';
 
   @override
-  String get leaveCancelAlertTitle => 'Movie is in progress, do you want to cancel?';
+  String get leaveCancelAlertTitle =>
+      'Movie is in progress, do you want to cancel?';
 
   @override
   String get leaveCancelAlertPrimary => 'cancel';
@@ -102,15 +105,12 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String orientationSelector(String orientation) {
-    String _temp0 = intl.Intl.selectLogic(
-      orientation,
-      {
-        'landscape': 'Landscape',
-        'portrait': 'Portrait',
-        'square': 'Square',
-        'other': '',
-      },
-    );
+    String _temp0 = intl.Intl.selectLogic(orientation, {
+      'landscape': 'Landscape',
+      'portrait': 'Portrait',
+      'square': 'Square',
+      'other': '',
+    });
     return '$_temp0';
   }
 
@@ -119,14 +119,11 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String resizeSelector(String resize) {
-    String _temp0 = intl.Intl.selectLogic(
-      resize,
-      {
-        'contain': 'Contain all content',
-        'cover': 'Resize and crop',
-        'other': '',
-      },
-    );
+    String _temp0 = intl.Intl.selectLogic(resize, {
+      'contain': 'Contain all content',
+      'cover': 'Resize and crop',
+      'other': '',
+    });
     return '$_temp0';
   }
 
@@ -141,15 +138,17 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String projectTitle(int projectId) {
-    final intl.NumberFormat projectIdNumberFormat = intl.NumberFormat.decimalPattern(localeName);
+    final intl.NumberFormat projectIdNumberFormat =
+        intl.NumberFormat.decimalPattern(localeName);
     final String projectIdString = projectIdNumberFormat.format(projectId);
 
     return 'project #$projectIdString';
   }
 
   @override
   String draftTitle(int projectId) {
-    final intl.NumberFormat projectIdNumberFormat = intl.NumberFormat.decimalPattern(localeName);
+    final intl.NumberFormat projectIdNumberFormat =
+        intl.NumberFormat.decimalPattern(localeName);
     final String projectIdString = projectIdNumberFormat.format(projectId);
 
     return 'draft #$projectIdString';

.dart_tool/flutter_gen/gen_l10n/app_localizations_uk.dart → lib/l10n/app_localizations_uk.dart

@@ -1,5 +1,5 @@
+// ignore: unused_import
 import 'package:intl/intl.dart' as intl;
-
 import 'app_localizations.dart';
 
 // ignore_for_file: type=lint
@@ -25,8 +25,10 @@ class AppLocalizationsUk extends AppLocalizations {
 
   @override
   String notEnoughMediaToCreateMovie(int minMediaCountToProceed) {
-    final intl.NumberFormat minMediaCountToProceedNumberFormat = intl.NumberFormat.decimalPattern(localeName);
-    final String minMediaCountToProceedString = minMediaCountToProceedNumberFormat.format(minMediaCountToProceed);
+    final intl.NumberFormat minMediaCountToProceedNumberFormat =
+        intl.NumberFormat.decimalPattern(localeName);
+    final String minMediaCountToProceedString =
+        minMediaCountToProceedNumberFormat.format(minMediaCountToProceed);
 
     return 'Додайте $minMediaCountToProceedString чи більше файлів, щоб створити відео';
   }
@@ -102,15 +104,12 @@ class AppLocalizationsUk extends AppLocalizations {
 
   @override
   String orientationSelector(String orientation) {
-    String _temp0 = intl.Intl.selectLogic(
-      orientation,
-      {
-        'landscape': 'Пейзажна',
-        'portrait': 'Портретна',
-        'square': 'Квадратна',
-        'other': '',
-      },
-    );
+    String _temp0 = intl.Intl.selectLogic(orientation, {
+      'landscape': 'Пейзажна',
+      'portrait': 'Портретна',
+      'square': 'Квадратна',
+      'other': '',
+    });
     return '$_temp0';
   }
 
@@ -119,14 +118,11 @@ class AppLocalizationsUk extends AppLocalizations {
 
   @override
   String resizeSelector(String resize) {
-    String _temp0 = intl.Intl.selectLogic(
-      resize,
-      {
-        'contain': 'Показувати весь контент',
-        'cover': 'Вирізати під розмір',
-        'other': '',
-      },
-    );
+    String _temp0 = intl.Intl.selectLogic(resize, {
+      'contain': 'Показувати весь контент',
+      'cover': 'Вирізати під розмір',
+      'other': '',
+    });
     return '$_temp0';
   }
 
@@ -141,15 +137,17 @@ class AppLocalizationsUk extends AppLocalizations {
 
   @override
   String projectTitle(int projectId) {
-    final intl.NumberFormat projectIdNumberFormat = intl.NumberFormat.decimalPattern(localeName);
+    final intl.NumberFormat projectIdNumberFormat =
+        intl.NumberFormat.decimalPattern(localeName);
     final String projectIdString = projectIdNumberFormat.format(projectId);
 
     return 'проєкт #$projectIdString';
   }
 
   @override
   String draftTitle(int projectId) {
-    final intl.NumberFormat projectIdNumberFormat = intl.NumberFormat.decimalPattern(localeName);
+    final intl.NumberFormat projectIdNumberFormat =
+        intl.NumberFormat.decimalPattern(localeName);
     final String projectIdString = projectIdNumberFormat.format(projectId);
 
     return 'чернетка #$projectIdString';

lib/localizations.dart

@@ -1,5 +1,5 @@
+import 'l10n/app_localizations.dart' as intl;
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart' as intl;
 import 'package:slidemix/main.dart';
 
 // flutter gen-l10n
@@ -20,7 +20,8 @@ class AppLocalizations {
   static List<LocalizationsDelegate<dynamic>> get localizationsDelegates =>
       intl.AppLocalizations.localizationsDelegates;
 
-  static List<Locale> get supportedLocales => intl.AppLocalizations.supportedLocales;
+  static List<Locale> get supportedLocales =>
+      intl.AppLocalizations.supportedLocales;
 }
 
 extension AppLocalizationsX on intl.AppLocalizations {