Merge pull request #21 from MateusRodCosta/dev

Version 1.3.0

Author: MateusRodCosta

.github/workflows/gradle-wrapper-validation.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:

.github/workflows/mobsf.yml

@@ -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

.github/workflows/validate-fastlane-metadata.yaml

@@ -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

.mobsf

@@ -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 '../..'
 }

android/app/build.gradle

@@ -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"

android/app/src/main/AndroidManifest.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>

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

@@ -1,6 +1,6 @@
 [versions]
-androidGradlePlugin = "8.1.1"
-kotlinVersion = "1.9.10"
+androidGradlePlugin = "8.2.0"
+kotlinVersion = "1.9.21"
 
 [libraries]
 

android/gradle/libs.versions.toml

@@ -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

android/gradle/wrapper/gradle-wrapper.properties

@@ -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 "
+ }
+