Merge pull request #24 from MateusRodCosta/dev

Version 1.4.0

README.md

@@ -6,14 +6,18 @@ A Flutter player for the [Vidya Intarweb Playlist](https://www.vipvgm.net/) (aka
 
 Licensed under AGPLv3-or-later.
 
-## Screenshots
-
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/com.mateusrodcosta.apps.vidyamusic/)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="80">](https://play.google.com/store/apps/details?id=com.mateusrodcosta.apps.vidyamusic)
 
-<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="454" height="963">
-<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="454" height="963">
-<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="454" height="963">
-<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="454" height="963">
+Or download the latest APK from the [Releases Section](https://github.com/MateusRodCosta/vidya_music/releases/latest).
 
-# Download
+## Screenshots
 
-<a href='https://play.google.com/store/apps/details?id=com.mateusrodcosta.apps.vidyamusic'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' width= "323" height="125"/></a>
+<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="540">
+<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="540">
+<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="540">
+<img src="https://raw.githubusercontent.com/MateusRodCosta/vidya_music/dev/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="540">

android/app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
-    alias libs.plugins.android.application
-    alias libs.plugins.kotlin.android
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
 def localProperties = new Properties()
@@ -11,22 +12,16 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
 }
+
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystorePropertiesFile = rootProject.file("key.properties")
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -37,12 +32,12 @@ kotlin {
 
 android {
     namespace "com.mateusrodcosta.apps.vidyamusic"
-
     compileSdk 34
+
     defaultConfig {
         applicationId "com.mateusrodcosta.apps.vidyamusic"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -53,6 +48,10 @@ android {
             keyPassword keystoreProperties['keyPassword']
             storeFile file(keystoreProperties['storeFile'])
             storePassword keystoreProperties['storePassword']
+
+            // Always enable v2 and v3 signing schemes, which will be used on modern Android OSes
+            enableV2Signing true
+            enableV3Signing true
         }
     }
 
@@ -97,6 +96,14 @@ android {
     }
 }
 
+flutter {
+    source '../..'
+}
+
+dependencies {
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+}
+
 ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, x86_64: 4]
 
 android.applicationVariants.configureEach { variant ->
@@ -119,9 +126,3 @@ android.applicationVariants.configureEach { variant ->
     }
 }
 
-flutter {
-    source '../..'
-}
-
-dependencies {
-}

android/app/src/main/AndroidManifest.xml

@@ -1,15 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+   xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
    <application
         android:label="${appName}"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:appCategory="audio"
         android:localeConfig="@xml/locales_config"
-        tools:targetApi="33">
+       android:enableOnBackInvokedCallback="true"
+       tools:targetApi="34">
         <activity
             android:name="com.ryanheise.audioservice.AudioServiceActivity"
             android:exported="true"

android/app/src/main/res/values-night/styles.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its

android/app/src/main/res/values/ic_launcher_background.xml → android/app/src/main/res/values/colors.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">#FFFFFF</color>
+    <color name="splash_screen_background">#000000</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">@color/splash_screen_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="windowSplashScreenIconBackgroundColor">@color/ic_launcher_background</item>
     </style>
-    <!-- Theme applied to the Android Window as soon as the process has started.
+     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.

android/app/src/main/res/xml/locales_config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en"/>
+    <locale android:name="en-US"/>
     <locale android:name="pt-BR"/>
 </locale-config>

android/build.gradle

@@ -1,16 +1,18 @@
-plugins {
-    alias libs.plugins.android.application apply false
-    alias libs.plugins.kotlin.android apply false
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
 }
 
-rootProject.layout.buildDirectory.set(new File('../build'))
+rootProject.layout.buildDirectory = file('../build')
 subprojects {
-    project.layout.buildDirectory.set(rootProject.layout.buildDirectory.dir(project.name))
+    project.layout.buildDirectory = rootProject.layout.buildDirectory.dir(project.name)
 }
 subprojects {
     project.evaluationDependsOn(':app')
 }
 
 tasks.register("clean", Delete) {
     delete rootProject.layout.buildDirectory
-}
+}

android/gradle.properties

@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -XX:+UseParallelGC -Dkotlin.daemon.jvm.options="-Xmx4096M"
 android.useAndroidX=true
 org.gradle.caching=true
-org.gradle.parallel=true
+org.gradle.parallel=true
+kotlin.code.style=official

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

@@ -1,28 +1,27 @@
-import org.gradle.api.initialization.resolve.RepositoriesMode
-
 pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
     }
-}
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    settings.ext.flutterSdkPath = flutterSdkPath()
+
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+
     repositories {
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
 }
-rootProject.name = "Vidya Music"
-include ':app'
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
-
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version '8.5.1' apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+rootProject.name = "Vidya Music"
+include ":app"

fastlane/metadata/android/en-US/changelogs/14.txt

@@ -0,0 +1,9 @@
+Version 2.0 has been delayed, so I'm releasing version 1.4 with a focus on Android 14 support.
+
+Version 1.4.0 includes:
+
+• Support Android 14
+• Upgrade to Flutter 3.19.6
+• Upgrade dependencies
+• Proper splash screen support (including support for pre-12)
+• Tweaks to some features specific to newer Android versions

fastlane/metadata/android/pt-BR/changelogs/14.txt

@@ -0,0 +1,9 @@
+A versão 2.0 foi adiada, então estou lançando a versão 1.4 com foco no suporte ao Android 14.
+
+A versão 1.4.0 inclui:
+
+• Suporte ao Android 14
+• Upgrade para o Flutter 3.19.6
+• Upgrade de dependências
+• Implementado suporte a splash screen (inclui suporte para Android anterior ao 12)
+• Ajustes para algumas funcionalidades especificas a versões recentes do Android

lib/utils/i18n.dart

@@ -2,7 +2,7 @@ import 'dart:ui';
 
 import 'package:easy_localization/easy_localization.dart';
 
-const appSupportedLocalesAsString = ['en', 'pt_BR'];
+const appSupportedLocalesAsString = ['en_US', 'pt_BR'];
 List<Locale> get appSupportedLocales =>
     appSupportedLocalesAsString.map((s) => s.toLocale()).toList();
 Locale get appDefaultLocale => appSupportedLocales.first;