feat: Added Lyricfier

Signed-off-by: Gabriel Fontán <[email protected]>
BobbyESP · Apr 14, 2024 · 5f5dece · 5f5dece
1 parent 9567b23
commit 5f5dece
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -164,6 +164,7 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.taglib)
     implementation(libs.scrollbar)
+    implementation(libs.lyricfier)
     implementation(project(":crashhandler"))
 
 //-------------------Testing-------------------//

diff --git a/app/src/main/java/com/bobbyesp/metadator/MainActivity.kt b/app/src/main/java/com/bobbyesp/metadator/MainActivity.kt
@@ -45,7 +45,6 @@ class MainActivity : ComponentActivity() {
 
     companion object {
         private lateinit var activity: MainActivity
-        const val CLOSE_ACTIVITY_NON_GRANTED_PERMISSIONS = 1
         fun getActivity(): MainActivity {
             return activity
         }

diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/Navigation.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/Navigation.kt
@@ -107,7 +107,7 @@ fun Navigator() {
                         fontWeight = FontWeight.Bold,
                         fontFamily = FontFamily.Monospace
                     )
-                    routesToNavigate.forEachIndexed { index, route ->
+                    routesToNavigate.forEachIndexed { _, route ->
                         NavigationDrawerItem(label = {
                             Text(text = route.title?.let { stringResource(id = it) } ?: "")
                         }, selected = currentRootRoute.value == route.route, onClick = {

diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePage.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStorePage.kt
@@ -36,6 +36,7 @@ import com.bobbyesp.metadator.presentation.components.cards.songs.HorizontalSong
 import com.bobbyesp.metadator.presentation.components.cards.songs.VerticalSongCard
 import com.bobbyesp.metadator.presentation.pages.home.LayoutType
 import com.bobbyesp.model.Song
+import com.bobbyesp.ui.common.pages.ErrorPage
 import com.bobbyesp.ui.components.pulltorefresh.PullState
 import com.bobbyesp.ui.components.pulltorefresh.PullToRefreshLayout
 import kotlinx.coroutines.Dispatchers
@@ -201,7 +202,9 @@ fun MediaStorePage(
                 }
 
                 is MediaStorePageState.Error -> {
-                    Text(text = "Error") //TODO: Change this
+                    ErrorPage(error = stringResource(id = com.bobbyesp.crashhandler.R.string.unknown_error_title)) {
+
+                    }
                 }
             }
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ lifecycle-runtime-ktx = "2.7.0"
 activity-compose = "1.8.2"
 compose-compiler = "1.5.11"
 ksp = "1.9.23-1.0.19"
+lyricfier = "1.0"
 splashscreen = "1.0.1"
 material = "1.11.0"
 media3 = "1.3.0"
@@ -122,6 +123,7 @@ compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref
 compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }
 compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "androidx-compose-material3" }
 compose-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "constraintLayout" }
+lyricfier = { module = "io.github.bobbyesp.lyricfier:lyricfier", version.ref = "lyricfier" }
 orbital = { module = "com.github.skydoves:orbital", version.ref = "orbital" }
 palette = { group = "androidx.palette", name = "palette-ktx", version.ref = "palette" }
 scrollbar = { group = "com.github.nanihadesuka", name = "LazyColumnScrollbar", version.ref = "scrollbar" }