Merge pull request #26 from JoaoGeniselli/develop

Release 1.3.0
JoaoGeniselli · Sep 27, 2023 · 674a05e · 674a05e
2 parents ca6f0a1 + aa0dab0
commit 674a05e
Show file tree

Hide file tree

Showing 160 changed files with 2,139 additions and 3,643 deletions.
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -16,15 +16,22 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v1.4.3
         with:
-          java-version: '11'
+          java-version: '17'
 
       - name: Setup secret.properties
         env:
           ADMOB_APPLICATION_ID: ${{ secrets.ADMOB_APPLICATION_ID }}
           ADMOB_HOME_BANNER_ID: ${{ secrets.ADMOB_HOME_BANNER_ID }}
+          ADMOB_TRANSPOSER_BANNER_ID: ${{ secrets.ADMOB_TRANSPOSER_BANNER_ID }}
           FAKE_ADMOB_HOME_BANNER_ID: ${{ secrets.FAKE_ADMOB_HOME_BANNER_ID }}
-        run: echo "ADMOB_APPLICATION_ID=\"$ADMOB_APPLICATION_ID\"" > ./secret.properties |
-          echo "ADMOB_HOME_BANNER_ID=\"$ADMOB_HOME_BANNER_ID\"" >> ./secret.properties
+          GITHUB_PACKAGES_USER: ${{ secrets.PACKAGES_USER }}
+          GITHUB_PACKAGES_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
+        run: | 
+          echo "ADMOB_APPLICATION_ID=\"$ADMOB_APPLICATION_ID\"" >> ./secret.properties |
+          echo "ADMOB_HOME_BANNER_ID=\"$ADMOB_HOME_BANNER_ID\"" >> ./secret.properties |
+          echo "ADMOB_TRANSPOSER_BANNER_ID=\"$ADMOB_TRANSPOSER_BANNER_ID\"" >> ./secret.properties |
+          echo "GITHUB_PACKAGES_USER=\"$GITHUB_PACKAGES_USER\"" >> ./secret.properties |
+          echo "GITHUB_PACKAGES_TOKEN=\"$GITHUB_PACKAGES_TOKEN\"" >> ./secret.properties
 
       - name: Setup firebase auth
         env:

diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -6,14 +6,13 @@ plugins {
 }
 
 android {
-    compileSdk = Versions.Sdk.compile
+    compileSdk = 33
     defaultConfig {
         applicationId = "com.dosei.music.scoreconverter"
-        minSdk = Versions.Sdk.minimum
-        targetSdk = Versions.Sdk.target
-        versionCode = Versions.App.code
-        versionName = Versions.App.name
-        buildToolsVersion = Versions.Sdk.buildTools
+        minSdk = 21
+        targetSdk = 33
+        versionCode = 7
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -35,6 +34,7 @@ android {
             resValue("string", "admob_application_id", secrets.getString(SecretsKeys.adMobAppId))
             resValue("string", "admob_home_banner_id", BuildConstants.adMobFakeBannerId)
             resValue("string", "admob_transposer_banner_id", BuildConstants.adMobFakeBannerId)
+            resValue("string", "admob_dictionary_banner_id", BuildConstants.adMobFakeBannerId)
         }
         getByName("release") {
             isMinifyEnabled = true
@@ -58,10 +58,15 @@ android {
                 "admob_transposer_banner_id",
                 secrets.getString(SecretsKeys.adMobTransposerBannerId)
             )
+            resValue(
+                "string",
+                "admob_dictionary_banner_id",
+                secrets.getString(SecretsKeys.adMobDictionaryBannerId)
+            )
         }
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.1.0-rc01"
+        kotlinCompilerExtensionVersion = libs.versions.compiler.kotlin.ext.get()
     }
     buildFeatures {
         compose = true
@@ -71,38 +76,59 @@ android {
         resources.excludes.add("META-INF/AL2.0")
         resources.excludes.add("META-INF/LGPL2.1")
     }
+    namespace = "com.dosei.music.scoreconverter"
+}
+
+kotlin {
+    jvmToolchain(8)
 }
 
 dependencies {
     implementation(project(path = ":ui"))
     implementation(project(path = ":player"))
-    implementation(project(path = ":arpeggio"))
 
     implementation(libs.kotlin.stdlib)
     implementation(libs.app.compat)
     implementation(libs.core.ktx)
     implementation(libs.constraint.layout)
     implementation(libs.recycler.view)
+
+    implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics.core)
+
+    implementation(platform(libs.koin.bom))
     implementation(libs.koin.android)
-    implementation(libs.koin.scope)
-    implementation(libs.koin.view.model)
+    implementation(libs.koin.compose)
     implementation(libs.play.services.ads)
     implementation(libs.android.material)
-    implementation(libs.bundles.compose)
     implementation(libs.lifecycle.runtime)
+
+    //region UI
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.ui)
+    implementation(libs.compose.material)
+    implementation(libs.compose.graphics)
+    implementation(libs.compose.preview)
+    implementation(libs.activity.compose)
+
+    debugImplementation(libs.compose.tooling.ui)
+    debugImplementation(libs.compose.test.manifest)
+
+    androidTestImplementation(platform(libs.compose.bom))
+    androidTestImplementation(libs.android.test.ext)
+    androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.compose.junit)
+
+    //endregion
+
     implementation(libs.hilt.compose)
     implementation(libs.navigation.compose)
     implementation(libs.ktransposer)
+    implementation(libs.arpeggio)
 
     testImplementation(libs.junit.core)
 
     androidTestImplementation(libs.android.test.ext)
-    androidTestImplementation(libs.espresso.core)
-    androidTestImplementation(libs.compose.junit)
-    androidTestImplementation(libs.espresso.compose)
-
-    debugImplementation(libs.compose.test.manifest)
-    debugImplementation(libs.compose.tooling.ui)
 }
diff --git a/app/src/androidTest/java/com/dosei/music/scoreconverter/main/ComposableConverterKtTest.kt b/app/src/androidTest/java/com/dosei/music/scoreconverter/main/ComposableConverterKtTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.dosei.music.scoreconverter">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name=".ScoreConverterApplication"
+        android:name=".GuitarKitApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Minuet">
+        android:theme="@style/Minuet"
+        tools:replace="android:theme">
 
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="@string/admob_application_id" />
 
-        <activity
-            android:name=".about.AboutActivity"
-            android:exported="false"
-            android:label="@string/about_activity_title" />
-
         <activity
             android:name="com.dosei.music.scoreconverter.main.MainActivity"
             android:exported="true"