refactor: improve project structure

app/src/main/AndroidManifest.xml

@@ -109,7 +109,7 @@
 
         </activity>
         <service
-            android:name="app.suhasdissa.vibeyou.backend.services.PlayerService"
+            android:name="app.suhasdissa.vibeyou.utils.services.PlayerService"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback">
             <intent-filter>

app/src/main/java/app/suhasdissa/vibeyou/AppContainer.kt

@@ -2,14 +2,14 @@ package app.suhasdissa.vibeyou
 
 import android.content.ContentResolver
 import androidx.media3.session.MediaController
-import app.suhasdissa.vibeyou.backend.database.SongDatabase
 import app.suhasdissa.vibeyou.backend.repository.AuthRepository
 import app.suhasdissa.vibeyou.backend.repository.AuthRepositoryImpl
 import app.suhasdissa.vibeyou.backend.repository.LocalMusicRepository
 import app.suhasdissa.vibeyou.backend.repository.PipedMusicRepository
 import app.suhasdissa.vibeyou.backend.repository.PlaylistRepository
 import app.suhasdissa.vibeyou.backend.repository.SongDatabaseRepository
 import app.suhasdissa.vibeyou.backend.repository.SongDatabaseRepositoryImpl
+import app.suhasdissa.vibeyou.data.database.SongDatabase
 import com.google.common.util.concurrent.ListenableFuture
 
 interface AppContainer {

app/src/main/java/app/suhasdissa/vibeyou/MainActivity.kt

@@ -26,9 +26,12 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.rememberNavController
-import app.suhasdissa.vibeyou.backend.viewmodel.PlayerViewModel
-import app.suhasdissa.vibeyou.backend.viewmodel.SettingsModel
-import app.suhasdissa.vibeyou.ui.components.NavDrawerContent
+import app.suhasdissa.vibeyou.navigation.AppNavHost
+import app.suhasdissa.vibeyou.navigation.Destination
+import app.suhasdissa.vibeyou.navigation.navigateTo
+import app.suhasdissa.vibeyou.presentation.components.NavDrawerContent
+import app.suhasdissa.vibeyou.presentation.screens.player.model.PlayerViewModel
+import app.suhasdissa.vibeyou.presentation.screens.settings.model.SettingsModel
 import app.suhasdissa.vibeyou.ui.theme.VibeYouTheme
 import app.suhasdissa.vibeyou.utils.ThemeUtil
 import kotlinx.coroutines.launch

app/src/main/java/app/suhasdissa/vibeyou/MellowMusicApplication.kt

@@ -5,12 +5,12 @@ import android.content.ComponentName
 import android.graphics.Color
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
-import app.suhasdissa.vibeyou.backend.data.EqualizerData
-import app.suhasdissa.vibeyou.backend.database.SongDatabase
-import app.suhasdissa.vibeyou.backend.services.PlayerService
+import app.suhasdissa.vibeyou.data.database.SongDatabase
+import app.suhasdissa.vibeyou.domain.models.primary.EqualizerData
 import app.suhasdissa.vibeyou.utils.Pref
 import app.suhasdissa.vibeyou.utils.UpdateUtil
 import app.suhasdissa.vibeyou.utils.preferences
+import app.suhasdissa.vibeyou.utils.services.PlayerService
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.disk.DiskCache

app/src/main/java/app/suhasdissa/vibeyou/backend/api/HyperpipeApi.kt → app/src/main/java/app/suhasdissa/vibeyou/data/api/HyperpipeApi.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.api
+package app.suhasdissa.vibeyou.data.api
 
 import app.suhasdissa.vibeyou.backend.models.hyper.NextSongsResponse
 import retrofit2.http.GET

app/src/main/java/app/suhasdissa/vibeyou/backend/api/PipedApi.kt → app/src/main/java/app/suhasdissa/vibeyou/data/api/PipedApi.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.api
+package app.suhasdissa.vibeyou.data.api
 
 import app.suhasdissa.vibeyou.backend.models.Login
 import app.suhasdissa.vibeyou.backend.models.PipedInstance

app/src/main/java/app/suhasdissa/vibeyou/backend/database/SongDatabase.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/SongDatabase.kt

@@ -1,18 +1,18 @@
-package app.suhasdissa.vibeyou.backend.database
+package app.suhasdissa.vibeyou.data.database
 
 import android.content.Context
 import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import app.suhasdissa.vibeyou.backend.database.dao.PlaylistDao
-import app.suhasdissa.vibeyou.backend.database.dao.RawDao
-import app.suhasdissa.vibeyou.backend.database.dao.SearchDao
-import app.suhasdissa.vibeyou.backend.database.dao.SongsDao
-import app.suhasdissa.vibeyou.backend.database.entities.PlaylistEntity
-import app.suhasdissa.vibeyou.backend.database.entities.SearchQuery
-import app.suhasdissa.vibeyou.backend.database.entities.SongEntity
-import app.suhasdissa.vibeyou.backend.database.entities.SongPlaylistMap
+import app.suhasdissa.vibeyou.data.database.dao.PlaylistDao
+import app.suhasdissa.vibeyou.data.database.dao.RawDao
+import app.suhasdissa.vibeyou.data.database.dao.SearchDao
+import app.suhasdissa.vibeyou.data.database.dao.SongsDao
+import app.suhasdissa.vibeyou.data.database.entities.PlaylistEntity
+import app.suhasdissa.vibeyou.data.database.entities.SearchQuery
+import app.suhasdissa.vibeyou.data.database.entities.SongEntity
+import app.suhasdissa.vibeyou.data.database.entities.SongPlaylistMap
 
 @Database(
     entities = [

app/src/main/java/app/suhasdissa/vibeyou/backend/database/dao/PlaylistDao.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/dao/PlaylistDao.kt

@@ -1,14 +1,14 @@
-package app.suhasdissa.vibeyou.backend.database.dao
+package app.suhasdissa.vibeyou.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import app.suhasdissa.vibeyou.backend.database.entities.PlaylistEntity
-import app.suhasdissa.vibeyou.backend.database.entities.PlaylistWithSongs
-import app.suhasdissa.vibeyou.backend.database.entities.SongPlaylistMap
+import app.suhasdissa.vibeyou.data.database.entities.PlaylistEntity
+import app.suhasdissa.vibeyou.data.database.entities.PlaylistWithSongs
+import app.suhasdissa.vibeyou.data.database.entities.SongPlaylistMap
 import kotlinx.coroutines.flow.Flow
 
 @Dao

app/src/main/java/app/suhasdissa/vibeyou/backend/database/dao/RawDao.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/dao/RawDao.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.database.dao
+package app.suhasdissa.vibeyou.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.RawQuery

app/src/main/java/app/suhasdissa/vibeyou/backend/database/dao/SearchDao.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/dao/SearchDao.kt

@@ -1,10 +1,10 @@
-package app.suhasdissa.vibeyou.backend.database.dao
+package app.suhasdissa.vibeyou.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import app.suhasdissa.vibeyou.backend.database.entities.SearchQuery
+import app.suhasdissa.vibeyou.data.database.entities.SearchQuery
 
 @Dao
 interface SearchDao {

app/src/main/java/app/suhasdissa/vibeyou/backend/database/dao/SongsDao.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/dao/SongsDao.kt

@@ -1,11 +1,11 @@
-package app.suhasdissa.vibeyou.backend.database.dao
+package app.suhasdissa.vibeyou.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import app.suhasdissa.vibeyou.backend.database.entities.SongEntity
+import app.suhasdissa.vibeyou.data.database.entities.SongEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao

app/src/main/java/app/suhasdissa/vibeyou/backend/database/entities/PlaylistEntity.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/entities/PlaylistEntity.kt

@@ -1,8 +1,8 @@
-package app.suhasdissa.vibeyou.backend.database.entities
+package app.suhasdissa.vibeyou.data.database.entities
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import app.suhasdissa.vibeyou.backend.data.Album
+import app.suhasdissa.vibeyou.domain.models.primary.Album
 
 @Entity(tableName = "playlists")
 data class PlaylistEntity(

app/src/main/java/app/suhasdissa/vibeyou/backend/database/entities/PlaylistWithSongs.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/entities/PlaylistWithSongs.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.database.entities
+package app.suhasdissa.vibeyou.data.database.entities
 
 import androidx.room.Embedded
 import androidx.room.Junction

app/src/main/java/app/suhasdissa/vibeyou/backend/database/entities/SearchQuery.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/entities/SearchQuery.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.database.entities
+package app.suhasdissa.vibeyou.data.database.entities
 
 import androidx.room.Entity
 import androidx.room.Index

app/src/main/java/app/suhasdissa/vibeyou/backend/database/entities/SongEntity.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/entities/SongEntity.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.database.entities
+package app.suhasdissa.vibeyou.data.database.entities
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/app/suhasdissa/vibeyou/backend/database/entities/SongPlaylistMap.kt → app/src/main/java/app/suhasdissa/vibeyou/data/database/entities/SongPlaylistMap.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.database.entities
+package app.suhasdissa.vibeyou.data.database.entities
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/app/suhasdissa/vibeyou/domain/models/hyper/Song.kt

@@ -0,0 +1,36 @@
+package app.suhasdissa.vibeyou.backend.models.hyper
+
+import androidx.core.net.toUri
+import app.suhasdissa.vibeyou.data.database.entities.SongEntity
+import app.suhasdissa.vibeyou.domain.models.primary.Song
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Song(
+    val id: String,
+    val subtitle: String,
+    val thumbnails: List<Thumbnail>,
+    val title: String
+) {
+    val asSong: Song
+        get() {
+            return Song(
+                id = id,
+                title = title,
+                artistsText = subtitle,
+                durationText = null,
+                thumbnailUri = thumbnails.maxByOrNull { it.height }?.url?.toUri()
+            )
+        }
+
+    val asSongEntity: SongEntity
+        get() {
+            return SongEntity(
+                id = id,
+                title = title,
+                artistsText = subtitle,
+                durationText = null,
+                thumbnailUrl = thumbnails.maxByOrNull { it.height }?.url
+            )
+        }
+}

app/src/main/java/app/suhasdissa/vibeyou/backend/data/Album.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/models/primary/Album.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.data
+package app.suhasdissa.vibeyou.domain.models.primary
 
 import android.net.Uri
 

app/src/main/java/app/suhasdissa/vibeyou/backend/data/Artist.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/models/primary/Artist.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.data
+package app.suhasdissa.vibeyou.domain.models.primary
 
 import android.net.Uri
 

app/src/main/java/app/suhasdissa/vibeyou/backend/data/EqualizerData.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/models/primary/EqualizerData.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.data
+package app.suhasdissa.vibeyou.domain.models.primary
 
 data class EqualizerBand(
     val frequency: Int,

app/src/main/java/app/suhasdissa/vibeyou/backend/data/Song.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/models/primary/Song.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou.backend.data
+package app.suhasdissa.vibeyou.domain.models.primary
 
 import android.net.Uri
 

app/src/main/java/app/suhasdissa/vibeyou/backend/repository/LocalMusicRepository.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/repository/LocalMusicRepository.kt

@@ -9,11 +9,11 @@ import android.os.Environment.getExternalStorageDirectory
 import android.provider.MediaStore
 import android.text.format.DateUtils
 import androidx.core.net.toUri
-import app.suhasdissa.vibeyou.backend.data.Album
-import app.suhasdissa.vibeyou.backend.data.Artist
-import app.suhasdissa.vibeyou.backend.data.Song
-import app.suhasdissa.vibeyou.backend.database.dao.SearchDao
-import app.suhasdissa.vibeyou.backend.database.entities.SearchQuery
+import app.suhasdissa.vibeyou.data.database.dao.SearchDao
+import app.suhasdissa.vibeyou.data.database.entities.SearchQuery
+import app.suhasdissa.vibeyou.domain.models.primary.Album
+import app.suhasdissa.vibeyou.domain.models.primary.Artist
+import app.suhasdissa.vibeyou.domain.models.primary.Song
 import app.suhasdissa.vibeyou.utils.Pref
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

app/src/main/java/app/suhasdissa/vibeyou/backend/repository/PipedMusicRepository.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/repository/PipedMusicRepository.kt

@@ -3,16 +3,16 @@ package app.suhasdissa.vibeyou.backend.repository
 import android.net.Uri
 import android.util.Log
 import androidx.core.net.toUri
-import app.suhasdissa.vibeyou.backend.data.Album
-import app.suhasdissa.vibeyou.backend.data.Artist
-import app.suhasdissa.vibeyou.backend.data.Song
-import app.suhasdissa.vibeyou.backend.database.dao.SearchDao
-import app.suhasdissa.vibeyou.backend.database.dao.SongsDao
-import app.suhasdissa.vibeyou.backend.database.entities.SearchQuery
 import app.suhasdissa.vibeyou.backend.models.SearchFilter
 import app.suhasdissa.vibeyou.backend.models.artists.Channel
 import app.suhasdissa.vibeyou.backend.models.artists.ChannelTab
 import app.suhasdissa.vibeyou.backend.models.playlists.PlaylistInfo
+import app.suhasdissa.vibeyou.data.database.dao.SearchDao
+import app.suhasdissa.vibeyou.data.database.dao.SongsDao
+import app.suhasdissa.vibeyou.data.database.entities.SearchQuery
+import app.suhasdissa.vibeyou.domain.models.primary.Album
+import app.suhasdissa.vibeyou.domain.models.primary.Artist
+import app.suhasdissa.vibeyou.domain.models.primary.Song
 import app.suhasdissa.vibeyou.utils.Pref
 import app.suhasdissa.vibeyou.utils.RetrofitHelper
 import app.suhasdissa.vibeyou.utils.asAlbum

app/src/main/java/app/suhasdissa/vibeyou/backend/repository/PlaylistRepository.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/repository/PlaylistRepository.kt

@@ -1,12 +1,12 @@
 package app.suhasdissa.vibeyou.backend.repository
 
-import app.suhasdissa.vibeyou.backend.data.Album
-import app.suhasdissa.vibeyou.backend.data.Song
-import app.suhasdissa.vibeyou.backend.database.dao.PlaylistDao
-import app.suhasdissa.vibeyou.backend.database.dao.SongsDao
-import app.suhasdissa.vibeyou.backend.database.entities.PlaylistEntity
-import app.suhasdissa.vibeyou.backend.database.entities.PlaylistWithSongs
-import app.suhasdissa.vibeyou.backend.database.entities.SongPlaylistMap
+import app.suhasdissa.vibeyou.data.database.dao.PlaylistDao
+import app.suhasdissa.vibeyou.data.database.dao.SongsDao
+import app.suhasdissa.vibeyou.data.database.entities.PlaylistEntity
+import app.suhasdissa.vibeyou.data.database.entities.PlaylistWithSongs
+import app.suhasdissa.vibeyou.data.database.entities.SongPlaylistMap
+import app.suhasdissa.vibeyou.domain.models.primary.Album
+import app.suhasdissa.vibeyou.domain.models.primary.Song
 import app.suhasdissa.vibeyou.utils.asPlaylistEntity
 import app.suhasdissa.vibeyou.utils.asSongEntity
 import kotlinx.coroutines.Dispatchers

app/src/main/java/app/suhasdissa/vibeyou/backend/repository/SongDatabaseRepository.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/repository/SongDatabaseRepository.kt

@@ -1,7 +1,7 @@
 package app.suhasdissa.vibeyou.backend.repository
 
-import app.suhasdissa.vibeyou.backend.data.Song
-import app.suhasdissa.vibeyou.backend.database.entities.SongEntity
+import app.suhasdissa.vibeyou.data.database.entities.SongEntity
+import app.suhasdissa.vibeyou.domain.models.primary.Song
 import kotlinx.coroutines.flow.Flow
 
 interface SongDatabaseRepository {

app/src/main/java/app/suhasdissa/vibeyou/backend/repository/SongDatabaseRepositoryImpl.kt → app/src/main/java/app/suhasdissa/vibeyou/domain/repository/SongDatabaseRepositoryImpl.kt

@@ -1,8 +1,8 @@
 package app.suhasdissa.vibeyou.backend.repository
 
-import app.suhasdissa.vibeyou.backend.data.Song
-import app.suhasdissa.vibeyou.backend.database.dao.SongsDao
-import app.suhasdissa.vibeyou.backend.database.entities.SongEntity
+import app.suhasdissa.vibeyou.data.database.dao.SongsDao
+import app.suhasdissa.vibeyou.data.database.entities.SongEntity
+import app.suhasdissa.vibeyou.domain.models.primary.Song
 import app.suhasdissa.vibeyou.utils.asSong
 import app.suhasdissa.vibeyou.utils.asSongEntity
 import kotlinx.coroutines.flow.Flow

app/src/main/java/app/suhasdissa/vibeyou/Destination.kt → app/src/main/java/app/suhasdissa/vibeyou/navigation/Destination.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.vibeyou
+package app.suhasdissa.vibeyou.navigation
 
 sealed class Destination(val route: String) {
     object PipedMusic : Destination("piped_music")