Merge pull request #37 from SuhasDissa/main

Change app package name

app/build.gradle.kts

@@ -6,15 +6,15 @@ plugins {
 }
 
 android {
-    namespace = "app.suhasdissa.mellowmusic"
+    namespace = "app.suhasdissa.vibeyou"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "app.suhasdissa.mellowmusic"
+        applicationId = "app.suhasdissa.vibeyou"
         minSdk = 26
         targetSdk = 34
-        versionCode = 9
-        versionName = "1.8"
+        versionCode = 1
+        versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/AndroidManifest.xml

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

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

@@ -1,14 +1,14 @@
-package app.suhasdissa.mellowmusic
+package app.suhasdissa.vibeyou
 
 import android.content.ContentResolver
 import androidx.media3.session.MediaController
-import app.suhasdissa.mellowmusic.backend.database.SongDatabase
-import app.suhasdissa.mellowmusic.backend.repository.AuthRepository
-import app.suhasdissa.mellowmusic.backend.repository.AuthRepositoryImpl
-import app.suhasdissa.mellowmusic.backend.repository.LocalMusicRepository
-import app.suhasdissa.mellowmusic.backend.repository.PipedMusicRepository
-import app.suhasdissa.mellowmusic.backend.repository.SongDatabaseRepository
-import app.suhasdissa.mellowmusic.backend.repository.SongDatabaseRepositoryImpl
+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.SongDatabaseRepository
+import app.suhasdissa.vibeyou.backend.repository.SongDatabaseRepositoryImpl
 import com.google.common.util.concurrent.ListenableFuture
 
 interface AppContainer {

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

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

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

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic
+package app.suhasdissa.vibeyou
 
 import android.content.Intent
 import android.net.Uri
@@ -22,9 +22,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.core.net.toUri
 import androidx.navigation.compose.rememberNavController
-import app.suhasdissa.mellowmusic.backend.viewmodel.PlayerViewModel
-import app.suhasdissa.mellowmusic.ui.components.NavDrawerContent
-import app.suhasdissa.mellowmusic.ui.theme.LibreMusicTheme
+import app.suhasdissa.vibeyou.backend.viewmodel.PlayerViewModel
+import app.suhasdissa.vibeyou.ui.components.NavDrawerContent
+import app.suhasdissa.vibeyou.ui.theme.LibreMusicTheme
 import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {

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

@@ -1,14 +1,14 @@
-package app.suhasdissa.mellowmusic
+package app.suhasdissa.vibeyou
 
 import android.app.Application
 import android.content.ComponentName
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
-import app.suhasdissa.mellowmusic.backend.database.SongDatabase
-import app.suhasdissa.mellowmusic.backend.services.PlayerService
-import app.suhasdissa.mellowmusic.utils.Pref
-import app.suhasdissa.mellowmusic.utils.UpdateUtil
-import app.suhasdissa.mellowmusic.utils.preferences
+import app.suhasdissa.vibeyou.backend.database.SongDatabase
+import app.suhasdissa.vibeyou.backend.services.PlayerService
+import app.suhasdissa.vibeyou.utils.Pref
+import app.suhasdissa.vibeyou.utils.UpdateUtil
+import app.suhasdissa.vibeyou.utils.preferences
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.disk.DiskCache

app/src/main/java/app/suhasdissa/mellowmusic/NavHost.kt → app/src/main/java/app/suhasdissa/vibeyou/NavHost.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic
+package app.suhasdissa.vibeyou
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -7,18 +7,18 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import app.suhasdissa.mellowmusic.backend.viewmodel.LocalSearchViewModel
-import app.suhasdissa.mellowmusic.backend.viewmodel.LocalSongViewModel
-import app.suhasdissa.mellowmusic.backend.viewmodel.PipedSearchViewModel
-import app.suhasdissa.mellowmusic.ui.screens.home.HomeScreen
-import app.suhasdissa.mellowmusic.ui.screens.search.AlbumScreen
-import app.suhasdissa.mellowmusic.ui.screens.search.ArtistScreen
-import app.suhasdissa.mellowmusic.ui.screens.search.LocalSearchScreen
-import app.suhasdissa.mellowmusic.ui.screens.search.SearchScreen
-import app.suhasdissa.mellowmusic.ui.screens.settings.AboutScreen
-import app.suhasdissa.mellowmusic.ui.screens.settings.DatabaseSettingsScreen
-import app.suhasdissa.mellowmusic.ui.screens.settings.NetworkSettingsScreen
-import app.suhasdissa.mellowmusic.ui.screens.settings.SettingsScreen
+import app.suhasdissa.vibeyou.backend.viewmodel.LocalSearchViewModel
+import app.suhasdissa.vibeyou.backend.viewmodel.LocalSongViewModel
+import app.suhasdissa.vibeyou.backend.viewmodel.PipedSearchViewModel
+import app.suhasdissa.vibeyou.ui.screens.home.HomeScreen
+import app.suhasdissa.vibeyou.ui.screens.search.AlbumScreen
+import app.suhasdissa.vibeyou.ui.screens.search.ArtistScreen
+import app.suhasdissa.vibeyou.ui.screens.search.LocalSearchScreen
+import app.suhasdissa.vibeyou.ui.screens.search.SearchScreen
+import app.suhasdissa.vibeyou.ui.screens.settings.AboutScreen
+import app.suhasdissa.vibeyou.ui.screens.settings.DatabaseSettingsScreen
+import app.suhasdissa.vibeyou.ui.screens.settings.NetworkSettingsScreen
+import app.suhasdissa.vibeyou.ui.screens.settings.SettingsScreen
 
 @Composable
 fun AppNavHost(navHostController: NavHostController) {

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

@@ -1,16 +1,16 @@
-package app.suhasdissa.mellowmusic.backend.api
+package app.suhasdissa.vibeyou.backend.api
 
-import app.suhasdissa.mellowmusic.backend.models.Login
-import app.suhasdissa.mellowmusic.backend.models.PipedInstance
-import app.suhasdissa.mellowmusic.backend.models.PipedSongResponse
-import app.suhasdissa.mellowmusic.backend.models.Token
-import app.suhasdissa.mellowmusic.backend.models.artists.Artists
-import app.suhasdissa.mellowmusic.backend.models.artists.Channel
-import app.suhasdissa.mellowmusic.backend.models.artists.ChannelTabResponse
-import app.suhasdissa.mellowmusic.backend.models.playlists.PlaylistInfo
-import app.suhasdissa.mellowmusic.backend.models.playlists.Playlists
-import app.suhasdissa.mellowmusic.backend.models.songs.Songs
-import app.suhasdissa.mellowmusic.utils.Pref
+import app.suhasdissa.vibeyou.backend.models.Login
+import app.suhasdissa.vibeyou.backend.models.PipedInstance
+import app.suhasdissa.vibeyou.backend.models.PipedSongResponse
+import app.suhasdissa.vibeyou.backend.models.Token
+import app.suhasdissa.vibeyou.backend.models.artists.Artists
+import app.suhasdissa.vibeyou.backend.models.artists.Channel
+import app.suhasdissa.vibeyou.backend.models.artists.ChannelTabResponse
+import app.suhasdissa.vibeyou.backend.models.playlists.PlaylistInfo
+import app.suhasdissa.vibeyou.backend.models.playlists.Playlists
+import app.suhasdissa.vibeyou.backend.models.songs.Songs
+import app.suhasdissa.vibeyou.utils.Pref
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header

app/src/main/java/app/suhasdissa/mellowmusic/backend/data/Album.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/data/Album.kt

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

app/src/main/java/app/suhasdissa/mellowmusic/backend/data/Artist.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/data/Artist.kt

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

app/src/main/java/app/suhasdissa/mellowmusic/backend/data/Song.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/data/Song.kt

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

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

@@ -1,14 +1,14 @@
-package app.suhasdissa.mellowmusic.backend.database
+package app.suhasdissa.vibeyou.backend.database
 
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import app.suhasdissa.mellowmusic.backend.database.dao.RawDao
-import app.suhasdissa.mellowmusic.backend.database.dao.SearchDao
-import app.suhasdissa.mellowmusic.backend.database.dao.SongsDao
-import app.suhasdissa.mellowmusic.backend.database.entities.SearchQuery
-import app.suhasdissa.mellowmusic.backend.database.entities.SongEntity
+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.SearchQuery
+import app.suhasdissa.vibeyou.backend.database.entities.SongEntity
 
 @Database(
     entities = [

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

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

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

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

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

@@ -1,11 +1,11 @@
-package app.suhasdissa.mellowmusic.backend.database.dao
+package app.suhasdissa.vibeyou.backend.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.mellowmusic.backend.database.entities.SongEntity
+import app.suhasdissa.vibeyou.backend.database.entities.SongEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao

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

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

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

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

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/Login.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/Login.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/PipedInstance.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/PipedInstance.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -19,4 +19,4 @@ data class PipedInstance(
     val version: String = ""
 ) {
     val netLoc = apiUrl.replace("https://", "")
-}
+}

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/PipedVIdeoResponse.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/PipedVIdeoResponse.kt

@@ -1,6 +1,6 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
-import app.suhasdissa.mellowmusic.backend.models.songs.SongItem
+import app.suhasdissa.vibeyou.backend.models.songs.SongItem
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/PlayerRepeatMode.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/PlayerRepeatMode.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
 import androidx.media3.common.Player
 

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/PlayerState.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/PlayerState.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
 enum class PlayerState {
     Buffer, Play, Pause

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/SearchFilter.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/SearchFilter.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
 enum class SearchFilter(val value: String) {
     Songs("music_songs"),

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/Token.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/Token.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models
+package app.suhasdissa.vibeyou.backend.models
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/artists/Artist.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/artists/Artist.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.artists
+package app.suhasdissa.vibeyou.backend.models.artists
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/artists/Artists.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/artists/Artists.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.artists
+package app.suhasdissa.vibeyou.backend.models.artists
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/artists/Channel.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/artists/Channel.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.artists
+package app.suhasdissa.vibeyou.backend.models.artists
 
 import kotlinx.serialization.Serializable
 

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/artists/ChannelTabResponse.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/artists/ChannelTabResponse.kt

@@ -1,6 +1,6 @@
-package app.suhasdissa.mellowmusic.backend.models.artists
+package app.suhasdissa.vibeyou.backend.models.artists
 
-import app.suhasdissa.mellowmusic.backend.models.playlists.Playlist
+import app.suhasdissa.vibeyou.backend.models.playlists.Playlist
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/playlists/Playlist.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/playlists/Playlist.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.playlists
+package app.suhasdissa.vibeyou.backend.models.playlists
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/playlists/PlaylistInfo.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/playlists/PlaylistInfo.kt

@@ -1,6 +1,6 @@
-package app.suhasdissa.mellowmusic.backend.models.playlists
+package app.suhasdissa.vibeyou.backend.models.playlists
 
-import app.suhasdissa.mellowmusic.backend.models.songs.SongItem
+import app.suhasdissa.vibeyou.backend.models.songs.SongItem
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/playlists/Playlists.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/playlists/Playlists.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.playlists
+package app.suhasdissa.vibeyou.backend.models.playlists
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/songs/SongItem.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/songs/SongItem.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.songs
+package app.suhasdissa.vibeyou.backend.models.songs
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/models/songs/Songs.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/models/songs/Songs.kt

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.models.songs
+package app.suhasdissa.vibeyou.backend.models.songs
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/app/suhasdissa/mellowmusic/backend/repository/AuthRepository.kt → app/src/main/java/app/suhasdissa/vibeyou/backend/repository/AuthRepository.kt

@@ -1,8 +1,8 @@
-package app.suhasdissa.mellowmusic.backend.repository
+package app.suhasdissa.vibeyou.backend.repository
 
-import app.suhasdissa.mellowmusic.backend.models.Login
-import app.suhasdissa.mellowmusic.backend.models.Token
-import app.suhasdissa.mellowmusic.utils.RetrofitHelper
+import app.suhasdissa.vibeyou.backend.models.Login
+import app.suhasdissa.vibeyou.backend.models.Token
+import app.suhasdissa.vibeyou.utils.RetrofitHelper
 
 interface AuthRepository {
     suspend fun getAuthToken(login: Login): Token

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

@@ -1,4 +1,4 @@
-package app.suhasdissa.mellowmusic.backend.repository
+package app.suhasdissa.vibeyou.backend.repository
 
 import android.Manifest
 import android.content.ContentResolver
@@ -8,11 +8,11 @@ import android.os.Build
 import android.provider.MediaStore
 import android.text.format.DateUtils
 import androidx.core.net.toUri
-import app.suhasdissa.mellowmusic.backend.data.Album
-import app.suhasdissa.mellowmusic.backend.data.Artist
-import app.suhasdissa.mellowmusic.backend.data.Song
-import app.suhasdissa.mellowmusic.backend.database.dao.SearchDao
-import app.suhasdissa.mellowmusic.backend.database.entities.SearchQuery
+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 kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext