remove spotify as lyrics source

In order to stay on f-droid spotify has to be removed. Doing different flavors is not worth it in my opinion.

app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/HomeViewModel.kt

@@ -2,17 +2,14 @@ package com.illusionman1212.lyricsgrabbr.viewmodels
 
 import android.content.Context
 import android.net.Uri
-import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
-import com.adamratzman.spotify.SpotifyClientApi
 import com.illusionman1212.lyricsgrabbr.LGApp
 import com.illusionman1212.lyricsgrabbr.NotificationEvent
-import com.illusionman1212.lyricsgrabbr.R
 import com.illusionman1212.lyricsgrabbr.data.HomeRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -103,32 +100,6 @@ class HomeViewModel(private val context: Context, private val homeRepository: Ho
         _uiState.value = _uiState.value.copy(isLoading = true, notification = song, error = null)
     }
 
-    fun makeRequestToSpotify(spotifyApi: SpotifyClientApi) {
-        viewModelScope.launch {
-            val track = spotifyApi.player.getCurrentlyPlaying()?.item
-
-            if (track?.id == null) {
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = context.resources.getString(R.string.no_spotify_song_playing)
-                )
-            } else {
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = null,
-                    results = listOf(SearchResult(
-                        title = _uiState.value.notification!!.title,
-                        artist = _uiState.value.notification!!.artist,
-                        url = track.asTrack?.externalUrls?.spotify?.toUri() ?: Uri.EMPTY,
-                        artistUrl = track.asTrack?.artists?.get(0)?.externalUrls?.spotify?.toUri() ?: Uri.EMPTY,
-                        thumbnail = track.asTrack?.album?.images?.get(0)?.url?.toUri() ?: Uri.EMPTY,
-                        id = track.id!!,
-                    ))
-                )
-            }
-        }
-    }
-
     fun makeRequestToGenius(song: String, artist: String) {
         viewModelScope.launch {
             _uiState.update { HomeState(true, uiState.value.results, uiState.value.notification, null) }

app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/LyricsViewModel.kt

@@ -22,7 +22,6 @@ data class LyricsState(
     val artist: String = "",
     val url: Uri = Uri.EMPTY,
     val trackId: String = "",
-    val useSpotifyApi: Boolean = false,
 
     // set by Lyrics screen
     val lyrics: String = "",
@@ -35,24 +34,9 @@ class LyricsViewModel(private val lyricsRepository: LyricsRepository): ViewModel
     private val _uiState = MutableStateFlow(LyricsState())
     val uiState = _uiState.asStateFlow()
 
-    fun onSongChange(trackId: String, title: String, subtitle: String, url: Uri, useSpotifyApi: Boolean) {
+    fun onSongChange(trackId: String, title: String, subtitle: String, url: Uri) {
         _uiState.update {
-            it.copy(song = title, artist = subtitle, url = url, useSpotifyApi = useSpotifyApi, trackId = trackId)
-        }
-    }
-
-    fun fetchLyricsFromSpotify() {
-        _uiState.value = _uiState.value.copy(isLoading = true, lyrics = "")
-
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val (lyrics, isSuccess) = lyricsRepository.fetchLyricsFromSpotify(uiState.value.trackId)
-                if (isSuccess) {
-                    _uiState.value = _uiState.value.copy(isLoading = false, lyrics = lyrics)
-                } else {
-                    _uiState.value = _uiState.value.copy(isLoading = false, error = lyrics, lyrics = "")
-                }
-            }
+            it.copy(song = title, artist = subtitle, url = url, trackId = trackId)
         }
     }
 

app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/SettingsViewModel.kt

@@ -18,7 +18,6 @@ import kotlinx.coroutines.launch
 
 data class SettingsState(
     val appTheme: Int = Theme.SYSTEM.ordinal,
-    val isSpotifyAuthed: Boolean = false,
 )
 
 class SettingsViewModel(private val settingsPrefsRepo: SettingsPreferencesRepository): ViewModel() {
@@ -35,10 +34,6 @@ class SettingsViewModel(private val settingsPrefsRepo: SettingsPreferencesReposi
         }
     }
 
-    fun updateSpotifyAuthStatus(isAuthed: Boolean) {
-        _uiState.value = _uiState.value.copy(isSpotifyAuthed = isAuthed)
-    }
-
     init {
         viewModelScope.launch {
             settingsPrefsRepo.preferences.collectLatest {