diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5c93f45 --- /dev/null +++ b/LICENSE @@ -0,0 +1,13 @@ + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5a2e70d..0c72174 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,11 +6,11 @@ plugins { } android { - namespace = "com.example.furumi_android" + namespace = "cy.hexor.furumi" compileSdk = 35 defaultConfig { - applicationId = "com.example.furumi_android" + applicationId = "cy.hexor.furumi" minSdk = 24 targetSdk = 35 versionCode = 1 diff --git a/app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt b/app/src/androidTest/java/cy/hexor/furumi/ExampleInstrumentedTest.kt similarity index 83% rename from app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/cy/hexor/furumi/ExampleInstrumentedTest.kt index 0cb5b0b..aa132af 100644 --- a/app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/cy/hexor/furumi/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android +package cy.hexor.furumi import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.furumi_android", appContext.packageName) + assertEquals("cy.hexor.furumi", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/furumi_android/FurumiApplication.kt b/app/src/main/java/cy/hexor/furumi/FurumiApplication.kt similarity index 78% rename from app/src/main/java/com/example/furumi_android/FurumiApplication.kt rename to app/src/main/java/cy/hexor/furumi/FurumiApplication.kt index da8fe96..ffc3fa7 100644 --- a/app/src/main/java/com/example/furumi_android/FurumiApplication.kt +++ b/app/src/main/java/cy/hexor/furumi/FurumiApplication.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android +package cy.hexor.furumi import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/main/java/com/example/furumi_android/MainActivity.kt b/app/src/main/java/cy/hexor/furumi/MainActivity.kt similarity index 92% rename from app/src/main/java/com/example/furumi_android/MainActivity.kt rename to app/src/main/java/cy/hexor/furumi/MainActivity.kt index 55b9ff5..1e41d70 100644 --- a/app/src/main/java/com/example/furumi_android/MainActivity.kt +++ b/app/src/main/java/cy/hexor/furumi/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android +package cy.hexor.furumi import android.Manifest import android.content.Intent @@ -19,10 +19,10 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.example.furumi_android.ui.login.LoginScreen -import com.example.furumi_android.ui.login.LoginViewModel -import com.example.furumi_android.ui.player.PlayerScreen -import com.example.furumi_android.ui.theme.FurumiTheme +import cy.hexor.furumi.ui.login.LoginScreen +import cy.hexor.furumi.ui.login.LoginViewModel +import cy.hexor.furumi.ui.player.PlayerScreen +import cy.hexor.furumi.ui.theme.FurumiTheme import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt b/app/src/main/java/cy/hexor/furumi/data/local/AuthSessionStorage.kt similarity index 95% rename from app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt rename to app/src/main/java/cy/hexor/furumi/data/local/AuthSessionStorage.kt index f2c802e..ce97ff9 100644 --- a/app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt +++ b/app/src/main/java/cy/hexor/furumi/data/local/AuthSessionStorage.kt @@ -1,11 +1,11 @@ -package com.example.furumi_android.data.local +package cy.hexor.furumi.data.local import android.content.Context import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey -import com.example.furumi_android.domain.model.AuthSession -import com.example.furumi_android.domain.model.AuthTokens -import com.example.furumi_android.domain.model.User +import cy.hexor.furumi.domain.model.AuthSession +import cy.hexor.furumi.domain.model.AuthTokens +import cy.hexor.furumi.domain.model.User import com.squareup.moshi.Moshi class AuthSessionStorage(context: Context, moshi: Moshi) { diff --git a/app/src/main/java/com/example/furumi_android/data/local/ConnectedDeviceStorage.kt b/app/src/main/java/cy/hexor/furumi/data/local/ConnectedDeviceStorage.kt similarity index 95% rename from app/src/main/java/com/example/furumi_android/data/local/ConnectedDeviceStorage.kt rename to app/src/main/java/cy/hexor/furumi/data/local/ConnectedDeviceStorage.kt index 8be04f9..89cb68b 100644 --- a/app/src/main/java/com/example/furumi_android/data/local/ConnectedDeviceStorage.kt +++ b/app/src/main/java/cy/hexor/furumi/data/local/ConnectedDeviceStorage.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.data.local +package cy.hexor.furumi.data.local import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt b/app/src/main/java/cy/hexor/furumi/data/remote/AccessTokenInterceptor.kt similarity index 91% rename from app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/AccessTokenInterceptor.kt index 1b8249f..f19a217 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/AccessTokenInterceptor.kt @@ -1,6 +1,6 @@ -package com.example.furumi_android.data.remote +package cy.hexor.furumi.data.remote -import com.example.furumi_android.data.local.AuthSessionStorage +import cy.hexor.furumi.data.local.AuthSessionStorage import okhttp3.Interceptor import okhttp3.Response import javax.inject.Inject diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AppClientInfo.kt b/app/src/main/java/cy/hexor/furumi/data/remote/AppClientInfo.kt similarity index 71% rename from app/src/main/java/com/example/furumi_android/data/remote/AppClientInfo.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/AppClientInfo.kt index c907d27..8ac0113 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/AppClientInfo.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/AppClientInfo.kt @@ -1,6 +1,6 @@ -package com.example.furumi_android.data.remote +package cy.hexor.furumi.data.remote -import com.example.furumi_android.BuildConfig +import cy.hexor.furumi.BuildConfig import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt b/app/src/main/java/cy/hexor/furumi/data/remote/AuthApiErrorParser.kt similarity index 87% rename from app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/AuthApiErrorParser.kt index 2efe35a..c4edf26 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/AuthApiErrorParser.kt @@ -1,6 +1,6 @@ -package com.example.furumi_android.data.remote +package cy.hexor.furumi.data.remote -import com.example.furumi_android.data.remote.model.ErrorResponse +import cy.hexor.furumi.data.remote.model.ErrorResponse import com.squareup.moshi.Moshi import retrofit2.Response import javax.inject.Inject diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt b/app/src/main/java/cy/hexor/furumi/data/remote/AuthAuthenticator.kt similarity index 85% rename from app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/AuthAuthenticator.kt index 96b54a9..a92e471 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/AuthAuthenticator.kt @@ -1,10 +1,10 @@ -package com.example.furumi_android.data.remote +package cy.hexor.furumi.data.remote -import com.example.furumi_android.data.local.AuthSessionStorage -import com.example.furumi_android.data.remote.AccessTokenInterceptor.Companion.HEADER_AUTHORIZATION -import com.example.furumi_android.data.remote.api.AuthApi -import com.example.furumi_android.data.remote.model.RefreshRequest -import com.example.furumi_android.data.remote.model.toDomain +import cy.hexor.furumi.data.local.AuthSessionStorage +import cy.hexor.furumi.data.remote.AccessTokenInterceptor.Companion.HEADER_AUTHORIZATION +import cy.hexor.furumi.data.remote.api.AuthApi +import cy.hexor.furumi.data.remote.model.RefreshRequest +import cy.hexor.furumi.data.remote.model.toDomain import dagger.Lazy import kotlinx.coroutines.runBlocking import okhttp3.Authenticator @@ -54,7 +54,7 @@ class AuthAuthenticator @Inject constructor( private suspend fun refreshTokens( baseUrl: String, refreshToken: String - ): com.example.furumi_android.domain.model.AuthTokens? { + ): cy.hexor.furumi.domain.model.AuthTokens? { val refreshResponse = runCatching { authApiLazy.get().refresh( url = authEndpoints.refresh(baseUrl), diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt b/app/src/main/java/cy/hexor/furumi/data/remote/AuthEndpoints.kt similarity index 95% rename from app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/AuthEndpoints.kt index 010054c..fbd0335 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/AuthEndpoints.kt @@ -1,7 +1,7 @@ -package com.example.furumi_android.data.remote +package cy.hexor.furumi.data.remote import android.net.Uri -import com.example.furumi_android.domain.model.AuthException +import cy.hexor.furumi.domain.model.AuthException import javax.inject.Inject class AuthEndpoints @Inject constructor() { diff --git a/app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt b/app/src/main/java/cy/hexor/furumi/data/remote/PlayerEndpoints.kt similarity index 98% rename from app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/PlayerEndpoints.kt index 91fef1d..b691ec0 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/PlayerEndpoints.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.data.remote +package cy.hexor.furumi.data.remote import javax.inject.Inject diff --git a/app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt b/app/src/main/java/cy/hexor/furumi/data/remote/api/AuthApi.kt similarity index 64% rename from app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/api/AuthApi.kt index 25bdaa6..e4d17e9 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/api/AuthApi.kt @@ -1,12 +1,12 @@ -package com.example.furumi_android.data.remote.api +package cy.hexor.furumi.data.remote.api -import com.example.furumi_android.data.remote.model.LoginRequest -import com.example.furumi_android.data.remote.model.LoginResponse -import com.example.furumi_android.data.remote.model.LogoutRequest -import com.example.furumi_android.data.remote.model.LogoutResponse -import com.example.furumi_android.data.remote.model.RefreshRequest -import com.example.furumi_android.data.remote.model.SsoExchangeRequest -import com.example.furumi_android.data.remote.model.TokenResponse +import cy.hexor.furumi.data.remote.model.LoginRequest +import cy.hexor.furumi.data.remote.model.LoginResponse +import cy.hexor.furumi.data.remote.model.LogoutRequest +import cy.hexor.furumi.data.remote.model.LogoutResponse +import cy.hexor.furumi.data.remote.model.RefreshRequest +import cy.hexor.furumi.data.remote.model.SsoExchangeRequest +import cy.hexor.furumi.data.remote.model.TokenResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.Header diff --git a/app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt b/app/src/main/java/cy/hexor/furumi/data/remote/api/PlayerApi.kt similarity index 72% rename from app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/api/PlayerApi.kt index 48e6b51..0c04b74 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/api/PlayerApi.kt @@ -1,26 +1,26 @@ -package com.example.furumi_android.data.remote.api +package cy.hexor.furumi.data.remote.api -import com.example.furumi_android.data.remote.model.ArtistPageResponse -import com.example.furumi_android.data.remote.model.ArtistDetailResponse -import com.example.furumi_android.data.remote.model.PlayHistoryPageResponse -import com.example.furumi_android.data.remote.model.ReleaseDetailResponse -import com.example.furumi_android.data.remote.model.AddPlaylistTracksRequest -import com.example.furumi_android.data.remote.model.DeviceActiveRequest -import com.example.furumi_android.data.remote.model.DeviceCommandRequest -import com.example.furumi_android.data.remote.model.DevicePollRequest -import com.example.furumi_android.data.remote.model.DevicePollResponse -import com.example.furumi_android.data.remote.model.JamCreateRequest -import com.example.furumi_android.data.remote.model.JamInviteRequest -import com.example.furumi_android.data.remote.model.JamJoinRequest -import com.example.furumi_android.data.remote.model.JamUserResponse -import com.example.furumi_android.data.remote.model.LikeToggleResponse -import com.example.furumi_android.data.remote.model.LikedTrackIdsResponse -import com.example.furumi_android.data.remote.model.PlaylistCardResponse -import com.example.furumi_android.data.remote.model.PlaylistDetailResponse -import com.example.furumi_android.data.remote.model.RecordHistoryRequest -import com.example.furumi_android.data.remote.model.SearchResponse -import com.example.furumi_android.data.remote.model.SharePlaylistRequest -import com.example.furumi_android.data.remote.model.SharePlaylistResponse +import cy.hexor.furumi.data.remote.model.ArtistPageResponse +import cy.hexor.furumi.data.remote.model.ArtistDetailResponse +import cy.hexor.furumi.data.remote.model.PlayHistoryPageResponse +import cy.hexor.furumi.data.remote.model.ReleaseDetailResponse +import cy.hexor.furumi.data.remote.model.AddPlaylistTracksRequest +import cy.hexor.furumi.data.remote.model.DeviceActiveRequest +import cy.hexor.furumi.data.remote.model.DeviceCommandRequest +import cy.hexor.furumi.data.remote.model.DevicePollRequest +import cy.hexor.furumi.data.remote.model.DevicePollResponse +import cy.hexor.furumi.data.remote.model.JamCreateRequest +import cy.hexor.furumi.data.remote.model.JamInviteRequest +import cy.hexor.furumi.data.remote.model.JamJoinRequest +import cy.hexor.furumi.data.remote.model.JamUserResponse +import cy.hexor.furumi.data.remote.model.LikeToggleResponse +import cy.hexor.furumi.data.remote.model.LikedTrackIdsResponse +import cy.hexor.furumi.data.remote.model.PlaylistCardResponse +import cy.hexor.furumi.data.remote.model.PlaylistDetailResponse +import cy.hexor.furumi.data.remote.model.RecordHistoryRequest +import cy.hexor.furumi.data.remote.model.SearchResponse +import cy.hexor.furumi.data.remote.model.SharePlaylistRequest +import cy.hexor.furumi.data.remote.model.SharePlaylistResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.GET diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt b/app/src/main/java/cy/hexor/furumi/data/remote/model/AuthMappers.kt similarity index 78% rename from app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/model/AuthMappers.kt index bc9ee38..55d2598 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/model/AuthMappers.kt @@ -1,8 +1,8 @@ -package com.example.furumi_android.data.remote.model +package cy.hexor.furumi.data.remote.model -import com.example.furumi_android.domain.model.AuthSession -import com.example.furumi_android.domain.model.AuthTokens -import com.example.furumi_android.domain.model.User +import cy.hexor.furumi.domain.model.AuthSession +import cy.hexor.furumi.domain.model.AuthTokens +import cy.hexor.furumi.domain.model.User fun LoginResponse.toDomainSession( serverBaseUrl: String, diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt b/app/src/main/java/cy/hexor/furumi/data/remote/model/AuthRequests.kt similarity index 92% rename from app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/model/AuthRequests.kt index b6d15c1..38785b2 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/model/AuthRequests.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.data.remote.model +package cy.hexor.furumi.data.remote.model import com.squareup.moshi.Json diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt b/app/src/main/java/cy/hexor/furumi/data/remote/model/AuthResponses.kt similarity index 93% rename from app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/model/AuthResponses.kt index 448df06..a120b4f 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/model/AuthResponses.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.data.remote.model +package cy.hexor.furumi.data.remote.model import com.squareup.moshi.Json diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/ConnectedDeviceModels.kt b/app/src/main/java/cy/hexor/furumi/data/remote/model/ConnectedDeviceModels.kt similarity index 94% rename from app/src/main/java/com/example/furumi_android/data/remote/model/ConnectedDeviceModels.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/model/ConnectedDeviceModels.kt index 8b21177..cf07561 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/model/ConnectedDeviceModels.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/model/ConnectedDeviceModels.kt @@ -1,14 +1,14 @@ -package com.example.furumi_android.data.remote.model +package cy.hexor.furumi.data.remote.model -import com.example.furumi_android.domain.model.ConnectedCommand -import com.example.furumi_android.domain.model.ConnectedCommandPayload -import com.example.furumi_android.domain.model.ConnectedDevice -import com.example.furumi_android.domain.model.ConnectedDevicesState -import com.example.furumi_android.domain.model.ConnectedJam -import com.example.furumi_android.domain.model.ConnectedJamMember -import com.example.furumi_android.domain.model.ConnectedJamUser -import com.example.furumi_android.domain.model.ConnectedPlaybackState -import com.example.furumi_android.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ConnectedCommand +import cy.hexor.furumi.domain.model.ConnectedCommandPayload +import cy.hexor.furumi.domain.model.ConnectedDevice +import cy.hexor.furumi.domain.model.ConnectedDevicesState +import cy.hexor.furumi.domain.model.ConnectedJam +import cy.hexor.furumi.domain.model.ConnectedJamMember +import cy.hexor.furumi.domain.model.ConnectedJamUser +import cy.hexor.furumi.domain.model.ConnectedPlaybackState +import cy.hexor.furumi.domain.model.TrackCard import com.squareup.moshi.Json data class ConnectedPlaybackStateBody( diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt b/app/src/main/java/cy/hexor/furumi/data/remote/model/PlayerResponses.kt similarity index 94% rename from app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt rename to app/src/main/java/cy/hexor/furumi/data/remote/model/PlayerResponses.kt index e8dbca9..a19872b 100644 --- a/app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt +++ b/app/src/main/java/cy/hexor/furumi/data/remote/model/PlayerResponses.kt @@ -1,17 +1,17 @@ -package com.example.furumi_android.data.remote.model +package cy.hexor.furumi.data.remote.model -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.ArtistDetail -import com.example.furumi_android.domain.model.ArtistPage -import com.example.furumi_android.domain.model.ArtistRef -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.domain.model.ListeningHistoryPage -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.PlaylistDetail -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.ReleaseDetail -import com.example.furumi_android.domain.model.SearchResults -import com.example.furumi_android.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.ArtistDetail +import cy.hexor.furumi.domain.model.ArtistPage +import cy.hexor.furumi.domain.model.ArtistRef +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.domain.model.ListeningHistoryPage +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.PlaylistDetail +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.ReleaseDetail +import cy.hexor.furumi.domain.model.SearchResults +import cy.hexor.furumi.domain.model.TrackCard import com.squareup.moshi.Json data class ArtistRefResponse( diff --git a/app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt b/app/src/main/java/cy/hexor/furumi/data/repository/AuthDeviceInfo.kt similarity index 92% rename from app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt rename to app/src/main/java/cy/hexor/furumi/data/repository/AuthDeviceInfo.kt index c74fa9f..563de03 100644 --- a/app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt +++ b/app/src/main/java/cy/hexor/furumi/data/repository/AuthDeviceInfo.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.data.repository +package cy.hexor.furumi.data.repository import android.os.Build import javax.inject.Inject diff --git a/app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/cy/hexor/furumi/data/repository/AuthRepositoryImpl.kt similarity index 81% rename from app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt rename to app/src/main/java/cy/hexor/furumi/data/repository/AuthRepositoryImpl.kt index 30e744d..e2a1127 100644 --- a/app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/cy/hexor/furumi/data/repository/AuthRepositoryImpl.kt @@ -1,18 +1,18 @@ -package com.example.furumi_android.data.repository +package cy.hexor.furumi.data.repository -import com.example.furumi_android.data.local.AuthSessionStorage -import com.example.furumi_android.data.remote.AuthApiErrorParser -import com.example.furumi_android.data.remote.AuthEndpoints -import com.example.furumi_android.data.remote.api.AuthApi -import com.example.furumi_android.data.remote.model.LoginRequest -import com.example.furumi_android.data.remote.model.LoginResponse -import com.example.furumi_android.data.remote.model.LogoutRequest -import com.example.furumi_android.data.remote.model.SsoExchangeRequest -import com.example.furumi_android.data.remote.model.toDomainSession -import com.example.furumi_android.domain.model.AuthException -import com.example.furumi_android.domain.model.AuthSession -import com.example.furumi_android.domain.model.ServerConfig -import com.example.furumi_android.domain.repository.AuthRepository +import cy.hexor.furumi.data.local.AuthSessionStorage +import cy.hexor.furumi.data.remote.AuthApiErrorParser +import cy.hexor.furumi.data.remote.AuthEndpoints +import cy.hexor.furumi.data.remote.api.AuthApi +import cy.hexor.furumi.data.remote.model.LoginRequest +import cy.hexor.furumi.data.remote.model.LoginResponse +import cy.hexor.furumi.data.remote.model.LogoutRequest +import cy.hexor.furumi.data.remote.model.SsoExchangeRequest +import cy.hexor.furumi.data.remote.model.toDomainSession +import cy.hexor.furumi.domain.model.AuthException +import cy.hexor.furumi.domain.model.AuthSession +import cy.hexor.furumi.domain.model.ServerConfig +import cy.hexor.furumi.domain.repository.AuthRepository import kotlinx.coroutines.CancellationException import retrofit2.Response import javax.inject.Inject diff --git a/app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt b/app/src/main/java/cy/hexor/furumi/data/repository/MediaImageLoader.kt similarity index 95% rename from app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt rename to app/src/main/java/cy/hexor/furumi/data/repository/MediaImageLoader.kt index 3828752..5553054 100644 --- a/app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt +++ b/app/src/main/java/cy/hexor/furumi/data/repository/MediaImageLoader.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.data.repository +package cy.hexor.furumi.data.repository import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt b/app/src/main/java/cy/hexor/furumi/data/repository/PlayerRepositoryImpl.kt similarity index 89% rename from app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt rename to app/src/main/java/cy/hexor/furumi/data/repository/PlayerRepositoryImpl.kt index d0d8884..32b2a02 100644 --- a/app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt +++ b/app/src/main/java/cy/hexor/furumi/data/repository/PlayerRepositoryImpl.kt @@ -1,38 +1,38 @@ -package com.example.furumi_android.data.repository +package cy.hexor.furumi.data.repository -import com.example.furumi_android.data.local.AuthSessionStorage -import com.example.furumi_android.data.local.ConnectedDeviceStorage -import com.example.furumi_android.data.remote.AppClientInfo -import com.example.furumi_android.data.remote.AuthApiErrorParser -import com.example.furumi_android.data.remote.PlayerEndpoints -import com.example.furumi_android.data.remote.api.PlayerApi -import com.example.furumi_android.data.remote.model.AddPlaylistTracksRequest -import com.example.furumi_android.data.remote.model.ConnectedCommandPayloadBody -import com.example.furumi_android.data.remote.model.DeviceActiveRequest -import com.example.furumi_android.data.remote.model.DeviceCommandRequest -import com.example.furumi_android.data.remote.model.DevicePollRequest -import com.example.furumi_android.data.remote.model.JamCreateRequest -import com.example.furumi_android.data.remote.model.JamInviteRequest -import com.example.furumi_android.data.remote.model.JamJoinRequest -import com.example.furumi_android.data.remote.model.RecordHistoryRequest -import com.example.furumi_android.data.remote.model.toDomain -import com.example.furumi_android.data.remote.model.toBody -import com.example.furumi_android.data.remote.model.toCommandPayloadBody -import com.example.furumi_android.data.remote.model.toTrackItemResponse -import com.example.furumi_android.domain.model.ArtistDetail -import com.example.furumi_android.domain.model.ArtistPage -import com.example.furumi_android.domain.model.AuthException -import com.example.furumi_android.domain.model.ConnectedCommand -import com.example.furumi_android.domain.model.ConnectedDevicesState -import com.example.furumi_android.domain.model.ConnectedJamUser -import com.example.furumi_android.domain.model.ConnectedPlaybackState -import com.example.furumi_android.domain.model.ListeningHistoryPage -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.PlaylistDetail -import com.example.furumi_android.domain.model.ReleaseDetail -import com.example.furumi_android.domain.model.SearchResults -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.repository.PlayerRepository +import cy.hexor.furumi.data.local.AuthSessionStorage +import cy.hexor.furumi.data.local.ConnectedDeviceStorage +import cy.hexor.furumi.data.remote.AppClientInfo +import cy.hexor.furumi.data.remote.AuthApiErrorParser +import cy.hexor.furumi.data.remote.PlayerEndpoints +import cy.hexor.furumi.data.remote.api.PlayerApi +import cy.hexor.furumi.data.remote.model.AddPlaylistTracksRequest +import cy.hexor.furumi.data.remote.model.ConnectedCommandPayloadBody +import cy.hexor.furumi.data.remote.model.DeviceActiveRequest +import cy.hexor.furumi.data.remote.model.DeviceCommandRequest +import cy.hexor.furumi.data.remote.model.DevicePollRequest +import cy.hexor.furumi.data.remote.model.JamCreateRequest +import cy.hexor.furumi.data.remote.model.JamInviteRequest +import cy.hexor.furumi.data.remote.model.JamJoinRequest +import cy.hexor.furumi.data.remote.model.RecordHistoryRequest +import cy.hexor.furumi.data.remote.model.toDomain +import cy.hexor.furumi.data.remote.model.toBody +import cy.hexor.furumi.data.remote.model.toCommandPayloadBody +import cy.hexor.furumi.data.remote.model.toTrackItemResponse +import cy.hexor.furumi.domain.model.ArtistDetail +import cy.hexor.furumi.domain.model.ArtistPage +import cy.hexor.furumi.domain.model.AuthException +import cy.hexor.furumi.domain.model.ConnectedCommand +import cy.hexor.furumi.domain.model.ConnectedDevicesState +import cy.hexor.furumi.domain.model.ConnectedJamUser +import cy.hexor.furumi.domain.model.ConnectedPlaybackState +import cy.hexor.furumi.domain.model.ListeningHistoryPage +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.PlaylistDetail +import cy.hexor.furumi.domain.model.ReleaseDetail +import cy.hexor.furumi.domain.model.SearchResults +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.repository.PlayerRepository import kotlinx.coroutines.CancellationException import javax.inject.Inject diff --git a/app/src/main/java/com/example/furumi_android/di/NetworkModule.kt b/app/src/main/java/cy/hexor/furumi/di/NetworkModule.kt similarity index 83% rename from app/src/main/java/com/example/furumi_android/di/NetworkModule.kt rename to app/src/main/java/cy/hexor/furumi/di/NetworkModule.kt index cc68471..de372a5 100644 --- a/app/src/main/java/com/example/furumi_android/di/NetworkModule.kt +++ b/app/src/main/java/cy/hexor/furumi/di/NetworkModule.kt @@ -1,12 +1,12 @@ -package com.example.furumi_android.di +package cy.hexor.furumi.di -import com.example.furumi_android.data.local.AuthSessionStorage -import com.example.furumi_android.data.remote.AccessTokenInterceptor -import com.example.furumi_android.data.remote.AppClientInfo -import com.example.furumi_android.data.remote.AuthAuthenticator -import com.example.furumi_android.data.remote.AuthEndpoints -import com.example.furumi_android.data.remote.api.AuthApi -import com.example.furumi_android.data.remote.api.PlayerApi +import cy.hexor.furumi.data.local.AuthSessionStorage +import cy.hexor.furumi.data.remote.AccessTokenInterceptor +import cy.hexor.furumi.data.remote.AppClientInfo +import cy.hexor.furumi.data.remote.AuthAuthenticator +import cy.hexor.furumi.data.remote.AuthEndpoints +import cy.hexor.furumi.data.remote.api.AuthApi +import cy.hexor.furumi.data.remote.api.PlayerApi import com.squareup.moshi.Moshi import dagger.Lazy import dagger.Module diff --git a/app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt b/app/src/main/java/cy/hexor/furumi/di/RepositoryModule.kt similarity index 60% rename from app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt rename to app/src/main/java/cy/hexor/furumi/di/RepositoryModule.kt index 3a1a486..48ec26f 100644 --- a/app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt +++ b/app/src/main/java/cy/hexor/furumi/di/RepositoryModule.kt @@ -1,9 +1,9 @@ -package com.example.furumi_android.di +package cy.hexor.furumi.di -import com.example.furumi_android.data.repository.AuthRepositoryImpl -import com.example.furumi_android.data.repository.PlayerRepositoryImpl -import com.example.furumi_android.domain.repository.AuthRepository -import com.example.furumi_android.domain.repository.PlayerRepository +import cy.hexor.furumi.data.repository.AuthRepositoryImpl +import cy.hexor.furumi.data.repository.PlayerRepositoryImpl +import cy.hexor.furumi.domain.repository.AuthRepository +import cy.hexor.furumi.domain.repository.PlayerRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/example/furumi_android/di/StorageModule.kt b/app/src/main/java/cy/hexor/furumi/di/StorageModule.kt similarity index 88% rename from app/src/main/java/com/example/furumi_android/di/StorageModule.kt rename to app/src/main/java/cy/hexor/furumi/di/StorageModule.kt index 90025b0..093efae 100644 --- a/app/src/main/java/com/example/furumi_android/di/StorageModule.kt +++ b/app/src/main/java/cy/hexor/furumi/di/StorageModule.kt @@ -1,7 +1,7 @@ -package com.example.furumi_android.di +package cy.hexor.furumi.di import android.content.Context -import com.example.furumi_android.data.local.AuthSessionStorage +import cy.hexor.furumi.data.local.AuthSessionStorage import com.squareup.moshi.Moshi import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import dagger.Module diff --git a/app/src/main/java/com/example/furumi_android/domain/model/Artist.kt b/app/src/main/java/cy/hexor/furumi/domain/model/Artist.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/domain/model/Artist.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/Artist.kt index 7919b42..2d4c904 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/Artist.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/Artist.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model data class ArtistCard( val id: Long, diff --git a/app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt b/app/src/main/java/cy/hexor/furumi/domain/model/AuthException.kt similarity index 68% rename from app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/AuthException.kt index 82337a7..a6500f9 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/AuthException.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model class AuthException( message: String, diff --git a/app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt b/app/src/main/java/cy/hexor/furumi/domain/model/AuthSession.kt similarity index 68% rename from app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/AuthSession.kt index f1b475d..6f4dff0 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/AuthSession.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model data class AuthSession( val serverBaseUrl: String, diff --git a/app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt b/app/src/main/java/cy/hexor/furumi/domain/model/AuthTokens.kt similarity index 93% rename from app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/AuthTokens.kt index e531de1..1bb1813 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/AuthTokens.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model data class AuthTokens( val accessToken: String, diff --git a/app/src/main/java/com/example/furumi_android/domain/model/ConnectedDevice.kt b/app/src/main/java/cy/hexor/furumi/domain/model/ConnectedDevice.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/domain/model/ConnectedDevice.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/ConnectedDevice.kt index 3e98802..59274ba 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/ConnectedDevice.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/ConnectedDevice.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model data class ConnectedDevice( val id: String, diff --git a/app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt b/app/src/main/java/cy/hexor/furumi/domain/model/ListeningHistory.kt similarity index 89% rename from app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/ListeningHistory.kt index df1552e..5fd69cc 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/ListeningHistory.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model data class ListeningHistoryPage( val items: List, diff --git a/app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt b/app/src/main/java/cy/hexor/furumi/domain/model/ServerConfig.kt similarity index 98% rename from app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/ServerConfig.kt index e18fd47..6a0ee21 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/ServerConfig.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model import java.net.URI import java.util.Locale diff --git a/app/src/main/java/com/example/furumi_android/domain/model/User.kt b/app/src/main/java/cy/hexor/furumi/domain/model/User.kt similarity index 62% rename from app/src/main/java/com/example/furumi_android/domain/model/User.kt rename to app/src/main/java/cy/hexor/furumi/domain/model/User.kt index 2ad5c44..2908b8c 100644 --- a/app/src/main/java/com/example/furumi_android/domain/model/User.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/model/User.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model data class User( val id: Int, diff --git a/app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt b/app/src/main/java/cy/hexor/furumi/domain/repository/AuthRepository.kt similarity index 67% rename from app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt rename to app/src/main/java/cy/hexor/furumi/domain/repository/AuthRepository.kt index ca21ca8..9bf402f 100644 --- a/app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/repository/AuthRepository.kt @@ -1,8 +1,8 @@ -package com.example.furumi_android.domain.repository +package cy.hexor.furumi.domain.repository -import com.example.furumi_android.domain.model.AuthSession -import com.example.furumi_android.domain.model.ServerConfig -import com.example.furumi_android.domain.model.User +import cy.hexor.furumi.domain.model.AuthSession +import cy.hexor.furumi.domain.model.ServerConfig +import cy.hexor.furumi.domain.model.User interface AuthRepository { suspend fun login(config: ServerConfig, password: String): Result diff --git a/app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt b/app/src/main/java/cy/hexor/furumi/domain/repository/PlayerRepository.kt similarity index 73% rename from app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt rename to app/src/main/java/cy/hexor/furumi/domain/repository/PlayerRepository.kt index df07e59..e4b34b7 100644 --- a/app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt +++ b/app/src/main/java/cy/hexor/furumi/domain/repository/PlayerRepository.kt @@ -1,17 +1,17 @@ -package com.example.furumi_android.domain.repository +package cy.hexor.furumi.domain.repository -import com.example.furumi_android.domain.model.ArtistPage -import com.example.furumi_android.domain.model.ArtistDetail -import com.example.furumi_android.domain.model.ConnectedCommand -import com.example.furumi_android.domain.model.ConnectedDevicesState -import com.example.furumi_android.domain.model.ConnectedJamUser -import com.example.furumi_android.domain.model.ConnectedPlaybackState -import com.example.furumi_android.domain.model.ListeningHistoryPage -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.PlaylistDetail -import com.example.furumi_android.domain.model.ReleaseDetail -import com.example.furumi_android.domain.model.SearchResults -import com.example.furumi_android.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ArtistPage +import cy.hexor.furumi.domain.model.ArtistDetail +import cy.hexor.furumi.domain.model.ConnectedCommand +import cy.hexor.furumi.domain.model.ConnectedDevicesState +import cy.hexor.furumi.domain.model.ConnectedJamUser +import cy.hexor.furumi.domain.model.ConnectedPlaybackState +import cy.hexor.furumi.domain.model.ListeningHistoryPage +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.PlaylistDetail +import cy.hexor.furumi.domain.model.ReleaseDetail +import cy.hexor.furumi.domain.model.SearchResults +import cy.hexor.furumi.domain.model.TrackCard interface PlayerRepository { suspend fun getArtists( diff --git a/app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt b/app/src/main/java/cy/hexor/furumi/playback/FurumiPlaybackService.kt similarity index 98% rename from app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt rename to app/src/main/java/cy/hexor/furumi/playback/FurumiPlaybackService.kt index 95e5efa..e0eeaed 100644 --- a/app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt +++ b/app/src/main/java/cy/hexor/furumi/playback/FurumiPlaybackService.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.playback +package cy.hexor.furumi.playback import android.app.NotificationChannel import android.app.NotificationManager @@ -18,7 +18,7 @@ import androidx.media3.session.DefaultMediaNotificationProvider import androidx.media3.session.MediaSession import androidx.media3.session.MediaSessionService import androidx.media3.session.MediaStyleNotificationHelper -import com.example.furumi_android.MainActivity +import cy.hexor.furumi.MainActivity import com.google.common.util.concurrent.MoreExecutors import dagger.hilt.android.AndroidEntryPoint import okhttp3.OkHttpClient diff --git a/app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt b/app/src/main/java/cy/hexor/furumi/playback/PlaybackController.kt similarity index 99% rename from app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt rename to app/src/main/java/cy/hexor/furumi/playback/PlaybackController.kt index 81fc34b..3ed4292 100644 --- a/app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt +++ b/app/src/main/java/cy/hexor/furumi/playback/PlaybackController.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.playback +package cy.hexor.furumi.playback import android.content.Context import android.content.Intent @@ -16,8 +16,8 @@ import androidx.media3.common.util.UnstableApi import androidx.media3.datasource.okhttp.OkHttpDataSource import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.source.DefaultMediaSourceFactory -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ConnectedPlaybackState +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ConnectedPlaybackState import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt b/app/src/main/java/cy/hexor/furumi/ui/login/LoginScreen.kt similarity index 95% rename from app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt rename to app/src/main/java/cy/hexor/furumi/ui/login/LoginScreen.kt index 337eb06..97c0207 100644 --- a/app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/login/LoginScreen.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.login +package cy.hexor.furumi.ui.login import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent @@ -30,15 +30,15 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiInk -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiInk +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted @Composable fun LoginScreen( diff --git a/app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt b/app/src/main/java/cy/hexor/furumi/ui/login/LoginViewModel.kt similarity index 96% rename from app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt rename to app/src/main/java/cy/hexor/furumi/ui/login/LoginViewModel.kt index 54c6b5b..800ef02 100644 --- a/app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/login/LoginViewModel.kt @@ -1,10 +1,10 @@ -package com.example.furumi_android.ui.login +package cy.hexor.furumi.ui.login import android.net.Uri import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.furumi_android.domain.model.ServerConfig -import com.example.furumi_android.domain.repository.AuthRepository +import cy.hexor.furumi.domain.model.ServerConfig +import cy.hexor.furumi.domain.repository.AuthRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerArtwork.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerArtwork.kt similarity index 83% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerArtwork.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerArtwork.kt index 4a428df..2585325 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerArtwork.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerArtwork.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerChrome.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerChrome.kt similarity index 94% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerChrome.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerChrome.kt index dbcbcdd..1db1f9b 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerChrome.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerChrome.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,22 +58,22 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.ConnectedDevice -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.ConnectedDevice +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerGlobalContent.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerGlobalContent.kt similarity index 96% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerGlobalContent.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerGlobalContent.kt index 9c60e54..ef468d0 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerGlobalContent.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerGlobalContent.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerHistoryContent.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerHistoryContent.kt similarity index 91% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerHistoryContent.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerHistoryContent.kt index 5342f21..7b0d3a9 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerHistoryContent.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerHistoryContent.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerIcons.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerIcons.kt similarity index 93% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerIcons.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerIcons.kt index b2611dd..71e7b0b 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerIcons.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerIcons.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerLibraryContent.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerLibraryContent.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerLibraryContent.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerLibraryContent.kt index 3bda23e..da30ea8 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerLibraryContent.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerLibraryContent.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -59,21 +59,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerMenus.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerMenus.kt similarity index 90% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerMenus.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerMenus.kt index 7402264..b6972ca 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerMenus.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerMenus.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerModels.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerModels.kt similarity index 75% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerModels.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerModels.kt index 2dbd0a6..075d5d2 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerModels.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerModels.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt internal enum class PlayerTab( diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerOverlay.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerOverlay.kt similarity index 95% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerOverlay.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerOverlay.kt index 982c424..e885f5b 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerOverlay.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerOverlay.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -59,25 +59,25 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.ConnectedDevice -import com.example.furumi_android.domain.model.ConnectedDevicesState -import com.example.furumi_android.domain.model.ConnectedJam -import com.example.furumi_android.domain.model.ConnectedJamUser -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.ConnectedDevice +import cy.hexor.furumi.domain.model.ConnectedDevicesState +import cy.hexor.furumi.domain.model.ConnectedJam +import cy.hexor.furumi.domain.model.ConnectedJamUser +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable @@ -100,7 +100,7 @@ internal fun FullPlayerOverlay( onPlayLast: (TrackCard) -> Unit, onShare: (TrackCard) -> Unit, onAddToPlaylist: (TrackCard) -> Unit, - onArtistClick: (com.example.furumi_android.domain.model.ArtistCard) -> Unit, + onArtistClick: (cy.hexor.furumi.domain.model.ArtistCard) -> Unit, connectedDevicesState: ConnectedDevicesState?, connectedDevicesError: String?, onDeviceClick: (String) -> Unit, @@ -275,7 +275,7 @@ internal fun FullPlayerOverlay( ) val artists = track.artistRefs.ifEmpty { - track.artists.mapIndexed { i, name -> com.example.furumi_android.domain.model.ArtistRef(id = -(i + 1L), name = name) } + track.artists.mapIndexed { i, name -> cy.hexor.furumi.domain.model.ArtistRef(id = -(i + 1L), name = name) } } Row( @@ -291,7 +291,7 @@ internal fun FullPlayerOverlay( overflow = TextOverflow.Ellipsis, modifier = Modifier.clickable(enabled = artistRef.id > 0) { onArtistClick( - com.example.furumi_android.domain.model.ArtistCard( + cy.hexor.furumi.domain.model.ArtistCard( id = artistRef.id, name = artistRef.name, imageUrl = null, diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerReleaseContent.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerReleaseContent.kt similarity index 92% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerReleaseContent.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerReleaseContent.kt index 58a7d96..3bdb24c 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerReleaseContent.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerReleaseContent.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerRows.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerRows.kt similarity index 94% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerRows.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerRows.kt index b619539..0259a92 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerRows.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerRows.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -61,21 +61,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerScreen.kt similarity index 94% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerScreen.kt index cc9ba39..4261e54 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerScreen.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,23 +58,23 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.ConnectedDevicesState -import com.example.furumi_android.domain.model.ConnectedPlaybackState -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.ConnectedDevicesState +import cy.hexor.furumi.domain.model.ConnectedPlaybackState +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerUiUtils.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerUiUtils.kt similarity index 88% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerUiUtils.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerUiUtils.kt index 170e207..4137bc9 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerUiUtils.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerUiUtils.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.content.Intent import android.graphics.Bitmap @@ -58,21 +58,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.ui.theme.FurumiBlack -import com.example.furumi_android.ui.theme.FurumiElectricCyan -import com.example.furumi_android.ui.theme.FurumiHotOrange -import com.example.furumi_android.ui.theme.FurumiLine -import com.example.furumi_android.ui.theme.FurumiNeonPink -import com.example.furumi_android.ui.theme.FurumiNeonViolet -import com.example.furumi_android.ui.theme.FurumiSurface -import com.example.furumi_android.ui.theme.FurumiSurfaceHigh -import com.example.furumi_android.ui.theme.FurumiTextMuted +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.ui.theme.FurumiBlack +import cy.hexor.furumi.ui.theme.FurumiElectricCyan +import cy.hexor.furumi.ui.theme.FurumiHotOrange +import cy.hexor.furumi.ui.theme.FurumiLine +import cy.hexor.furumi.ui.theme.FurumiNeonPink +import cy.hexor.furumi.ui.theme.FurumiNeonViolet +import cy.hexor.furumi.ui.theme.FurumiSurface +import cy.hexor.furumi.ui.theme.FurumiSurfaceHigh +import cy.hexor.furumi.ui.theme.FurumiTextMuted import kotlin.math.roundToInt internal fun artistsSubtitle(uiState: PlayerUiState): String { diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerViewModel.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt rename to app/src/main/java/cy/hexor/furumi/ui/player/PlayerViewModel.kt index f446b9a..fa37d7e 100644 --- a/app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/player/PlayerViewModel.kt @@ -1,27 +1,27 @@ -package com.example.furumi_android.ui.player +package cy.hexor.furumi.ui.player import android.graphics.Bitmap import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.furumi_android.data.repository.MediaImageLoader -import com.example.furumi_android.domain.model.ArtistCard -import com.example.furumi_android.domain.model.ArtistDetail -import com.example.furumi_android.domain.model.ConnectedCommand -import com.example.furumi_android.domain.model.ConnectedDevicesState -import com.example.furumi_android.domain.model.ConnectedJamUser -import com.example.furumi_android.domain.model.ConnectedPlaybackState -import com.example.furumi_android.domain.model.ListeningHistoryItem -import com.example.furumi_android.domain.model.PlaylistCard -import com.example.furumi_android.domain.model.PlaylistDetail -import com.example.furumi_android.domain.model.ReleaseCard -import com.example.furumi_android.domain.model.ReleaseDetail -import com.example.furumi_android.domain.model.SearchResults -import com.example.furumi_android.domain.model.TrackCard -import com.example.furumi_android.domain.repository.AuthRepository -import com.example.furumi_android.domain.repository.PlayerRepository -import com.example.furumi_android.playback.AudioPlaybackState -import com.example.furumi_android.playback.PlaybackController +import cy.hexor.furumi.data.repository.MediaImageLoader +import cy.hexor.furumi.domain.model.ArtistCard +import cy.hexor.furumi.domain.model.ArtistDetail +import cy.hexor.furumi.domain.model.ConnectedCommand +import cy.hexor.furumi.domain.model.ConnectedDevicesState +import cy.hexor.furumi.domain.model.ConnectedJamUser +import cy.hexor.furumi.domain.model.ConnectedPlaybackState +import cy.hexor.furumi.domain.model.ListeningHistoryItem +import cy.hexor.furumi.domain.model.PlaylistCard +import cy.hexor.furumi.domain.model.PlaylistDetail +import cy.hexor.furumi.domain.model.ReleaseCard +import cy.hexor.furumi.domain.model.ReleaseDetail +import cy.hexor.furumi.domain.model.SearchResults +import cy.hexor.furumi.domain.model.TrackCard +import cy.hexor.furumi.domain.repository.AuthRepository +import cy.hexor.furumi.domain.repository.PlayerRepository +import cy.hexor.furumi.playback.AudioPlaybackState +import cy.hexor.furumi.playback.PlaybackController import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow @@ -95,7 +95,7 @@ class PlayerViewModel @Inject constructor( private val playerRepository: PlayerRepository, private val mediaImageLoader: MediaImageLoader, private val playbackController: PlaybackController, - appClientInfo: com.example.furumi_android.data.remote.AppClientInfo + appClientInfo: cy.hexor.furumi.data.remote.AppClientInfo ) : ViewModel() { private val artistDetailCache = mutableMapOf() diff --git a/app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt b/app/src/main/java/cy/hexor/furumi/ui/profile/ProfileScreen.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt rename to app/src/main/java/cy/hexor/furumi/ui/profile/ProfileScreen.kt index 3fd449a..25f6bbf 100644 --- a/app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/profile/ProfileScreen.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.profile +package cy.hexor.furumi.ui.profile import androidx.compose.foundation.layout.* import androidx.compose.material3.* diff --git a/app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt b/app/src/main/java/cy/hexor/furumi/ui/profile/ProfileViewModel.kt similarity index 85% rename from app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt rename to app/src/main/java/cy/hexor/furumi/ui/profile/ProfileViewModel.kt index 9126a8e..269eb7d 100644 --- a/app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/profile/ProfileViewModel.kt @@ -1,9 +1,9 @@ -package com.example.furumi_android.ui.profile +package cy.hexor.furumi.ui.profile import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.furumi_android.domain.model.User -import com.example.furumi_android.domain.repository.AuthRepository +import cy.hexor.furumi.domain.model.User +import cy.hexor.furumi.domain.repository.AuthRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/example/furumi_android/ui/theme/Color.kt b/app/src/main/java/cy/hexor/furumi/ui/theme/Color.kt similarity index 92% rename from app/src/main/java/com/example/furumi_android/ui/theme/Color.kt rename to app/src/main/java/cy/hexor/furumi/ui/theme/Color.kt index 7649325..00f6a49 100644 --- a/app/src/main/java/com/example/furumi_android/ui/theme/Color.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.theme +package cy.hexor.furumi.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt b/app/src/main/java/cy/hexor/furumi/ui/theme/Theme.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt rename to app/src/main/java/cy/hexor/furumi/ui/theme/Theme.kt index 1029094..7164204 100644 --- a/app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.theme +package cy.hexor.furumi.ui.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/com/example/furumi_android/ui/theme/Type.kt b/app/src/main/java/cy/hexor/furumi/ui/theme/Type.kt similarity index 97% rename from app/src/main/java/com/example/furumi_android/ui/theme/Type.kt rename to app/src/main/java/cy/hexor/furumi/ui/theme/Type.kt index 46711d9..bd14989 100644 --- a/app/src/main/java/com/example/furumi_android/ui/theme/Type.kt +++ b/app/src/main/java/cy/hexor/furumi/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.ui.theme +package cy.hexor.furumi.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/test/java/com/example/furumi_android/ExampleUnitTest.kt b/app/src/test/java/cy/hexor/furumi/ExampleUnitTest.kt similarity index 90% rename from app/src/test/java/com/example/furumi_android/ExampleUnitTest.kt rename to app/src/test/java/cy/hexor/furumi/ExampleUnitTest.kt index 0ea6505..92528a5 100644 --- a/app/src/test/java/com/example/furumi_android/ExampleUnitTest.kt +++ b/app/src/test/java/cy/hexor/furumi/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android +package cy.hexor.furumi import org.junit.Test diff --git a/app/src/test/java/com/example/furumi_android/domain/model/ServerConfigTest.kt b/app/src/test/java/cy/hexor/furumi/domain/model/ServerConfigTest.kt similarity index 95% rename from app/src/test/java/com/example/furumi_android/domain/model/ServerConfigTest.kt rename to app/src/test/java/cy/hexor/furumi/domain/model/ServerConfigTest.kt index 8119aab..13630e8 100644 --- a/app/src/test/java/com/example/furumi_android/domain/model/ServerConfigTest.kt +++ b/app/src/test/java/cy/hexor/furumi/domain/model/ServerConfigTest.kt @@ -1,4 +1,4 @@ -package com.example.furumi_android.domain.model +package cy.hexor.furumi.domain.model import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue diff --git a/cy.hexor.furumi.yml b/cy.hexor.furumi.yml new file mode 100644 index 0000000..d9f4e56 --- /dev/null +++ b/cy.hexor.furumi.yml @@ -0,0 +1,41 @@ +Categories: + - Multimedia +License: WTFPL +AuthorName: ab +SourceCode: https://gt.hexor.cy/ab/furumi_android +IssueTracker: https://gt.hexor.cy/ab/furumi_android/issues + +AutoName: Furumi + +Description: |- + Furumi is an Android client for the Furumi self-hosted music streaming server. + + Connect to your own Furumi instance and enjoy your personal music library from anywhere. + + Features: + + * Browse your music library — artists, albums, and tracks + * Full playback controls with background playback support + * Queue management and listening history + * Connect and control multiple remote devices + * Jam sessions — listen together with others + * Secure authentication with token-based sessions + * Material You design with edge-to-edge UI + + Requires a running Furumi server instance to connect to. + +RepoType: git +Repo: https://gt.hexor.cy/ab/furumi_android.git + +Builds: + - versionName: '1.1' + versionCode: 1 + commit: v1.1 + subdir: app + gradle: + - yes + +AutoUpdateMode: Version v%v +UpdateCheckMode: Tags +CurrentVersion: '1.1' +CurrentVersionCode: 1 diff --git a/fastlane/metadata/android/en-US/changelogs/1.txt b/fastlane/metadata/android/en-US/changelogs/1.txt new file mode 100644 index 0000000..feb0d17 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1.txt @@ -0,0 +1 @@ +Initial release. diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 0000000..819bd61 --- /dev/null +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1,14 @@ +Furumi is an Android client for the Furumi self-hosted music streaming server. + +Connect to your own Furumi instance and enjoy your personal music library from anywhere. + +Features: +* Browse your music library — artists, albums, and tracks +* Full playback controls with background playback support +* Queue management and listening history +* Connect and control multiple remote devices +* Jam sessions — listen together with others +* Secure authentication with token-based sessions +* Material You design with edge-to-edge UI + +Furumi requires a running Furumi server instance to connect to. diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 0000000..10b8851 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 0000000..2257427 --- /dev/null +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +Android client for the Furumi self-hosted music streaming server \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index c745675..f09b594 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,9 +11,6 @@ pluginManagement { gradlePluginPortal() } } -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" -} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {