Merge pull request #21 from MateusRodCosta/dev

Version 1.3.0
MateusRodCosta · Dec 8, 2023 · cbfa839 · cbfa839
2 parents d25adcf + 7a36142
commit cbfa839
Show file tree

Hide file tree

Showing 66 changed files with 566 additions and 347 deletions.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/mobsf.yml b/.github/workflows/mobsf.yml
@@ -7,11 +7,12 @@ name: MobSF
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "dev" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "dev" ]
   schedule:
-    - cron: '38 22 * * 3'
+    - cron: '0 15 * * 5'
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -25,18 +26,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Setup python
         uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-
       - name: Run mobsfscan
         uses: MobSF/mobsfscan@main
         with:
           args: . --sarif --output results.sarif || true
-
       - name: Upload mobsfscan report
         uses: github/codeql-action/upload-sarif@v2
         with:

diff --git a/.github/workflows/validate-fastlane-metadata.yaml b/.github/workflows/validate-fastlane-metadata.yaml
@@ -1,9 +1,20 @@
-on: [pull_request]
+name: Validate Fastlane metadata
+
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+  schedule:
+    - cron: '0 15 * * 5'
+  workflow_dispatch:
+
 jobs:
   validate-fastlane:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
       - uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2
         with:
           usePlayStoreLocales: true # optional
diff --git a/.mobsf b/.mobsf
@@ -0,0 +1,10 @@
+---
+
+- ignore-rules:
+  - android_prevent_screenshot
+  - android_root_detection
+  - android_safetynet
+  - ios_custom_keyboard_disabled
+  - ios_detect_reversing
+  - ios_jailbreak_detect
+  - ios_keyboard_cache
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -38,11 +38,11 @@ kotlin {
 android {
     namespace "com.mateusrodcosta.apps.vidyamusic"
 
-    compileSdk  33
+    compileSdk 34
     defaultConfig {
         applicationId "com.mateusrodcosta.apps.vidyamusic"
         minSdkVersion 26
-        targetSdkVersion  33
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -76,6 +76,18 @@ android {
         }
     }
 
+    splits {
+        abi {
+            enable true
+
+            reset()
+            //noinspection ChromeOsAbiSupport
+            include "armeabi-v7a", "arm64-v8a", "x86_64"
+
+            universalApk true
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -85,6 +97,28 @@ android {
     }
 }
 
+ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, x86_64: 4]
+
+android.applicationVariants.configureEach { variant ->
+
+    variant.outputs.each { output ->
+
+        def baseAbiVersionCode =
+                project.ext.abiCodes.get(output.getFilter("ABI"))
+
+        if (baseAbiVersionCode != null) {
+
+            output.versionCodeOverride =
+                // As required by F-Droid, version code at beginning and abi code at the end
+                // If wanting to build a universal APK with similar naming scheme, do so manually
+                // via `--build-number` argument from `flutter build apk`
+                variant.versionCode * 100 + baseAbiVersionCode
+                // Default split apk version code, api code at beginning and version code at the end
+                //baseAbiVersionCode * 1000 + variant.versionCode
+        }
+    }
+}
+
 flutter {
     source '../..'
 }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,10 @@
    <application
         android:label="${appName}"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:appCategory="audio"
+        android:localeConfig="@xml/locales_config"
+        tools:targetApi="33">
         <activity
             android:name="com.ryanheise.audioservice.AudioServiceActivity"
             android:exported="true"

diff --git a/android/app/src/main/res/xml/locales_config.xml b/android/app/src/main/res/xml/locales_config.xml
@@ -0,0 +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="pt-BR"/>
+</locale-config>
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-androidGradlePlugin = "8.1.1"
-kotlinVersion = "1.9.10"
+androidGradlePlugin = "8.2.0"
+kotlinVersion = "1.9.21"
 
 [libraries]
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/assets/i18n/en.json b/assets/i18n/en.json
@@ -0,0 +1,19 @@
+{
+    "genericError": "An Error Occurred.",
+    "rosterErrorNoInternet": "No Internet Connection!",
+    "rosterErrorCouldntFetch": "Couldn't fetch tracks...",
+    "rosterRetry": "Retry",
+    "playerNoTrack": "No track",
+    "playerArranger": "Arranger: {}",
+    "playerComposer": "Composer: {}",
+    "themeModeSystem": "System Theme",
+    "themeModeLight": "Light Theme",
+    "themeModeDark": "Dark Theme",
+    "drawerAboutTile": "About",
+    "aboutDialogLicense": "Licensed under AGPLv3+, developed by MateusRodCosta",
+    "aboutDialogAppDescription": "A player for the Vidya Intarweb Playlist (aka VIP Aersia)",
+    "aboutDialogVipCats777": "Vidya Intarweb Playlist by Cats777",
+    "aboutDialogCopyrightNotice": "All Tracks © & ℗ Their Respective Owners",
+    "aboutDialogSourceCode": "Source code is available at "
+ }
+
diff --git a/assets/i18n/pt-BR.json b/assets/i18n/pt-BR.json
@@ -0,0 +1,19 @@
+{
+    "genericError": "Ocorreu um erro.",
+    "rosterErrorNoInternet": "Sem Conexão a Internet!",
+    "rosterErrorCouldntFetch": "Não foi possível obter as faixas...",
+    "rosterRetry": "Tentar novamente",
+    "playerNoTrack": "Nenhuma faixa",
+    "playerArranger": "Arranjador: {}",
+    "playerComposer": "Compositor: {}",
+    "themeModeSystem": "Tema do Sistema",
+    "themeModeLight": "Tema Claro",
+    "themeModeDark": "Tema Escuro",
+    "drawerAboutTile": "Sobre",
+    "aboutDialogLicense": "Licenciado sob a AGPLv3+, desenvolvido por MateusRodCosta",
+    "aboutDialogAppDescription": "Um player para a Vidya Intarweb Playlist (aka VIP Aersia)",
+    "aboutDialogVipCats777": "Vidya Intarweb Playlist por Cats777",
+    "aboutDialogCopyrightNotice": "Todas as Faixas Tracks © & ℗ Seus Respectivos Donos",
+    "aboutDialogSourceCode": "O código fonte está disponível em "
+ }
+
diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -0,0 +1,7 @@
+• Upgraded Flutter to 3.13.9
+• Updated dependencies
+• Added localizations support (currently only English and Brazilian Portuguese)
+• Added per-app language support
+• Small appearance tweaks, including theming (e.g. colors and used widgets) and spacing (padding and margins)
+• Arranger is now shown on Track list
+• Improved error handling
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,5 +1,7 @@
-Listen to lots of awesome videogame songs from your favorite video games directly from your device.
+Do you like VGM (aka Video Game Music)? If so, you cam to the right place!
 
-The original playlist is available at <a href="https://www.vipvgm.net/">https://www.vipvgm.net/</a>. All Tracks © & ℗ Their Respective Owners.
+Listen to several of the awesomest videogame songs from your favorite video games directly from your device. This app is based on the VIP Aersia playlist (nowadays VIPVGM), which contains the very best VGM tracks as selected by Cats777.
 
-The app is developed with Flutter and licensed under AGPLv3+.  Source code is available at <a href="https://github.com/MateusRodCosta/vidya_music">https://github.com/MateusRodCosta/vidya_music</a>.
+The original playlist is available at <a href="https://www.vipvgm.net/">https://www.vipvgm.net/</a> . All Tracks © & ℗ Their Respective Owners.
+
+Vidya Music is developed with Flutter and is FLOSS software. The source code is available at <a href="https://github.com/MateusRodCosta/vidya_music">https://github.com/MateusRodCosta/vidya_music</a> and licensed under AGPLv3+ .
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/5.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/6.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/7.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/7.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/8.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/8.png
diff --git a/fastlane/metadata/android/pt-BR/changelogs/13.txt b/fastlane/metadata/android/pt-BR/changelogs/13.txt
@@ -0,0 +1,7 @@
+• Flutter atualizado para 3.13.9
+• Dependências atualizadas
+• Adicionado suporte a traduções (atualmente apenas Inglês e Português Brasileiro)
+• Adicionado suporte a seleção de idioma por aplicativo
+• Pequenos ajustes de aparência, incluindo em temas (e.g. cores e widgets usado) e espaçamento (padding e margens)
+• O arranjador agora é mostrado na lista de faixas
+• Melhorias no tratamento de erros
diff --git a/fastlane/metadata/android/pt-BR/full_description.txt b/fastlane/metadata/android/pt-BR/full_description.txt
@@ -1,5 +1,7 @@
-Ouça várias músicas de videogame incríveis dos seus jogos favoritos direto do seu dispositivo.
+Curte VGM (aka Música de Videogame)? Se sim, então veio ao lugar certo!?
+
+Ouça várias das músicas de videogame mais incríveis dos seus jogos favoritos direto do seu dispositivo. Este app se baseia na playlist VIP Aersia (hoje em dia chamada VIPVGM), que contém as melhores das melhores músicas de videogame selecionadas por Cats777.
 
 A playlist original está disponível em <a href="https://www.vipvgm.net/">https://www.vipvgm.net/</a>. Todas as Faixas © & ℗ Seus Respectivos Donos.
 
-O app é desenvolvido com Flutter e licenciado sob AGPLv3+. O código-fonte está disponível em <a href="https://github.com/MateusRodCosta/vidya_music">https://github.com/MateusRodCosta/vidya_music</a>.
+Vidya Music é desenvolvido com Flutter e é software livre. O código-fonte está disponível em <a href="https://github.com/MateusRodCosta/vidya_music">https://github.com/MateusRodCosta/vidya_music</a> e licenciado sob AGPLv3+.
diff --git a/flutter-sdk b/flutter-sdk
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -2,25 +2,25 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>11.0</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>App</string>
+	<key>CFBundleIdentifier</key>
+	<string>io.flutter.flutter.app</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>App</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>MinimumOSVersion</key>
+	<string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -66,16 +66,16 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
-  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
 
 PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3