From a8e53e344c215572430f0ed20a96c9076750a3ff Mon Sep 17 00:00:00 2001 From: Ultradesu Date: Fri, 5 Jun 2026 12:04:49 +0300 Subject: [PATCH] init --- .gitignore | 15 + .idea/.gitignore | 3 + .idea/.name | 1 + .idea/AndroidProjectSystem.xml | 6 + .idea/codeStyles/Project.xml | 123 + .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 6 + .idea/deploymentTargetSelector.xml | 18 + .idea/deviceManager.xml | 13 + .idea/gradle.xml | 18 + .idea/inspectionProfiles/Project_Default.xml | 61 + .idea/misc.xml | 10 + .idea/runConfigurations.xml | 17 + .idea/vcs.xml | 6 + app/.gitignore | 1 + app/build.gradle.kts | 77 + .../furumi_android/ExampleInstrumentedTest.kt | 24 + app/src/main/AndroidManifest.xml | 61 + .../furumi_android/FurumiApplication.kt | 7 + .../example/furumi_android/MainActivity.kt | 113 + .../data/local/AuthSessionStorage.kt | 117 + .../data/remote/AccessTokenInterceptor.kt | 33 + .../data/remote/AuthApiErrorParser.kt | 31 + .../data/remote/AuthAuthenticator.kt | 94 + .../data/remote/AuthEndpoints.kt | 67 + .../data/remote/PlayerEndpoints.kt | 19 + .../furumi_android/data/remote/api/AuthApi.kt | 46 + .../data/remote/api/PlayerApi.kt | 42 + .../data/remote/model/AuthMappers.kt | 38 + .../data/remote/model/AuthRequests.kt | 26 + .../data/remote/model/AuthResponses.kt | 25 + .../data/remote/model/PlayerResponses.kt | 224 ++ .../data/repository/AuthDeviceInfo.kt | 23 + .../data/repository/AuthRepositoryImpl.kt | 123 + .../data/repository/MediaImageLoader.kt | 38 + .../data/repository/PlayerRepositoryImpl.kt | 112 + .../furumi_android/di/NetworkModule.kt | 90 + .../furumi_android/di/RepositoryModule.kt | 28 + .../furumi_android/di/StorageModule.kt | 34 + .../furumi_android/domain/model/Artist.kt | 51 + .../domain/model/AuthException.kt | 6 + .../domain/model/AuthSession.kt | 7 + .../furumi_android/domain/model/AuthTokens.kt | 21 + .../domain/model/ListeningHistory.kt | 19 + .../domain/model/ServerConfig.kt | 74 + .../furumi_android/domain/model/User.kt | 7 + .../domain/repository/AuthRepository.kt | 18 + .../domain/repository/PlayerRepository.kt | 20 + .../playback/FurumiPlaybackService.kt | 126 + .../playback/PlaybackController.kt | 263 ++ .../furumi_android/ui/login/LoginScreen.kt | 378 +++ .../furumi_android/ui/login/LoginViewModel.kt | 161 + .../furumi_android/ui/player/PlayerScreen.kt | 2894 +++++++++++++++++ .../ui/player/PlayerViewModel.kt | 411 +++ .../ui/profile/ProfileScreen.kt | 51 + .../ui/profile/ProfileViewModel.kt | 37 + .../example/furumi_android/ui/theme/Color.kt | 16 + .../example/furumi_android/ui/theme/Theme.kt | 54 + .../example/furumi_android/ui/theme/Type.kt | 59 + app/src/main/keepRules/rules.keep | 12 + .../res/drawable/ic_launcher_background.xml | 170 + .../res/drawable/ic_launcher_foreground.xml | 30 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../example/furumi_android/ExampleUnitTest.kt | 17 + .../domain/model/ServerConfigTest.kt | 35 + build.gradle.kts | 7 + gradle.properties | 20 + gradle/gradle-daemon-jvm.properties | 12 + gradle/libs.versions.toml | 60 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 251 ++ gradlew.bat | 94 + settings.gradle.kts | 26 + 90 files changed, 7272 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/AndroidProjectSystem.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/deviceManager.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/example/furumi_android/FurumiApplication.kt create mode 100644 app/src/main/java/com/example/furumi_android/MainActivity.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt create mode 100644 app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt create mode 100644 app/src/main/java/com/example/furumi_android/di/NetworkModule.kt create mode 100644 app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt create mode 100644 app/src/main/java/com/example/furumi_android/di/StorageModule.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/Artist.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/model/User.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt create mode 100644 app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt create mode 100644 app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt create mode 100644 app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/theme/Color.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/example/furumi_android/ui/theme/Type.kt create mode 100644 app/src/main/keepRules/rules.keep create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/test/java/com/example/furumi_android/ExampleUnitTest.kt create mode 100644 app/src/test/java/com/example/furumi_android/domain/model/ServerConfigTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/gradle-daemon-jvm.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..7a9188e --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +furumi-android \ No newline at end of file diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..be32e44 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml new file mode 100644 index 0000000..91f9558 --- /dev/null +++ b/.idea/deviceManager.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..02c4aa5 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7061a0d --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,61 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..990516a --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,77 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) + id("com.google.devtools.ksp") + id("com.google.dagger.hilt.android") +} + +android { + namespace = "com.example.furumi_android" + compileSdk = 35 + + defaultConfig { + applicationId = "com.example.furumi_android" + minSdk = 24 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + optimization { + enable = false + } + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.navigation.compose) + + // Networking + implementation(libs.retrofit) + implementation(libs.retrofit.moshi) + implementation(libs.okhttp) + implementation(libs.okhttp.logging) + implementation(libs.moshi) + implementation(libs.androidx.media3.exoplayer) + implementation(libs.androidx.media3.datasource.okhttp) + implementation(libs.androidx.media3.session) + + // Security & Storage + implementation(libs.androidx.security.crypto) + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.browser) + + // DI + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + implementation(libs.hilt.navigation.compose) + + testImplementation(libs.junit) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(libs.androidx.junit) + debugImplementation(libs.androidx.compose.ui.test.manifest) + debugImplementation(libs.androidx.compose.ui.tooling) +} diff --git a/app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..0cb5b0b --- /dev/null +++ b/app/src/androidTest/java/com/example/furumi_android/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.furumi_android + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.furumi_android", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a27ead7 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/example/furumi_android/FurumiApplication.kt b/app/src/main/java/com/example/furumi_android/FurumiApplication.kt new file mode 100644 index 0000000..da8fe96 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/FurumiApplication.kt @@ -0,0 +1,7 @@ +package com.example.furumi_android + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class FurumiApplication : Application() diff --git a/app/src/main/java/com/example/furumi_android/MainActivity.kt b/app/src/main/java/com/example/furumi_android/MainActivity.kt new file mode 100644 index 0000000..18487e0 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/MainActivity.kt @@ -0,0 +1,113 @@ +package com.example.furumi_android + +import android.Manifest +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.os.Build +import android.os.Bundle +import androidx.activity.result.contract.ActivityResultContracts +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +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.FurumiandroidTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + + private var deepLinkUri by mutableStateOf(null) + private val notificationPermissionLauncher = registerForActivityResult( + ActivityResultContracts.RequestPermission() + ) { } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + requestNotificationPermissionIfNeeded() + + if (deepLinkUri == null) { + deepLinkUri = intent?.data + } + + setContent { + FurumiandroidTheme { + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + Box(modifier = Modifier.padding(innerPadding)) { + FurumiApp( + deepLinkUri = deepLinkUri, + onDeepLinkHandled = { deepLinkUri = null } + ) + } + } + } + } + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + deepLinkUri = intent.data + } + + private fun requestNotificationPermissionIfNeeded() { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return + + if (checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) { + notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) + } + } +} + +@Composable +fun FurumiApp(deepLinkUri: Uri?, onDeepLinkHandled: () -> Unit) { + val navController = rememberNavController() + + NavHost(navController = navController, startDestination = "login") { + composable("login") { + val loginViewModel: LoginViewModel = hiltViewModel() + + // Handle deep link when it arrives + androidx.compose.runtime.LaunchedEffect(deepLinkUri) { + deepLinkUri?.let { uri -> + loginViewModel.handleDeepLink(uri) + onDeepLinkHandled() + } + } + + LoginScreen( + viewModel = loginViewModel, + onLoginSuccess = { + navController.navigate("player") { + popUpTo("login") { inclusive = true } + } + } + ) + } + composable("player") { + PlayerScreen( + onLoggedOut = { + navController.navigate("login") { + popUpTo("player") { inclusive = true } + } + } + ) + } + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt b/app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt new file mode 100644 index 0000000..f2c802e --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/local/AuthSessionStorage.kt @@ -0,0 +1,117 @@ +package com.example.furumi_android.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 com.squareup.moshi.Moshi + +class AuthSessionStorage(context: Context, moshi: Moshi) { + private val masterKey = MasterKey.Builder(context) + .setKeyScheme(MasterKey.KeyScheme.AES256_GCM) + .build() + + private val prefs = EncryptedSharedPreferences.create( + context, + PREFS_NAME, + masterKey, + EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, + EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM + ) + + private val userAdapter = moshi.adapter(User::class.java) + + fun saveSession(session: AuthSession) { + prefs.edit() + .putString(KEY_BASE_URL, session.serverBaseUrl) + .putString(KEY_ACCESS_TOKEN, session.tokens.accessToken) + .putString(KEY_REFRESH_TOKEN, session.tokens.refreshToken) + .putString(KEY_TOKEN_TYPE, session.tokens.tokenType) + .putInt(KEY_EXPIRES_IN_SECONDS, session.tokens.expiresInSeconds) + .putLong(KEY_EXPIRES_AT_EPOCH_SECONDS, session.tokens.expiresAtEpochSeconds) + .putString(KEY_USER_DATA, userAdapter.toJson(session.user)) + .remove(KEY_PENDING_SSO_BASE_URL) + .apply() + } + + fun saveTokens(tokens: AuthTokens) { + prefs.edit() + .putString(KEY_ACCESS_TOKEN, tokens.accessToken) + .putString(KEY_REFRESH_TOKEN, tokens.refreshToken) + .putString(KEY_TOKEN_TYPE, tokens.tokenType) + .putInt(KEY_EXPIRES_IN_SECONDS, tokens.expiresInSeconds) + .putLong(KEY_EXPIRES_AT_EPOCH_SECONDS, tokens.expiresAtEpochSeconds) + .apply() + } + + fun savePendingSsoBaseUrl(baseUrl: String) { + prefs.edit() + .putString(KEY_PENDING_SSO_BASE_URL, baseUrl) + .apply() + } + + fun getPendingSsoBaseUrl(): String? { + return prefs.getString(KEY_PENDING_SSO_BASE_URL, null) + } + + fun getBaseUrl(): String? { + return prefs.getString(KEY_BASE_URL, null) + } + + fun getSession(): AuthSession? { + val baseUrl = getBaseUrl() ?: return null + val user = getUser() ?: return null + val tokens = getTokens() ?: return null + return AuthSession(baseUrl, user, tokens) + } + + fun getTokens(): AuthTokens? { + val accessToken = prefs.getString(KEY_ACCESS_TOKEN, null) ?: return null + val refreshToken = prefs.getString(KEY_REFRESH_TOKEN, null) ?: return null + val tokenType = prefs.getString(KEY_TOKEN_TYPE, AuthTokens.DEFAULT_TOKEN_TYPE) + ?: AuthTokens.DEFAULT_TOKEN_TYPE + + return AuthTokens( + accessToken = accessToken, + refreshToken = refreshToken, + tokenType = tokenType, + expiresInSeconds = prefs.getInt(KEY_EXPIRES_IN_SECONDS, 0), + expiresAtEpochSeconds = prefs.getLong(KEY_EXPIRES_AT_EPOCH_SECONDS, 0L) + ) + } + + private fun getUser(): User? { + val json = prefs.getString(KEY_USER_DATA, null) ?: return null + return runCatching { userAdapter.fromJson(json) }.getOrNull() + } + + fun clear() { + prefs.edit().clear().apply() + } + + fun clearSession() { + prefs.edit() + .remove(KEY_ACCESS_TOKEN) + .remove(KEY_REFRESH_TOKEN) + .remove(KEY_TOKEN_TYPE) + .remove(KEY_EXPIRES_IN_SECONDS) + .remove(KEY_EXPIRES_AT_EPOCH_SECONDS) + .remove(KEY_PENDING_SSO_BASE_URL) + .remove(KEY_USER_DATA) + .apply() + } + + companion object { + private const val PREFS_NAME = "auth_session" + private const val KEY_ACCESS_TOKEN = "access_token" + private const val KEY_REFRESH_TOKEN = "refresh_token" + private const val KEY_TOKEN_TYPE = "token_type" + private const val KEY_EXPIRES_IN_SECONDS = "expires_in_seconds" + private const val KEY_EXPIRES_AT_EPOCH_SECONDS = "expires_at_epoch_seconds" + private const val KEY_BASE_URL = "base_url" + private const val KEY_PENDING_SSO_BASE_URL = "pending_sso_base_url" + private const val KEY_USER_DATA = "user_data" + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt b/app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt new file mode 100644 index 0000000..6d6182f --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/AccessTokenInterceptor.kt @@ -0,0 +1,33 @@ +package com.example.furumi_android.data.remote + +import com.example.furumi_android.data.local.AuthSessionStorage +import okhttp3.Interceptor +import okhttp3.Response +import javax.inject.Inject + +class AccessTokenInterceptor @Inject constructor( + private val sessionStorage: AuthSessionStorage, + private val authEndpoints: AuthEndpoints +) : Interceptor { + + override fun intercept(chain: Interceptor.Chain): Response { + val request = chain.request() + + if (request.header(HEADER_AUTHORIZATION) != null || + authEndpoints.isLoginOrRefreshPath(request.url.encodedPath) + ) { + return chain.proceed(request) + } + + val tokens = sessionStorage.getTokens() ?: return chain.proceed(request) + val authorizedRequest = request.newBuilder() + .header(HEADER_AUTHORIZATION, tokens.authorizationHeader) + .build() + + return chain.proceed(authorizedRequest) + } + + companion object { + const val HEADER_AUTHORIZATION = "Authorization" + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt b/app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt new file mode 100644 index 0000000..2efe35a --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/AuthApiErrorParser.kt @@ -0,0 +1,31 @@ +package com.example.furumi_android.data.remote + +import com.example.furumi_android.data.remote.model.ErrorResponse +import com.squareup.moshi.Moshi +import retrofit2.Response +import javax.inject.Inject + +class AuthApiErrorParser @Inject constructor( + moshi: Moshi +) { + private val errorAdapter = moshi.adapter(ErrorResponse::class.java) + + fun messageFrom(response: Response<*>): String { + val code = response.code() + val rawError = response.errorBody()?.string() + + if (rawError.isNullOrBlank()) { + return "Server error $code" + } + + val apiError = runCatching { errorAdapter.fromJson(rawError)?.error } + .getOrNull() + ?.takeIf { it.isNotBlank() } + + return apiError ?: "Server error $code: ${rawError.take(MAX_ERROR_PREVIEW_LENGTH)}" + } + + companion object { + private const val MAX_ERROR_PREVIEW_LENGTH = 160 + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt b/app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt new file mode 100644 index 0000000..96b54a9 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/AuthAuthenticator.kt @@ -0,0 +1,94 @@ +package com.example.furumi_android.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 dagger.Lazy +import kotlinx.coroutines.runBlocking +import okhttp3.Authenticator +import okhttp3.Request +import okhttp3.Response +import okhttp3.Route +import javax.inject.Inject + +class AuthAuthenticator @Inject constructor( + private val sessionStorage: AuthSessionStorage, + private val authEndpoints: AuthEndpoints, + private val authApiLazy: Lazy +) : Authenticator { + + private val refreshLock = Any() + + override fun authenticate(route: Route?, response: Response): Request? { + if (responseCount(response) >= MAX_AUTH_ATTEMPTS || + authEndpoints.isLoginOrRefreshPath(response.request.url.encodedPath) + ) { + return null + } + + val requestAuthorization = response.request.header(HEADER_AUTHORIZATION) ?: return null + + return synchronized(refreshLock) { + val currentTokens = sessionStorage.getTokens() ?: return@synchronized null + if (requestAuthorization != currentTokens.authorizationHeader) { + return@synchronized response.withAuthorization(currentTokens.authorizationHeader) + } + + val baseUrl = sessionStorage.getBaseUrl() ?: return@synchronized null + val refreshedTokens = runBlocking { + refreshTokens(baseUrl, currentTokens.refreshToken) + } + + if (refreshedTokens == null) { + sessionStorage.clearSession() + null + } else { + sessionStorage.saveTokens(refreshedTokens) + response.withAuthorization(refreshedTokens.authorizationHeader) + } + } + } + + private suspend fun refreshTokens( + baseUrl: String, + refreshToken: String + ): com.example.furumi_android.domain.model.AuthTokens? { + val refreshResponse = runCatching { + authApiLazy.get().refresh( + url = authEndpoints.refresh(baseUrl), + request = RefreshRequest(refreshToken) + ) + }.getOrNull() + + if (refreshResponse?.isSuccessful != true) { + return null + } + + val body = refreshResponse.body() ?: return null + return body.toDomain(nowEpochSeconds()) + } + + private fun Response.withAuthorization(authorizationHeader: String): Request { + return request.newBuilder() + .header(HEADER_AUTHORIZATION, authorizationHeader) + .build() + } + + private fun responseCount(response: Response): Int { + var count = 1 + var priorResponse = response.priorResponse + while (priorResponse != null) { + count++ + priorResponse = priorResponse.priorResponse + } + return count + } + + private fun nowEpochSeconds(): Long = System.currentTimeMillis() / 1000L + + companion object { + private const val MAX_AUTH_ATTEMPTS = 2 + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt b/app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt new file mode 100644 index 0000000..010054c --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/AuthEndpoints.kt @@ -0,0 +1,67 @@ +package com.example.furumi_android.data.remote + +import android.net.Uri +import com.example.furumi_android.domain.model.AuthException +import javax.inject.Inject + +class AuthEndpoints @Inject constructor() { + fun passwordLogin(baseUrl: String): String = "$baseUrl$PASSWORD_LOGIN_PATH" + + fun ssoExchange(baseUrl: String): String = "$baseUrl$SSO_EXCHANGE_PATH" + + fun refresh(baseUrl: String): String = "$baseUrl$REFRESH_PATH" + + fun logout(baseUrl: String): String = "$baseUrl$LOGOUT_PATH" + + fun ssoStart(baseUrl: String): String { + return Uri.parse("$baseUrl$SSO_START_PATH") + .buildUpon() + .appendQueryParameter("redirect_uri", SSO_REDIRECT_URI) + .build() + .toString() + } + + fun parseSsoCallback(callbackUrl: String): Result { + val uri = runCatching { Uri.parse(callbackUrl) }.getOrElse { + return Result.failure(AuthException("Invalid SSO callback")) + } + + if (uri.scheme != SSO_REDIRECT_SCHEME || uri.host != SSO_REDIRECT_HOST || uri.path != SSO_REDIRECT_PATH) { + return Result.failure(AuthException("Unexpected SSO callback")) + } + + uri.getQueryParameter("error")?.let { error -> + return Result.failure(AuthException("SSO error: $error")) + } + + val code = uri.getQueryParameter("code") + if (code.isNullOrBlank()) { + return Result.failure(AuthException("SSO callback does not contain an authorization code")) + } + + return Result.success(SsoCallback(code)) + } + + fun isLoginOrRefreshPath(path: String): Boolean { + return path.endsWith(PASSWORD_LOGIN_PATH) || + path.endsWith(SSO_EXCHANGE_PATH) || + path.endsWith(REFRESH_PATH) + } + + companion object { + const val SSO_REDIRECT_URI = "furumi://auth/callback" + + private const val PASSWORD_LOGIN_PATH = "/api/auth/password" + private const val SSO_EXCHANGE_PATH = "/api/auth/sso/exchange" + private const val REFRESH_PATH = "/api/auth/refresh" + private const val LOGOUT_PATH = "/api/auth/logout" + private const val SSO_START_PATH = "/auth/mobile/oidc/start" + private const val SSO_REDIRECT_SCHEME = "furumi" + private const val SSO_REDIRECT_HOST = "auth" + private const val SSO_REDIRECT_PATH = "/callback" + } +} + +data class SsoCallback( + val code: String +) diff --git a/app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt b/app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt new file mode 100644 index 0000000..5725bc1 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/PlayerEndpoints.kt @@ -0,0 +1,19 @@ +package com.example.furumi_android.data.remote + +import javax.inject.Inject + +class PlayerEndpoints @Inject constructor() { + fun artists(baseUrl: String): String = "$baseUrl$ARTISTS_PATH" + + fun artistDetail(baseUrl: String, artistId: Long): String = "$baseUrl$ARTISTS_PATH/$artistId" + + fun releaseDetail(baseUrl: String, releaseId: Long): String = "$baseUrl$RELEASES_PATH/$releaseId" + + fun history(baseUrl: String): String = "$baseUrl$HISTORY_PATH" + + companion object { + private const val ARTISTS_PATH = "/api/player/artists" + private const val RELEASES_PATH = "/api/player/releases" + private const val HISTORY_PATH = "/api/player/history" + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt b/app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt new file mode 100644 index 0000000..25bdaa6 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/api/AuthApi.kt @@ -0,0 +1,46 @@ +package com.example.furumi_android.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 retrofit2.Response +import retrofit2.http.Body +import retrofit2.http.Header +import retrofit2.http.Headers +import retrofit2.http.POST +import retrofit2.http.Url + +interface AuthApi { + @Headers("Accept: application/json") + @POST + suspend fun login( + @Url url: String, + @Body request: LoginRequest + ): Response + + @Headers("Accept: application/json") + @POST + suspend fun ssoExchange( + @Url url: String, + @Body request: SsoExchangeRequest + ): Response + + @Headers("Accept: application/json") + @POST + suspend fun refresh( + @Url url: String, + @Body request: RefreshRequest + ): Response + + @Headers("Accept: application/json") + @POST + suspend fun logout( + @Url url: String, + @Header("Authorization") bearerToken: String, + @Body request: LogoutRequest + ): Response +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt b/app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt new file mode 100644 index 0000000..e739a2a --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/api/PlayerApi.kt @@ -0,0 +1,42 @@ +package com.example.furumi_android.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 retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Headers +import retrofit2.http.Query +import retrofit2.http.Url + +interface PlayerApi { + @Headers("Accept: application/json") + @GET + suspend fun artists( + @Url url: String, + @Query("page") page: Int, + @Query("limit") limit: Int, + @Query("mine") mine: Boolean + ): Response + + @Headers("Accept: application/json") + @GET + suspend fun artistDetail( + @Url url: String + ): Response + + @Headers("Accept: application/json") + @GET + suspend fun releaseDetail( + @Url url: String + ): Response + + @Headers("Accept: application/json") + @GET + suspend fun history( + @Url url: String, + @Query("page") page: Int, + @Query("limit") limit: Int + ): Response +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt b/app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt new file mode 100644 index 0000000..bc9ee38 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/model/AuthMappers.kt @@ -0,0 +1,38 @@ +package com.example.furumi_android.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 + +fun LoginResponse.toDomainSession( + serverBaseUrl: String, + receivedAtEpochSeconds: Long +): AuthSession { + return AuthSession( + serverBaseUrl = serverBaseUrl, + user = user.toDomain(), + tokens = tokens.toDomain(receivedAtEpochSeconds) + ) +} + +fun UserResponse.toDomain(): User { + return User( + id = id, + name = name, + role = role + ) +} + +fun TokenResponse.toDomain(receivedAtEpochSeconds: Long): AuthTokens { + return AuthTokens( + accessToken = accessToken, + refreshToken = refreshToken, + tokenType = tokenType, + expiresInSeconds = expiresInSeconds, + expiresAtEpochSeconds = if (expiresInSeconds > 0) { + receivedAtEpochSeconds + expiresInSeconds + } else { + 0L + } + ) +} diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt b/app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt new file mode 100644 index 0000000..b6d15c1 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/model/AuthRequests.kt @@ -0,0 +1,26 @@ +package com.example.furumi_android.data.remote.model + +import com.squareup.moshi.Json + +data class LoginRequest( + @param:Json(name = "username") val username: String, + @param:Json(name = "password") val password: String, + @param:Json(name = "device_name") val deviceName: String +) + +data class SsoExchangeRequest( + @param:Json(name = "code") val code: String, + @param:Json(name = "device_name") val deviceName: String +) + +data class RefreshRequest( + @param:Json(name = "refresh_token") val refreshToken: String +) + +data class LogoutRequest( + @param:Json(name = "refresh_token") val refreshToken: String +) + +data class LogoutResponse( + @param:Json(name = "revoked") val revoked: Boolean +) diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt b/app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt new file mode 100644 index 0000000..448df06 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/model/AuthResponses.kt @@ -0,0 +1,25 @@ +package com.example.furumi_android.data.remote.model + +import com.squareup.moshi.Json + +data class LoginResponse( + @param:Json(name = "user") val user: UserResponse, + @param:Json(name = "tokens") val tokens: TokenResponse +) + +data class UserResponse( + @param:Json(name = "id") val id: Int, + @param:Json(name = "name") val name: String, + @param:Json(name = "role") val role: String +) + +data class TokenResponse( + @param:Json(name = "access_token") val accessToken: String, + @param:Json(name = "refresh_token") val refreshToken: String, + @param:Json(name = "token_type") val tokenType: String, + @param:Json(name = "expires_in_seconds") val expiresInSeconds: Int +) + +data class ErrorResponse( + @param:Json(name = "error") val error: String +) diff --git a/app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt b/app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt new file mode 100644 index 0000000..99953d1 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/remote/model/PlayerResponses.kt @@ -0,0 +1,224 @@ +package com.example.furumi_android.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.ListeningHistoryItem +import com.example.furumi_android.domain.model.ListeningHistoryPage +import com.example.furumi_android.domain.model.ReleaseCard +import com.example.furumi_android.domain.model.ReleaseDetail +import com.example.furumi_android.domain.model.TrackCard +import com.squareup.moshi.Json + +data class ArtistRefResponse( + @param:Json(name = "id") val id: Long, + @param:Json(name = "name") val name: String +) + +data class TrackItemResponse( + @param:Json(name = "id") val id: Long, + @param:Json(name = "title") val title: String, + @param:Json(name = "track_number") val trackNumber: Int? = null, + @param:Json(name = "disc_number") val discNumber: Int? = null, + @param:Json(name = "duration_seconds") val durationSeconds: Double, + @param:Json(name = "artists") val artists: List = emptyList(), + @param:Json(name = "featured_artists") val featuredArtists: List = emptyList(), + @param:Json(name = "release_title") val releaseTitle: String? = null, + @param:Json(name = "cover_url") val coverUrl: String? = null, + @param:Json(name = "stream_url") val streamUrl: String +) + +data class PlayHistoryItemResponse( + @param:Json(name = "id") val id: Long, + @param:Json(name = "track_id") val trackId: Long, + @param:Json(name = "track_title") val trackTitle: String, + @param:Json(name = "release_title") val releaseTitle: String? = null, + @param:Json(name = "track") val track: TrackItemResponse, + @param:Json(name = "played_at") val playedAt: String, + @param:Json(name = "duration_listened") val durationListened: Double? = null, + @param:Json(name = "completed") val completed: Boolean +) + + +data class PlayHistoryPageResponse( + @param:Json(name = "items") val items: List, + @param:Json(name = "total") val total: Long, + @param:Json(name = "page") val page: Int, + @param:Json(name = "per_page") val perPage: Int +) + +data class ArtistCardResponse( + @param:Json(name = "id") val id: Long, + @param:Json(name = "name") val name: String, + @param:Json(name = "image_url") val imageUrl: String? = null, + @param:Json(name = "release_count") val releaseCount: Int = 0, + @param:Json(name = "track_count") val trackCount: Int = 0 +) + +data class ArtistPageResponse( + @param:Json(name = "items") val items: List, + @param:Json(name = "total") val total: Long, + @param:Json(name = "page") val page: Int, + @param:Json(name = "per_page") val perPage: Int, + @param:Json(name = "has_more") val hasMore: Boolean +) + +data class ReleaseCardResponse( + @param:Json(name = "id") val id: Long, + @param:Json(name = "title") val title: String, + @param:Json(name = "release_type") val releaseType: String? = null, + @param:Json(name = "year") val year: Int? = null, + @param:Json(name = "cover_url") val coverUrl: String? = null, + @param:Json(name = "track_count") val trackCount: Int = 0 +) + +data class ArtistDetailResponse( + @param:Json(name = "artist") val artist: ArtistCardResponse? = null, + @param:Json(name = "id") val id: Long? = null, + @param:Json(name = "name") val name: String? = null, + @param:Json(name = "image_url") val imageUrl: String? = null, + @param:Json(name = "release_count") val releaseCount: Int? = null, + @param:Json(name = "track_count") val trackCount: Int? = null, + @param:Json(name = "top_tracks") val topTracks: List = emptyList(), + @param:Json(name = "releases") val releases: List = emptyList(), + @param:Json(name = "featured_tracks") val featuredTracks: List = emptyList() +) + +data class ReleaseDetailResponse( + @param:Json(name = "release") val release: ReleaseCardResponse? = null, + @param:Json(name = "id") val id: Long? = null, + @param:Json(name = "title") val title: String? = null, + @param:Json(name = "release_type") val releaseType: String? = null, + @param:Json(name = "year") val year: Int? = null, + @param:Json(name = "cover_url") val coverUrl: String? = null, + @param:Json(name = "track_count") val trackCount: Int? = null, + @param:Json(name = "artists") val artists: List = emptyList(), + @param:Json(name = "tracks") val tracks: List = emptyList() +) + +fun PlayHistoryPageResponse.toDomain(): ListeningHistoryPage { + return ListeningHistoryPage( + items = items.map { it.toDomain() }, + total = total, + page = page, + perPage = perPage + ) +} + +private fun PlayHistoryItemResponse.toDomain(): ListeningHistoryItem { + val artistNames = track.artists + .ifEmpty { track.featuredArtists } + .map { it.name } + + return ListeningHistoryItem( + id = id, + trackId = trackId, + title = trackTitle.ifBlank { track.title }, + artists = artistNames, + releaseTitle = releaseTitle ?: track.releaseTitle, + playedAt = playedAt, + durationListenedSeconds = durationListened?.toInt(), + completed = completed + ) + +} + +fun ArtistPageResponse.toDomain(baseUrl: String): ArtistPage { + return ArtistPage( + items = items.map { it.toDomain(baseUrl) }, + total = total, + page = page, + perPage = perPage, + hasMore = hasMore + ) +} + +fun ArtistDetailResponse.toDomain(baseUrl: String): ArtistDetail { + val mappedReleases = releases.map { it.toDomain(baseUrl) } + val mappedTopTracks = topTracks.map { it.toDomain(baseUrl) } + val mappedFeaturedTracks = featuredTracks.map { it.toDomain(baseUrl) } + val mappedArtist = artist?.toDomain(baseUrl) ?: ArtistCard( + id = id ?: 0L, + name = name ?: "Unknown artist", + imageUrl = imageUrl.toAbsoluteMediaUrl(baseUrl), + releaseCount = releaseCount ?: mappedReleases.size, + trackCount = trackCount ?: (mappedTopTracks.size + mappedFeaturedTracks.size) + ) + + return ArtistDetail( + artist = mappedArtist, + releases = mappedReleases, + topTracks = mappedTopTracks, + featuredTracks = mappedFeaturedTracks + ) +} + +fun ReleaseDetailResponse.toDomain(baseUrl: String): ReleaseDetail { + val mappedTracks = tracks.map { it.toDomain(baseUrl) } + val mappedRelease = release?.toDomain(baseUrl) ?: ReleaseCard( + id = id ?: 0L, + title = title ?: "Unknown release", + releaseType = releaseType, + year = year, + coverUrl = coverUrl.toAbsoluteMediaUrl(baseUrl), + trackCount = trackCount ?: mappedTracks.size + ) + + return ReleaseDetail( + release = mappedRelease, + artists = artists.map { it.toDomain(baseUrl) }, + tracks = mappedTracks + ) +} + +private fun ArtistCardResponse.toDomain(baseUrl: String): ArtistCard { + return ArtistCard( + id = id, + name = name, + imageUrl = imageUrl.toAbsoluteMediaUrl(baseUrl), + releaseCount = releaseCount, + trackCount = trackCount + ) +} + +private fun ReleaseCardResponse.toDomain(baseUrl: String): ReleaseCard { + return ReleaseCard( + id = id, + title = title, + releaseType = releaseType, + year = year, + coverUrl = coverUrl.toAbsoluteMediaUrl(baseUrl), + trackCount = trackCount + ) +} + +private fun TrackItemResponse.toDomain(baseUrl: String): TrackCard { + val artistNames = artists + .ifEmpty { featuredArtists } + .map { it.name } + + return TrackCard( + id = id, + title = title, + trackNumber = trackNumber, + discNumber = discNumber, + durationSeconds = durationSeconds.toInt(), + artists = artistNames, + releaseTitle = releaseTitle, + coverUrl = coverUrl.toAbsoluteMediaUrl(baseUrl), + streamUrl = streamUrl.toAbsoluteMediaUrl(baseUrl).orEmpty() + ) +} + +private fun String?.toAbsoluteMediaUrl(baseUrl: String): String? { + val value = this?.trim()?.takeIf { it.isNotBlank() } ?: return null + if (value.startsWith("http://", ignoreCase = true) || + value.startsWith("https://", ignoreCase = true) + ) { + return value + } + + val normalizedBaseUrl = baseUrl.trimEnd('/') + val normalizedPath = if (value.startsWith('/')) value else "/$value" + return "$normalizedBaseUrl$normalizedPath" +} diff --git a/app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt b/app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt new file mode 100644 index 0000000..c74fa9f --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/repository/AuthDeviceInfo.kt @@ -0,0 +1,23 @@ +package com.example.furumi_android.data.repository + +import android.os.Build +import javax.inject.Inject + +class AuthDeviceInfo @Inject constructor() { + val deviceName: String + get() { + val manufacturer = Build.MANUFACTURER.orEmpty().trim() + val model = Build.MODEL.orEmpty().trim() + + return when { + model.isBlank() -> DEFAULT_DEVICE_NAME + manufacturer.isBlank() -> model + model.startsWith(manufacturer, ignoreCase = true) -> model + else -> "$manufacturer $model" + } + } + + companion object { + private const val DEFAULT_DEVICE_NAME = "Android Device" + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt new file mode 100644 index 0000000..30e744d --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/repository/AuthRepositoryImpl.kt @@ -0,0 +1,123 @@ +package com.example.furumi_android.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 kotlinx.coroutines.CancellationException +import retrofit2.Response +import javax.inject.Inject + +class AuthRepositoryImpl @Inject constructor( + private val authApi: AuthApi, + private val sessionStorage: AuthSessionStorage, + private val authEndpoints: AuthEndpoints, + private val errorParser: AuthApiErrorParser, + private val deviceInfo: AuthDeviceInfo +) : AuthRepository { + + override suspend fun login(config: ServerConfig, password: String): Result { + return authResult { + val normalizedConfig = ServerConfig.credentials(config.baseUrl, config.login).getOrThrow() + val response = authApi.login( + url = authEndpoints.passwordLogin(normalizedConfig.baseUrl), + request = LoginRequest( + username = normalizedConfig.login, + password = password, + deviceName = deviceInfo.deviceName + ) + ) + saveAuthSession(response, normalizedConfig.baseUrl) + } + } + + override suspend fun createSsoAuthorizationUrl(serverUrl: String): Result { + return authResult { + val config = ServerConfig.sso(serverUrl).getOrThrow() + sessionStorage.savePendingSsoBaseUrl(config.baseUrl) + authEndpoints.ssoStart(config.baseUrl) + } + } + + override suspend fun completeSsoLogin(callbackUrl: String): Result { + return authResult { + val callback = authEndpoints.parseSsoCallback(callbackUrl).getOrThrow() + val baseUrl = sessionStorage.getPendingSsoBaseUrl() + ?: sessionStorage.getBaseUrl() + ?: throw AuthException("SSO server is missing. Start SSO login again.") + val response = authApi.ssoExchange( + url = authEndpoints.ssoExchange(baseUrl), + request = SsoExchangeRequest( + code = callback.code, + deviceName = deviceInfo.deviceName + ) + ) + saveAuthSession(response, baseUrl) + } + } + + private fun saveAuthSession(response: Response, baseUrl: String): AuthSession { + if (!response.isSuccessful) { + throw AuthException(errorParser.messageFrom(response)) + } + + val body = response.body() ?: throw AuthException("Auth response is empty") + val session = body.toDomainSession( + serverBaseUrl = baseUrl, + receivedAtEpochSeconds = nowEpochSeconds() + ) + sessionStorage.saveSession(session) + return session + } + + override suspend fun logout(): Result { + return try { + val session = sessionStorage.getSession() + if (session != null) { + authApi.logout( + url = authEndpoints.logout(session.serverBaseUrl), + bearerToken = session.tokens.authorizationHeader, + request = LogoutRequest(session.tokens.refreshToken) + ) + } + Result.success(Unit) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Result.failure(AuthException("Logged out locally, but server logout failed", e)) + } finally { + sessionStorage.clearSession() + } + } + + override fun getCurrentSession(): AuthSession? { + return sessionStorage.getSession() + } + + override fun getSavedServerUrl(): String? { + return sessionStorage.getBaseUrl() ?: sessionStorage.getPendingSsoBaseUrl() + } + + private suspend fun authResult(block: suspend () -> T): Result { + return try { + Result.success(block()) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Result.failure(e) + } + } + + private fun nowEpochSeconds(): Long { + return System.currentTimeMillis() / 1000L + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt b/app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt new file mode 100644 index 0000000..3828752 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/repository/MediaImageLoader.kt @@ -0,0 +1,38 @@ +package com.example.furumi_android.data.repository + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import java.io.IOException +import javax.inject.Inject +import javax.inject.Singleton +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import okhttp3.OkHttpClient +import okhttp3.Request + +@Singleton +class MediaImageLoader @Inject constructor( + private val okHttpClient: OkHttpClient +) { + suspend fun load(url: String): Result { + return withContext(Dispatchers.IO) { + runCatching { + val request = Request.Builder() + .url(url) + .build() + + okHttpClient.newCall(request).execute().use { response -> + if (!response.isSuccessful) { + throw IOException("Image request failed with HTTP ${response.code}") + } + + val bytes = response.body?.bytes() + ?: throw IOException("Image response is empty") + + BitmapFactory.decodeByteArray(bytes, 0, bytes.size) + ?: throw IOException("Image response is not a supported bitmap") + } + } + } + } +} diff --git a/app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt b/app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt new file mode 100644 index 0000000..7da52e3 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/data/repository/PlayerRepositoryImpl.kt @@ -0,0 +1,112 @@ +package com.example.furumi_android.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.PlayerEndpoints +import com.example.furumi_android.data.remote.api.PlayerApi +import com.example.furumi_android.data.remote.model.toDomain +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.ListeningHistoryPage +import com.example.furumi_android.domain.model.ReleaseDetail +import com.example.furumi_android.domain.repository.PlayerRepository +import kotlinx.coroutines.CancellationException +import javax.inject.Inject + +class PlayerRepositoryImpl @Inject constructor( + private val playerApi: PlayerApi, + private val sessionStorage: AuthSessionStorage, + private val playerEndpoints: PlayerEndpoints, + private val errorParser: AuthApiErrorParser +) : PlayerRepository { + + override suspend fun getArtists(page: Int, limit: Int, mine: Boolean): Result { + return try { + val baseUrl = sessionStorage.getBaseUrl() + ?: throw AuthException("Server URL is missing") + val response = playerApi.artists( + url = playerEndpoints.artists(baseUrl), + page = page, + limit = limit, + mine = mine + ) + + if (!response.isSuccessful) { + throw AuthException(errorParser.messageFrom(response)) + } + + val body = response.body() ?: throw AuthException("Artists response is empty") + Result.success(body.toDomain(baseUrl)) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Result.failure(e) + } + } + + override suspend fun getArtistDetail(artistId: Long): Result { + return try { + val baseUrl = sessionStorage.getBaseUrl() + ?: throw AuthException("Server URL is missing") + val response = playerApi.artistDetail( + url = playerEndpoints.artistDetail(baseUrl, artistId) + ) + + if (!response.isSuccessful) { + throw AuthException(errorParser.messageFrom(response)) + } + + val body = response.body() ?: throw AuthException("Artist response is empty") + Result.success(body.toDomain(baseUrl)) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Result.failure(e) + } + } + + override suspend fun getReleaseDetail(releaseId: Long): Result { + return try { + val baseUrl = sessionStorage.getBaseUrl() + ?: throw AuthException("Server URL is missing") + val response = playerApi.releaseDetail( + url = playerEndpoints.releaseDetail(baseUrl, releaseId) + ) + + if (!response.isSuccessful) { + throw AuthException(errorParser.messageFrom(response)) + } + + val body = response.body() ?: throw AuthException("Release response is empty") + Result.success(body.toDomain(baseUrl)) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Result.failure(e) + } + } + + override suspend fun getListeningHistory(page: Int, limit: Int): Result { + return try { + val baseUrl = sessionStorage.getBaseUrl() + ?: throw AuthException("Server URL is missing") + val response = playerApi.history( + url = playerEndpoints.history(baseUrl), + page = page, + limit = limit + ) + + if (!response.isSuccessful) { + throw AuthException(errorParser.messageFrom(response)) + } + + val body = response.body() ?: throw AuthException("Listening history response is empty") + Result.success(body.toDomain()) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + Result.failure(e) + } + } +} diff --git a/app/src/main/java/com/example/furumi_android/di/NetworkModule.kt b/app/src/main/java/com/example/furumi_android/di/NetworkModule.kt new file mode 100644 index 0000000..e6a42db --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/di/NetworkModule.kt @@ -0,0 +1,90 @@ +package com.example.furumi_android.di + +import com.example.furumi_android.data.local.AuthSessionStorage +import com.example.furumi_android.data.remote.AccessTokenInterceptor +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 com.squareup.moshi.Moshi +import dagger.Lazy +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object NetworkModule { + + @Provides + @Singleton + fun provideAccessTokenInterceptor( + sessionStorage: AuthSessionStorage, + authEndpoints: AuthEndpoints + ): AccessTokenInterceptor { + return AccessTokenInterceptor(sessionStorage, authEndpoints) + } + + @Provides + @Singleton + fun provideAuthAuthenticator( + sessionStorage: AuthSessionStorage, + authEndpoints: AuthEndpoints, + authApiLazy: Lazy + ): AuthAuthenticator { + return AuthAuthenticator(sessionStorage, authEndpoints, authApiLazy) + } + + @Provides + @Singleton + fun provideOkHttpClient( + accessTokenInterceptor: AccessTokenInterceptor, + authAuthenticator: AuthAuthenticator + ): OkHttpClient { + val logging = HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.BASIC + } + + return OkHttpClient.Builder() + .addInterceptor(accessTokenInterceptor) + .addInterceptor(logging) + .authenticator(authAuthenticator) + .build() + } + + @Provides + @Singleton + fun provideAuthApi( + okHttpClient: OkHttpClient, + moshi: Moshi + ): AuthApi { + // Auth requests use @Url, but Retrofit still requires an initial base URL. + // The actual server URL is supplied per request. + return Retrofit.Builder() + .baseUrl("https://placeholder.com/") + .client(okHttpClient) + .addConverterFactory(MoshiConverterFactory.create(moshi)) + .build() + .create(AuthApi::class.java) + } + + @Provides + @Singleton + fun providePlayerApi( + okHttpClient: OkHttpClient, + moshi: Moshi + ): PlayerApi { + return Retrofit.Builder() + .baseUrl("https://placeholder.com/") + .client(okHttpClient) + .addConverterFactory(MoshiConverterFactory.create(moshi)) + .build() + .create(PlayerApi::class.java) + } +} diff --git a/app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt b/app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt new file mode 100644 index 0000000..3a1a486 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/di/RepositoryModule.kt @@ -0,0 +1,28 @@ +package com.example.furumi_android.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 dagger.Binds +import dagger.Module +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +abstract class RepositoryModule { + + @Binds + @Singleton + abstract fun bindAuthRepository( + impl: AuthRepositoryImpl + ): AuthRepository + + @Binds + @Singleton + abstract fun bindPlayerRepository( + impl: PlayerRepositoryImpl + ): PlayerRepository +} diff --git a/app/src/main/java/com/example/furumi_android/di/StorageModule.kt b/app/src/main/java/com/example/furumi_android/di/StorageModule.kt new file mode 100644 index 0000000..90025b0 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/di/StorageModule.kt @@ -0,0 +1,34 @@ +package com.example.furumi_android.di + +import android.content.Context +import com.example.furumi_android.data.local.AuthSessionStorage +import com.squareup.moshi.Moshi +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object StorageModule { + + @Provides + @Singleton + fun provideMoshi(): Moshi { + return Moshi.Builder() + .add(KotlinJsonAdapterFactory()) + .build() + } + + @Provides + @Singleton + fun provideAuthSessionStorage( + @ApplicationContext context: Context, + moshi: Moshi + ): AuthSessionStorage { + return AuthSessionStorage(context, moshi) + } +} diff --git a/app/src/main/java/com/example/furumi_android/domain/model/Artist.kt b/app/src/main/java/com/example/furumi_android/domain/model/Artist.kt new file mode 100644 index 0000000..dfdd3c8 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/Artist.kt @@ -0,0 +1,51 @@ +package com.example.furumi_android.domain.model + +data class ArtistCard( + val id: Long, + val name: String, + val imageUrl: String?, + val releaseCount: Int, + val trackCount: Int +) + +data class ArtistPage( + val items: List, + val total: Long, + val page: Int, + val perPage: Int, + val hasMore: Boolean +) + +data class ReleaseCard( + val id: Long, + val title: String, + val releaseType: String?, + val year: Int?, + val coverUrl: String?, + val trackCount: Int +) + +data class TrackCard( + val id: Long, + val title: String, + val trackNumber: Int?, + val discNumber: Int?, + val durationSeconds: Int?, + val artists: List, + val releaseTitle: String?, + val coverUrl: String?, + val streamUrl: String +) + +data class ArtistDetail( + val artist: ArtistCard, + val releases: List, + val topTracks: List, + val featuredTracks: List +) + +data class ReleaseDetail( + val release: ReleaseCard, + val artists: List, + val tracks: List +) diff --git a/app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt b/app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt new file mode 100644 index 0000000..82337a7 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/AuthException.kt @@ -0,0 +1,6 @@ +package com.example.furumi_android.domain.model + +class AuthException( + message: String, + cause: Throwable? = null +) : Exception(message, cause) diff --git a/app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt b/app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt new file mode 100644 index 0000000..f1b475d --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/AuthSession.kt @@ -0,0 +1,7 @@ +package com.example.furumi_android.domain.model + +data class AuthSession( + val serverBaseUrl: String, + val user: User, + val tokens: AuthTokens +) diff --git a/app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt b/app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt new file mode 100644 index 0000000..e531de1 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/AuthTokens.kt @@ -0,0 +1,21 @@ +package com.example.furumi_android.domain.model + +data class AuthTokens( + val accessToken: String, + val refreshToken: String, + val tokenType: String = DEFAULT_TOKEN_TYPE, + val expiresInSeconds: Int, + val expiresAtEpochSeconds: Long = 0L +) { + val authorizationHeader: String + get() = "${tokenType.ifBlank { DEFAULT_TOKEN_TYPE }} $accessToken" + + fun isExpired(nowEpochSeconds: Long, skewSeconds: Long = DEFAULT_EXPIRY_SKEW_SECONDS): Boolean { + return expiresAtEpochSeconds > 0 && nowEpochSeconds >= expiresAtEpochSeconds - skewSeconds + } + + companion object { + const val DEFAULT_TOKEN_TYPE = "Bearer" + private const val DEFAULT_EXPIRY_SKEW_SECONDS = 60L + } +} diff --git a/app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt b/app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt new file mode 100644 index 0000000..df1552e --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/ListeningHistory.kt @@ -0,0 +1,19 @@ +package com.example.furumi_android.domain.model + +data class ListeningHistoryPage( + val items: List, + val total: Long, + val page: Int, + val perPage: Int +) + +data class ListeningHistoryItem( + val id: Long, + val trackId: Long, + val title: String, + val artists: List, + val releaseTitle: String?, + val playedAt: String, + val durationListenedSeconds: Int?, + val completed: Boolean +) diff --git a/app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt b/app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt new file mode 100644 index 0000000..e18fd47 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/ServerConfig.kt @@ -0,0 +1,74 @@ +package com.example.furumi_android.domain.model + +import java.net.URI +import java.util.Locale + +data class ServerConfig( + val baseUrl: String, + val login: String = "" +) { + val url: String + get() = baseUrl + + companion object { + fun credentials(serverUrl: String, login: String): Result { + val normalizedBaseUrl = normalizeBaseUrl(serverUrl).getOrElse { return Result.failure(it) } + val trimmedLogin = login.trim() + + if (trimmedLogin.isBlank()) { + return Result.failure(IllegalArgumentException("Username is required")) + } + + return Result.success(ServerConfig(normalizedBaseUrl, trimmedLogin)) + } + + fun sso(serverUrl: String): Result { + val normalizedBaseUrl = normalizeBaseUrl(serverUrl).getOrElse { return Result.failure(it) } + return Result.success(ServerConfig(normalizedBaseUrl)) + } + + fun normalizeBaseUrl(rawUrl: String): Result { + val trimmedUrl = rawUrl.trim().trimEnd('/') + + if (trimmedUrl.isBlank()) { + return Result.failure(IllegalArgumentException("Server URL is required")) + } + + val candidate = if (trimmedUrl.hasScheme()) trimmedUrl else "https://$trimmedUrl" + val uri = runCatching { URI(candidate) }.getOrElse { + return Result.failure(IllegalArgumentException("Enter a valid server URL")) + } + + val scheme = uri.scheme?.lowercase(Locale.US) + val rawAuthority = uri.rawAuthority + val host = uri.host + if (scheme != "http" && scheme != "https") { + return Result.failure(IllegalArgumentException("Server URL must start with http:// or https://")) + } + + if (rawAuthority.isNullOrBlank() || host.isNullOrBlank()) { + return Result.failure(IllegalArgumentException("Enter a valid server URL")) + } + + if (uri.userInfo != null) { + return Result.failure(IllegalArgumentException("Server URL must not contain user info")) + } + + if (uri.rawQuery != null || uri.rawFragment != null) { + return Result.failure(IllegalArgumentException("Server URL must not contain query or fragment")) + } + + val normalizedPath = uri.rawPath + ?.takeUnless { it == "/" } + ?.trimEnd('/') + .orEmpty() + + val authority = rawAuthority.lowercase(Locale.US) + return Result.success("$scheme://$authority$normalizedPath") + } + + private fun String.hasScheme(): Boolean { + return startsWith("http://", ignoreCase = true) || startsWith("https://", ignoreCase = true) + } + } +} diff --git a/app/src/main/java/com/example/furumi_android/domain/model/User.kt b/app/src/main/java/com/example/furumi_android/domain/model/User.kt new file mode 100644 index 0000000..2ad5c44 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/model/User.kt @@ -0,0 +1,7 @@ +package com.example.furumi_android.domain.model + +data class User( + val id: Int, + val name: String, + val role: String +) diff --git a/app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt b/app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt new file mode 100644 index 0000000..ca21ca8 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/repository/AuthRepository.kt @@ -0,0 +1,18 @@ +package com.example.furumi_android.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 + +interface AuthRepository { + suspend fun login(config: ServerConfig, password: String): Result + suspend fun createSsoAuthorizationUrl(serverUrl: String): Result + suspend fun completeSsoLogin(callbackUrl: String): Result + suspend fun logout(): Result + fun getCurrentSession(): AuthSession? + fun getSavedServerUrl(): String? + + fun getCurrentUser(): User? { + return getCurrentSession()?.user + } +} diff --git a/app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt b/app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt new file mode 100644 index 0000000..aff3d44 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/domain/repository/PlayerRepository.kt @@ -0,0 +1,20 @@ +package com.example.furumi_android.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.ListeningHistoryPage +import com.example.furumi_android.domain.model.ReleaseDetail + +interface PlayerRepository { + suspend fun getArtists( + page: Int = 1, + limit: Int = 60, + mine: Boolean = false + ): Result + + suspend fun getArtistDetail(artistId: Long): Result + + suspend fun getReleaseDetail(releaseId: Long): Result + + suspend fun getListeningHistory(page: Int = 1, limit: Int = 20): Result +} diff --git a/app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt b/app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt new file mode 100644 index 0000000..29325ae --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/playback/FurumiPlaybackService.kt @@ -0,0 +1,126 @@ +package com.example.furumi_android.playback + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.content.pm.ServiceInfo +import android.os.Build +import android.util.Log +import androidx.annotation.OptIn +import androidx.core.app.NotificationCompat +import androidx.media3.common.util.UnstableApi +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 dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject + +@AndroidEntryPoint +class FurumiPlaybackService : MediaSessionService() { + + @Inject lateinit var playbackController: PlaybackController + + private var mediaSession: MediaSession? = null + + companion object { + const val NOTIFICATION_ID = 1001 + const val CHANNEL_ID = "furumi_playback_channel" + } + + @OptIn(UnstableApi::class) + override fun onCreate() { + super.onCreate() + Log.d("FurumiPlaybackService", "onCreate") + + createNotificationChannel() + + val sessionActivity = PendingIntent.getActivity( + this, + 0, + Intent(this, MainActivity::class.java), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT + ) + + mediaSession = MediaSession.Builder(this, playbackController.player) + .setId("FurumiPlaybackSession") + .setSessionActivity(sessionActivity) + .build() + + // Настройка провайдера с иконкой + val notificationProvider = DefaultMediaNotificationProvider.Builder(this) + .setChannelId(CHANNEL_ID) + .setNotificationId(NOTIFICATION_ID) + .build() + + // Это важно для появления иконки в статус-баре при автоматических обновлениях Media3 + notificationProvider.setSmallIcon(android.R.drawable.ic_media_play) + setMediaNotificationProvider(notificationProvider) + } + + @OptIn(UnstableApi::class) + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + val session = mediaSession + if (session != null) { + val metadata = playbackController.player.currentMediaItem?.mediaMetadata + + val notification = NotificationCompat.Builder(this, CHANNEL_ID) + .setSmallIcon(android.R.drawable.ic_media_play) // Иконка для трея + .setContentTitle(metadata?.title ?: "Furumi") + .setContentText(metadata?.artist ?: "Playing...") + .setOngoing(true) + .setCategory(NotificationCompat.CATEGORY_TRANSPORT) // Сообщаем системе, что это транспорт управления + .setPriority(NotificationCompat.PRIORITY_MAX) // Максимальный приоритет для трея + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) + .setStyle(MediaStyleNotificationHelper.MediaStyle(session)) + .build() + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK) + } else { + startForeground(NOTIFICATION_ID, notification) + } + } + + super.onStartCommand(intent, flags, startId) + return START_STICKY + } + + override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? { + return mediaSession + } + + private fun createNotificationChannel() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val name = "Furumi Playback" + // Повышаем важность до HIGH, чтобы иконка не пропадала + val importance = NotificationManager.IMPORTANCE_HIGH + val channel = NotificationChannel(CHANNEL_ID, name, importance).apply { + setShowBadge(true) + lockscreenVisibility = android.app.Notification.VISIBILITY_PUBLIC + } + val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + notificationManager.createNotificationChannel(channel) + } + } + + @OptIn(UnstableApi::class) + override fun onTaskRemoved(rootIntent: Intent?) { + val player = playbackController.player + if (!player.playWhenReady || player.mediaItemCount == 0) { + stopSelf() + } + } + + override fun onDestroy() { + Log.d("FurumiPlaybackService", "onDestroy") + mediaSession?.run { + release() + mediaSession = null + } + super.onDestroy() + } +} diff --git a/app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt b/app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt new file mode 100644 index 0000000..38441f8 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/playback/PlaybackController.kt @@ -0,0 +1,263 @@ +package com.example.furumi_android.playback + +import android.content.Context +import android.content.Intent +import android.graphics.Bitmap +import android.net.Uri +import androidx.annotation.OptIn +import androidx.media3.common.AudioAttributes +import androidx.media3.common.C +import androidx.media3.common.MediaItem +import androidx.media3.common.MediaMetadata +import androidx.media3.common.PlaybackException +import androidx.media3.common.Player +import androidx.media3.common.util.UnstableApi +import androidx.core.content.ContextCompat +import androidx.media3.datasource.okhttp.OkHttpDataSource +import androidx.media3.exoplayer.ExoPlayer +import androidx.media3.exoplayer.source.DefaultMediaSourceFactory +import com.example.furumi_android.data.repository.MediaImageLoader +import com.example.furumi_android.domain.model.TrackCard +import dagger.hilt.android.qualifiers.ApplicationContext +import javax.inject.Inject +import javax.inject.Singleton +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import okhttp3.OkHttpClient +import java.io.ByteArrayOutputStream + +data class AudioPlaybackState( + val queue: List = emptyList(), + val currentIndex: Int = -1, + val isPlaying: Boolean = false, + val isBuffering: Boolean = false, + val positionMs: Long = 0L, + val durationMs: Long = 0L, + val errorMessage: String? = null +) { + val currentTrack: TrackCard? + get() = queue.getOrNull(currentIndex) + + val progress: Float + get() = if (durationMs > 0L) { + (positionMs.toFloat() / durationMs.toFloat()).coerceIn(0f, 1f) + } else { + 0f + } + + val canGoPrevious: Boolean + get() = currentIndex > 0 || positionMs > RESTART_WINDOW_MS + + val canGoNext: Boolean + get() = currentIndex in 0 until queue.lastIndex + + private companion object { + const val RESTART_WINDOW_MS = 3_000L + } +} + +@OptIn(UnstableApi::class) +@Singleton +class PlaybackController @Inject constructor( + @param:ApplicationContext private val context: Context, + private val mediaImageLoader: MediaImageLoader, + okHttpClient: OkHttpClient +) { + private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) + private val _state = MutableStateFlow(AudioPlaybackState()) + + val player: ExoPlayer + val state: StateFlow = _state.asStateFlow() + + init { + val dataSourceFactory = OkHttpDataSource.Factory(okHttpClient) + val mediaSourceFactory = DefaultMediaSourceFactory(dataSourceFactory) + + player = ExoPlayer.Builder(context) + .setMediaSourceFactory(mediaSourceFactory) + .build() + .apply { + setAudioAttributes( + AudioAttributes.Builder() + .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC) + .setUsage(C.USAGE_MEDIA) + .build(), + true + ) + setHandleAudioBecomingNoisy(true) + setWakeMode(C.WAKE_MODE_LOCAL) + } + + player.addListener( + object : Player.Listener { + override fun onIsPlayingChanged(isPlaying: Boolean) { + publishState() + } + + override fun onPlaybackStateChanged(playbackState: Int) { + publishState() + } + + override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) { + publishState() + // Просто уведомляем систему, что состояние изменилось. + // MediaSessionService сам обновит уведомление, так как он слушает плеер. + } + + override fun onPlayerError(error: PlaybackException) { + _state.value = _state.value.copy( + isPlaying = false, + isBuffering = false, + errorMessage = error.message ?: "Playback failed" + ) + } + } + ) + + scope.launch { + while (isActive) { + publishState() + delay(PROGRESS_TICK_MS) + } + } + } + + fun playQueue(queue: List, startIndex: Int = 0) { + val playableQueue = queue.filter { it.streamUrl.isNotBlank() } + if (playableQueue.isEmpty()) { + _state.value = AudioPlaybackState(errorMessage = "No playable tracks") + return + } + + val safeStartIndex = startIndex.coerceIn(0, playableQueue.lastIndex) + val mediaItems = playableQueue.map { track -> + MediaItem.Builder() + .setMediaId(track.id.toString()) + .setUri(track.streamUrl) + .setMediaMetadata(track.toMediaMetadata()) + .build() + } + + _state.value = AudioPlaybackState( + queue = playableQueue, + currentIndex = safeStartIndex, + isBuffering = true + ) + + player.setMediaItems(mediaItems, safeStartIndex, 0L) + player.prepare() + player.playWhenReady = true + + startPlaybackService() + } + + fun playTrack(track: TrackCard, queue: List) { + val playableQueue = queue + .ifEmpty { listOf(track) } + .filter { it.streamUrl.isNotBlank() } + .ifEmpty { listOf(track).filter { it.streamUrl.isNotBlank() } } + + val startIndex = playableQueue.indexOfFirst { it.id == track.id } + .takeIf { it >= 0 } + ?: 0 + + playQueue(playableQueue, startIndex) + } + + fun togglePlayPause() { + if (_state.value.currentTrack == null) return + + if (player.isPlaying) { + player.pause() + } else { + player.play() + } + publishState() + } + + fun next() { + if (player.hasNextMediaItem()) { + player.seekToNextMediaItem() + player.play() + } + publishState() + } + + fun previous() { + if (player.currentPosition > RESTART_WINDOW_MS || !player.hasPreviousMediaItem()) { + player.seekTo(0L) + } else { + player.seekToPreviousMediaItem() + } + player.play() + publishState() + } + + fun seekToProgress(progress: Float) { + val duration = player.duration.takeIf { it > 0L } ?: return + player.seekTo((duration * progress.coerceIn(0f, 1f)).toLong()) + publishState() + } + + fun release() { + scope.cancel() + player.release() + } + + fun stop() { + player.stop() + _state.value = AudioPlaybackState() + } + + private fun publishState() { + val existingErrorMessage = _state.value.errorMessage + val currentQueue = _state.value.queue + val currentIndex = player.currentMediaItemIndex.takeIf { it >= 0 } ?: _state.value.currentIndex + val duration = player.duration.takeIf { it > 0L } ?: currentQueue + .getOrNull(currentIndex) + ?.durationSeconds + ?.times(1_000L) + ?: 0L + + _state.value = _state.value.copy( + currentIndex = currentIndex, + isPlaying = player.isPlaying, + isBuffering = player.playbackState == Player.STATE_BUFFERING, + positionMs = player.currentPosition.coerceAtLeast(0L), + durationMs = duration, + errorMessage = existingErrorMessage + ) + } + + private companion object { + const val PROGRESS_TICK_MS = 500L + const val RESTART_WINDOW_MS = 3_000L + } + + private fun startPlaybackService() { + val intent = Intent(context, FurumiPlaybackService::class.java) + ContextCompat.startForegroundService(context, intent) + } +} + +private fun TrackCard.toMediaMetadata(): MediaMetadata { + val artist = artists.joinToString(", ") + .ifBlank { releaseTitle.orEmpty() } + .ifBlank { "Unknown artist" } + + return MediaMetadata.Builder() + .setTitle(title) + .setArtist(artist) + .setAlbumTitle(releaseTitle) + .setArtworkUri(coverUrl?.let(Uri::parse)) + .setMediaType(MediaMetadata.MEDIA_TYPE_MUSIC) + .build() +} diff --git a/app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt b/app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt new file mode 100644 index 0000000..fcca761 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/login/LoginScreen.kt @@ -0,0 +1,378 @@ +package com.example.furumi_android.ui.login + +import android.net.Uri +import androidx.browser.customtabs.CustomTabsIntent +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +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 + +@Composable +fun LoginScreen( + viewModel: LoginViewModel = hiltViewModel(), + onLoginSuccess: () -> Unit +) { + val uiState by viewModel.uiState.collectAsState() + val context = LocalContext.current + val focusManager = LocalFocusManager.current + val loginFocusRequester = remember { FocusRequester() } + val passwordFocusRequester = remember { FocusRequester() } + val isSsoLoading = uiState.loadingAction == LoginLoadingAction.Sso + val isPasswordLoading = uiState.loadingAction == LoginLoadingAction.Password + var isPasswordLoginVisible by rememberSaveable { mutableStateOf(false) } + + LaunchedEffect(uiState.isAuthenticated) { + if (uiState.isAuthenticated) { + onLoginSuccess() + } + } + + LaunchedEffect(uiState.externalAuthUrl) { + uiState.externalAuthUrl?.let { authUrl -> + CustomTabsIntent.Builder() + .build() + .launchUrl(context, Uri.parse(authUrl)) + viewModel.onExternalAuthUrlOpened() + } + } + + Box( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background) + .windowInsetsPadding(WindowInsets.safeDrawing) + .imePadding() + ) { + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(horizontal = 24.dp, vertical = 28.dp), + verticalArrangement = Arrangement.SpaceBetween + ) { + Column { + BrandHeader() + Spacer(modifier = Modifier.height(34.dp)) + AlbumTileStrip() + } + + Spacer(modifier = Modifier.height(32.dp)) + + LoginControls( + uiState = uiState, + isPasswordLoginVisible = isPasswordLoginVisible, + isSsoLoading = isSsoLoading, + isPasswordLoading = isPasswordLoading, + loginFocusRequester = loginFocusRequester, + passwordFocusRequester = passwordFocusRequester, + onPasswordLoginVisibilityChange = { + isPasswordLoginVisible = !isPasswordLoginVisible + if (!isPasswordLoginVisible) { + focusManager.clearFocus() + } + }, + onServerUrlChange = viewModel::onServerUrlChange, + onLoginChange = viewModel::onLoginChange, + onPasswordChange = viewModel::onPasswordChange, + onSsoClick = { + focusManager.clearFocus() + viewModel.loginWithSSO() + }, + onPasswordLoginClick = { + focusManager.clearFocus() + viewModel.login() + } + ) + } + } +} + +@Composable +private fun BrandHeader() { + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(34.dp) + .clip(CircleShape) + .background(FurumiNeonPink), + contentAlignment = Alignment.Center + ) { + Text( + text = "F", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onPrimary, + fontWeight = FontWeight.ExtraBold + ) + } + + Spacer(modifier = Modifier.width(10.dp)) + + Text( + text = "Furumi", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + } +} + +@Composable +private fun AlbumTileStrip() { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + AlbumTile( + modifier = Modifier.weight(1f), + brush = Brush.linearGradient(listOf(FurumiNeonPink, FurumiSurfaceHigh)) + ) + AlbumTile( + modifier = Modifier.weight(1f), + brush = Brush.linearGradient(listOf(FurumiElectricCyan, FurumiInk)) + ) + AlbumTile( + modifier = Modifier.weight(1f), + brush = Brush.linearGradient(listOf(FurumiNeonViolet, FurumiHotOrange, FurumiSurface)) + ) + } +} + +@Composable +private fun AlbumTile( + modifier: Modifier, + brush: Brush +) { + Box( + modifier = modifier + .aspectRatio(1f) + .clip(RoundedCornerShape(8.dp)) + .background(brush) + .border(1.dp, Color.White.copy(alpha = 0.08f), RoundedCornerShape(8.dp)) + ) +} + +@Composable +private fun LoginControls( + uiState: LoginUiState, + isPasswordLoginVisible: Boolean, + isSsoLoading: Boolean, + isPasswordLoading: Boolean, + loginFocusRequester: FocusRequester, + passwordFocusRequester: FocusRequester, + onPasswordLoginVisibilityChange: () -> Unit, + onServerUrlChange: (String) -> Unit, + onLoginChange: (String) -> Unit, + onPasswordChange: (String) -> Unit, + onSsoClick: () -> Unit, + onPasswordLoginClick: () -> Unit +) { + Column { + LoginTextField( + value = uiState.serverUrl, + onValueChange = onServerUrlChange, + label = "Server URL", + placeholder = "https://media.example.com", + enabled = !uiState.isLoading, + keyboardType = KeyboardType.Uri, + imeAction = if (isPasswordLoginVisible) ImeAction.Next else ImeAction.Go, + keyboardActions = KeyboardActions( + onGo = { onSsoClick() }, + onNext = { loginFocusRequester.requestFocus() } + ) + ) + + if (uiState.error != null) { + Spacer(modifier = Modifier.height(12.dp)) + Text( + text = uiState.error, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodyMedium + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + Button( + onClick = onSsoClick, + modifier = Modifier + .fillMaxWidth() + .height(56.dp), + enabled = !uiState.isLoading, + shape = CircleShape, + colors = ButtonDefaults.buttonColors( + containerColor = FurumiNeonPink, + contentColor = MaterialTheme.colorScheme.onPrimary, + disabledContainerColor = FurumiSurfaceHigh, + disabledContentColor = FurumiTextMuted + ) + ) { + if (isSsoLoading) { + CircularProgressIndicator( + modifier = Modifier.size(24.dp), + color = MaterialTheme.colorScheme.onPrimary, + strokeWidth = 2.dp + ) + } else { + Text("Continue with SSO") + } + } + + Spacer(modifier = Modifier.height(14.dp)) + + TextButton( + onClick = onPasswordLoginVisibilityChange, + modifier = Modifier.align(Alignment.CenterHorizontally), + enabled = !uiState.isLoading, + colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.onBackground) + ) { + Text( + text = if (isPasswordLoginVisible) "Hide password login" else "Sign in with password", + style = MaterialTheme.typography.labelSmall + ) + } + + if (isPasswordLoginVisible) { + Spacer(modifier = Modifier.height(8.dp)) + HorizontalDivider(color = FurumiLine) + Spacer(modifier = Modifier.height(18.dp)) + + LoginTextField( + value = uiState.login, + onValueChange = onLoginChange, + label = "Username or email", + placeholder = "name@example.com", + enabled = !uiState.isLoading, + keyboardType = KeyboardType.Email, + imeAction = ImeAction.Next, + keyboardActions = KeyboardActions( + onNext = { passwordFocusRequester.requestFocus() } + ), + modifier = Modifier.focusRequester(loginFocusRequester) + ) + + Spacer(modifier = Modifier.height(10.dp)) + + LoginTextField( + value = uiState.password, + onValueChange = onPasswordChange, + label = "Password", + enabled = !uiState.isLoading, + keyboardType = KeyboardType.Password, + imeAction = ImeAction.Done, + keyboardActions = KeyboardActions( + onDone = { onPasswordLoginClick() } + ), + visualTransformation = PasswordVisualTransformation(), + modifier = Modifier.focusRequester(passwordFocusRequester) + ) + + Spacer(modifier = Modifier.height(16.dp)) + + OutlinedButton( + onClick = onPasswordLoginClick, + modifier = Modifier + .fillMaxWidth() + .height(54.dp), + enabled = !uiState.isLoading, + shape = CircleShape, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.onBackground), + colors = ButtonDefaults.outlinedButtonColors( + contentColor = MaterialTheme.colorScheme.onBackground, + disabledContentColor = FurumiTextMuted + ) + ) { + if (isPasswordLoading) { + CircularProgressIndicator( + modifier = Modifier.size(24.dp), + color = MaterialTheme.colorScheme.onBackground, + strokeWidth = 2.dp + ) + } else { + Text("Sign in") + } + } + } + } +} + +@Composable +private fun LoginTextField( + value: String, + onValueChange: (String) -> Unit, + label: String, + enabled: Boolean, + keyboardType: KeyboardType, + imeAction: ImeAction, + keyboardActions: KeyboardActions, + modifier: Modifier = Modifier, + placeholder: String? = null, + visualTransformation: PasswordVisualTransformation? = null +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + label = { Text(label) }, + modifier = modifier.fillMaxWidth(), + placeholder = placeholder?.let { { Text(it) } }, + enabled = enabled, + singleLine = true, + maxLines = 1, + visualTransformation = visualTransformation ?: androidx.compose.ui.text.input.VisualTransformation.None, + keyboardOptions = KeyboardOptions( + keyboardType = keyboardType, + imeAction = imeAction + ), + keyboardActions = keyboardActions, + shape = RoundedCornerShape(8.dp), + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = MaterialTheme.colorScheme.onBackground, + unfocusedTextColor = MaterialTheme.colorScheme.onBackground, + disabledTextColor = FurumiTextMuted, + focusedContainerColor = FurumiSurface, + unfocusedContainerColor = FurumiSurface, + disabledContainerColor = FurumiSurface, + focusedBorderColor = FurumiNeonPink, + unfocusedBorderColor = FurumiLine, + disabledBorderColor = FurumiLine, + focusedLabelColor = FurumiNeonPink, + unfocusedLabelColor = FurumiTextMuted, + disabledLabelColor = FurumiTextMuted, + focusedPlaceholderColor = FurumiTextMuted, + unfocusedPlaceholderColor = FurumiTextMuted + ) + ) +} diff --git a/app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt b/app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt new file mode 100644 index 0000000..57b7064 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/login/LoginViewModel.kt @@ -0,0 +1,161 @@ +package com.example.furumi_android.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 dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class LoginUiState( + val serverUrl: String = "", + val login: String = "", + val password: String = "", + val isLoading: Boolean = false, + val loadingAction: LoginLoadingAction? = null, + val error: String? = null, + val isAuthenticated: Boolean = false, + val externalAuthUrl: String? = null +) + +enum class LoginLoadingAction { + Password, + Sso +} + +@HiltViewModel +class LoginViewModel @Inject constructor( + private val authRepository: AuthRepository +) : ViewModel() { + private val _uiState = MutableStateFlow( + LoginUiState( + serverUrl = authRepository.getSavedServerUrl().orEmpty(), + isAuthenticated = authRepository.getCurrentSession() != null + ) + ) + val uiState: StateFlow = _uiState.asStateFlow() + + fun onServerUrlChange(url: String) { + _uiState.value = _uiState.value.copy(serverUrl = url.withoutLineBreaks(), error = null) + } + + fun onLoginChange(login: String) { + _uiState.value = _uiState.value.copy(login = login.withoutLineBreaks(), error = null) + } + + fun onPasswordChange(password: String) { + _uiState.value = _uiState.value.copy(password = password.withoutLineBreaks(), error = null) + } + + fun login() { + val state = _uiState.value + val password = state.password + + if (password.isBlank()) { + _uiState.value = _uiState.value.copy(error = "Password is required") + return + } + + val config = ServerConfig.credentials(state.serverUrl, state.login).getOrElse { + _uiState.value = _uiState.value.copy(error = it.message ?: "Check your login details") + return + } + + viewModelScope.launch { + _uiState.value = _uiState.value.copy( + isLoading = true, + loadingAction = LoginLoadingAction.Password, + error = null + ) + + val result = authRepository.login( + config = config, + password = password + ) + + result.onSuccess { + _uiState.value = _uiState.value.copy( + isLoading = false, + loadingAction = null, + password = "", + serverUrl = it.serverBaseUrl, + isAuthenticated = true + ) + }.onFailure { + _uiState.value = _uiState.value.copy( + isLoading = false, + loadingAction = null, + error = it.message + ) + } + } + } + + fun loginWithSSO() { + val state = _uiState.value + + viewModelScope.launch { + _uiState.value = _uiState.value.copy( + isLoading = true, + loadingAction = LoginLoadingAction.Sso, + error = null + ) + + authRepository.createSsoAuthorizationUrl(state.serverUrl) + .onSuccess { authUrl -> + _uiState.value = _uiState.value.copy( + isLoading = false, + loadingAction = null, + externalAuthUrl = authUrl + ) + } + .onFailure { + _uiState.value = _uiState.value.copy( + isLoading = false, + loadingAction = null, + error = it.message ?: "Unable to start SSO login" + ) + } + } + } + + fun onExternalAuthUrlOpened() { + _uiState.value = _uiState.value.copy(externalAuthUrl = null) + } + + fun handleDeepLink(uri: Uri?) { + val callbackUrl = uri?.toString() ?: return + + viewModelScope.launch { + _uiState.value = _uiState.value.copy( + isLoading = true, + loadingAction = LoginLoadingAction.Sso, + error = null + ) + val result = authRepository.completeSsoLogin(callbackUrl) + result.onSuccess { + _uiState.value = _uiState.value.copy( + isLoading = false, + loadingAction = null, + serverUrl = it.serverBaseUrl, + isAuthenticated = true + ) + }.onFailure { + _uiState.value = _uiState.value.copy( + isLoading = false, + loadingAction = null, + error = it.message + ) + } + } + } + + private fun String.withoutLineBreaks(): String { + return replace("\r", "").replace("\n", "") + } +} diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt b/app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt new file mode 100644 index 0000000..2fe0a11 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/player/PlayerScreen.kt @@ -0,0 +1,2894 @@ +package com.example.furumi_android.ui.player + +import android.graphics.Bitmap +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Slider +import androidx.compose.material3.SliderDefaults +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.layout.ContentScale +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.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 + +private enum class PlayerTab( + val label: String +) { + Global("Global"), + Search("Search"), + Library("Library") +} + +private data class MockTrack( + val title: String, + val artist: String, + val duration: String, + val colors: List +) + +private data class MockPlaylist( + val title: String, + val subtitle: String, + val description: String, + val colors: List, + val tracks: List +) + +@Composable +fun PlayerScreen( + viewModel: PlayerViewModel = hiltViewModel(), + onLoggedOut: () -> Unit +) { + val uiState by viewModel.uiState.collectAsState() + var selectedTabName by rememberSaveable { mutableStateOf(PlayerTab.Global.name) } + val selectedTab = PlayerTab.entries.firstOrNull { it.name == selectedTabName } ?: PlayerTab.Global + var isProfileMenuOpen by rememberSaveable { mutableStateOf(false) } + var selectedPlaylistTitle by rememberSaveable { mutableStateOf(null) } + var isFullPlayerOpen by rememberSaveable { mutableStateOf(false) } + val selectedPlaylist = selectedPlaylistTitle?.let { title -> + mockPlaylists.firstOrNull { it.title == title } + } + + BackHandler( + enabled = selectedPlaylist != null || + uiState.selectedRelease != null || + uiState.selectedArtist != null || + isFullPlayerOpen || + isProfileMenuOpen || + uiState.isListeningHistoryVisible + ) { + when { + uiState.isListeningHistoryVisible -> viewModel.closeListeningHistory() + isFullPlayerOpen -> isFullPlayerOpen = false + selectedPlaylist != null -> selectedPlaylistTitle = null + uiState.selectedRelease != null -> viewModel.closeReleaseDetail() + uiState.selectedArtist != null -> viewModel.closeArtistDetail() + isProfileMenuOpen -> isProfileMenuOpen = false + } + } + + LaunchedEffect(uiState.isLoggedOut) { + if (uiState.isLoggedOut) { + onLoggedOut() + } + } + + Box( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background) + .windowInsetsPadding(WindowInsets.safeDrawing) + ) { + Column(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .weight(1f) + .fillMaxWidth() + ) { + val onProfileClick = { isProfileMenuOpen = !isProfileMenuOpen } + if (selectedPlaylist != null) { + Box( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + ) { + PlaylistDetailContent( + playlist = selectedPlaylist, + onBack = { selectedPlaylistTitle = null }, + onTrackClick = { isFullPlayerOpen = true }, + onPlayClick = { isFullPlayerOpen = true } + ) + } + } else if (uiState.selectedRelease != null) { + Box( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + ) { + ReleaseDetailContent( + uiState = uiState, + onBack = viewModel::closeReleaseDetail, + onRetry = viewModel::retryReleaseDetail, + onMediaImageNeeded = viewModel::loadMediaImage, + onPlayClick = { + if (viewModel.playReleaseTracks(shuffle = false)) { + isFullPlayerOpen = true + } + }, + onShuffleClick = { + if (viewModel.playReleaseTracks(shuffle = true)) { + isFullPlayerOpen = true + } + }, + onTrackClick = { track -> + if (viewModel.playTrack(track, uiState.releaseDetail?.tracks.orEmpty())) { + isFullPlayerOpen = true + } + } + ) + } + } else if (uiState.selectedArtist != null) { + Box( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + ) { + ArtistDetailContent( + uiState = uiState, + onBack = viewModel::closeArtistDetail, + onRetry = viewModel::retryArtistDetail, + onMediaImageNeeded = viewModel::loadMediaImage, + onPlayClick = { + if (viewModel.playArtistTracks(shuffle = false)) { + isFullPlayerOpen = true + } + }, + onRadioClick = { + if (viewModel.playArtistTracks(shuffle = true)) { + isFullPlayerOpen = true + } + }, + onTrackClick = { track -> + if (viewModel.playTrack(track, uiState.artistDetail?.topTracks.orEmpty())) { + isFullPlayerOpen = true + } + }, + onReleaseClick = viewModel::openRelease + ) + } + } else { + when (selectedTab) { + PlayerTab.Global -> GlobalContent( + uiState = uiState, + onProfileClick = onProfileClick, + onRetry = viewModel::retryGlobalArtists, + onLoadMore = viewModel::loadMoreGlobalArtists, + onArtistImageNeeded = viewModel::loadMediaImage, + onArtistClick = viewModel::openArtist + ) + PlayerTab.Search -> Box( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + ) { + SearchContent(onProfileClick) + } + PlayerTab.Library -> Box( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + ) { + LibraryContent( + onProfileClick = onProfileClick, + onPlaylistClick = { selectedPlaylistTitle = it.title } + ) + } + } + } + } + + uiState.playback.currentTrack?.let { track -> + NowPlayingBar( + playback = uiState.playback, + coverBitmap = track.coverUrl?.let { uiState.mediaImages[it] }, + onMediaImageNeeded = viewModel::loadMediaImage, + onClick = { isFullPlayerOpen = true }, + onPlayPause = viewModel::togglePlayPause + ) + } + BottomPlayerNav( + selectedTab = selectedTab, + onTabSelected = { + selectedTabName = it.name + selectedPlaylistTitle = null + } + ) + } + + if (isProfileMenuOpen) { + ProfileMenu( + uiState = uiState, + onHistoryClick = { + isProfileMenuOpen = false + viewModel.openListeningHistory() + }, + onLogout = viewModel::logout, + modifier = Modifier + .align(Alignment.TopEnd) + .padding(top = 72.dp, end = 20.dp) + ) + } + + if (isFullPlayerOpen && uiState.playback.currentTrack != null) { + FullPlayerOverlay( + playback = uiState.playback, + coverBitmap = uiState.playback.currentTrack?.coverUrl?.let { uiState.mediaImages[it] }, + onMediaImageNeeded = viewModel::loadMediaImage, + onDismiss = { isFullPlayerOpen = false }, + onPlayPause = viewModel::togglePlayPause, + onPrevious = viewModel::previousTrack, + onNext = viewModel::nextTrack, + onSeekToProgress = viewModel::seekToPlaybackProgress, + onQueueTrackClick = { track -> + viewModel.playTrack(track, uiState.playback.queue) + } + ) + } + + if (uiState.isListeningHistoryVisible) { + ListeningHistoryPanel( + uiState = uiState, + onDismiss = viewModel::closeListeningHistory, + onRetry = viewModel::retryListeningHistory + ) + } + } +} + +@Composable +private fun GlobalContent( + uiState: PlayerUiState, + onProfileClick: () -> Unit, + onRetry: () -> Unit, + onLoadMore: () -> Unit, + onArtistImageNeeded: (String?) -> Unit, + onArtistClick: (ArtistCard) -> Unit +) { + LazyVerticalGrid( + columns = GridCells.Adaptive(minSize = 148.dp), + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(horizontal = 20.dp, vertical = 24.dp), + horizontalArrangement = Arrangement.spacedBy(14.dp), + verticalArrangement = Arrangement.spacedBy(18.dp) + ) { + item(span = { GridItemSpan(maxLineSpan) }) { + PlayerHeader( + title = "Global", + subtitle = artistsSubtitle(uiState), + onProfileClick = onProfileClick + ) + } + + when { + uiState.isGlobalArtistsLoading && uiState.globalArtists.isEmpty() -> { + item(span = { GridItemSpan(maxLineSpan) }) { GlobalArtistsLoading() } + } + + uiState.globalArtistsError != null && uiState.globalArtists.isEmpty() -> { + item(span = { GridItemSpan(maxLineSpan) }) { + GlobalArtistsError( + message = uiState.globalArtistsError, + onRetry = onRetry + ) + } + } + + uiState.globalArtists.isEmpty() -> { + item(span = { GridItemSpan(maxLineSpan) }) { GlobalArtistsEmpty() } + } + + else -> { + item(span = { GridItemSpan(maxLineSpan) }) { + Text( + text = "Artists", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + } + + items( + items = uiState.globalArtists, + key = { artist -> artist.id } + ) { artist -> + ArtistTile( + artist = artist, + bitmap = artist.imageUrl?.let { uiState.mediaImages[it] }, + onArtistImageNeeded = onArtistImageNeeded, + onClick = { onArtistClick(artist) } + ) + } + + item(span = { GridItemSpan(maxLineSpan) }) { + GlobalArtistsFooter( + uiState = uiState, + onLoadMore = onLoadMore + ) + } + } + } + } +} + +@Composable +private fun ArtistTile( + artist: ArtistCard, + bitmap: Bitmap?, + onArtistImageNeeded: (String?) -> Unit, + onClick: () -> Unit +) { + LaunchedEffect(artist.imageUrl) { + onArtistImageNeeded(artist.imageUrl) + } + + Column( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onClick) + ) { + ArtistArtwork( + artist = artist, + bitmap = bitmap, + modifier = Modifier + .fillMaxWidth() + .aspectRatio(1f) + ) + Spacer(modifier = Modifier.height(10.dp)) + Text( + text = artist.name, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = "${pluralCount(artist.releaseCount, "release")} / ${pluralCount(artist.trackCount, "track")}", + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} + +@Composable +private fun ArtistArtwork( + artist: ArtistCard, + bitmap: Bitmap?, + modifier: Modifier +) { + MediaArtwork( + title = artist.name, + seedId = artist.id, + bitmap = bitmap, + modifier = modifier, + cornerRadius = 8 + ) +} + +@Composable +private fun MediaArtwork( + title: String, + seedId: Long, + bitmap: Bitmap?, + modifier: Modifier, + cornerRadius: Int +) { + Box( + modifier = modifier + .clip(RoundedCornerShape(cornerRadius.dp)) + .background(Brush.linearGradient(artistArtworkColors(seedId))) + .border(1.dp, Color.White.copy(alpha = 0.10f), RoundedCornerShape(cornerRadius.dp)), + contentAlignment = Alignment.Center + ) { + if (bitmap != null) { + Image( + bitmap = bitmap.asImageBitmap(), + contentDescription = "$title image", + modifier = Modifier.fillMaxSize(), + contentScale = ContentScale.Crop + ) + } else { + Text( + text = title.firstOrNull()?.uppercaseChar()?.toString() ?: "#", + style = MaterialTheme.typography.titleMedium, + color = Color.White, + fontWeight = FontWeight.ExtraBold + ) + } + } +} + +@Composable +private fun ArtistDetailContent( + uiState: PlayerUiState, + onBack: () -> Unit, + onRetry: () -> Unit, + onMediaImageNeeded: (String?) -> Unit, + onPlayClick: () -> Unit, + onRadioClick: () -> Unit, + onTrackClick: (TrackCard) -> Unit, + onReleaseClick: (ReleaseCard) -> Unit +) { + val artist = uiState.artistDetail?.artist ?: uiState.selectedArtist ?: return + val artistImage = artist.imageUrl?.let { uiState.mediaImages[it] } + + LaunchedEffect(artist.imageUrl) { + onMediaImageNeeded(artist.imageUrl) + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 20.dp) + ) { + Row( + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onBack) + .padding(vertical = 8.dp, horizontal = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + BackGlyph( + modifier = Modifier.size(20.dp), + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = "Artist", + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground + ) + } + + Spacer(modifier = Modifier.height(20.dp)) + + ArtistDetailHero( + artist = artist, + bitmap = artistImage, + onPlayClick = onPlayClick, + onRadioClick = onRadioClick + ) + + Spacer(modifier = Modifier.height(28.dp)) + + when { + uiState.isArtistDetailLoading && uiState.artistDetail == null -> ArtistDetailLoading() + uiState.artistDetailError != null && uiState.artistDetail == null -> ArtistDetailError( + message = uiState.artistDetailError, + onRetry = onRetry + ) + uiState.artistDetail != null -> { + val detail = uiState.artistDetail + if (detail.topTracks.isNotEmpty()) { + PopularTracksSection( + tracks = detail.topTracks, + mediaImages = uiState.mediaImages, + onMediaImageNeeded = onMediaImageNeeded, + onTrackClick = onTrackClick + ) + Spacer(modifier = Modifier.height(28.dp)) + } + + ReleasesSection( + releases = detail.releases, + mediaImages = uiState.mediaImages, + onMediaImageNeeded = onMediaImageNeeded, + onReleaseClick = onReleaseClick + ) + } + } + + Spacer(modifier = Modifier.height(24.dp)) + } +} + +@Composable +private fun ArtistDetailHero( + artist: ArtistCard, + bitmap: Bitmap?, + onPlayClick: () -> Unit, + onRadioClick: () -> Unit +) { + Column { + MediaArtwork( + title = artist.name, + seedId = artist.id, + bitmap = bitmap, + modifier = Modifier + .size(210.dp) + .align(Alignment.CenterHorizontally), + cornerRadius = 10 + ) + Spacer(modifier = Modifier.height(22.dp)) + Text( + text = artist.name, + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "${pluralCount(artist.releaseCount, "release")} / ${pluralCount(artist.trackCount, "track")}", + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Spacer(modifier = Modifier.height(18.dp)) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + PillAction( + label = "Play", + selected = true, + modifier = Modifier.weight(1f), + onClick = onPlayClick + ) + Spacer(modifier = Modifier.width(12.dp)) + PillAction( + label = "Radio", + selected = false, + modifier = Modifier.weight(1f), + onClick = onRadioClick + ) + } + } +} + +@Composable +private fun ArtistDetailLoading() { + Box( + modifier = Modifier + .fillMaxWidth() + .height(180.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = FurumiNeonPink, + strokeWidth = 2.dp + ) + } +} + +@Composable +private fun ArtistDetailError( + message: String, + onRetry: () -> Unit +) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "Could not load artist", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Spacer(modifier = Modifier.height(14.dp)) + PillAction( + label = "Retry", + selected = true, + onClick = onRetry + ) + } + } +} + +@Composable +private fun PopularTracksSection( + tracks: List, + mediaImages: Map, + onMediaImageNeeded: (String?) -> Unit, + onTrackClick: (TrackCard) -> Unit +) { + SectionTitle("Popular") + Spacer(modifier = Modifier.height(12.dp)) + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + tracks.take(5).forEachIndexed { index, track -> + ArtistDetailTrackRow( + index = index + 1, + track = track, + bitmap = track.coverUrl?.let { mediaImages[it] }, + onMediaImageNeeded = onMediaImageNeeded, + onTrackClick = onTrackClick + ) + } + } +} + +@Composable +private fun ArtistDetailTrackRow( + index: Int, + track: TrackCard, + bitmap: Bitmap?, + onMediaImageNeeded: (String?) -> Unit, + onTrackClick: (TrackCard) -> Unit +) { + LaunchedEffect(track.coverUrl) { + onMediaImageNeeded(track.coverUrl) + } + + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable { onTrackClick(track) } + .padding(vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = index.toString(), + modifier = Modifier.width(28.dp), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + MediaArtwork( + title = track.title, + seedId = track.id, + bitmap = bitmap, + modifier = Modifier.size(48.dp), + cornerRadius = 6 + ) + Spacer(modifier = Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = track.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = track.artists.joinToString(", ") + .ifBlank { track.releaseTitle.orEmpty() } + .ifBlank { "Unknown artist" }, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Text( + text = formatDuration(track.durationSeconds), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } +} + +@Composable +private fun ReleasesSection( + releases: List, + mediaImages: Map, + onMediaImageNeeded: (String?) -> Unit, + onReleaseClick: (ReleaseCard) -> Unit +) { + SectionTitle("Releases") + Spacer(modifier = Modifier.height(12.dp)) + + if (releases.isEmpty()) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Text( + text = "No releases yet", + modifier = Modifier.padding(16.dp), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + return + } + + Column(verticalArrangement = Arrangement.spacedBy(18.dp)) { + releases.chunked(2).forEach { row -> + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(14.dp) + ) { + row.forEach { release -> + ReleaseTile( + release = release, + bitmap = release.coverUrl?.let { mediaImages[it] }, + onMediaImageNeeded = onMediaImageNeeded, + onClick = { onReleaseClick(release) }, + modifier = Modifier.weight(1f) + ) + } + + if (row.size == 1) { + Spacer(modifier = Modifier.weight(1f)) + } + } + } + } +} + +@Composable +private fun ReleaseTile( + release: ReleaseCard, + bitmap: Bitmap?, + onMediaImageNeeded: (String?) -> Unit, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + LaunchedEffect(release.coverUrl) { + onMediaImageNeeded(release.coverUrl) + } + + Column( + modifier = modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onClick) + ) { + MediaArtwork( + title = release.title, + seedId = release.id, + bitmap = bitmap, + modifier = Modifier + .fillMaxWidth() + .aspectRatio(1f), + cornerRadius = 8 + ) + Spacer(modifier = Modifier.height(10.dp)) + Text( + text = release.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = releaseMeta(release), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} + +@Composable +private fun ReleaseDetailContent( + uiState: PlayerUiState, + onBack: () -> Unit, + onRetry: () -> Unit, + onMediaImageNeeded: (String?) -> Unit, + onPlayClick: () -> Unit, + onShuffleClick: () -> Unit, + onTrackClick: (TrackCard) -> Unit +) { + val release = uiState.releaseDetail?.release ?: uiState.selectedRelease ?: return + val releaseImage = release.coverUrl?.let { uiState.mediaImages[it] } + val artists = uiState.releaseDetail?.artists.orEmpty() + + LaunchedEffect(release.coverUrl) { + onMediaImageNeeded(release.coverUrl) + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 20.dp) + ) { + Row( + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onBack) + .padding(vertical = 8.dp, horizontal = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + BackGlyph( + modifier = Modifier.size(20.dp), + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = "Release", + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground + ) + } + + Spacer(modifier = Modifier.height(20.dp)) + + ReleaseDetailHero( + release = release, + artistsText = releaseArtistsText(artists), + bitmap = releaseImage, + onPlayClick = onPlayClick, + onShuffleClick = onShuffleClick + ) + + Spacer(modifier = Modifier.height(28.dp)) + + when { + uiState.isReleaseDetailLoading && uiState.releaseDetail == null -> ReleaseDetailLoading() + uiState.releaseDetailError != null && uiState.releaseDetail == null -> ReleaseDetailError( + message = uiState.releaseDetailError, + onRetry = onRetry + ) + uiState.releaseDetail != null -> ReleaseTracksSection( + tracks = uiState.releaseDetail.tracks, + onTrackClick = onTrackClick + ) + } + + Spacer(modifier = Modifier.height(24.dp)) + } +} + +@Composable +private fun ReleaseDetailHero( + release: ReleaseCard, + artistsText: String, + bitmap: Bitmap?, + onPlayClick: () -> Unit, + onShuffleClick: () -> Unit +) { + Column { + MediaArtwork( + title = release.title, + seedId = release.id, + bitmap = bitmap, + modifier = Modifier + .size(210.dp) + .align(Alignment.CenterHorizontally), + cornerRadius = 10 + ) + Spacer(modifier = Modifier.height(22.dp)) + Text( + text = release.title, + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = artistsText, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = releaseMeta(release), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(18.dp)) + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + PillAction( + label = "Play", + selected = true, + modifier = Modifier.weight(1f), + onClick = onPlayClick + ) + Spacer(modifier = Modifier.width(12.dp)) + PillAction( + label = "Shuffle", + selected = false, + modifier = Modifier.weight(1f), + onClick = onShuffleClick + ) + } + } +} + +@Composable +private fun ReleaseDetailLoading() { + Box( + modifier = Modifier + .fillMaxWidth() + .height(180.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = FurumiNeonPink, + strokeWidth = 2.dp + ) + } +} + +@Composable +private fun ReleaseDetailError( + message: String, + onRetry: () -> Unit +) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "Could not load release", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Spacer(modifier = Modifier.height(14.dp)) + PillAction( + label = "Retry", + selected = true, + onClick = onRetry + ) + } + } +} + +@Composable +private fun ReleaseTracksSection( + tracks: List, + onTrackClick: (TrackCard) -> Unit +) { + SectionTitle("Tracks") + Spacer(modifier = Modifier.height(12.dp)) + + if (tracks.isEmpty()) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Text( + text = "No tracks yet", + modifier = Modifier.padding(16.dp), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + return + } + + val groupedTracks = tracks.groupBy { it.discNumber ?: 1 }.toSortedMap() + + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + groupedTracks.forEach { (discNumber, discTracks) -> + if (groupedTracks.size > 1) { + Text( + text = "Disc $discNumber", + style = MaterialTheme.typography.labelLarge, + color = FurumiTextMuted + ) + } + + discTracks.forEachIndexed { index, track -> + ReleaseTrackRow( + fallbackIndex = index + 1, + track = track, + onTrackClick = onTrackClick + ) + } + } + } +} + +@Composable +private fun ReleaseTrackRow( + fallbackIndex: Int, + track: TrackCard, + onTrackClick: (TrackCard) -> Unit +) { + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable { onTrackClick(track) } + .padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = (track.trackNumber ?: fallbackIndex).toString(), + modifier = Modifier.width(32.dp), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Column(modifier = Modifier.weight(1f)) { + Text( + text = track.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = track.artists.joinToString(", ").ifBlank { "Unknown artist" }, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Spacer(modifier = Modifier.width(10.dp)) + Text( + text = formatDuration(track.durationSeconds), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } +} + +@Composable +private fun GlobalArtistsFooter( + uiState: PlayerUiState, + onLoadMore: () -> Unit +) { + when { + uiState.isGlobalArtistsLoadingMore -> { + Box( + modifier = Modifier + .fillMaxWidth() + .height(72.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = FurumiNeonPink, + strokeWidth = 2.dp, + modifier = Modifier.size(24.dp) + ) + } + } + + uiState.globalArtistsError != null -> { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(10.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Row( + modifier = Modifier.padding(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = "Could not load more artists", + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = "Retry", + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onLoadMore) + .padding(horizontal = 10.dp, vertical = 8.dp), + style = MaterialTheme.typography.labelLarge, + color = FurumiNeonPink + ) + } + } + } + + uiState.globalArtistsHasMore -> { + LaunchedEffect(uiState.globalArtists.size, uiState.globalArtistsPage) { + onLoadMore() + } + + Box( + modifier = Modifier + .fillMaxWidth() + .height(72.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = FurumiNeonPink, + strokeWidth = 2.dp, + modifier = Modifier.size(24.dp) + ) + } + } + + else -> { + Text( + text = "${uiState.globalArtists.size} artists loaded", + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 18.dp), + style = MaterialTheme.typography.labelSmall, + color = FurumiTextMuted + ) + } + } +} + +@Composable +private fun GlobalArtistsLoading() { + Box( + modifier = Modifier + .fillMaxWidth() + .height(240.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = FurumiNeonPink, + strokeWidth = 2.dp + ) + } +} + +@Composable +private fun GlobalArtistsError( + message: String, + onRetry: () -> Unit +) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "Could not load artists", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Spacer(modifier = Modifier.height(14.dp)) + PillAction( + label = "Retry", + selected = true, + onClick = onRetry + ) + } + } +} + +@Composable +private fun GlobalArtistsEmpty() { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "No artists yet", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = "Artists uploaded to this server will appear here.", + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + } +} + +@Composable +private fun SearchContent(onProfileClick: () -> Unit) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 24.dp) + ) { + PlayerHeader(title = "Search", subtitle = "Find music on your server", onProfileClick = onProfileClick) + Spacer(modifier = Modifier.height(18.dp)) + Surface( + modifier = Modifier + .fillMaxWidth() + .height(54.dp), + shape = RoundedCornerShape(8.dp), + color = MaterialTheme.colorScheme.onBackground + ) { + Row( + modifier = Modifier.padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + SearchGlyph( + modifier = Modifier.size(22.dp), + color = FurumiBlack + ) + Spacer(modifier = Modifier.width(12.dp)) + Text( + text = "Artists, albums, tracks", + style = MaterialTheme.typography.bodyLarge, + color = FurumiBlack, + fontWeight = FontWeight.SemiBold + ) + } + } + + Spacer(modifier = Modifier.height(28.dp)) + SectionTitle("Browse") + Spacer(modifier = Modifier.height(12.dp)) + GenreGrid() + } +} + +@Composable +private fun LibraryContent( + onProfileClick: () -> Unit, + onPlaylistClick: (MockPlaylist) -> Unit +) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 24.dp) + ) { + PlayerHeader(title = "Your Library", subtitle = "Playlists and saved albums", onProfileClick = onProfileClick) + Spacer(modifier = Modifier.height(16.dp)) + FilterChips(listOf("Playlists", "Albums", "Artists")) + Spacer(modifier = Modifier.height(18.dp)) + LibraryRows(onPlaylistClick) + } +} + +@Composable +private fun PlaylistDetailContent( + playlist: MockPlaylist, + onBack: () -> Unit, + onTrackClick: (MockTrack) -> Unit, + onPlayClick: () -> Unit +) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 20.dp) + ) { + Row( + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onBack) + .padding(vertical = 8.dp, horizontal = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + BackGlyph( + modifier = Modifier.size(20.dp), + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = "Playlist", + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground + ) + } + + Spacer(modifier = Modifier.height(20.dp)) + + AlbumArtwork( + colors = playlist.colors, + modifier = Modifier + .size(190.dp) + .align(Alignment.CenterHorizontally), + cornerRadius = 10 + ) + + Spacer(modifier = Modifier.height(22.dp)) + + Text( + text = playlist.title, + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = playlist.description, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Spacer(modifier = Modifier.height(10.dp)) + Text( + text = "${playlist.tracks.size} tracks", + style = MaterialTheme.typography.labelSmall, + color = FurumiTextMuted + ) + + Spacer(modifier = Modifier.height(18.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + PillAction( + label = "Play", + selected = true, + modifier = Modifier.weight(1f), + onClick = onPlayClick + ) + Spacer(modifier = Modifier.width(12.dp)) + PillAction( + label = "Shuffle", + selected = false, + modifier = Modifier.weight(1f), + onClick = onPlayClick + ) + } + + Spacer(modifier = Modifier.height(24.dp)) + + playlist.tracks.forEachIndexed { index, track -> + PlaylistTrackRow( + index = index + 1, + track = track, + onTrackClick = onTrackClick + ) + if (index < playlist.tracks.lastIndex) { + Spacer(modifier = Modifier.height(12.dp)) + } + } + + Spacer(modifier = Modifier.height(24.dp)) + } +} + +@Composable +private fun ListeningHistoryPanel( + uiState: PlayerUiState, + onDismiss: () -> Unit, + onRetry: () -> Unit +) { + Surface( + modifier = Modifier + .fillMaxSize() + .windowInsetsPadding(WindowInsets.safeDrawing), + color = MaterialTheme.colorScheme.background + ) { + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(horizontal = 20.dp, vertical = 20.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Column { + Text( + text = "Listening history", + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Text( + text = if (uiState.listeningHistoryTotal > 0) { + "${uiState.listeningHistoryTotal} plays" + } else { + "Recently played tracks" + }, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + + Text( + text = "Close", + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onDismiss) + .padding(horizontal = 10.dp, vertical = 8.dp), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground + ) + } + + Spacer(modifier = Modifier.height(22.dp)) + + when { + uiState.isListeningHistoryLoading -> ListeningHistoryLoading() + uiState.listeningHistoryError != null -> ListeningHistoryError( + message = uiState.listeningHistoryError, + onRetry = onRetry + ) + uiState.listeningHistory.isEmpty() -> ListeningHistoryEmpty() + else -> ListeningHistoryList(uiState.listeningHistory) + } + } + } +} + +@Composable +private fun ListeningHistoryLoading() { + Box( + modifier = Modifier + .fillMaxWidth() + .height(220.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = FurumiNeonPink, + strokeWidth = 2.dp + ) + } +} + +@Composable +private fun ListeningHistoryError( + message: String, + onRetry: () -> Unit +) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "Could not load history", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Spacer(modifier = Modifier.height(14.dp)) + PillAction( + label = "Retry", + selected = true, + onClick = onRetry + ) + } + } +} + +@Composable +private fun ListeningHistoryEmpty() { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = "No plays yet", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = "Tracks you play will appear here.", + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + } +} + +@Composable +private fun ListeningHistoryList(items: List) { + Column(verticalArrangement = Arrangement.spacedBy(14.dp)) { + items.forEach { item -> + ListeningHistoryRow(item) + } + } +} + +@Composable +private fun ListeningHistoryRow(item: ListeningHistoryItem) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(10.dp), + color = FurumiSurface, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Row( + modifier = Modifier.padding(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + AlbumArtwork( + colors = historyArtworkColors(item.trackId), + modifier = Modifier.size(54.dp), + cornerRadius = 8 + ) + Spacer(modifier = Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = item.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = item.artists.joinToString(", ").ifBlank { "Unknown artist" }, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = item.releaseTitle ?: "Unknown release", + style = MaterialTheme.typography.labelSmall, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Spacer(modifier = Modifier.width(10.dp)) + Column(horizontalAlignment = Alignment.End) { + Text( + text = formatListenedDuration(item.durationListenedSeconds), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onBackground + ) + Text( + text = if (item.completed) "Completed" else "Partial", + style = MaterialTheme.typography.labelSmall, + color = if (item.completed) FurumiNeonPink else FurumiTextMuted + ) + } + } + } +} + +@Composable +private fun PlaylistTrackRow( + index: Int, + track: MockTrack, + onTrackClick: (MockTrack) -> Unit +) { + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable { onTrackClick(track) } + .padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = index.toString(), + modifier = Modifier.width(28.dp), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + Column(modifier = Modifier.weight(1f)) { + Text( + text = track.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = track.artist, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Text( + text = track.duration, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } +} + +@Composable +private fun PlayerHeader( + title: String, + subtitle: String, + onProfileClick: () -> Unit +) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Column { + Text( + text = title, + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Text( + text = subtitle, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + + Row( + modifier = Modifier + .height(38.dp) + .clip(CircleShape) + .background(FurumiSurfaceHigh) + .border(1.dp, FurumiLine, CircleShape) + .clickable(onClick = onProfileClick) + .padding(start = 5.dp, end = 12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .size(28.dp) + .clip(CircleShape) + .background(FurumiNeonPink), + contentAlignment = Alignment.Center + ) { + Text( + text = "F", + style = MaterialTheme.typography.labelSmall, + color = FurumiBlack, + fontWeight = FontWeight.ExtraBold + ) + } + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = "Profile", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onBackground + ) + } + } +} + +@Composable +private fun ProfileMenu( + uiState: PlayerUiState, + onHistoryClick: () -> Unit, + onLogout: () -> Unit, + modifier: Modifier = Modifier +) { + Surface( + modifier = modifier.width(284.dp), + shape = RoundedCornerShape(12.dp), + color = FurumiSurfaceHigh, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine), + shadowElevation = 8.dp + ) { + Column( + modifier = Modifier.padding(16.dp) + ) { + Text( + text = "Profile", + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) + Spacer(modifier = Modifier.height(14.dp)) + Text( + text = uiState.userName, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = uiState.serverUrl.ifBlank { "No server selected" }, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(16.dp)) + OutlinedButton( + onClick = onHistoryClick, + modifier = Modifier + .fillMaxWidth() + .height(46.dp), + shape = CircleShape, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine), + colors = ButtonDefaults.outlinedButtonColors( + contentColor = MaterialTheme.colorScheme.onBackground, + disabledContentColor = FurumiTextMuted + ) + ) { + Text("Listening history") + } + Spacer(modifier = Modifier.height(10.dp)) + Button( + onClick = onLogout, + modifier = Modifier + .fillMaxWidth() + .height(48.dp), + enabled = !uiState.isLoggingOut, + shape = CircleShape, + colors = ButtonDefaults.buttonColors( + containerColor = FurumiNeonPink, + contentColor = FurumiBlack, + disabledContainerColor = FurumiSurface, + disabledContentColor = FurumiTextMuted + ) + ) { + if (uiState.isLoggingOut) { + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + color = FurumiBlack, + strokeWidth = 2.dp + ) + } else { + Text("Log out") + } + } + } + } +} + +@Composable +private fun QuickAccessGrid(onPlaylistClick: (MockPlaylist) -> Unit) { + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + QuickAccessItem(mockPlaylists[0], Modifier.weight(1f), onPlaylistClick) + QuickAccessItem(mockPlaylists[1], Modifier.weight(1f), onPlaylistClick) + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + QuickAccessItem(mockPlaylists[2], Modifier.weight(1f), onPlaylistClick) + QuickAccessItem(mockPlaylists[3], Modifier.weight(1f), onPlaylistClick) + } + } +} + +@Composable +private fun QuickAccessItem( + playlist: MockPlaylist, + modifier: Modifier, + onPlaylistClick: (MockPlaylist) -> Unit +) { + Surface( + modifier = modifier + .height(64.dp) + .clip(RoundedCornerShape(8.dp)) + .clickable { onPlaylistClick(playlist) }, + shape = RoundedCornerShape(8.dp), + color = FurumiSurface + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + AlbumArtwork( + colors = playlist.colors, + modifier = Modifier.size(64.dp), + cornerRadius = 8 + ) + Text( + text = playlist.title, + modifier = Modifier.padding(horizontal = 10.dp), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + } + } +} + +@Composable +private fun SectionTitle(title: String) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onBackground + ) +} + +@Composable +private fun PlaylistRail( + playlists: List, + onPlaylistClick: (MockPlaylist) -> Unit +) { + Row( + modifier = Modifier.horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(14.dp) + ) { + playlists.forEach { playlist -> + Column( + modifier = Modifier + .width(142.dp) + .clip(RoundedCornerShape(8.dp)) + .clickable { onPlaylistClick(playlist) } + ) { + AlbumArtwork( + colors = playlist.colors, + modifier = Modifier + .size(142.dp) + .clip(RoundedCornerShape(8.dp)), + cornerRadius = 8 + ) + Spacer(modifier = Modifier.height(10.dp)) + Text( + text = playlist.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = playlist.subtitle, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + } + } +} + +@Composable +private fun TrackList( + tracks: List, + onTrackClick: (MockTrack) -> Unit +) { + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + tracks.forEach { track -> + TrackRow(track, onTrackClick) + } + } +} + +@Composable +private fun TrackRow( + track: MockTrack, + onTrackClick: (MockTrack) -> Unit +) { + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable { onTrackClick(track) } + .padding(vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + AlbumArtwork( + colors = track.colors, + modifier = Modifier.size(48.dp), + cornerRadius = 6 + ) + Spacer(modifier = Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = track.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = track.artist, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Text( + text = track.duration, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } +} + +@Composable +private fun FilterChips(filters: List) { + Row( + modifier = Modifier.horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + filters.forEachIndexed { index, filter -> + Surface( + shape = CircleShape, + color = if (index == 0) FurumiNeonPink else FurumiSurface, + border = if (index == 0) null else androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Text( + text = filter, + modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp), + style = MaterialTheme.typography.labelSmall, + color = if (index == 0) FurumiBlack else MaterialTheme.colorScheme.onBackground + ) + } + } + } +} + +@Composable +private fun LibraryRows(onPlaylistClick: (MockPlaylist) -> Unit) { + Column(verticalArrangement = Arrangement.spacedBy(14.dp)) { + mockPlaylists.forEach { playlist -> + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable { onPlaylistClick(playlist) }, + verticalAlignment = Alignment.CenterVertically + ) { + AlbumArtwork( + colors = playlist.colors, + modifier = Modifier.size(56.dp), + cornerRadius = 8 + ) + Spacer(modifier = Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = playlist.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground + ) + Text( + text = playlist.subtitle, + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } + } + } + } +} + +@Composable +private fun GenreGrid() { + val genres = listOf( + "Synthwave" to listOf(FurumiNeonPink, FurumiNeonViolet), + "Electronic" to listOf(FurumiElectricCyan, FurumiSurfaceHigh), + "Indie" to listOf(FurumiHotOrange, FurumiNeonPink), + "Focus" to listOf(FurumiNeonViolet, FurumiSurface) + ) + + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + genres.chunked(2).forEach { row -> + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + row.forEach { genre -> + GenreTile( + title = genre.first, + colors = genre.second, + modifier = Modifier.weight(1f) + ) + } + } + } + } +} + +@Composable +private fun GenreTile( + title: String, + colors: List, + modifier: Modifier +) { + Box( + modifier = modifier + .height(110.dp) + .clip(RoundedCornerShape(8.dp)) + .background(Brush.linearGradient(colors)) + .border(1.dp, Color.White.copy(alpha = 0.12f), RoundedCornerShape(8.dp)) + .padding(14.dp) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + color = Color.White + ) + } +} + +@Composable +private fun PillAction( + label: String, + selected: Boolean, + modifier: Modifier = Modifier, + onClick: () -> Unit +) { + Surface( + modifier = modifier + .height(48.dp) + .clip(CircleShape) + .clickable(onClick = onClick), + shape = CircleShape, + color = if (selected) FurumiNeonPink else FurumiSurface, + border = if (selected) null else androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Box(contentAlignment = Alignment.Center) { + Text( + text = label, + style = MaterialTheme.typography.labelLarge, + color = if (selected) FurumiBlack else MaterialTheme.colorScheme.onBackground + ) + } + } +} + +@Composable +private fun NowPlayingBar( + playback: AudioPlaybackState, + coverBitmap: Bitmap?, + onMediaImageNeeded: (String?) -> Unit, + onClick: () -> Unit, + onPlayPause: () -> Unit +) { + val track = playback.currentTrack ?: return + + LaunchedEffect(track.coverUrl) { + onMediaImageNeeded(track.coverUrl) + } + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 10.dp, vertical = 6.dp) + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onClick), + shape = RoundedCornerShape(8.dp), + color = FurumiSurfaceHigh, + border = androidx.compose.foundation.BorderStroke(1.dp, FurumiLine) + ) { + Column { + Row( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + MediaArtwork( + title = track.title, + seedId = track.id, + bitmap = coverBitmap, + modifier = Modifier.size(42.dp), + cornerRadius = 6 + ) + Spacer(modifier = Modifier.width(10.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = track.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = playback.errorMessage ?: trackSubtitle(track), + style = MaterialTheme.typography.bodyMedium, + color = if (playback.errorMessage == null) FurumiTextMuted else FurumiHotOrange, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Box( + modifier = Modifier + .size(38.dp) + .clip(CircleShape) + .background(FurumiNeonPink) + .clickable(onClick = onPlayPause), + contentAlignment = Alignment.Center + ) { + PlaybackGlyph( + playback = playback, + playSize = 16, + pauseSize = 16 + ) + } + } + Box( + modifier = Modifier + .fillMaxWidth() + .height(3.dp) + .background(FurumiLine) + ) { + Box( + modifier = Modifier + .fillMaxWidth(playback.progress) + .fillMaxHeight() + .background(FurumiNeonPink) + ) + } + } + } +} + +@Composable +private fun FullPlayerOverlay( + playback: AudioPlaybackState, + coverBitmap: Bitmap?, + onMediaImageNeeded: (String?) -> Unit, + onDismiss: () -> Unit, + onPlayPause: () -> Unit, + onPrevious: () -> Unit, + onNext: () -> Unit, + onSeekToProgress: (Float) -> Unit, + onQueueTrackClick: (TrackCard) -> Unit +) { + val track = playback.currentTrack ?: return + val upcomingQueue = playback.queue.drop(playback.currentIndex + 1) + + LaunchedEffect(track.coverUrl) { + onMediaImageNeeded(track.coverUrl) + } + + Box( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background) + .windowInsetsPadding(WindowInsets.safeDrawing) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(horizontal = 24.dp, vertical = 18.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = "Now playing", + style = MaterialTheme.typography.labelLarge, + color = FurumiTextMuted + ) + Text( + text = "Done", + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onDismiss) + .padding(horizontal = 10.dp, vertical = 8.dp), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground + ) + } + + Spacer(modifier = Modifier.height(36.dp)) + + MediaArtwork( + title = track.title, + seedId = track.id, + bitmap = coverBitmap, + modifier = Modifier + .fillMaxWidth() + .aspectRatio(1f), + cornerRadius = 12 + ) + + Spacer(modifier = Modifier.height(28.dp)) + + Text( + text = track.title, + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = playback.errorMessage ?: trackSubtitle(track), + style = MaterialTheme.typography.bodyLarge, + color = if (playback.errorMessage == null) FurumiTextMuted else FurumiHotOrange, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + + Spacer(modifier = Modifier.height(26.dp)) + + PlayerProgress( + playback = playback, + onSeekToProgress = onSeekToProgress + ) + + Spacer(modifier = Modifier.height(24.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically + ) { + RoundControlButton( + size = 48, + background = FurumiSurface, + onClick = onPrevious + ) { + PreviousGlyph(Modifier.size(20.dp), MaterialTheme.colorScheme.onBackground) + } + RoundControlButton( + size = 72, + background = FurumiNeonPink, + onClick = onPlayPause + ) { + PlaybackGlyph( + playback = playback, + playSize = 24, + pauseSize = 24 + ) + } + RoundControlButton( + size = 48, + background = FurumiSurface, + onClick = onNext + ) { + NextGlyph(Modifier.size(20.dp), MaterialTheme.colorScheme.onBackground) + } + } + + Spacer(modifier = Modifier.height(34.dp)) + + SectionTitle("Up next") + Spacer(modifier = Modifier.height(12.dp)) + if (upcomingQueue.isEmpty()) { + Text( + text = "Queue is empty", + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } else { + upcomingQueue.take(8).forEachIndexed { index, queueTrack -> + QueueTrackRow( + track = queueTrack, + onClick = { onQueueTrackClick(queueTrack) } + ) + if (index < upcomingQueue.take(8).lastIndex) { + Spacer(modifier = Modifier.height(12.dp)) + } + } + } + } + } +} + +@Composable +private fun QueueTrackRow( + track: TrackCard, + onClick: () -> Unit +) { + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onClick) + .padding(vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + MediaArtwork( + title = track.title, + seedId = track.id, + bitmap = null, + modifier = Modifier.size(48.dp), + cornerRadius = 6 + ) + Spacer(modifier = Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = track.title, + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onBackground, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = trackSubtitle(track), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + Text( + text = formatDuration(track.durationSeconds), + style = MaterialTheme.typography.bodyMedium, + color = FurumiTextMuted + ) + } +} + +@Composable +private fun PlayerProgress( + playback: AudioPlaybackState, + onSeekToProgress: (Float) -> Unit +) { + Column { + Slider( + value = playback.progress, + onValueChange = onSeekToProgress, + enabled = playback.durationMs > 0L, + colors = SliderDefaults.colors( + thumbColor = FurumiNeonPink, + activeTrackColor = FurumiNeonPink, + inactiveTrackColor = FurumiLine, + disabledThumbColor = FurumiTextMuted, + disabledActiveTrackColor = FurumiLine, + disabledInactiveTrackColor = FurumiLine + ) + ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = formatPlaybackTime(playback.positionMs), + style = MaterialTheme.typography.labelSmall, + color = FurumiTextMuted + ) + Text( + text = formatPlaybackTime(playback.durationMs), + style = MaterialTheme.typography.labelSmall, + color = FurumiTextMuted + ) + } + } +} + +@Composable +private fun RoundControlButton( + size: Int, + background: Color, + onClick: () -> Unit, + content: @Composable BoxScope.() -> Unit +) { + Box( + modifier = Modifier + .size(size.dp) + .clip(CircleShape) + .background(background) + .clickable(onClick = onClick), + contentAlignment = Alignment.Center, + content = content + ) +} + +@Composable +private fun BottomPlayerNav( + selectedTab: PlayerTab, + onTabSelected: (PlayerTab) -> Unit +) { + Surface( + color = FurumiBlack + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .height(66.dp) + .padding(horizontal = 14.dp), + horizontalArrangement = Arrangement.SpaceAround, + verticalAlignment = Alignment.CenterVertically + ) { + PlayerTab.entries.forEach { tab -> + BottomNavItem( + tab = tab, + selected = tab == selectedTab, + onClick = { onTabSelected(tab) } + ) + } + } + } +} + +@Composable +private fun BottomNavItem( + tab: PlayerTab, + selected: Boolean, + onClick: () -> Unit +) { + val color = if (selected) FurumiNeonPink else FurumiTextMuted + Column( + modifier = Modifier + .width(86.dp) + .clip(RoundedCornerShape(8.dp)) + .clickable(onClick = onClick) + .padding(vertical = 6.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + when (tab) { + PlayerTab.Global -> GlobalGlyph(Modifier.size(22.dp), color) + PlayerTab.Search -> SearchGlyph(Modifier.size(22.dp), color) + PlayerTab.Library -> LibraryGlyph(Modifier.size(22.dp), color) + } + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = tab.label, + style = MaterialTheme.typography.labelSmall, + color = color + ) + } +} + +@Composable +private fun AlbumArtwork( + colors: List, + modifier: Modifier, + cornerRadius: Int +) { + Box( + modifier = modifier + .clip(RoundedCornerShape(cornerRadius.dp)) + .background(Brush.linearGradient(colors)) + .border(1.dp, Color.White.copy(alpha = 0.10f), RoundedCornerShape(cornerRadius.dp)) + ) { + Canvas(modifier = Modifier.fillMaxSize()) { + drawCircle( + color = Color.White.copy(alpha = 0.16f), + radius = size.minDimension * 0.26f, + center = Offset(size.width * 0.72f, size.height * 0.24f) + ) + drawLine( + color = Color.White.copy(alpha = 0.18f), + start = Offset(size.width * 0.10f, size.height * 0.78f), + end = Offset(size.width * 0.92f, size.height * 0.34f), + strokeWidth = size.minDimension * 0.05f, + cap = StrokeCap.Round + ) + } + } +} + +@Composable +private fun PlayGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + val path = Path().apply { + moveTo(size.width * 0.28f, size.height * 0.18f) + lineTo(size.width * 0.28f, size.height * 0.82f) + lineTo(size.width * 0.82f, size.height * 0.50f) + close() + } + drawPath(path, color) + } +} + +@Composable +private fun PauseGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + val barWidth = size.width * 0.18f + drawRoundRect( + color = color, + topLeft = Offset(size.width * 0.24f, size.height * 0.18f), + size = androidx.compose.ui.geometry.Size(barWidth, size.height * 0.64f) + ) + drawRoundRect( + color = color, + topLeft = Offset(size.width * 0.58f, size.height * 0.18f), + size = androidx.compose.ui.geometry.Size(barWidth, size.height * 0.64f) + ) + } +} + +@Composable +private fun PlaybackGlyph( + playback: AudioPlaybackState, + playSize: Int, + pauseSize: Int +) { + when { + playback.isBuffering -> CircularProgressIndicator( + modifier = Modifier.size(pauseSize.dp), + color = FurumiBlack, + strokeWidth = 2.dp + ) + playback.isPlaying -> PauseGlyph(Modifier.size(pauseSize.dp), FurumiBlack) + else -> PlayGlyph(Modifier.size(playSize.dp), FurumiBlack) + } +} + +@Composable +private fun BackGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + drawLine( + color = color, + start = Offset(size.width * 0.72f, size.height * 0.16f), + end = Offset(size.width * 0.28f, size.height * 0.50f), + strokeWidth = size.minDimension * 0.12f, + cap = StrokeCap.Round + ) + drawLine( + color = color, + start = Offset(size.width * 0.28f, size.height * 0.50f), + end = Offset(size.width * 0.72f, size.height * 0.84f), + strokeWidth = size.minDimension * 0.12f, + cap = StrokeCap.Round + ) + } +} + +@Composable +private fun PreviousGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + val first = Path().apply { + moveTo(size.width * 0.48f, size.height * 0.18f) + lineTo(size.width * 0.48f, size.height * 0.82f) + lineTo(size.width * 0.16f, size.height * 0.50f) + close() + } + val second = Path().apply { + moveTo(size.width * 0.84f, size.height * 0.18f) + lineTo(size.width * 0.84f, size.height * 0.82f) + lineTo(size.width * 0.52f, size.height * 0.50f) + close() + } + drawPath(first, color) + drawPath(second, color) + } +} + +@Composable +private fun NextGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + val first = Path().apply { + moveTo(size.width * 0.16f, size.height * 0.18f) + lineTo(size.width * 0.16f, size.height * 0.82f) + lineTo(size.width * 0.48f, size.height * 0.50f) + close() + } + val second = Path().apply { + moveTo(size.width * 0.52f, size.height * 0.18f) + lineTo(size.width * 0.52f, size.height * 0.82f) + lineTo(size.width * 0.84f, size.height * 0.50f) + close() + } + drawPath(first, color) + drawPath(second, color) + } +} + +@Composable +private fun GlobalGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + val strokeWidth = size.minDimension * 0.09f + drawCircle( + color = color, + radius = size.minDimension * 0.38f, + center = Offset(size.width * 0.50f, size.height * 0.50f), + style = Stroke(width = strokeWidth) + ) + drawLine( + color = color, + start = Offset(size.width * 0.50f, size.height * 0.16f), + end = Offset(size.width * 0.50f, size.height * 0.84f), + strokeWidth = strokeWidth, + cap = StrokeCap.Round + ) + drawLine( + color = color, + start = Offset(size.width * 0.16f, size.height * 0.50f), + end = Offset(size.width * 0.84f, size.height * 0.50f), + strokeWidth = strokeWidth, + cap = StrokeCap.Round + ) + drawLine( + color = color.copy(alpha = 0.74f), + start = Offset(size.width * 0.24f, size.height * 0.34f), + end = Offset(size.width * 0.76f, size.height * 0.34f), + strokeWidth = strokeWidth * 0.78f, + cap = StrokeCap.Round + ) + drawLine( + color = color.copy(alpha = 0.74f), + start = Offset(size.width * 0.24f, size.height * 0.66f), + end = Offset(size.width * 0.76f, size.height * 0.66f), + strokeWidth = strokeWidth * 0.78f, + cap = StrokeCap.Round + ) + } +} + +@Composable +private fun SearchGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + drawCircle( + color = color, + radius = size.minDimension * 0.30f, + center = Offset(size.width * 0.42f, size.height * 0.42f), + style = Stroke(width = size.minDimension * 0.10f) + ) + drawLine( + color = color, + start = Offset(size.width * 0.64f, size.height * 0.64f), + end = Offset(size.width * 0.88f, size.height * 0.88f), + strokeWidth = size.minDimension * 0.10f, + cap = StrokeCap.Round + ) + } +} + +@Composable +private fun LibraryGlyph( + modifier: Modifier, + color: Color +) { + Canvas(modifier = modifier) { + val strokeWidth = size.minDimension * 0.10f + drawLine( + color = color, + start = Offset(size.width * 0.18f, size.height * 0.16f), + end = Offset(size.width * 0.18f, size.height * 0.86f), + strokeWidth = strokeWidth, + cap = StrokeCap.Round + ) + drawLine( + color = color, + start = Offset(size.width * 0.46f, size.height * 0.16f), + end = Offset(size.width * 0.46f, size.height * 0.86f), + strokeWidth = strokeWidth, + cap = StrokeCap.Round + ) + drawLine( + color = color, + start = Offset(size.width * 0.70f, size.height * 0.22f), + end = Offset(size.width * 0.86f, size.height * 0.82f), + strokeWidth = strokeWidth, + cap = StrokeCap.Round + ) + } +} + +private fun artistsSubtitle(uiState: PlayerUiState): String { + return if (uiState.globalArtistsTotal > 0) { + pluralCount(uiState.globalArtistsTotal, "artist") + } else { + "Artists on this server" + } +} + +private fun pluralCount(count: Long, singular: String): String { + val label = if (count == 1L) singular else "${singular}s" + return "$count $label" +} + +private fun pluralCount(count: Int, singular: String): String { + return pluralCount(count.toLong(), singular) +} + +private fun formatListenedDuration(seconds: Int?): String { + if (seconds == null || seconds <= 0) return "--" + val minutes = seconds / 60 + val remainingSeconds = seconds % 60 + return "$minutes:${remainingSeconds.toString().padStart(2, '0')}" +} + +private fun formatDuration(seconds: Int?): String { + if (seconds == null || seconds <= 0) return "--" + val minutes = seconds / 60 + val remainingSeconds = seconds % 60 + return "$minutes:${remainingSeconds.toString().padStart(2, '0')}" +} + +private fun formatPlaybackTime(milliseconds: Long): String { + if (milliseconds <= 0L) return "0:00" + val totalSeconds = milliseconds / 1_000L + val minutes = totalSeconds / 60L + val seconds = totalSeconds % 60L + return "$minutes:${seconds.toString().padStart(2, '0')}" +} + +private fun trackSubtitle(track: TrackCard): String { + return track.artists.joinToString(", ") + .ifBlank { track.releaseTitle.orEmpty() } + .ifBlank { "Unknown artist" } +} + +private fun releaseMeta(release: ReleaseCard): String { + val parts = buildList { + release.year?.let { add(it.toString()) } + release.releaseType + ?.replace('_', ' ') + ?.takeIf { it.isNotBlank() } + ?.let { add(it) } + add(pluralCount(release.trackCount, "track")) + } + + return parts.joinToString(" / ") +} + +private fun releaseArtistsText(artists: List): String { + return artists.joinToString(", ") { it.name }.ifBlank { "Unknown artist" } +} + +private fun artistArtworkColors(artistId: Long): List { + val palettes = listOf( + listOf(FurumiNeonPink, FurumiNeonViolet, FurumiBlack), + listOf(FurumiElectricCyan, FurumiSurfaceHigh), + listOf(FurumiHotOrange, FurumiNeonPink), + listOf(FurumiNeonViolet, FurumiSurface), + listOf(FurumiSurfaceHigh, FurumiNeonPink) + ) + return palettes[(artistId % palettes.size).toInt()] +} + +private fun historyArtworkColors(trackId: Long): List { + val palettes = listOf( + listOf(FurumiNeonPink, FurumiNeonViolet, FurumiBlack), + listOf(FurumiElectricCyan, FurumiSurfaceHigh), + listOf(FurumiHotOrange, FurumiNeonPink), + listOf(FurumiNeonViolet, FurumiSurface) + ) + return palettes[(trackId % palettes.size).toInt()] +} + +private val mockTracks = listOf( + MockTrack( + title = "Neon Drift", + artist = "Vanta Sequence", + duration = "3:42", + colors = listOf(FurumiNeonPink, FurumiNeonViolet, FurumiBlack) + ), + MockTrack( + title = "Glass City", + artist = "Afterimage", + duration = "4:08", + colors = listOf(FurumiElectricCyan, FurumiSurfaceHigh) + ), + MockTrack( + title = "Low Orbit", + artist = "Signal Room", + duration = "2:58", + colors = listOf(FurumiHotOrange, FurumiNeonPink) + ), + MockTrack( + title = "Night Cache", + artist = "Mirror Index", + duration = "5:16", + colors = listOf(FurumiNeonViolet, FurumiSurface) + ), + MockTrack( + title = "Pink Voltage", + artist = "Kairo Unit", + duration = "3:19", + colors = listOf(FurumiNeonPink, FurumiHotOrange) + ), + MockTrack( + title = "After Hours Relay", + artist = "North Terminal", + duration = "4:31", + colors = listOf(FurumiElectricCyan, FurumiNeonViolet) + ), + MockTrack( + title = "Static Bloom", + artist = "Velvet Protocol", + duration = "3:07", + colors = listOf(FurumiSurfaceHigh, FurumiNeonPink) + ), + MockTrack( + title = "Server Room Lullaby", + artist = "Echo Archive", + duration = "5:04", + colors = listOf(FurumiNeonViolet, FurumiBlack) + ) +) + +private val mockPlaylists = listOf( + MockPlaylist( + title = "Daily Pulse", + subtitle = "Playlist", + description = "A fast pass through the tracks that fit today.", + colors = listOf(FurumiNeonPink, FurumiNeonViolet), + tracks = mockTracks + ), + MockPlaylist( + title = "Server Favorites", + subtitle = "74 tracks", + description = "Most replayed music from this Furumi server.", + colors = listOf(FurumiElectricCyan, FurumiSurfaceHigh), + tracks = mockTracks.drop(1) + mockTracks.take(1) + ), + MockPlaylist( + title = "Late Drive", + subtitle = "Playlist", + description = "Night-road energy with neon edges.", + colors = listOf(FurumiHotOrange, FurumiNeonPink), + tracks = mockTracks.drop(2) + mockTracks.take(2) + ), + MockPlaylist( + title = "Albums to Replay", + subtitle = "Collection", + description = "Albums and long listens worth returning to.", + colors = listOf(FurumiNeonViolet, FurumiSurface), + tracks = mockTracks.drop(3) + mockTracks.take(3) + ), + MockPlaylist( + title = "Focus Cache", + subtitle = "32 tracks", + description = "Lower-friction tracks for coding and reading.", + colors = listOf(FurumiSurfaceHigh, FurumiElectricCyan), + tracks = mockTracks.drop(4) + mockTracks.take(4) + ) +) diff --git a/app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt b/app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt new file mode 100644 index 0000000..fe7e26d --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/player/PlayerViewModel.kt @@ -0,0 +1,411 @@ +package com.example.furumi_android.ui.player + +import android.graphics.Bitmap +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.ListeningHistoryItem +import com.example.furumi_android.domain.model.ReleaseCard +import com.example.furumi_android.domain.model.ReleaseDetail +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 dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class PlayerUiState( + val userName: String = "Listener", + val serverUrl: String = "", + val isLoggingOut: Boolean = false, + val isLoggedOut: Boolean = false, + val isListeningHistoryVisible: Boolean = false, + val isListeningHistoryLoading: Boolean = false, + val listeningHistory: List = emptyList(), + val listeningHistoryTotal: Long = 0, + val listeningHistoryError: String? = null, + val globalArtists: List = emptyList(), + val globalArtistsTotal: Long = 0, + val globalArtistsPage: Int = 0, + val globalArtistsHasMore: Boolean = true, + val isGlobalArtistsLoading: Boolean = false, + val isGlobalArtistsLoadingMore: Boolean = false, + val globalArtistsError: String? = null, + val selectedArtist: ArtistCard? = null, + val artistDetail: ArtistDetail? = null, + val isArtistDetailLoading: Boolean = false, + val artistDetailError: String? = null, + val selectedRelease: ReleaseCard? = null, + val releaseDetail: ReleaseDetail? = null, + val isReleaseDetailLoading: Boolean = false, + val releaseDetailError: String? = null, + val mediaImages: Map = emptyMap(), + val loadingMediaImageUrls: Set = emptySet(), + val playback: AudioPlaybackState = AudioPlaybackState() +) + +@HiltViewModel +class PlayerViewModel @Inject constructor( + private val authRepository: AuthRepository, + private val playerRepository: PlayerRepository, + private val mediaImageLoader: MediaImageLoader, + private val playbackController: PlaybackController +) : ViewModel() { + + private val artistDetailCache = mutableMapOf() + private val releaseDetailCache = mutableMapOf() + + private val _uiState = MutableStateFlow( + authRepository.getCurrentSession()?.let { session -> + PlayerUiState( + userName = session.user.name, + serverUrl = session.serverBaseUrl + ) + } ?: PlayerUiState( + serverUrl = authRepository.getSavedServerUrl().orEmpty() + ) + ) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + loadGlobalArtistsIfNeeded() + observePlayback() + } + + fun loadGlobalArtistsIfNeeded() { + val state = _uiState.value + if (state.globalArtists.isNotEmpty() || + state.isGlobalArtistsLoading || + state.isGlobalArtistsLoadingMore + ) { + return + } + + loadGlobalArtists(page = 1, append = false) + } + + fun retryGlobalArtists() { + loadGlobalArtists(page = 1, append = false) + } + + fun loadMoreGlobalArtists() { + val state = _uiState.value + if (!state.globalArtistsHasMore || + state.isGlobalArtistsLoading || + state.isGlobalArtistsLoadingMore + ) { + return + } + + loadGlobalArtists(page = state.globalArtistsPage + 1, append = true) + } + + fun openArtist(artist: ArtistCard) { + val cachedDetail = artistDetailCache[artist.id] + + _uiState.value = _uiState.value.copy( + selectedArtist = cachedDetail?.artist ?: artist, + artistDetail = cachedDetail, + isArtistDetailLoading = cachedDetail == null, + artistDetailError = null + ) + + if (cachedDetail == null) { + loadArtistDetail(artist.id) + } + } + + fun closeArtistDetail() { + _uiState.value = _uiState.value.copy( + selectedArtist = null, + artistDetail = null, + isArtistDetailLoading = false, + artistDetailError = null, + selectedRelease = null, + releaseDetail = null, + isReleaseDetailLoading = false, + releaseDetailError = null + ) + } + + fun retryArtistDetail() { + val artist = _uiState.value.selectedArtist ?: return + loadArtistDetail(artist.id) + } + + fun openRelease(release: ReleaseCard) { + val cachedDetail = releaseDetailCache[release.id] + + _uiState.value = _uiState.value.copy( + selectedRelease = cachedDetail?.release ?: release, + releaseDetail = cachedDetail, + isReleaseDetailLoading = cachedDetail == null, + releaseDetailError = null + ) + + if (cachedDetail == null) { + loadReleaseDetail(release.id) + } + } + + fun closeReleaseDetail() { + _uiState.value = _uiState.value.copy( + selectedRelease = null, + releaseDetail = null, + isReleaseDetailLoading = false, + releaseDetailError = null + ) + } + + fun retryReleaseDetail() { + val release = _uiState.value.selectedRelease ?: return + loadReleaseDetail(release.id) + } + + fun playTrack(track: TrackCard, queue: List): Boolean { + if (track.streamUrl.isBlank()) return false + + playbackController.playTrack(track, queue) + return true + } + + fun playArtistTracks(shuffle: Boolean = false): Boolean { + val detail = _uiState.value.artistDetail ?: return false + val tracks = detail.topTracks + .ifEmpty { detail.featuredTracks } + .filter { it.streamUrl.isNotBlank() } + .let { if (shuffle) it.shuffled() else it } + + if (tracks.isEmpty()) return false + + playbackController.playQueue(tracks) + return true + } + + fun playReleaseTracks(shuffle: Boolean = false): Boolean { + val tracks = _uiState.value.releaseDetail + ?.tracks + .orEmpty() + .filter { it.streamUrl.isNotBlank() } + .let { if (shuffle) it.shuffled() else it } + + if (tracks.isEmpty()) return false + + playbackController.playQueue(tracks) + return true + } + + fun togglePlayPause() { + playbackController.togglePlayPause() + } + + fun nextTrack() { + playbackController.next() + } + + fun previousTrack() { + playbackController.previous() + } + + fun seekToPlaybackProgress(progress: Float) { + playbackController.seekToProgress(progress) + } + + fun loadMediaImage(url: String?) { + val imageUrl = url?.takeIf { it.isNotBlank() } ?: return + val state = _uiState.value + + if (state.mediaImages.containsKey(imageUrl) || + state.loadingMediaImageUrls.contains(imageUrl) + ) { + return + } + + _uiState.value = state.copy( + loadingMediaImageUrls = state.loadingMediaImageUrls + imageUrl + ) + + viewModelScope.launch { + mediaImageLoader.load(imageUrl) + .onSuccess { bitmap -> + val currentState = _uiState.value + _uiState.value = currentState.copy( + mediaImages = currentState.mediaImages + (imageUrl to bitmap) + ) + } + + val currentState = _uiState.value + _uiState.value = currentState.copy( + loadingMediaImageUrls = currentState.loadingMediaImageUrls - imageUrl + ) + } + } + + fun openListeningHistory() { + _uiState.value = _uiState.value.copy(isListeningHistoryVisible = true) + + if (_uiState.value.listeningHistory.isEmpty() && !_uiState.value.isListeningHistoryLoading) { + loadListeningHistory() + } + } + + fun closeListeningHistory() { + _uiState.value = _uiState.value.copy(isListeningHistoryVisible = false) + } + + fun retryListeningHistory() { + loadListeningHistory() + } + + fun logout() { + if (_uiState.value.isLoggingOut) return + + viewModelScope.launch { + _uiState.value = _uiState.value.copy(isLoggingOut = true) + authRepository.logout() + _uiState.value = _uiState.value.copy( + isLoggingOut = false, + isLoggedOut = true + ) + } + } + + private fun loadListeningHistory() { + viewModelScope.launch { + _uiState.value = _uiState.value.copy( + isListeningHistoryLoading = true, + listeningHistoryError = null + ) + + playerRepository.getListeningHistory(page = 1, limit = 20) + .onSuccess { page -> + _uiState.value = _uiState.value.copy( + isListeningHistoryLoading = false, + listeningHistory = page.items, + listeningHistoryTotal = page.total, + listeningHistoryError = null + ) + } + .onFailure { error -> + _uiState.value = _uiState.value.copy( + isListeningHistoryLoading = false, + listeningHistoryError = error.message ?: "Unable to load listening history" + ) + } + } + } + + private fun observePlayback() { + viewModelScope.launch { + playbackController.state.collect { playbackState -> + _uiState.value = _uiState.value.copy(playback = playbackState) + } + } + } + + private fun loadGlobalArtists(page: Int, append: Boolean) { + viewModelScope.launch { + val state = _uiState.value + _uiState.value = if (append) { + state.copy( + isGlobalArtistsLoadingMore = true, + globalArtistsError = null + ) + } else { + state.copy( + isGlobalArtistsLoading = true, + isGlobalArtistsLoadingMore = false, + globalArtistsError = null, + globalArtistsHasMore = true + ) + } + + playerRepository.getArtists(page = page, limit = ARTIST_PAGE_SIZE, mine = false) + .onSuccess { artistPage -> + val currentArtists = if (append) _uiState.value.globalArtists else emptyList() + val mergedArtists = (currentArtists + artistPage.items).distinctBy { it.id } + + _uiState.value = _uiState.value.copy( + globalArtists = mergedArtists, + globalArtistsTotal = artistPage.total, + globalArtistsPage = artistPage.page, + globalArtistsHasMore = artistPage.hasMore, + isGlobalArtistsLoading = false, + isGlobalArtistsLoadingMore = false, + globalArtistsError = null + ) + } + .onFailure { error -> + _uiState.value = _uiState.value.copy( + isGlobalArtistsLoading = false, + isGlobalArtistsLoadingMore = false, + globalArtistsError = error.message ?: "Unable to load artists" + ) + } + } + } + + private fun loadArtistDetail(artistId: Long) { + viewModelScope.launch { + _uiState.value = _uiState.value.copy( + isArtistDetailLoading = true, + artistDetailError = null + ) + + playerRepository.getArtistDetail(artistId) + .onSuccess { detail -> + artistDetailCache[artistId] = detail + _uiState.value = _uiState.value.copy( + selectedArtist = detail.artist, + artistDetail = detail, + isArtistDetailLoading = false, + artistDetailError = null + ) + } + .onFailure { error -> + _uiState.value = _uiState.value.copy( + isArtistDetailLoading = false, + artistDetailError = error.message ?: "Unable to load artist" + ) + } + } + } + + private fun loadReleaseDetail(releaseId: Long) { + viewModelScope.launch { + _uiState.value = _uiState.value.copy( + isReleaseDetailLoading = true, + releaseDetailError = null + ) + + playerRepository.getReleaseDetail(releaseId) + .onSuccess { detail -> + releaseDetailCache[releaseId] = detail + _uiState.value = _uiState.value.copy( + selectedRelease = detail.release, + releaseDetail = detail, + isReleaseDetailLoading = false, + releaseDetailError = null + ) + } + .onFailure { error -> + _uiState.value = _uiState.value.copy( + isReleaseDetailLoading = false, + releaseDetailError = error.message ?: "Unable to load release" + ) + } + } + } + + private companion object { + const val ARTIST_PAGE_SIZE = 60 + } + +} diff --git a/app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt b/app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt new file mode 100644 index 0000000..3fd449a --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/profile/ProfileScreen.kt @@ -0,0 +1,51 @@ +package com.example.furumi_android.ui.profile + +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel + +@Composable +fun ProfileScreen( + viewModel: ProfileViewModel = hiltViewModel(), + onLoggedOut: () -> Unit +) { + val uiState by viewModel.uiState.collectAsState() + + LaunchedEffect(uiState.isLoggedOut) { + if (uiState.isLoggedOut) { + onLoggedOut() + } + } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text(text = "Profile", style = MaterialTheme.typography.headlineMedium) + + Spacer(modifier = Modifier.height(32.dp)) + + uiState.user?.let { user -> + Text(text = "Name: ${user.name}", style = MaterialTheme.typography.bodyLarge) + Text(text = "ID: ${user.id}", style = MaterialTheme.typography.bodyMedium) + Text(text = "Role: ${user.role}", style = MaterialTheme.typography.bodyMedium) + } ?: Text(text = "Loading user info...") + + Spacer(modifier = Modifier.height(48.dp)) + + Button( + onClick = { viewModel.logout() }, + modifier = Modifier.fillMaxWidth(), + colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error) + ) { + Text("Logout") + } + } +} diff --git a/app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt b/app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt new file mode 100644 index 0000000..9126a8e --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/profile/ProfileViewModel.kt @@ -0,0 +1,37 @@ +package com.example.furumi_android.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 dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class ProfileUiState( + val user: User? = null, + val isLoggedOut: Boolean = false +) + +@HiltViewModel +class ProfileViewModel @Inject constructor( + private val authRepository: AuthRepository +) : ViewModel() { + + private val _uiState = MutableStateFlow(ProfileUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + _uiState.value = _uiState.value.copy(user = authRepository.getCurrentUser()) + } + + fun logout() { + viewModelScope.launch { + authRepository.logout() + _uiState.value = _uiState.value.copy(isLoggedOut = true) + } + } +} diff --git a/app/src/main/java/com/example/furumi_android/ui/theme/Color.kt b/app/src/main/java/com/example/furumi_android/ui/theme/Color.kt new file mode 100644 index 0000000..7649325 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/theme/Color.kt @@ -0,0 +1,16 @@ +package com.example.furumi_android.ui.theme + +import androidx.compose.ui.graphics.Color + +val FurumiBlack = Color(0xFF080A0E) +val FurumiInk = Color(0xFF111019) +val FurumiSurface = Color(0xFF1A1524) +val FurumiSurfaceHigh = Color(0xFF2A2036) +val FurumiLine = Color(0xFF4A385D) +val FurumiText = Color(0xFFFFF7FB) +val FurumiTextMuted = Color(0xFFC9B8D6) +val FurumiNeonPink = Color(0xFFFF3EA5) +val FurumiNeonPinkPressed = Color(0xFFE12A8E) +val FurumiElectricCyan = Color(0xFF37F3FF) +val FurumiNeonViolet = Color(0xFFA855F7) +val FurumiHotOrange = Color(0xFFFF7A3D) diff --git a/app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt b/app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt new file mode 100644 index 0000000..88596df --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/theme/Theme.kt @@ -0,0 +1,54 @@ +package com.example.furumi_android.ui.theme + +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color + +private val DarkColorScheme = darkColorScheme( + primary = FurumiNeonPink, + onPrimary = FurumiBlack, + primaryContainer = FurumiNeonPinkPressed, + onPrimaryContainer = FurumiBlack, + secondary = FurumiElectricCyan, + onSecondary = FurumiBlack, + tertiary = FurumiNeonViolet, + background = FurumiBlack, + onBackground = FurumiText, + surface = FurumiInk, + onSurface = FurumiText, + surfaceVariant = FurumiSurface, + onSurfaceVariant = FurumiTextMuted, + outline = FurumiLine, + error = FurumiHotOrange, + onError = Color.White +) + +private val LightColorScheme = lightColorScheme( + primary = Color(0xFFB90068), + onPrimary = Color.White, + secondary = Color(0xFF006B73), + tertiary = Color(0xFF6D27B8), + background = Color(0xFFFFF7FB), + onBackground = Color(0xFF17101F), + surface = Color.White, + onSurface = Color(0xFF17101F), + surfaceVariant = Color(0xFFF2E6F6), + onSurfaceVariant = Color(0xFF67536F), + outline = Color(0xFFD8BFE2) +) + +@Composable +fun FurumiandroidTheme( + darkTheme: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/app/src/main/java/com/example/furumi_android/ui/theme/Type.kt b/app/src/main/java/com/example/furumi_android/ui/theme/Type.kt new file mode 100644 index 0000000..46711d9 --- /dev/null +++ b/app/src/main/java/com/example/furumi_android/ui/theme/Type.kt @@ -0,0 +1,59 @@ +package com.example.furumi_android.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +val Typography = Typography( + headlineLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.ExtraBold, + fontSize = 34.sp, + lineHeight = 40.sp, + letterSpacing = 0.sp + ), + headlineMedium = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.ExtraBold, + fontSize = 28.sp, + lineHeight = 34.sp, + letterSpacing = 0.sp + ), + titleMedium = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.SemiBold, + fontSize = 18.sp, + lineHeight = 24.sp, + letterSpacing = 0.sp + ), + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.sp + ), + bodyMedium = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.sp + ), + labelLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Bold, + fontSize = 15.sp, + lineHeight = 20.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.SemiBold, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.sp + ) +) diff --git a/app/src/main/keepRules/rules.keep b/app/src/main/keepRules/rules.keep new file mode 100644 index 0000000..d7e081a --- /dev/null +++ b/app/src/main/keepRules/rules.keep @@ -0,0 +1,12 @@ +# Add project specific R8 rules here. +# AGP will combine all keep rule files in src/main/keepRules to pass to R8 +# +# For more details, see +# https://d.android.com/r/tools/r8/keep-rules + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..a636bf5 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + furumi-android + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..a5d1732 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +