diff --git a/build.gradle b/build.gradle index f69b0dd9..fd2f19cf 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ buildscript { ext { daggerVersion = "2.60.1" kotlinVersion = "2.4.10" + lifecycleVersion = "2.11.0" jUnitVersion = "4.13.2" androidXTestVersion = "1.3.0" androidXEspressoTestVersion = "3.7.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9d159708..12c02be1 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -77,6 +77,7 @@ + @@ -98,6 +99,7 @@ + @@ -105,6 +107,11 @@ + + + + + @@ -174,6 +181,7 @@ + @@ -245,6 +253,7 @@ + @@ -281,6 +290,7 @@ + @@ -296,6 +306,7 @@ + @@ -335,6 +346,11 @@ + + + + + @@ -14904,6 +14920,11 @@ + + + + + @@ -19369,6 +19390,11 @@ + + + + + @@ -20874,6 +20900,11 @@ + + + + + diff --git a/material-color-utilities/build.gradle b/material-color-utilities/build.gradle index 83e301dd..119c41b4 100644 --- a/material-color-utilities/build.gradle +++ b/material-color-utilities/build.gradle @@ -1,3 +1,4 @@ + /* * Nextcloud Android Common Library * diff --git a/sample/build.gradle b/sample/build.gradle index 72fd3597..f5fc90ba 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -45,6 +45,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.11.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0' implementation project(path: ':ui') testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.3.0' diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index bc5dab68..153a8ae0 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" + android:usesCleartextTraffic="true" android:theme="@style/Theme.Androidcommon"> + Toast.makeText(this, result, Toast.LENGTH_LONG).show() + } + setSupportActionBar(binding.toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) mainViewModel.color.observe(this) { applyTheme(it) } diff --git a/sample/src/main/java/com/nextcloud/android/common/sample/MainViewModel.kt b/sample/src/main/java/com/nextcloud/android/common/sample/MainViewModel.kt index 457600c7..58e6bdf4 100644 --- a/sample/src/main/java/com/nextcloud/android/common/sample/MainViewModel.kt +++ b/sample/src/main/java/com/nextcloud/android/common/sample/MainViewModel.kt @@ -9,7 +9,41 @@ package com.nextcloud.android.common.sample import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.nextcloud.android.common.ui.network.auth.ServerCredentials +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.network.http.NextcloudHttpClient +import com.nextcloud.android.common.ui.network.UserStatusRepository +import kotlinx.coroutines.launch class MainViewModel : ViewModel() { val color = MutableLiveData() + val apiTestResult = MutableLiveData() + + fun testPredefinedStatuses( + baseUrl: String, + username: String, + token: String + ) { + viewModelScope.launch { + val credentials = ServerCredentials(baseUrl, username, token) + val client = NextcloudHttpClient.create(credentials) + val service = UserStatusRepository(client) + + when (val result = service.fetchPredefinedStatuses()) { + is NetworkResult.Success -> + apiTestResult.value = + "✅ Success (${result.data.size} statuses):\n" + + result.data.joinToString("\n") { "${it.icon} ${it.message}" } + + is NetworkResult.ServerError -> + apiTestResult.value = + "❌ Error ${result.response.ocs.meta.statusCode}: ${result.response.ocs.meta.message}" + + is NetworkResult.NetworkException -> + apiTestResult.value = + "❌ Exception: ${result.throwable.message}" + } + } + } } diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 23447605..2e4f232b 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -193,6 +193,67 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/circular_progress_bar" /> + + + + + + + + + + + + + + + + + + + + diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml index 1b957aa2..f7db289e 100644 --- a/sample/src/main/res/values/strings.xml +++ b/sample/src/main/res/values/strings.xml @@ -19,6 +19,10 @@ Suggestion Chip Filter Chip Color + Base URL + Username + App token + Test User Status API Theming UI Module \ No newline at end of file diff --git a/ui/build.gradle b/ui/build.gradle index 3d1b4d99..d7f38168 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -7,6 +7,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.compose' + id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion" id 'com.android.library' id 'com.android.built-in-kotlin' id 'com.android.legacy-kapt' @@ -15,7 +16,7 @@ plugins { android { defaultConfig { - minSdk = 21 + minSdk = 26 compileSdk = 37 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -23,6 +24,7 @@ android { buildFeatures { compose = true + buildConfig = true } compileOptions { @@ -45,12 +47,27 @@ android { } dependencies { + // region Jetpack Compose + implementation 'androidx.compose.ui:ui-tooling-preview:1.11.4' + debugImplementation 'androidx.compose.ui:ui-tooling:1.11.4' kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:${kotlinVersion}" implementation(platform("androidx.compose:compose-bom:2026.06.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material:material-icons-core") + // endregion + + // region lifecycle + api "androidx.lifecycle:lifecycle-viewmodel:$lifecycleVersion" + api "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion" + implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion" + // endregion + + implementation("io.coil-kt.coil3:coil-compose:3.5.0") + implementation("io.coil-kt.coil3:coil-network-okhttp:3.5.0") + implementation("io.coil-kt.coil3:coil-svg:3.5.0") implementation("com.vanniktech:ui:0.10.0") @@ -60,6 +77,14 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' + // region okhttp + implementation(platform("com.squareup.okhttp3:okhttp-bom:5.4.0")) + implementation("com.squareup.okhttp3:okhttp") + implementation("com.squareup.okhttp3:logging-interceptor") + // endregion + + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") + implementation project(':core') api project(':material-color-utilities') diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml index b830d265..447589b1 100644 --- a/ui/src/main/AndroidManifest.xml +++ b/ui/src/main/AndroidManifest.xml @@ -5,6 +5,6 @@ ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors ~ SPDX-License-Identifier: MIT --> - + diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/component/ContentUnavailableView.kt b/ui/src/main/java/com/nextcloud/android/common/ui/component/ContentUnavailableView.kt new file mode 100644 index 00000000..3d28ffc2 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/component/ContentUnavailableView.kt @@ -0,0 +1,64 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.component + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp + +@Composable +fun ContentUnavailableView(title: String, description: String? = null, iconId: Int? = null) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + iconId?.let { + Image( + painter = painterResource(iconId), + modifier = Modifier.size(48.dp), + contentDescription = "", + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = title, + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center + ) + + description?.let { + Spacer(modifier = Modifier.height(8.dp)) + + Text( + text = description, + style = MaterialTheme.typography.headlineSmall, + textAlign = TextAlign.Center + ) + } + + Spacer(modifier = Modifier.height(32.dp)) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/PredefinedStatus.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/PredefinedStatus.kt new file mode 100644 index 00000000..bc1eb79b --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/PredefinedStatus.kt @@ -0,0 +1,43 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network + +import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializable +import kotlinx.serialization.descriptors.PrimitiveKind +import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.json.JsonDecoder +import kotlinx.serialization.json.JsonPrimitive + +object ClearAtTimeSerializer : KSerializer { + override val descriptor = PrimitiveSerialDescriptor("ClearAtTime", PrimitiveKind.STRING) + + override fun deserialize(decoder: Decoder): String { + val jsonDecoder = decoder as? JsonDecoder ?: return decoder.decodeString() + return (jsonDecoder.decodeJsonElement() as? JsonPrimitive)?.content ?: "" + } + + override fun serialize(encoder: Encoder, value: String) = encoder.encodeString(value) +} + +@Serializable +data class ClearAt( + val type: String, + @Serializable(with = ClearAtTimeSerializer::class) + val time: String +) + +@Serializable +data class PredefinedStatus( + val id: String, + val icon: String, + val message: String, + val clearAt: ClearAt? = null +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/UserStatusRepository.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/UserStatusRepository.kt new file mode 100644 index 00000000..7c36bdf9 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/UserStatusRepository.kt @@ -0,0 +1,30 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network + +import com.nextcloud.android.common.ui.network.http.HttpMethod +import com.nextcloud.android.common.ui.network.http.NextcloudHttpClient +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.network.model.OcsResponse +import com.nextcloud.android.common.ui.network.serialization.OCSSerializer + +class UserStatusRepository(private val client: NextcloudHttpClient) { + + private companion object { + private const val PREDEFINED_STATUSES_ENDPOINT = + "/ocs/v2.php/apps/user_status/api/v1/predefined_statuses" + } + + suspend fun fetchPredefinedStatuses(): NetworkResult> = + client.executeRequest( + endpoint = PREDEFINED_STATUSES_ENDPOINT, + method = HttpMethod.GET + ) { body -> + OCSSerializer.json.decodeFromString>>(body).ocs.data + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/auth/AuthInterceptor.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/auth/AuthInterceptor.kt new file mode 100644 index 00000000..07c7b485 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/auth/AuthInterceptor.kt @@ -0,0 +1,49 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.auth + +import okhttp3.Credentials +import okhttp3.Interceptor +import okhttp3.Response + +class AuthInterceptor(private val credentials: ServerCredentials) : Interceptor { + + private companion object { + private const val HTTP_PREFIX = "http://" + private const val HTTPS_PREFIX = "https://" + private const val DELIMITER = '/' + + private const val HEADER_AUTHORIZATION = "Authorization" + private const val HEADER_OCS_REQUEST = "OCS-APIRequest" + private const val HEADER_OCS_REQUEST_VALUE = "true" + } + + override fun intercept(chain: Interceptor.Chain): Response { + val basicCredentials = Credentials.basic(credentials.username, credentials.token) + + val request = chain.request() + .newBuilder() + .header(HEADER_AUTHORIZATION, basicCredentials) + .header(HEADER_OCS_REQUEST, HEADER_OCS_REQUEST_VALUE) + .url(resolveUrl(chain.request().url.toString())) + .build() + + return chain.proceed(request) + } + + /** + * Prepends [ServerCredentials.baseURL] to relative URLs. + * Absolute URLs (starting with http/https) are passed through unchanged. + */ + private fun resolveUrl(requestUrl: String): String = + if (requestUrl.startsWith(HTTP_PREFIX) || requestUrl.startsWith(HTTPS_PREFIX)) { + requestUrl + } else { + "${credentials.baseURL.trimEnd(DELIMITER)}/${requestUrl.trimStart(DELIMITER)}" + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/auth/ServerCredentials.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/auth/ServerCredentials.kt new file mode 100644 index 00000000..b299353c --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/auth/ServerCredentials.kt @@ -0,0 +1,14 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.auth + +data class ServerCredentials( + val baseURL: String, + val username: String, + val token: String +) \ No newline at end of file diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/http/HttpMethod.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/HttpMethod.kt new file mode 100644 index 00000000..f5901b8d --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/HttpMethod.kt @@ -0,0 +1,15 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.http + +enum class HttpMethod(val type: String) { + GET("GET"), + POST("POST"), + PUT("PUT"), + DELETE("DELETE") +} \ No newline at end of file diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/http/NextcloudHttpClient.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/NextcloudHttpClient.kt new file mode 100644 index 00000000..ff1e3b26 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/NextcloudHttpClient.kt @@ -0,0 +1,97 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.http + +import com.nextcloud.android.common.ui.BuildConfig +import com.nextcloud.android.common.ui.network.auth.AuthInterceptor +import com.nextcloud.android.common.ui.network.auth.ServerCredentials +import com.nextcloud.android.common.ui.network.model.Meta +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.network.model.Ocs +import com.nextcloud.android.common.ui.network.model.OcsResponse +import com.nextcloud.android.common.ui.network.serialization.OCSSerializer +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonPrimitive +import okhttp3.OkHttpClient +import okhttp3.RequestBody +import java.util.concurrent.TimeUnit + +class NextcloudHttpClient private constructor( + val okHttpClient: OkHttpClient, + val credentials: ServerCredentials, + private val debugLogger: NextcloudHttpClientLogger +) { + companion object { + private const val CONNECT_TIMEOUT_SECONDS = 90L + private const val READ_TIMEOUT_SECONDS = 90L + private const val WRITE_TIMEOUT_SECONDS = 90L + private const val OCS_OK = "ok" + private const val OCS_FAILURE = "failure" + + fun create( + credentials: ServerCredentials + ): NextcloudHttpClient { + val okHttpClient = OkHttpClient.Builder() + .connectTimeout(CONNECT_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .readTimeout(READ_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .writeTimeout(WRITE_TIMEOUT_SECONDS, TimeUnit.SECONDS) + .addInterceptor(AuthInterceptor(credentials)) + .build() + + return NextcloudHttpClient(okHttpClient, credentials, NextcloudHttpClientLogger(BuildConfig.DEBUG)) + } + } + + private val baseUrl get() = credentials.baseURL.trimEnd('/') + + private fun errorMeta(code: Int): Meta = Meta(status = OCS_FAILURE, statusCode = code, message = "") + + suspend fun executeRequest( + endpoint: String, + method: HttpMethod, + body: RequestBody? = null, + parse: (String) -> T + ): NetworkResult = withContext(Dispatchers.IO) { + val request = buildOcsRequest("$baseUrl$endpoint", method, body) + debugLogger.logRequest(endpoint, method, body) + try { + val response = okHttpClient.newCall(request).execute() + val responseBody = response.body.string() + + if (responseBody.isBlank()) { + val isError = !response.isSuccessful + debugLogger.logResponse(endpoint, method, response.code, responseBody, isError = isError) + return@withContext if (isError) { + NetworkResult.ServerError(OcsResponse(Ocs(errorMeta(response.code), ""))) + } else { + NetworkResult.Success(parse(responseBody)) + } + } + + val ocs = OCSSerializer.json + .decodeFromString>(responseBody) + .ocs + val meta = ocs.meta + val isError = !response.isSuccessful || meta.status != OCS_OK + debugLogger.logResponse(endpoint, method, response.code, responseBody, isError = isError) + + if (isError) { + val dataMessage = (ocs.data as? JsonPrimitive)?.takeIf { it.isString }?.content + val message = dataMessage?.takeIf { it.isNotBlank() } ?: meta.message + NetworkResult.ServerError(OcsResponse(Ocs(meta, message))) + } else { + NetworkResult.Success(parse(responseBody)) + } + } catch (e: Exception) { + debugLogger.logException(endpoint, method, e) + NetworkResult.fromException(e) + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/http/NextcloudHttpClientLogger.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/NextcloudHttpClientLogger.kt new file mode 100644 index 00000000..98d66e0c --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/NextcloudHttpClientLogger.kt @@ -0,0 +1,92 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.http + +import android.util.Log +import kotlinx.serialization.json.Json +import okhttp3.RequestBody +import okio.Buffer + +internal class NextcloudHttpClientLogger(private val enabled: Boolean) { + + companion object { + private const val TAG = "NextcloudHttpClient" + + private val prettyJson = Json { + prettyPrint = true + prettyPrintIndent = " " + ignoreUnknownKeys = true + } + } + + fun logRequest(endpoint: String, method: HttpMethod, body: RequestBody?) { + if (!enabled) return + + Log.d( + TAG, + """ + |➡️ REQUEST [$method] $endpoint + |Body: + |${body.readableString().prettyPrintJsonOrRaw()} + """.trimMargin() + ) + } + + fun logResponse( + endpoint: String, + method: HttpMethod, + code: Int, + responseBody: String, + isError: Boolean + ) { + if (!enabled) return + + Log.d( + TAG, + """ + |${statusEmojiFor(code, isError)} RESPONSE [$method] $endpoint (HTTP $code) + |Body: + |${responseBody.ifBlank { "" }.prettyPrintJsonOrRaw()} + """.trimMargin() + ) + } + + fun logException(endpoint: String, method: HttpMethod, e: Exception) { + if (!enabled) return + + Log.e(TAG, "💥 EXCEPTION [$method] $endpoint -> ${e.javaClass.simpleName}: ${e.message}", e) + } + + private fun statusEmojiFor(code: Int, isError: Boolean): String = when { + isError -> "🔴" + code in 200..299 -> "🟢" + code in 300..399 -> "🟡" + else -> "🔴" + } + + private fun RequestBody?.readableString(): String { + if (this == null) return "" + return try { + val buffer = Buffer() + writeTo(buffer) + buffer.readUtf8() + } catch (e: Exception) { + "" + } + } + + private fun String.prettyPrintJsonOrRaw(): String { + if (this.isBlank() || this == "" || this == "") return this + return try { + val element = Json.parseToJsonElement(this) + prettyJson.encodeToString(kotlinx.serialization.json.JsonElement.serializer(), element) + } catch (_: Exception) { + this + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/http/RequestBuilder.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/RequestBuilder.kt new file mode 100644 index 00000000..7e7560cd --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/http/RequestBuilder.kt @@ -0,0 +1,27 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.http + +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.Request +import okhttp3.RequestBody + +val JSON_CONTENT_TYPE = "application/json; charset=utf-8".toMediaType() + +private const val HEADER_ACCEPT = "Accept" +private const val HEADER_ACCEPT_VALUE = "application/json" + +fun buildOcsRequest( + url: String, + method: HttpMethod, + body: RequestBody? = null +): Request = Request.Builder() + .url(url) + .header(HEADER_ACCEPT, HEADER_ACCEPT_VALUE) + .method(method.type, body) + .build() diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/model/NetworkResult.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/model/NetworkResult.kt new file mode 100644 index 00000000..ef05856b --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/model/NetworkResult.kt @@ -0,0 +1,32 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.model + +sealed class NetworkResult { + data class Success(val data: T) : NetworkResult() + + data class ServerError(val response: OcsResponse) : NetworkResult() + + data class NetworkException(val throwable: Throwable) : NetworkResult() + + val isSuccess: Boolean get() = this is Success + + companion object { + fun fromException(e: Throwable): NetworkException = NetworkException(e) + } +} + +inline fun NetworkResult.dataOrElse(onError: () -> Unit): T? = + when (this) { + is NetworkResult.Success -> data + is NetworkResult.ServerError, + is NetworkResult.NetworkException -> { + onError() + null + } + } diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/model/OcsResponse.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/model/OcsResponse.kt new file mode 100644 index 00000000..0b5c39db --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/model/OcsResponse.kt @@ -0,0 +1,38 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.model + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class OcsResponse( + val ocs: Ocs +) + +@Serializable +data class Ocs( + val meta: Meta, + val data: T +) + +@Serializable +data class Meta( + val status: String, + + @SerialName("statuscode") + val statusCode: Int, + + val message: String, + + @SerialName("totalitems") + val totalItems: String = "", + + @SerialName("itemsperpage") + val itemsPerPage: String = "" +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/network/serialization/OCSSerializer.kt b/ui/src/main/java/com/nextcloud/android/common/ui/network/serialization/OCSSerializer.kt new file mode 100644 index 00000000..aae4ab75 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/network/serialization/OCSSerializer.kt @@ -0,0 +1,14 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.network.serialization + +import kotlinx.serialization.json.Json + +object OCSSerializer { + val json = Json { ignoreUnknownKeys = true } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/ShareScreen.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/ShareScreen.kt new file mode 100644 index 00000000..e0f046fe --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/ShareScreen.kt @@ -0,0 +1,449 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Send +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.filled.MoreVert +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ColorScheme +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.material3.pulltorefresh.PullToRefreshBox +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +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.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.platform.ComposeView +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.platform.LocalResources +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelStoreOwner +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import coil3.ImageLoader +import coil3.compose.setSingletonImageLoaderFactory +import coil3.svg.SvgDecoder +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.component.ContentUnavailableView +import com.nextcloud.android.common.ui.network.auth.ServerCredentials +import com.nextcloud.android.common.ui.network.http.NextcloudHttpClient +import com.nextcloud.android.common.ui.share.component.PublicLinkIcon +import com.nextcloud.android.common.ui.share.component.RecipientIcon +import com.nextcloud.android.common.ui.share.component.bottomsheet.AddOrEditShareBottomSheet +import com.nextcloud.android.common.ui.share.component.bottomsheet.QuickSharePermissionBottomSheet +import com.nextcloud.android.common.ui.share.component.dialog.DeleteShareConfirmationDialog +import com.nextcloud.android.common.ui.share.model.api.permission.PermissionPreset +import com.nextcloud.android.common.ui.share.model.api.share.Share +import com.nextcloud.android.common.ui.share.model.ui.PermissionPresetOption +import com.nextcloud.android.common.ui.share.model.ui.ShareEditorEntry +import com.nextcloud.android.common.ui.share.model.ui.ShareItemOverlayState +import com.nextcloud.android.common.ui.share.model.ui.ShareItemType +import com.nextcloud.android.common.ui.share.model.ui.ShareScreenState +import com.nextcloud.android.common.ui.share.model.ui.label +import com.nextcloud.android.common.ui.share.repository.ShareRemoteRepository +import com.nextcloud.android.common.ui.share.viewmodel.ShareViewModel +import com.nextcloud.android.common.ui.share.viewmodel.ShareViewModelFactory + +private val FIRST_ITEM_TOP_SPACING = 16.dp +private val ITEM_SPACING = 2.dp + +@Composable +private fun ShareScreen( + internalLink: String, + viewModel: ShareViewModel +) { + val errorMessageId by viewModel.errorMessageId.collectAsStateWithLifecycle() + val screenState by viewModel.state.collectAsStateWithLifecycle() + val activeShare by viewModel.activeShare.collectAsStateWithLifecycle() + val permissionPresets by viewModel.permissionPresets.collectAsStateWithLifecycle() + val snackbarHostState = remember { SnackbarHostState() } + val resources = LocalResources.current + + LaunchedEffect(errorMessageId) { + errorMessageId?.let { + snackbarHostState.showSnackbar(resources.getString(it)) + viewModel.updateErrorMessage(null) + } + } + + Scaffold( + floatingActionButton = { + FloatingActionButton( + onClick = { viewModel.createDraftShare() }, + ) { + Icon(painterResource(R.drawable.ic_person_add), contentDescription = "Add") + } + }, + snackbarHost = { SnackbarHost(snackbarHostState) }, + containerColor = Color.Transparent + ) { paddingValues -> + when (val state = screenState) { + is ShareScreenState.Loading -> { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator() + } + } + + is ShareScreenState.Empty -> ShareList( + isRefreshing = false, + shares = emptyList(), + permissionPresets = permissionPresets, + paddingValues = paddingValues, + viewModel = viewModel + ) + + is ShareScreenState.Loaded -> ShareList( + isRefreshing = state.refreshing, + shares = state.shares, + permissionPresets = permissionPresets, + paddingValues = paddingValues, + viewModel = viewModel + ) + } + } + + activeShare.shareOrNull?.let { activeShareObject -> + AddOrEditShareBottomSheet( + share = activeShareObject, + internalLink = internalLink, + viewModel = viewModel, + permissionPresets = permissionPresets, + onDismissDraft = { draftShare -> + viewModel.deleteShare(draftShare.id) + viewModel.setActiveShare(null) + } + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun ShareList( + isRefreshing: Boolean, + shares: List, + permissionPresets: List, + paddingValues: PaddingValues, + viewModel: ShareViewModel +) { + val context = LocalContext.current + + PullToRefreshBox( + isRefreshing = isRefreshing, + onRefresh = viewModel::refreshShares, + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + if (shares.isEmpty()) { + item { + Box(modifier = Modifier.fillParentMaxSize()) { + ContentUnavailableView( + iconId = R.drawable.ic_person_add, + title = stringResource(R.string.share_view_empty_title), + ) + } + } + } + + itemsIndexed(shares, key = { _, share -> share.id }) { index, share -> + Spacer(modifier = Modifier.height(if (index == 0) FIRST_ITEM_TOP_SPACING else ITEM_SPACING)) + + ShareItem( + share = share, + title = share.getHeadline(context, shares), + type = ShareItemType.type(index, shares.lastIndex), + permissionPresets = permissionPresets, + onSelectShare = { selected -> + viewModel.setActiveShare(selected, ShareEditorEntry.EDIT) + }, + onCustomizeShare = { selected -> + viewModel.setActiveShare(selected, ShareEditorEntry.CUSTOMIZE_PERMISSION) + }, + onChangePreset = { selected, preset -> + viewModel.updatePermissionPreset(selected.id, preset, updateActiveShare = false) + }, + onDeleteShare = { viewModel.deleteShare(it.id) }, + onSendEmail = { selected -> + viewModel.setActiveShare(selected, ShareEditorEntry.SEND_EMAIL) + } + ) + } + } + } +} + +@Composable +private fun ShareItem( + share: Share, + title: String, + type: ShareItemType, + permissionPresets: List, + onSelectShare: (Share) -> Unit, + onCustomizeShare: (Share) -> Unit, + onChangePreset: (Share, String) -> Unit, + onDeleteShare: (Share) -> Unit, + onSendEmail: (Share) -> Unit +) { + var overlayState by rememberSaveable(share.id) { mutableStateOf(ShareItemOverlayState.None) } + val haptics = LocalHapticFeedback.current + val presetOptions = PermissionPresetOption.optionsFor(share, permissionPresets) + val selectedPresetOption = PermissionPresetOption.from(share.permissionPreset, permissionPresets) + + when (overlayState) { + ShareItemOverlayState.QuickShare -> { + QuickSharePermissionBottomSheet( + options = presetOptions, + selectedOption = selectedPresetOption, + onOptionSelected = { option -> + overlayState = ShareItemOverlayState.None + val presetClass = option.presetClass + if (presetClass != null) { + onChangePreset(share, presetClass) + } else { + onCustomizeShare(share) + } + }, + onDismiss = { overlayState = ShareItemOverlayState.None } + ) + } + + ShareItemOverlayState.DeleteConfirmation -> { + DeleteShareConfirmationDialog( + onConfirm = { + overlayState = ShareItemOverlayState.None + onDeleteShare(share) + }, + onDismiss = { overlayState = ShareItemOverlayState.None } + ) + } + + else -> Unit + } + + ListItem( + modifier = Modifier + .fillMaxWidth(0.9f) + .clip(type.getShape()) + .combinedClickable( + onClick = { onSelectShare(share) }, + onLongClick = { + haptics.performHapticFeedback(HapticFeedbackType.LongPress) + overlayState = ShareItemOverlayState.ContextMenu + } + ) + .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)), + headlineContent = { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + leadingContent = { + Box( + modifier = Modifier.size(24.dp), + contentAlignment = Alignment.Center + ) { + val icon = share.recipients.firstOrNull()?.icon + if (icon != null) { + RecipientIcon(icon = icon, modifier = Modifier.size(24.dp)) + } else { + PublicLinkIcon(modifier = Modifier.size(24.dp)) + } + } + }, + supportingContent = { + val chipHorizontalPadding = 10.dp + val selectedLabel = selectedPresetOption.label() + + Row( + modifier = Modifier + .offset(x = -chipHorizontalPadding) + .clip(RoundedCornerShape(percent = 50)) + .clickable { overlayState = ShareItemOverlayState.QuickShare } + .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.08f)) + .padding(horizontal = chipHorizontalPadding, vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Box(contentAlignment = Alignment.CenterStart) { + presetOptions.forEach { option -> + Text( + text = option.label(), + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + modifier = Modifier + .alpha(0f) + .clearAndSetSemantics {} + ) + } + + Text( + text = selectedLabel, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.primary, + maxLines = 1 + ) + } + + Spacer(modifier = Modifier.width(2.dp)) + + Icon( + imageVector = Icons.Default.KeyboardArrowDown, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(18.dp) + ) + } + }, + trailingContent = { + Box { + IconButton(onClick = { overlayState = ShareItemOverlayState.ContextMenu }) { + Icon(Icons.Default.MoreVert, contentDescription = "More options") + } + + DropdownMenu( + expanded = overlayState == ShareItemOverlayState.ContextMenu, + onDismissRequest = { overlayState = ShareItemOverlayState.None } + ) { + DropdownMenuItem( + leadingIcon = { + Icon(Icons.Default.Edit, + contentDescription = "Edit icon", + modifier = Modifier.size(18.dp) + ) + }, + text = { Text(stringResource(R.string.share_view_list_item_edit)) }, + onClick = { + overlayState = ShareItemOverlayState.None + onSelectShare(share) + } + ) + DropdownMenuItem( + leadingIcon = { + Icon( + Icons.AutoMirrored.Filled.Send, + contentDescription = "Send icon", + modifier = Modifier.size(18.dp) + ) + }, + text = { Text(stringResource(R.string.share_view_list_item_send_email)) }, + onClick = { + onSendEmail(share) + overlayState = ShareItemOverlayState.None + } + ) + HorizontalDivider() + DropdownMenuItem( + leadingIcon = { + Icon( + Icons.Default.Delete, + contentDescription = "Delete icon", + modifier = Modifier.size(18.dp) + ) + }, + text = { + Text( + stringResource(R.string.share_view_list_item_delete), + color = MaterialTheme.colorScheme.error + ) + }, + onClick = { + overlayState = ShareItemOverlayState.DeleteConfirmation + } + ) + } + } + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent) + ) +} + +fun ComposeView.initShareScreen( + viewModelStoreOwner: ViewModelStoreOwner, + sourceId: String, + internalLink: String, + credentials: ServerCredentials, + colorScheme: ColorScheme +) { + val factory = ShareViewModelFactory(sourceId) { + ShareRemoteRepository(NextcloudHttpClient.create(credentials)) + } + val viewModel = ViewModelProvider.create(viewModelStoreOwner, factory)[ShareViewModel::class] + + setContent { + setSingletonImageLoaderFactory { context -> + ImageLoader.Builder(context) + .components { add(SvgDecoder.Factory()) } + .build() + } + + MaterialTheme( + colorScheme = colorScheme, + content = { + ShareScreen(internalLink, viewModel) + } + ) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/avatar/ShareAvatarRepository.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/avatar/ShareAvatarRepository.kt new file mode 100644 index 00000000..6316f315 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/avatar/ShareAvatarRepository.kt @@ -0,0 +1,37 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.avatar + +import android.util.Log +import com.nextcloud.android.common.ui.network.auth.ServerCredentials +import com.nextcloud.android.common.ui.network.http.NextcloudHttpClient +import com.nextcloud.android.common.ui.network.model.dataOrElse +import com.nextcloud.android.common.ui.share.model.api.share.Share +import com.nextcloud.android.common.ui.share.model.api.source.Source +import com.nextcloud.android.common.ui.share.repository.ShareRemoteRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class ShareAvatarRepository(private val credentials: ServerCredentials) { + companion object { + private const val TAG = "ShareAvatarRepository" + private const val SHARES_PAGE_SIZE = 3 + } + + suspend fun fetchShareAvatars(sourceId: String): List? = withContext(Dispatchers.IO) { + val client = NextcloudHttpClient.create(credentials) + val shareRepository = ShareRemoteRepository(client) + val result = shareRepository.fetchShares( + filterSourceTypeValue = sourceId, + limit = SHARES_PAGE_SIZE, + filterSourceTypeClass = Source.NODE_SOURCE_CLASS, + lastShareID = null + ) + return@withContext result.dataOrElse { Log.e(TAG, "failed to fetch avatars") } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/CollapsibleShareSection.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/CollapsibleShareSection.kt new file mode 100644 index 00000000..91e640c4 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/CollapsibleShareSection.kt @@ -0,0 +1,60 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.filled.KeyboardArrowUp +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +fun CollapsibleShareSection( + label: String, + isExpanded: Boolean, + onToggle: () -> Unit, + content: @Composable () -> Unit +) { + Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { onToggle() } + .padding(vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = label, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.primary + ) + Icon( + imageVector = if (isExpanded) Icons.Default.KeyboardArrowUp else Icons.Default.KeyboardArrowDown, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary + ) + } + + AnimatedVisibility(visible = isExpanded) { + Column { content() } + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/CustomLink.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/CustomLink.kt new file mode 100644 index 00000000..e747b63e --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/CustomLink.kt @@ -0,0 +1,124 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import kotlinx.coroutines.launch + +private const val MAX_TOKEN_LENGTH = 32 + +@Composable +fun CustomLink( + recipient: Recipient, + onGenerateSecret: suspend () -> String?, + onTokenChange: (String) -> Unit +) { + val prefix = remember(recipient.secret.url, recipient.secret.value) { + val url = recipient.secret.url.orEmpty() + val token = recipient.secret.value.orEmpty() + if (token.isNotEmpty() && url.endsWith(token)) url.removeSuffix(token) else url + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 8.dp) + ) { + Text( + text = stringResource(R.string.share_view_custom_link_title), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface + ) + + Text( + text = stringResource(R.string.share_view_custom_link_description), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(top = 4.dp, bottom = 8.dp) + ) + + CustomLinkTokenField( + initialToken = recipient.secret.value ?: "", + prefix = prefix, + onGenerateSecret = onGenerateSecret, + onCommit = onTokenChange + ) + } +} + +@Composable +private fun CustomLinkTokenField( + initialToken: String, + prefix: String, + onGenerateSecret: suspend () -> String?, + onCommit: (String) -> Unit +) { + val scope = rememberCoroutineScope() + var token by remember(initialToken) { mutableStateOf(initialToken) } + var committedToken by remember(initialToken) { mutableStateOf(initialToken) } + var wasFocused by remember(initialToken) { mutableStateOf(false) } + + fun commit() { + if (token == committedToken || token.isBlank()) return + committedToken = token + onCommit(token) + } + + OutlinedTextField( + value = token, + onValueChange = { newValue -> token = newValue.take(MAX_TOKEN_LENGTH) }, + label = { Text(prefix) }, + singleLine = true, + trailingIcon = { + IconButton( + onClick = { + scope.launch { + val generated = onGenerateSecret() ?: return@launch + token = generated + committedToken = generated + onCommit(generated) + } + } + ) { + Icon( + imageVector = Icons.Default.Refresh, + contentDescription = stringResource(R.string.share_view_custom_link_refresh) + ) + } + }, + modifier = Modifier + .fillMaxWidth() + .onFocusChanged { focusState -> + if (wasFocused && !focusState.isFocused) commit() + wasFocused = focusState.isFocused + } + ) +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/SelectRecipientField.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/SelectRecipientField.kt new file mode 100644 index 00000000..05521c60 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/SelectRecipientField.kt @@ -0,0 +1,221 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuAnchorType +import androidx.compose.material3.ExposedDropdownMenuBox +import androidx.compose.material3.Icon +import androidx.compose.material3.InputChip +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import coil3.compose.AsyncImage +import coil3.request.ImageRequest +import coil3.svg.SvgDecoder +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.viewmodel.ShareViewModel +import com.nextcloud.android.common.ui.share.model.api.icon.Icon +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.share.Share + +private val FIELD_PADDING = 12.dp +private val CHIP_SPACING = 8.dp +private val CHIP_AVATAR_SIZE = 20.dp +private val CHIP_CLOSE_ICON_SIZE = 18.dp +private val RESULT_ICON_SIZE = 20.dp + +@Composable +fun SelectRecipientField( + share: Share, + viewModel: ShareViewModel +) { + val selected = share.invitedRecipients + + Column(modifier = Modifier.fillMaxWidth()) { + RecipientChips( + recipients = selected, + onRemove = { recipient -> + viewModel.removeRecipient( + id = share.id, + clazz = recipient.clazz, + value = recipient.value, + instance = recipient.instance + ) + } + ) + + RecipientSearch(share = share, selected = selected, viewModel = viewModel) + } +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun RecipientChips(recipients: List, onRemove: (Recipient) -> Unit) { + if (recipients.isEmpty()) return + + FlowRow( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = FIELD_PADDING), + horizontalArrangement = Arrangement.spacedBy(CHIP_SPACING) + ) { + recipients.forEach { recipient -> + InputChip( + selected = false, + onClick = { onRemove(recipient) }, + label = { Text(recipient.displayName) }, + avatar = { + recipient.icon?.let { RecipientIcon(icon = it, modifier = Modifier.size(CHIP_AVATAR_SIZE)) } + }, + trailingIcon = { + Icon( + imageVector = Icons.Default.Close, + contentDescription = stringResource(R.string.share_view_select_recipient_clear), + modifier = Modifier.size(CHIP_CLOSE_ICON_SIZE) + ) + } + ) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun RecipientSearch(share: Share, selected: List, viewModel: ShareViewModel) { + val query by viewModel.searchQuery.collectAsStateWithLifecycle() + var expanded by rememberSaveable { mutableStateOf(false) } + val results by viewModel.recipientSearchResults.collectAsStateWithLifecycle() + val suggestions = results.filterNot { result -> selected.any { it.isSameAs(result) } } + + ExposedDropdownMenuBox( + modifier = Modifier + .fillMaxWidth() + .padding(FIELD_PADDING), + expanded = expanded && query.isNotBlank(), + onExpandedChange = { expanded = it } + ) { + OutlinedTextField( + value = query, + onValueChange = { + expanded = true + viewModel.onSearchQueryChanged(it) + }, + label = { Text(stringResource(R.string.share_view_select_recipient_label)) }, + singleLine = true, + modifier = Modifier + .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryEditable, true) + .fillMaxWidth() + ) + + if (query.isNotBlank()) { + ExposedDropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + RecipientDropdownContent( + results = suggestions, + onSelect = { recipient -> + viewModel.addRecipient(share.id, recipient.clazz, recipient.value, recipient.instance) + viewModel.onSearchQueryChanged("") + expanded = false + } + ) + } + } + } +} + +@Composable +private fun RecipientDropdownContent( + results: List, + onSelect: (Recipient) -> Unit +) { + if (results.isEmpty()) { + DropdownMenuItem( + text = { + Text( + text = stringResource(R.string.share_view_recipient_search_field_empty_result), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + }, + onClick = {}, + enabled = false + ) + } else { + results.forEach { recipient -> + DropdownMenuItem( + leadingIcon = { + recipient.icon?.let { + RecipientIcon( + icon = it, + modifier = Modifier.size(RESULT_ICON_SIZE) + ) + } + }, + text = { Text(recipient.displayName) }, + onClick = { onSelect(recipient) } + ) + } + } +} + +// TODO: can this come from backend? +@Composable +fun PublicLinkIcon(modifier: Modifier = Modifier) { + Icon( + painter = painterResource(R.drawable.ic_link), + contentDescription = "public link icon", + tint = MaterialTheme.colorScheme.onSurface, + modifier = modifier + ) +} + +@Composable +fun RecipientIcon(icon: Icon, modifier: Modifier = Modifier) { + val isDark = isSystemInDarkTheme() + val url = if (isDark) icon.dark ?: icon.light else icon.light ?: icon.dark + + if (url != null) { + AsyncImage( + model = ImageRequest.Builder(LocalContext.current) + .data(url) + .decoderFactory(SvgDecoder.Factory()) + .build(), + contentDescription = null, + modifier = modifier, + ) + } else { + // reserve the same space even with no image + Box(modifier = modifier) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/ShareSwitch.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/ShareSwitch.kt new file mode 100644 index 00000000..ebe0744d --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/ShareSwitch.kt @@ -0,0 +1,50 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +fun ShareSwitch( + label: String, + checked: Boolean, + onCheckedChange: (Boolean) -> Unit +) { + Row( + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 48.dp) + .padding(vertical = 4.dp, horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = label, + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f) + ) + + Spacer(modifier = Modifier.width(16.dp)) + + Switch( + checked = checked, + onCheckedChange = onCheckedChange + ) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/bottomsheet/AddOrEditShareBottomSheet.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/bottomsheet/AddOrEditShareBottomSheet.kt new file mode 100644 index 00000000..8b51b58f --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/bottomsheet/AddOrEditShareBottomSheet.kt @@ -0,0 +1,569 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + + +package com.nextcloud.android.common.ui.share.component.bottomsheet + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuAnchorType +import androidx.compose.material3.ExposedDropdownMenuBox +import androidx.compose.material3.ExposedDropdownMenuDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.ModalBottomSheetProperties +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.SegmentedButton +import androidx.compose.material3.SegmentedButtonDefaults +import androidx.compose.material3.SheetValue +import androidx.compose.material3.SingleChoiceSegmentedButtonRow +import androidx.compose.material3.Text +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +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.platform.LocalClipboard +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.viewmodel.ShareViewModel +import com.nextcloud.android.common.ui.share.component.CollapsibleShareSection +import com.nextcloud.android.common.ui.share.component.CustomLink +import com.nextcloud.android.common.ui.share.component.SelectRecipientField +import com.nextcloud.android.common.ui.share.component.ShareSwitch +import com.nextcloud.android.common.ui.share.component.property.SharePropertyView +import com.nextcloud.android.common.ui.share.model.api.permission.Permission +import com.nextcloud.android.common.ui.share.model.api.permission.PermissionPreset +import com.nextcloud.android.common.ui.share.model.api.property.PropertyString +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.secret.Secret +import com.nextcloud.android.common.ui.share.model.api.share.Share +import com.nextcloud.android.common.ui.share.model.api.source.Source +import com.nextcloud.android.common.ui.share.model.api.state.ShareState +import com.nextcloud.android.common.ui.share.model.api.user.User +import com.nextcloud.android.common.ui.share.model.ui.ActiveShareState +import com.nextcloud.android.common.ui.share.model.ui.PermissionPresetOption +import com.nextcloud.android.common.ui.share.model.ui.ShareCategory +import com.nextcloud.android.common.ui.share.model.ui.ShareEditorEntry +import com.nextcloud.android.common.ui.share.model.ui.label +import com.nextcloud.android.common.ui.share.repository.MockShareRepository +import kotlinx.coroutines.launch + +private const val CUSTOM_SELECTION = "custom" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AddOrEditShareBottomSheet( + share: Share, + internalLink: String, + viewModel: ShareViewModel, + permissionPresets: List = emptyList(), + onDismissDraft: (Share) -> Unit = {} +) { + val entry by viewModel.editorEntry.collectAsStateWithLifecycle() + var dismissAllowed by remember { mutableStateOf(false) } + val scope = rememberCoroutineScope() + val sheetState = rememberModalBottomSheetState( + skipPartiallyExpanded = true, + confirmValueChange = { value -> dismissAllowed || value != SheetValue.Hidden } + ) + val categories = remember { ShareCategory.entries.toList() } + var selectedCategory by rememberSaveable(share.id) { + mutableStateOf(if (share.belongsAnyoneTab) ShareCategory.Anyone else ShareCategory.Invited) + } + var showAdvancedSettings by rememberSaveable(share.id) { mutableStateOf(entry == ShareEditorEntry.SEND_EMAIL) } + val context = LocalContext.current + val propertyErrors by viewModel.propertyErrors.collectAsStateWithLifecycle() + val pendingProperties by viewModel.pendingProperties.collectAsStateWithLifecycle() + val hasPropertyErrors = propertyErrors.isNotEmpty() + val sendEnabled = !hasPropertyErrors && pendingProperties.isEmpty() + + Column( + modifier = Modifier + .fillMaxSize() + ) { + ModalBottomSheet( + onDismissRequest = {}, + sheetState = sheetState, + dragHandle = null, + properties = ModalBottomSheetProperties(shouldDismissOnBackPress = false), + containerColor = MaterialTheme.colorScheme.surface, + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .verticalScroll(rememberScrollState()) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(start = 16.dp, end = 4.dp, top = 12.dp, bottom = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = share.title(context), + style = MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + + IconButton(onClick = { + dismissAllowed = true + scope.launch { + sheetState.hide() + if (share.shareState == ShareState.DRAFT) onDismissDraft(share) else viewModel.setActiveShare( + null + ) + } + }) { + Icon( + imageVector = Icons.Default.Close, + contentDescription = "close bottom sheet", + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + ShareCategorySelector( + share = share, + categories = categories, + selectedCategory = selectedCategory, + onCategorySelected = { category -> + selectedCategory = category + viewModel.selectCategory(category, share) + } + ) + + if (selectedCategory == ShareCategory.Invited) { + SelectRecipientField(share, viewModel) + } + + PermissionsView( + share = share, + entry = entry, + permissionPresets = permissionPresets, + viewModel = viewModel + ) + + BasicSettingsSection( + share = share, + viewModel = viewModel + ) + + AdvancedSettingsSection( + share = share, + isExpanded = showAdvancedSettings, + onToggle = { showAdvancedSettings = !showAdvancedSettings }, + viewModel = viewModel + ) + + if (share.canSend) { + ActionButtons( + share = share, + internalLink = internalLink, + category = selectedCategory, + sendEnabled = sendEnabled, + viewModel = viewModel + ) + } + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun ShareCategorySelector( + share: Share, + categories: List, + selectedCategory: ShareCategory, + onCategorySelected: (ShareCategory) -> Unit +) { + // only allow user to select between taps if it is draft share + if (share.shareState != ShareState.DRAFT) return + + SingleChoiceSegmentedButtonRow( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + ) { + categories.forEachIndexed { index, category -> + SegmentedButton( + selected = selectedCategory == category, + onClick = { onCategorySelected(category) }, + shape = SegmentedButtonDefaults.itemShape(index = index, count = categories.size), + icon = { + Icon(painter = painterResource(category.iconId), contentDescription = "") + } + ) { + Text(stringResource(category.titleId)) + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun PermissionsView( + share: Share, + entry: ShareEditorEntry, + permissionPresets: List, + viewModel: ShareViewModel +) { + var userSelection by rememberSaveable(share.id) { + mutableStateOf( + if (entry == ShareEditorEntry.CUSTOMIZE_PERMISSION) CUSTOM_SELECTION else null + ) + } + + val selectedPreset = when (userSelection) { + null -> share.permissionPreset + CUSTOM_SELECTION -> null + else -> userSelection + } + + PermissionPresetDropdown( + options = PermissionPresetOption.optionsFor(share, permissionPresets), + selectedOption = PermissionPresetOption.from(selectedPreset, permissionPresets), + onOptionSelected = { option -> + userSelection = option.presetClass ?: CUSTOM_SELECTION + option.presetClass?.let { viewModel.updatePermissionPreset(share.id, it, true) } + } + ) + + if (selectedPreset != null) return + + share.permissions.forEach { permission -> + key(permission.clazz) { + var checked by remember(permission.clazz, permission.enabled) { + mutableStateOf(permission.enabled) + } + ShareSwitch( + label = permission.displayName, + checked = checked, + onCheckedChange = { isChecked -> + checked = isChecked + viewModel.updatePermission(share.id, permission.clazz, isChecked) + } + ) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun PermissionPresetDropdown( + options: List, + selectedOption: PermissionPresetOption, + onOptionSelected: (PermissionPresetOption) -> Unit +) { + var expanded by remember { mutableStateOf(false) } + + ExposedDropdownMenuBox( + modifier = Modifier.padding(12.dp), + expanded = expanded, + onExpandedChange = { expanded = it } + ) { + OutlinedTextField( + value = selectedOption.label(), + onValueChange = {}, + readOnly = true, + label = { Text(stringResource(R.string.share_view_permission_preset_label)) }, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, + modifier = Modifier + .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, true) + .fillMaxWidth() + ) + + ExposedDropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + options.forEach { option -> + DropdownMenuItem( + text = { Text(option.label()) }, + onClick = { + expanded = false + onOptionSelected(option) + } + ) + } + } + } +} + +@Composable +private fun BasicSettingsSection( + share: Share, + viewModel: ShareViewModel +) { + if (!share.isBasicSectionAvailable) { + return + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + ) { + share.basicProperties.forEach { property -> + key(property.clazz) { + SharePropertyView( + shareId = share.id, + property = property, + viewModel = viewModel + ) + } + } + } +} + +@Composable +private fun AdvancedSettingsSection( + share: Share, + isExpanded: Boolean, + onToggle: () -> Unit, + viewModel: ShareViewModel +) { + if (!share.isAdvancedSectionAvailable) { + return + } + + CollapsibleShareSection( + label = stringResource(R.string.share_view_advanced_settings), + isExpanded = isExpanded, + onToggle = onToggle + ) { + share.advancedProperties.forEach { property -> + key(property.clazz) { + SharePropertyView( + shareId = share.id, + property = property, + viewModel = viewModel + ) + } + } + + share.customLinkRecipient?.let { + CustomLink( + recipient = it, + onGenerateSecret = { viewModel.generateSecret() }, + onTokenChange = { token -> + viewModel.updateRecipientSecret(share.id, it, token) + } + ) + } + } +} + +@Composable +private fun ActionButtons( + share: Share, + internalLink: String, + category: ShareCategory, + sendEnabled: Boolean, + viewModel: ShareViewModel +) { + val localClipboard = LocalClipboard.current + val scope = rememberCoroutineScope() + val isPreparingLink by viewModel.isPreparingLink.collectAsStateWithLifecycle() + val activeShare by viewModel.activeShare.collectAsStateWithLifecycle() + + LaunchedEffect(activeShare) { + val ready = (activeShare as? ActiveShareState.Activating)?.share ?: return@LaunchedEffect + ready.getClipEntry(internalLink, category)?.let { localClipboard.setClipEntry(it) } + viewModel.onLinkCopied() + } + + Row( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + Button( + onClick = { + if (category == ShareCategory.Anyone) { + viewModel.prepareLinkForCopy(share.id) + } else { + scope.launch { + share.getClipEntry(internalLink, category)?.let { localClipboard.setClipEntry(it) } + } + } + }, + enabled = !isPreparingLink && (category != ShareCategory.Anyone || sendEnabled), + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(10.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onSurface, + ), + ) { + if (isPreparingLink) { + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.onSurface + ) + } else { + Icon( + painter = painterResource(R.drawable.ic_link), + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + } + Text( + text = stringResource(category.copyLinkTitleId), + modifier = Modifier.padding(start = 8.dp), + ) + } + + if (category == ShareCategory.Invited) { + Button( + onClick = { + viewModel.updateState(share.id, ShareState.ACTIVE) + }, + enabled = sendEnabled, + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(10.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary, + ), + ) { + Icon( + imageVector = category.sendActionIcon, + contentDescription = null, + modifier = Modifier.size(20.dp), + ) + Text( + text = stringResource(category.sendActionTitleId), + modifier = Modifier.padding(start = 8.dp), + ) + } + } else { + Button( + onClick = { + viewModel.updateState(share.id, ShareState.ACTIVE) + }, + enabled = sendEnabled, + modifier = Modifier.weight(1f), + shape = RoundedCornerShape(10.dp), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onSurface, + ), + ) { + Text( + text = stringResource(category.sendActionTitleId), + modifier = Modifier.padding(start = 8.dp), + ) + } + } + } +} + +@Preview(showBackground = true) +@Composable +private fun AddOrEditShareBottomSheetPreview() { + MaterialTheme { + AddOrEditShareBottomSheet( + share = previewShare, + internalLink = "internal_link", + viewModel = ShareViewModel(MockShareRepository(), "preview-source", SavedStateHandle()) + ) + } +} + +private val previewIcon = + com.nextcloud.android.common.ui.share.model.api.icon.Icon(svg = "") + +private val previewUser = User( + userId = "alice", + displayName = "Alice Johnson", + icon = previewIcon +) + +private val previewShare = Share( + id = "preview", + owner = previewUser, + lastUpdated = 0L, + shareState = ShareState.DRAFT, + sources = listOf( + Source(clazz = "file", value = "/Photos/vacation.jpg", displayName = "vacation.jpg", icon = previewIcon) + ), + recipients = listOf( + Recipient( + clazz = "user", + value = "bob@example.com", + displayName = "Bob Smith", + icon = previewIcon, + secret = Secret(updatable = false, value = "", url = "https://example.com/s/abc123") + ) + ), + properties = listOf( + PropertyString( + clazz = "note", + displayName = "Note", + priority = 10, + required = false, + advanced = false, + value = "" + ) + ), + permissions = listOf( + Permission( + clazz = "read", + displayName = "Read", + priority = 10, + presets = listOf("view", "edit"), + enabled = true + ), + Permission( + clazz = "update", + displayName = "Update", + priority = 20, + presets = listOf("edit"), + enabled = false + ) + ), + permissionPreset = null +) + diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/bottomsheet/QuickSharePermissionBottomSheet.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/bottomsheet/QuickSharePermissionBottomSheet.kt new file mode 100644 index 00000000..399910d6 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/bottomsheet/QuickSharePermissionBottomSheet.kt @@ -0,0 +1,78 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.android.common.ui.share.component.bottomsheet + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Text +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.model.ui.PermissionPresetOption +import com.nextcloud.android.common.ui.share.model.ui.label + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun QuickSharePermissionBottomSheet( + options: List, + selectedOption: PermissionPresetOption, + onOptionSelected: (PermissionPresetOption) -> Unit, + onDismiss: () -> Unit +) { + val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + + ModalBottomSheet( + onDismissRequest = onDismiss, + sheetState = sheetState, + containerColor = MaterialTheme.colorScheme.surface + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(bottom = 32.dp) + ) { + Text( + text = stringResource(R.string.share_view_quick_permission_title), + style = MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.padding(16.dp) + ) + + options.forEach { option -> + ListItem( + modifier = Modifier.clickable { onOptionSelected(option) }, + headlineContent = { Text(option.label()) }, + trailingContent = { + if (option == selectedOption) { + Icon( + imageVector = Icons.Default.Check, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary + ) + } + }, + colors = ListItemDefaults.colors(containerColor = Color.Transparent) + ) + } + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/dialog/DeleteShareConfirmationDialog.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/dialog/DeleteShareConfirmationDialog.kt new file mode 100644 index 00000000..cf16a865 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/dialog/DeleteShareConfirmationDialog.kt @@ -0,0 +1,46 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.android.common.ui.share.component.dialog + +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import com.nextcloud.android.common.ui.R + +@Composable +fun DeleteShareConfirmationDialog( + onConfirm: () -> Unit, + onDismiss: () -> Unit +) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(stringResource(R.string.share_view_delete_confirm_title)) }, + text = { Text(stringResource(R.string.share_view_delete_confirm_message)) }, + confirmButton = { + FilledTonalButton( + onClick = onConfirm, + colors = ButtonDefaults.filledTonalButtonColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentColor = MaterialTheme.colorScheme.onErrorContainer + ) + ) { + Text(stringResource(R.string.common_ok)) + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text(stringResource(R.string.common_cancel)) + } + } + ) +} \ No newline at end of file diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyEnumField.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyEnumField.kt new file mode 100644 index 00000000..22fb837d --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyEnumField.kt @@ -0,0 +1,74 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuAnchorType +import androidx.compose.material3.ExposedDropdownMenuBox +import androidx.compose.material3.ExposedDropdownMenuDefaults +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.nextcloud.android.common.ui.share.model.api.property.PropertyEnum + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SharePropertyEnumField( + property: PropertyEnum, + isError: Boolean, + onValueSelected: (String) -> Unit +) { + var expanded by remember { mutableStateOf(false) } + var selectedValue by remember(property.clazz) { mutableStateOf(property.value ?: "") } + + ExposedDropdownMenuBox( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 4.dp), + expanded = expanded, + onExpandedChange = { expanded = it } + ) { + OutlinedTextField( + value = selectedValue, + onValueChange = {}, + readOnly = true, + singleLine = true, + label = { Text(property.displayName) }, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, + isError = isError, + modifier = Modifier + .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable, true) + .fillMaxWidth() + ) + + ExposedDropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + property.validValues.forEach { value -> + DropdownMenuItem( + text = { Text(value) }, + onClick = { + selectedValue = value + expanded = false + onValueSelected(value) + } + ) + } + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyMessage.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyMessage.kt new file mode 100644 index 00000000..77363da8 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyMessage.kt @@ -0,0 +1,35 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +private val MESSAGE_START_PADDING = 16.dp +private val MESSAGE_BOTTOM_PADDING = 4.dp + +@Composable +fun SharePropertyMessage(errorMessage: String?, hint: String?) { + val message = errorMessage ?: hint?.takeIf { it.isNotBlank() } ?: return + val color = if (errorMessage != null) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + + Text( + text = message, + color = color, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(start = MESSAGE_START_PADDING, bottom = MESSAGE_BOTTOM_PADDING) + ) +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyView.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyView.kt new file mode 100644 index 00000000..6a1a3173 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/SharePropertyView.kt @@ -0,0 +1,155 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.viewmodel.ShareViewModel +import com.nextcloud.android.common.ui.share.component.ShareSwitch +import com.nextcloud.android.common.ui.share.component.property.datepicker.ShareDatePicker +import com.nextcloud.android.common.ui.share.model.api.property.Property +import com.nextcloud.android.common.ui.share.model.api.property.PropertyBoolean +import com.nextcloud.android.common.ui.share.model.api.property.PropertyDate +import com.nextcloud.android.common.ui.share.model.api.property.PropertyEnum +import com.nextcloud.android.common.ui.share.model.api.property.PropertyPassword +import com.nextcloud.android.common.ui.share.model.api.property.PropertyString + +private const val SINGLE_LINE_COUNT = 1 +private const val MULTILINE_MIN_LINES = 1 +private const val MULTILINE_MAX_LINES = 3 + +@Composable +fun SharePropertyView(shareId: String, property: Property, viewModel: ShareViewModel) { + val propertyErrors by viewModel.propertyErrors.collectAsStateWithLifecycle() + val fallbackError = stringResource(R.string.share_view_update_error_message) + val errorMessage = if (propertyErrors.containsKey(property.clazz)) { + propertyErrors[property.clazz] ?: fallbackError + } else { + null + } + + Column { + SharePropertyField( + shareId = shareId, + property = property, + isError = errorMessage != null, + viewModel = viewModel + ) + + SharePropertyMessage(errorMessage = errorMessage, hint = property.hint) + } +} + +@Composable +private fun SharePropertyField( + shareId: String, + property: Property, + isError: Boolean, + viewModel: ShareViewModel +) { + when (property) { + is PropertyBoolean -> { + var checkedValue by remember(property.clazz) { mutableStateOf(property.isTrue()) } + + ShareSwitch( + label = property.displayName, + checked = checkedValue, + onCheckedChange = { isChecked -> + checkedValue = isChecked + viewModel.updateProperty(shareId, property.clazz, isChecked.toString()) + } + ) + } + + is PropertyString -> ShareTextPropertyField( + shareId = shareId, + property = property, + isError = isError, + viewModel = viewModel + ) + + is PropertyPassword -> ShareTextPropertyField( + shareId = shareId, + property = property, + isError = isError, + viewModel = viewModel, + visualTransformation = PasswordVisualTransformation() + ) + + is PropertyDate -> ShareDatePicker( + property = property, + isError = isError, + onDateSelected = { dateValue -> viewModel.updateProperty(shareId, property.clazz, dateValue) } + ) + + is PropertyEnum -> SharePropertyEnumField( + property = property, + isError = isError, + onValueSelected = { value -> viewModel.updateProperty(shareId, property.clazz, value) } + ) + } +} + +@Composable +private fun ShareTextPropertyField( + shareId: String, + property: Property, + isError: Boolean, + viewModel: ShareViewModel, + visualTransformation: VisualTransformation = VisualTransformation.None +) { + val stringProperty = property as? PropertyString + val isMultiline = stringProperty?.isMultiline == true + val maxLength = stringProperty?.maxLength + val clazz = property.clazz + val initialValue = property.value ?: "" + var value by remember(clazz) { mutableStateOf(initialValue) } + var committedValue by remember(clazz) { mutableStateOf(initialValue) } + var wasFocused by remember(clazz) { mutableStateOf(false) } + + OutlinedTextField( + value = value, + onValueChange = { newValue -> + if (maxLength == null || newValue.length <= maxLength) { + value = newValue + } + }, + label = { Text(property.displayName) }, + visualTransformation = visualTransformation, + isError = isError, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 4.dp) + .onFocusChanged { focusState -> + if (wasFocused && !focusState.isFocused && value != committedValue) { + committedValue = value + viewModel.updateProperty(shareId, clazz, value) + } + wasFocused = focusState.isFocused + }, + singleLine = !isMultiline, + minLines = if (isMultiline) MULTILINE_MIN_LINES else SINGLE_LINE_COUNT, + maxLines = if (isMultiline) MULTILINE_MAX_LINES else SINGLE_LINE_COUNT + ) +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/ShareDatePicker.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/ShareDatePicker.kt new file mode 100644 index 00000000..a8187db6 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/ShareDatePicker.kt @@ -0,0 +1,149 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property.datepicker + +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.PressInteraction +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.component.property.datepicker.util.NoPastSelectableDates +import com.nextcloud.android.common.ui.share.component.property.datepicker.util.ShareDateFormatter +import com.nextcloud.android.common.ui.share.model.api.property.PropertyDate +import com.nextcloud.android.common.ui.util.extensions.Strings + +@Composable +fun ShareDatePicker(property: PropertyDate, isError: Boolean, onDateSelected: (String) -> Unit) { + val formatter = remember { ShareDateFormatter() } + var showDatePicker by remember { mutableStateOf(false) } + var dateValue by remember(property.clazz) { mutableStateOf(formatter.formatIsoForDisplay(property.value)) } + + val interactionSource = remember { MutableInteractionSource() } + LaunchedEffect(interactionSource) { + interactionSource.interactions.collect { interaction -> + if (interaction is PressInteraction.Release) { + showDatePicker = true + } + } + } + + OutlinedTextField( + value = dateValue, + onValueChange = {}, + readOnly = true, + enabled = true, + isError = isError, + modifier = Modifier.fillMaxWidth(), + interactionSource = interactionSource, + label = { Text(formatter.getDisplayName(property)) }, + trailingIcon = { + val isDateBlank = dateValue.isBlank() + val iconId = if (isDateBlank) { + R.drawable.ic_calendar + } else { + R.drawable.ic_cancel + } + IconButton(onClick = { + if (isDateBlank) { + showDatePicker = true + } else { + dateValue = Strings.EMPTY + onDateSelected(Strings.EMPTY) + } + }) { + Icon( + painter = painterResource(iconId), + contentDescription = null + ) + } + } + ) + + if (showDatePicker) { + DatePickerModal( + formatter = formatter, + onDateSelected = { displayDate, isoDate -> + dateValue = displayDate ?: Strings.EMPTY + onDateSelected(isoDate ?: Strings.EMPTY) + }, + onDismiss = { showDatePicker = false } + ) + } +} + +@Composable +private fun DatePickerModal( + formatter: ShareDateFormatter, + onDateSelected: (displayDate: String?, isoDate: String?) -> Unit, + onDismiss: () -> Unit +) { + val datePickerState = rememberDatePickerState( + selectableDates = remember { NoPastSelectableDates() } + ) + + DatePickerDialog( + onDismissRequest = onDismiss, + confirmButton = { + TextButton(onClick = { + onDateSelected( + formatter.formatDisplayDate(datePickerState), + formatter.formatIso8601Date(datePickerState) + ) + onDismiss() + }) { + Text(stringResource(R.string.common_ok)) + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text(stringResource(R.string.common_cancel)) + } + } + ) { + DatePicker(state = datePickerState) + } +} + +@Preview(showBackground = true) +@Composable +private fun ShareDatePickerPreview() { + MaterialTheme { + ShareDatePicker( + property = PropertyDate( + clazz = "expiry", + displayName = "Expiration Date", + priority = 1, + required = false, + advanced = false, + value = "2026-12-31", + minDate = "2026-01-01", + maxDate = "2027-12-31" + ), + isError = false, + onDateSelected = {} + ) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/NoPastSelectableDates.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/NoPastSelectableDates.kt new file mode 100644 index 00000000..0fdc2c3c --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/NoPastSelectableDates.kt @@ -0,0 +1,22 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property.datepicker.util + +import androidx.compose.material3.SelectableDates +import java.time.LocalDate +import java.time.ZoneOffset + +class NoPastSelectableDates : SelectableDates { + + private val today: LocalDate = LocalDate.now(ZoneOffset.UTC) + private val todayUtcMillis: Long = today.atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli() + + override fun isSelectableDate(utcTimeMillis: Long): Boolean = utcTimeMillis >= todayUtcMillis + + override fun isSelectableYear(year: Int): Boolean = year >= today.year +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/ShareDateFormatter.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/ShareDateFormatter.kt new file mode 100644 index 00000000..8e766bfb --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/ShareDateFormatter.kt @@ -0,0 +1,44 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property.datepicker.util + +import androidx.compose.material3.DatePickerState +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.getSelectedDate +import com.nextcloud.android.common.ui.share.model.api.property.PropertyDate +import java.time.LocalDate +import java.time.OffsetDateTime +import java.time.ZoneId +import java.time.format.DateTimeFormatter +import java.time.format.FormatStyle +import java.util.Locale + +class ShareDateFormatter { + + private val displayDateFormatter: DateTimeFormatter = + DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).withLocale(Locale.getDefault()) + + fun getDisplayName(property: PropertyDate): String = property.displayName + + @OptIn(ExperimentalMaterial3Api::class) + fun formatDisplayDate(datePickerState: DatePickerState): String? = + datePickerState.getSelectedDate()?.format(displayDateFormatter) + + @OptIn(ExperimentalMaterial3Api::class) + fun formatIso8601Date(datePickerState: DatePickerState): String? = + datePickerState.getSelectedDate() + ?.atStartOfDay(ZoneId.systemDefault()) + ?.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME) + + fun formatIsoForDisplay(isoDate: String?): String { + if (isoDate.isNullOrBlank()) return "" + return runCatching { OffsetDateTime.parse(isoDate).toLocalDate().format(displayDateFormatter) } + .recoverCatching { LocalDate.parse(isoDate).format(displayDateFormatter) } + .getOrDefault(isoDate) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/capabilities/SharingCapabilities.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/capabilities/SharingCapabilities.kt new file mode 100644 index 00000000..27c52b3b --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/capabilities/SharingCapabilities.kt @@ -0,0 +1,22 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.capabilities + +import com.nextcloud.android.common.ui.share.model.api.permission.PermissionPreset +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class SharingCapabilities( + @SerialName("api_versions") + val apiVersions: List = emptyList(), + @SerialName("source_types") + val sourceTypes: List = emptyList(), + @SerialName("permission_presets") + val permissionPresets: List = emptyList(), +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/capabilities/SourceType.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/capabilities/SourceType.kt new file mode 100644 index 00000000..dbdfe0a6 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/capabilities/SourceType.kt @@ -0,0 +1,17 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.capabilities + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class SourceType( + @SerialName("class") + val classField: String, +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/icon/Icon.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/icon/Icon.kt new file mode 100644 index 00000000..4343042a --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/icon/Icon.kt @@ -0,0 +1,17 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.icon + +import kotlinx.serialization.Serializable + +@Serializable +data class Icon( + val svg: String? = null, + val light: String? = null, + val dark: String? = null +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/permission/Permission.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/permission/Permission.kt new file mode 100644 index 00000000..ccd405a5 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/permission/Permission.kt @@ -0,0 +1,34 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.permission + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +/** + * [presets] holds the class identifiers of the [PermissionPreset]s this permission belongs to. + */ +@Serializable +data class Permission( + @SerialName("class") + val clazz: String, + + @SerialName("source_class") + val sourceClass: String? = null, + + @SerialName("display_name") + val displayName: String, + + val hint: String? = null, + + val priority: Int, + + val presets: List, + + val enabled: Boolean +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/permission/PermissionPreset.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/permission/PermissionPreset.kt new file mode 100644 index 00000000..eb78df95 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/permission/PermissionPreset.kt @@ -0,0 +1,22 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.permission + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class PermissionPreset( + @SerialName("class") + val clazz: String, + + @SerialName("display_name") + val displayName: String, + + val hint: String? = null +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/property/Property.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/property/Property.kt new file mode 100644 index 00000000..07f3aeb7 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/property/Property.kt @@ -0,0 +1,106 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.property + +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonClassDiscriminator + +@OptIn(ExperimentalSerializationApi::class) +@JsonClassDiscriminator("type") +@Serializable +sealed class Property { + abstract val clazz: String + abstract val displayName: String + abstract val hint: String? + abstract val priority: Int + abstract val required: Boolean + abstract val advanced: Boolean + abstract val value: String? + + open val isFilledIn: Boolean + get() = !value.isNullOrBlank() +} + +@Serializable +@SerialName("boolean") +data class PropertyBoolean( + @SerialName("class") override val clazz: String, + @SerialName("display_name") override val displayName: String, + override val hint: String? = null, + override val priority: Int, + override val required: Boolean, + override val advanced: Boolean, + override val value: String? = null +) : Property() { + fun isTrue(): Boolean = value == "true" + + override val isFilledIn: Boolean + get() = isTrue() +} + +@Serializable +@SerialName("date") +data class PropertyDate( + @SerialName("class") override val clazz: String, + @SerialName("display_name") override val displayName: String, + override val hint: String? = null, + override val priority: Int, + override val required: Boolean, + override val advanced: Boolean, + override val value: String? = null, + @SerialName("min_date") val minDate: String? = null, + @SerialName("max_date") val maxDate: String? = null +) : Property() + +@Serializable +@SerialName("enum") +data class PropertyEnum( + @SerialName("class") override val clazz: String, + @SerialName("display_name") override val displayName: String, + override val hint: String? = null, + override val priority: Int, + override val required: Boolean, + override val advanced: Boolean, + override val value: String? = null, + @SerialName("valid_values") val validValues: List +) : Property() + +@Serializable +@SerialName("password") +data class PropertyPassword( + @SerialName("class") override val clazz: String, + @SerialName("display_name") override val displayName: String, + override val hint: String? = null, + override val priority: Int, + override val required: Boolean, + override val advanced: Boolean, + override val value: String? = null +) : Property() + +@Serializable +@SerialName("string") +data class PropertyString( + @SerialName("class") override val clazz: String, + @SerialName("display_name") override val displayName: String, + override val hint: String? = null, + override val priority: Int, + override val required: Boolean, + override val advanced: Boolean, + override val value: String? = null, + @SerialName("min_length") val minLength: Int? = null, + @SerialName("max_length") val maxLength: Int? = null +) : Property() { + companion object { + private const val SINGLE_LINE_MAX_LENGTH = 255 + } + + val isMultiline: Boolean + get() = maxLength == null || maxLength > SINGLE_LINE_MAX_LENGTH +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/recipients/Recipient.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/recipients/Recipient.kt new file mode 100644 index 00000000..601dabcc --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/recipients/Recipient.kt @@ -0,0 +1,40 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.recipients + +import com.nextcloud.android.common.ui.share.model.api.icon.Icon +import com.nextcloud.android.common.ui.share.model.api.secret.Secret +import com.nextcloud.android.common.ui.share.model.api.user.User +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Recipient( + @SerialName("class") + val clazz: String, + + val value: String, + + val instance: String? = null, + + @SerialName("display_name") + val displayName: String, + + val icon: Icon? = null, + + val secret: Secret, + + val initiator: User? = null +) { + companion object { + const val TOKEN_RECIPIENT_CLASS = """OC\Core\Sharing\Recipient\TokenShareRecipientType""" + } + + fun isSameAs(other: Recipient): Boolean = + clazz == other.clazz && value == other.value && instance == other.instance +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/request/ShareRequests.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/request/ShareRequests.kt new file mode 100644 index 00000000..3ca61b45 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/request/ShareRequests.kt @@ -0,0 +1,76 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.request + +import com.nextcloud.android.common.ui.share.model.api.state.ShareState +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonElement + +@Serializable +data class GetShareRequest( + val secret: String? = null, + val arguments: Map = emptyMap() +) + +@Serializable +data class UpdateShareStateRequest( + @SerialName("state") + val shareState: ShareState +) + +@Serializable +data class AddSourceRequest( + @SerialName("class") + val clazz: String, + + val value: String +) + +@Serializable +data class AddRecipientRequest( + @SerialName("class") + val clazz: String, + + val value: String, + + val instance: String? = null +) + +@Serializable +data class UpdateSharePropertyRequest( + @SerialName("class") + val clazz: String, + + val value: String? = null +) + +@Serializable +data class UpdateSharePermissionRequest( + @SerialName("class") + val clazz: String, + + val enabled: Boolean +) + +@Serializable +data class UpdateSharePermissionPresetRequest( + val permissionPresetClass: String +) + +@Serializable +data class UpdateShareRecipientSecretRequest( + @SerialName("class") + val clazz: String, + + val value: String, + + val instance: String? = null, + + val secret: String +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/secret/Secret.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/secret/Secret.kt new file mode 100644 index 00000000..b951e6d0 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/secret/Secret.kt @@ -0,0 +1,17 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.secret + +import kotlinx.serialization.Serializable + +@Serializable +data class Secret( + val updatable: Boolean, + val value: String? = null, + val url: String? = null +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/share/Share.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/share/Share.kt new file mode 100644 index 00000000..e77041ea --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/share/Share.kt @@ -0,0 +1,132 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.share + +import android.content.ClipData +import android.content.Context +import androidx.compose.ui.platform.ClipEntry +import androidx.compose.ui.platform.toClipEntry +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.share.model.api.permission.Permission +import com.nextcloud.android.common.ui.share.model.api.property.Property +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.source.Source +import com.nextcloud.android.common.ui.share.model.api.state.ShareState +import com.nextcloud.android.common.ui.share.model.api.user.User +import com.nextcloud.android.common.ui.share.model.ui.ActiveShareState +import com.nextcloud.android.common.ui.share.model.ui.ShareCategory +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Share( + val id: String, + + val owner: User, + + @SerialName("last_updated") + val lastUpdated: Long, + + @SerialName("state") + val shareState: ShareState, + + val sources: List, + + val recipients: List, + + val properties: List, + + val permissions: List, + + @SerialName("permission_preset") + val permissionPreset: String? = null +) { + companion object { + private const val LABEL_PROPERTY_CLASS = "label" + } + + val basicProperties: List by lazy { + properties.filterNot { it.advanced }.sortedBy { it.priority } + } + + val advancedProperties: List by lazy { + properties.filter { it.advanced }.sortedBy { it.priority } + } + + val isBasicSectionAvailable: Boolean + get() { + return basicProperties.isNotEmpty() + } + + val isAdvancedSectionAvailable: Boolean + get() { + return advancedProperties.isNotEmpty() || customLinkRecipient != null + } + + fun toActiveShare(): ActiveShareState { + return ActiveShareState.Editing(this) + } + + fun getClipEntry(internalLink: String, category: ShareCategory): ClipEntry? { + if (category == ShareCategory.Anyone) { + val recipient = customLinkRecipient ?: return null + return recipient.secret.url?.let { ClipData.newPlainText(recipient.displayName, it).toClipEntry() } + } + + return recipients.firstOrNull()?.let { ClipData.newPlainText(it.displayName, internalLink).toClipEntry() } + } + + fun getHeadline(context: Context, shares: List): String { + if (!belongsAnyoneTab) { + return recipients.firstOrNull()?.displayName ?: "" + } + + return label ?: publicLinkHeadline(context, shares) + } + + private fun publicLinkHeadline(context: Context, shares: List): String { + val publicLinks = shares.filter { it.belongsAnyoneTab } + if (publicLinks.size <= 1) { + return context.getString(R.string.share_view_public_link) + } + + val position = publicLinks.sortedBy { it.lastUpdated }.indexOfFirst { it.id == id } + 1 + return context.getString(R.string.share_view_public_link_numbered, position) + } + + val label: String? + get() = properties + .firstOrNull { it.clazz.contains(LABEL_PROPERTY_CLASS, ignoreCase = true) } + ?.value + ?.takeIf { it.isNotBlank() } + + val belongsAnyoneTab: Boolean + get() { + return customLinkRecipient != null + } + + val customLinkRecipient: Recipient? by lazy { + recipients.firstOrNull { it.secret.updatable } + } + + val invitedRecipients: List + get() = recipients.filterNot { it.clazz == Recipient.TOKEN_RECIPIENT_CLASS } + + val canSend: Boolean + get() { + return sources.isNotEmpty() && + recipients.isNotEmpty() && + permissions.any { it.enabled } && + properties.none { it.required && it.value.isNullOrEmpty() } + } + + fun title(context: Context): String { + val firstRecipient = sources.firstOrNull()?.displayName ?: "..." + return context.getString(R.string.share_view_bottom_sheet_title, firstRecipient) + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/source/Source.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/source/Source.kt new file mode 100644 index 00000000..f4c66311 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/source/Source.kt @@ -0,0 +1,29 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.source + +import com.nextcloud.android.common.ui.share.model.api.icon.Icon +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class Source( + @SerialName("class") + val clazz: String, + + val value: String, + + @SerialName("display_name") + val displayName: String, + + val icon: Icon? = null +) { + companion object { + const val NODE_SOURCE_CLASS = """OCA\Files\Sharing\Source\NodeShareSourceType""" + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/state/ShareState.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/state/ShareState.kt new file mode 100644 index 00000000..2846dc06 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/state/ShareState.kt @@ -0,0 +1,23 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.state + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +enum class ShareState { + @SerialName("active") + ACTIVE, + + @SerialName("draft") + DRAFT, + + @SerialName("deleted") + DELETED +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/user/User.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/user/User.kt new file mode 100644 index 00000000..d0870bf3 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/api/user/User.kt @@ -0,0 +1,25 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.api.user + +import com.nextcloud.android.common.ui.share.model.api.icon.Icon +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class User( + @SerialName("user_id") + val userId: String, + + val instance: String? = null, + + @SerialName("display_name") + val displayName: String, + + val icon: Icon +) diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ActiveShareState.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ActiveShareState.kt new file mode 100644 index 00000000..e7b56192 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ActiveShareState.kt @@ -0,0 +1,23 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +import com.nextcloud.android.common.ui.share.model.api.share.Share + +sealed class ActiveShareState { + data object None : ActiveShareState() + data class Editing(val share: Share) : ActiveShareState() + data class Activating(val share: Share) : ActiveShareState() + + val shareOrNull: Share? + get() = when (this) { + is Editing -> share + is Activating -> share + None -> null + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/PermissionPresetOption.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/PermissionPresetOption.kt new file mode 100644 index 00000000..73afcc48 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/PermissionPresetOption.kt @@ -0,0 +1,36 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +import com.nextcloud.android.common.ui.share.model.api.permission.PermissionPreset +import com.nextcloud.android.common.ui.share.model.api.share.Share + +sealed interface PermissionPresetOption { + + val presetClass: String? + + data object Custom : PermissionPresetOption { + override val presetClass: String? = null + } + + data class Preset(val preset: PermissionPreset) : PermissionPresetOption { + override val presetClass: String get() = preset.clazz + } + + companion object { + fun optionsFor(share: Share, presets: List): List { + val applicableClasses = share.permissions.flatMap { it.presets }.toSet() + return presets.filter { it.clazz in applicableClasses }.map { Preset(it) } + Custom + } + + fun from(presetClass: String?, presets: List): PermissionPresetOption { + if (presetClass == null) return Custom + return presets.firstOrNull { it.clazz == presetClass }?.let { Preset(it) } ?: Custom + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/PermissionPresetOptionLabel.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/PermissionPresetOptionLabel.kt new file mode 100644 index 00000000..f36a5e28 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/PermissionPresetOptionLabel.kt @@ -0,0 +1,18 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import com.nextcloud.android.common.ui.R + +@Composable +fun PermissionPresetOption.label(): String = when (this) { + PermissionPresetOption.Custom -> stringResource(R.string.share_view_permission_preset_custom) + is PermissionPresetOption.Preset -> preset.displayName +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareCategory.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareCategory.kt new file mode 100644 index 00000000..6522188e --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareCategory.kt @@ -0,0 +1,30 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Send +import androidx.compose.material.icons.filled.Share +import com.nextcloud.android.common.ui.R + +enum class ShareCategory(val titleId: Int, val iconId: Int) { + Invited( + R.string.share_view_invited_category_title, + R.drawable.ic_person_add + ), + Anyone(R.string.share_view_anyone_category_title, R.drawable.ic_anyone); + + val copyLinkTitleId + get() = if (this == Invited) R.string.share_view_invited_copy_action else R.string.share_view_anyone_copy_action + + val sendActionTitleId + get() = if (this == Invited) R.string.share_view_send_action else R.string.share_view_share_action + + val sendActionIcon + get() = if (this == Invited) Icons.AutoMirrored.Filled.Send else Icons.Default.Share +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareEditorEntry.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareEditorEntry.kt new file mode 100644 index 00000000..b4208f34 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareEditorEntry.kt @@ -0,0 +1,14 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +enum class ShareEditorEntry { + EDIT, + CUSTOMIZE_PERMISSION, + SEND_EMAIL +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareItemOverlayState.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareItemOverlayState.kt new file mode 100644 index 00000000..b5c73b97 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareItemOverlayState.kt @@ -0,0 +1,15 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.android.common.ui.share.model.ui + +enum class ShareItemOverlayState { + None, + ContextMenu, + QuickShare, + DeleteConfirmation +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareItemType.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareItemType.kt new file mode 100644 index 00000000..f3c08a5f --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareItemType.kt @@ -0,0 +1,35 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.ui.unit.dp + +enum class ShareItemType { + Top, Mid, Bottom; + + @Composable + fun getShape(): RoundedCornerShape { + return when (this) { + Top -> RoundedCornerShape(12.dp, 12.dp, 4.dp, 4.dp) + Mid -> RoundedCornerShape(4.dp, 4.dp, 4.dp, 4.dp) + Bottom -> RoundedCornerShape(4.dp, 4.dp, 12.dp, 12.dp) + } + } + + companion object { + fun type(index: Int, lastIndex: Int): ShareItemType { + return when (index) { + 0 -> Top + lastIndex -> Bottom + else -> Mid + } + } + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareScreenState.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareScreenState.kt new file mode 100644 index 00000000..81fb4038 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/model/ui/ShareScreenState.kt @@ -0,0 +1,19 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.model.ui + +import com.nextcloud.android.common.ui.share.model.api.share.Share +import com.nextcloud.android.common.ui.share.model.api.state.ShareState + +sealed class ShareScreenState { + data object Empty: ShareScreenState() + data object Loading: ShareScreenState() + data class Loaded(val shares: List, val refreshing: Boolean): ShareScreenState() +} + +fun List.activeOnly(): List = filter { it.shareState == ShareState.ACTIVE } diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/MockShareRepository.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/MockShareRepository.kt new file mode 100644 index 00000000..1a2bb62d --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/MockShareRepository.kt @@ -0,0 +1,491 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.repository + +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.share.model.api.capabilities.SharingCapabilities +import com.nextcloud.android.common.ui.share.model.api.icon.Icon +import com.nextcloud.android.common.ui.share.model.api.permission.Permission +import com.nextcloud.android.common.ui.share.model.api.permission.PermissionPreset +import com.nextcloud.android.common.ui.share.model.api.property.PropertyBoolean +import com.nextcloud.android.common.ui.share.model.api.property.PropertyDate +import com.nextcloud.android.common.ui.share.model.api.property.PropertyPassword +import com.nextcloud.android.common.ui.share.model.api.property.PropertyString +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.request.AddRecipientRequest +import com.nextcloud.android.common.ui.share.model.api.request.AddSourceRequest +import com.nextcloud.android.common.ui.share.model.api.request.GetShareRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionPresetRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePropertyRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareRecipientSecretRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareStateRequest +import com.nextcloud.android.common.ui.share.model.api.secret.Secret +import com.nextcloud.android.common.ui.share.model.api.share.Share +import com.nextcloud.android.common.ui.share.model.api.source.Source +import com.nextcloud.android.common.ui.share.model.api.state.ShareState +import com.nextcloud.android.common.ui.share.model.api.user.User + +class MockShareRepository : ShareRepository { + + private val mockOwner = User( + userId = "alice", + displayName = "Alice Johnson", + icon = Icon( + light = "https://mock/icons/user_light.png", + dark = "https://mock/icons/user_dark.png" + ) + ) + + private val mockPermissions = listOf( + Permission( + clazz = "read", + displayName = "Read", + priority = 10, + presets = listOf("view", "edit"), + enabled = true + ), + Permission( + clazz = "update", + displayName = "Update", + priority = 20, + presets = listOf("edit"), + enabled = false + ), + Permission( + clazz = "delete", + displayName = "Delete", + priority = 30, + presets = listOf("edit"), + enabled = false + ) + ) + + private val mockProperties = listOf( + PropertyString( + clazz = "note", + displayName = "Note", + priority = 10, + required = false, + advanced = false, + value = "Design review – please check latest changes" + ), + PropertyPassword( + clazz = "password", + displayName = "Password", + priority = 20, + required = false, + advanced = false, + value = null + ), + PropertyDate( + clazz = "expiration_date", + displayName = "Expiration date", + priority = 30, + required = false, + advanced = true, + value = null, + minDate = "2026-01-01", + maxDate = "2027-01-01" + ), + PropertyBoolean( + clazz = "hide_download", + displayName = "Hide download", + priority = 40, + required = false, + advanced = true, + value = "false" + ) + ) + + private fun buildShare( + id: String, + sources: List, + recipients: List, + shareState: ShareState = ShareState.ACTIVE, + lastUpdated: Long = System.currentTimeMillis(), + owner: User = mockOwner + ) = Share( + id = id, + owner = owner, + lastUpdated = lastUpdated, + shareState = shareState, + sources = sources, + recipients = recipients, + properties = mockProperties, + permissions = mockPermissions + ) + + private val mockShares = mutableListOf( + buildShare( + id = "1", + sources = listOf( + Source(clazz = "file", value = "/Photos/vacation.jpg", displayName = "vacation.jpg") + ), + recipients = listOf( + Recipient( + clazz = "user", + value = "alice@company.com", + displayName = "Alice Johnson", + icon = Icon( + light = "https://mock/icons/user_light.png", + dark = "https://mock/icons/user_dark.png" + ), + secret = Secret(false, value = "", url = "") + ) + ) + ), + buildShare( + id = "2", + sources = listOf( + Source(clazz = "file", value = "/Documents/report.pdf", displayName = "report.pdf") + ), + recipients = listOf( + Recipient( + clazz = "group", + value = "marketing", + displayName = "Marketing Team", + icon = Icon( + light = "https://mock/icons/group_light.png", + dark = "https://mock/icons/group_dark.png" + ), + secret = Secret(false, value = "", url = "") + ) + ), + owner = User( + userId = "system", + displayName = "System", + icon = Icon( + light = "https://mock/icons/system_light.png", + dark = "https://mock/icons/system_dark.png" + ) + ) + ), + buildShare( + id = "3", + sources = listOf( + Source(clazz = "link", value = "https://nextcloud.com/s/abc123", displayName = "Public Link") + ), + recipients = emptyList(), + lastUpdated = 1710000000L, + owner = User( + userId = "system", + displayName = "System", + icon = Icon( + light = "https://mock/icons/system_light.png", + dark = "https://mock/icons/system_dark.png" + ) + ) + ), + buildShare( + id = "4", + sources = listOf( + Source(clazz = "file", value = "/Projects/brief.docx", displayName = "brief.docx") + ), + recipients = listOf( + Recipient( + clazz = "mail", + value = "john@external.com", + displayName = "John External", + icon = Icon( + light = "https://mock/icons/external_light.png", + dark = "https://mock/icons/external_dark.png" + ), + secret = Secret(false, value = "", url = "") + ) + ), + owner = User( + userId = "john", + displayName = "John External", + icon = Icon( + light = "https://mock/icons/user_light.png", + dark = "https://mock/icons/user_dark.png" + ) + ) + ), + buildShare( + id = "5", + sources = listOf( + Source(clazz = "file", value = "/Shared/assets.zip", displayName = "assets.zip") + ), + recipients = listOf( + Recipient( + clazz = "federated", + value = "partner@nextcloud.org", + instance = "nextcloud.org", + displayName = "Partner Cloud", + icon = Icon( + light = "https://mock/icons/federated_light.png", + dark = "https://mock/icons/federated_dark.png" + ), + secret = Secret(false, value = "", url = "") + ) + ), + owner = User( + userId = "partner", + displayName = "Partner Cloud", + icon = Icon( + light = "https://mock/icons/user_light.png", + dark = "https://mock/icons/user_dark.png" + ) + ) + ) + ) + + override suspend fun fetchRecipients( + recipientTypeClasses: List?, + query: String, + limit: Int, + offset: Int + ): NetworkResult> { + val all = listOf( + Recipient( + clazz = "user", + value = "alice@company.com", + displayName = "Alice Johnson", + icon = Icon( + light = "https://mock/icons/user_light.png", + dark = "https://mock/icons/user_dark.png" + ), + secret = Secret(false, value = "", url = "") + ), + Recipient( + clazz = "group", + value = "marketing", + displayName = "Marketing Team", + icon = Icon( + light = "https://mock/icons/group_light.png", + dark = "https://mock/icons/group_dark.png" + ), + secret = Secret(false, value = "", url = "") + ), + Recipient( + clazz = "mail", + value = "john@external.com", + displayName = "John External", + icon = Icon( + light = "https://mock/icons/external_light.png", + dark = "https://mock/icons/external_dark.png" + ), + secret = Secret(false, value = "", url = "") + ), + Recipient( + clazz = "federated", + value = "partner@nextcloud.org", + instance = "nextcloud.org", + displayName = "Partner Cloud", + icon = Icon( + light = "https://mock/icons/federated_light.png", + dark = "https://mock/icons/federated_dark.png" + ), + secret = Secret(false, value = "", url = "") + ) + ) + + val filtered = all + .filter { recipientTypeClasses.isNullOrEmpty() || it.clazz in recipientTypeClasses } + .filter { it.displayName.contains(query, ignoreCase = true) || it.value.contains(query, ignoreCase = true) } + .drop(offset) + .take(limit) + + return NetworkResult.Success(filtered) + } + + override suspend fun createDraftShare(): NetworkResult { + val share = buildShare( + id = "mock-share-${System.currentTimeMillis()}", + sources = emptyList(), + recipients = emptyList(), + shareState = ShareState.DRAFT + ) + mockShares.add(share) + return NetworkResult.Success(share) + } + + override suspend fun fetchShare( + id: String, + request: GetShareRequest + ): NetworkResult { + val share = mockShares.find { it.id == id } + ?: return NetworkResult.Success( + buildShare(id = id, sources = emptyList(), recipients = emptyList()) + ) + return NetworkResult.Success(share) + } + + override suspend fun deleteShare(id: String): NetworkResult { + mockShares.removeAll { it.id == id } + return NetworkResult.Success(Unit) + } + + override suspend fun fetchShares( + filterSourceTypeValue: String, + limit: Int, + filterSourceTypeClass: String?, + lastShareID: String? + ): NetworkResult> { + var result = mockShares.filter { share -> + share.sources.any { + it.value == filterSourceTypeValue && + (filterSourceTypeClass == null || it.clazz == filterSourceTypeClass) + } + } + + if (lastShareID != null) { + val index = result.indexOfFirst { it.id == lastShareID } + if (index >= 0) result = result.drop(index + 1) + } + + return NetworkResult.Success(result.take(limit)) + } + + override suspend fun updateShareState( + id: String, + request: UpdateShareStateRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val updated = (if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList())) + .copy(shareState = request.shareState, lastUpdated = System.currentTimeMillis()) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun addShareSource( + id: String, + request: AddSourceRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val newSource = Source(clazz = request.clazz, value = request.value, displayName = request.value) + val updated = current.copy( + sources = current.sources + newSource, + lastUpdated = System.currentTimeMillis() + ) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun removeShareSource( + id: String, + clazz: String, + value: String + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val updated = current.copy( + sources = current.sources.filterNot { it.clazz == clazz && it.value == value }, + lastUpdated = System.currentTimeMillis() + ) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun addShareRecipient( + id: String, + request: AddRecipientRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val newRecipient = Recipient( + clazz = request.clazz, + value = request.value, + instance = request.instance, + displayName = request.value, + secret = Secret(false, value = "", url = "") + ) + val updated = current.copy( + recipients = current.recipients + newRecipient, + lastUpdated = System.currentTimeMillis() + ) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun removeShareRecipient( + id: String, + clazz: String, + value: String, + instance: String? + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val updated = current.copy( + recipients = current.recipients.filterNot { + it.clazz == clazz && it.value == value && it.instance == instance + }, + lastUpdated = System.currentTimeMillis() + ) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun updateShareProperty( + id: String, + request: UpdateSharePropertyRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val updated = current.copy(lastUpdated = System.currentTimeMillis()) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun updateShareRecipientSecret( + id: String, + request: UpdateShareRecipientSecretRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + return NetworkResult.Success(current) + } + + override suspend fun generateSecret(): NetworkResult = NetworkResult.Success("mockSecret12345") + + override suspend fun updateSharePermission( + id: String, + request: UpdateSharePermissionRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = + if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val updatedPermissions = current.permissions.map { + if (it.clazz == request.clazz) it.copy(enabled = request.enabled) else it + } + val updated = current.copy( + permissions = updatedPermissions, + lastUpdated = System.currentTimeMillis() + ) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun updateSharePermissionPreset( + id: String, + request: UpdateSharePermissionPresetRequest + ): NetworkResult { + val index = mockShares.indexOfFirst { it.id == id } + val current = + if (index >= 0) mockShares[index] else buildShare(id = id, sources = emptyList(), recipients = emptyList()) + val updated = current.copy( + permissionPreset = request.permissionPresetClass, + lastUpdated = System.currentTimeMillis() + ) + if (index >= 0) mockShares[index] = updated + return NetworkResult.Success(updated) + } + + override suspend fun fetchSharingCapabilities(): NetworkResult = + NetworkResult.Success( + SharingCapabilities( + permissionPresets = listOf( + PermissionPreset(clazz = "view", displayName = "Can view"), + PermissionPreset(clazz = "edit", displayName = "Can edit") + ) + ) + ) +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/ShareRemoteRepository.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/ShareRemoteRepository.kt new file mode 100644 index 00000000..0e20df77 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/ShareRemoteRepository.kt @@ -0,0 +1,227 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.repository + +import com.nextcloud.android.common.ui.network.http.HttpMethod +import com.nextcloud.android.common.ui.network.http.JSON_CONTENT_TYPE +import com.nextcloud.android.common.ui.network.http.NextcloudHttpClient +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.network.model.OcsResponse +import com.nextcloud.android.common.ui.network.serialization.OCSSerializer +import com.nextcloud.android.common.ui.share.model.api.capabilities.SharingCapabilities +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.request.AddRecipientRequest +import com.nextcloud.android.common.ui.share.model.api.request.AddSourceRequest +import com.nextcloud.android.common.ui.share.model.api.request.GetShareRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionPresetRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePropertyRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareRecipientSecretRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareStateRequest +import com.nextcloud.android.common.ui.share.model.api.share.Share +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.decodeFromJsonElement +import kotlinx.serialization.json.jsonObject +import okhttp3.RequestBody.Companion.toRequestBody +import java.net.URLEncoder + +private fun String.urlEncoded(): String = URLEncoder.encode(this, Charsets.UTF_8.name()) + +class ShareRemoteRepository( + private val client: NextcloudHttpClient, + private val json: kotlinx.serialization.json.Json = OCSSerializer.json +) : ShareRepository { + + private companion object { + private const val SHARE_ENDPOINT = "/ocs/v2.php/apps/sharing/api/v1/share" + private const val SHARES_ENDPOINT = "/ocs/v2.php/apps/sharing/api/v1/shares" + private const val RECIPIENTS_ENDPOINT = "/ocs/v2.php/apps/sharing/api/v1/recipients" + private const val SECRET_ENDPOINT = "/ocs/v2.php/apps/sharing/api/v1/secret" + private const val CAPABILITIES_ENDPOINT = "/ocs/v2.php/cloud/capabilities" + private const val NODE_CAPABILITIES = "capabilities" + private const val NODE_SHARING = "sharing" + } + + private fun decodeShare(body: String): Share = + json.decodeFromString>(body).ocs.data + + override suspend fun fetchRecipients( + recipientTypeClasses: List?, + query: String, + limit: Int, + offset: Int + ): NetworkResult> { + val queryParams = buildString { + append("?query=${query.urlEncoded()}&limit=$limit&offset=$offset") + recipientTypeClasses?.forEach { append("&recipientTypeClasses[]=${it.urlEncoded()}") } + } + return client.executeRequest( + endpoint = "$RECIPIENTS_ENDPOINT$queryParams", + method = HttpMethod.GET + ) { body -> + json.decodeFromString>>(body).ocs.data + } + } + + override suspend fun createDraftShare(): NetworkResult = + client.executeRequest( + endpoint = SHARE_ENDPOINT, + method = HttpMethod.POST, + body = ByteArray(0).toRequestBody() + ) { decodeShare(it) } + + override suspend fun fetchShare( + id: String, + request: GetShareRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id", + method = HttpMethod.POST, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun deleteShare(id: String): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id", + method = HttpMethod.DELETE + ) { } + + override suspend fun fetchShares( + filterSourceTypeValue: String, + limit: Int, + filterSourceTypeClass: String?, + lastShareID: String? + ): NetworkResult> { + val queryParams = buildString { + append("?limit=$limit") + append("&filterSourceTypeValue=${filterSourceTypeValue.urlEncoded()}") + filterSourceTypeClass?.let { append("&filterSourceTypeClass=${it.urlEncoded()}") } + lastShareID?.let { append("&lastShareID=${it.urlEncoded()}") } + } + return client.executeRequest( + endpoint = "$SHARES_ENDPOINT$queryParams", + method = HttpMethod.GET + ) { body -> + json.decodeFromString>>(body).ocs.data + } + } + + override suspend fun updateShareState( + id: String, + request: UpdateShareStateRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/state", + method = HttpMethod.PUT, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun addShareSource( + id: String, + request: AddSourceRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/source", + method = HttpMethod.POST, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun removeShareSource( + id: String, + clazz: String, + value: String + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/source?class=${clazz.urlEncoded()}&value=${value.urlEncoded()}", + method = HttpMethod.DELETE + ) { decodeShare(it) } + + override suspend fun addShareRecipient( + id: String, + request: AddRecipientRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/recipient", + method = HttpMethod.POST, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun removeShareRecipient( + id: String, + clazz: String, + value: String, + instance: String? + ): NetworkResult { + val queryParams = buildString { + append("?class=${clazz.urlEncoded()}&value=${value.urlEncoded()}") + instance?.let { append("&instance=${it.urlEncoded()}") } + } + return client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/recipient$queryParams", + method = HttpMethod.DELETE + ) { decodeShare(it) } + } + + override suspend fun updateShareProperty( + id: String, + request: UpdateSharePropertyRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/property", + method = HttpMethod.PUT, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun updateSharePermission( + id: String, + request: UpdateSharePermissionRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/permission", + method = HttpMethod.PUT, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun updateSharePermissionPreset( + id: String, + request: UpdateSharePermissionPresetRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/permission/preset", + method = HttpMethod.PUT, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun updateShareRecipientSecret( + id: String, + request: UpdateShareRecipientSecretRequest + ): NetworkResult = + client.executeRequest( + endpoint = "$SHARE_ENDPOINT/$id/recipient/secret", + method = HttpMethod.PUT, + body = json.encodeToString(request).toRequestBody(JSON_CONTENT_TYPE) + ) { decodeShare(it) } + + override suspend fun generateSecret(): NetworkResult = + client.executeRequest( + endpoint = SECRET_ENDPOINT, + method = HttpMethod.GET + ) { body -> + json.decodeFromString>(body).ocs.data + } + + override suspend fun fetchSharingCapabilities(): NetworkResult = + client.executeRequest( + endpoint = CAPABILITIES_ENDPOINT, + method = HttpMethod.GET + ) { body -> + val sharing = json.decodeFromString>(body) + .ocs.data[NODE_CAPABILITIES]?.jsonObject?.get(NODE_SHARING) + sharing?.let { json.decodeFromJsonElement(it) } ?: SharingCapabilities() + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/ShareRepository.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/ShareRepository.kt new file mode 100644 index 00000000..6f5cae0d --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/repository/ShareRepository.kt @@ -0,0 +1,98 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ +package com.nextcloud.android.common.ui.share.repository + +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.share.model.api.capabilities.SharingCapabilities +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.request.AddRecipientRequest +import com.nextcloud.android.common.ui.share.model.api.request.AddSourceRequest +import com.nextcloud.android.common.ui.share.model.api.request.GetShareRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionPresetRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePropertyRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareRecipientSecretRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareStateRequest +import com.nextcloud.android.common.ui.share.model.api.share.Share + +interface ShareRepository { + + suspend fun fetchRecipients( + recipientTypeClasses: List?, + query: String, + limit: Int, + offset: Int + ): NetworkResult> + + suspend fun createDraftShare(): NetworkResult + + suspend fun fetchShare( + id: String, + request: GetShareRequest = GetShareRequest() + ): NetworkResult + + suspend fun deleteShare(id: String): NetworkResult + + suspend fun fetchShares( + filterSourceTypeValue: String, + limit: Int, + filterSourceTypeClass: String? = null, + lastShareID: String? = null + ): NetworkResult> + + suspend fun updateShareState( + id: String, + request: UpdateShareStateRequest + ): NetworkResult + + suspend fun addShareSource( + id: String, + request: AddSourceRequest + ): NetworkResult + + suspend fun removeShareSource( + id: String, + clazz: String, + value: String + ): NetworkResult + + suspend fun addShareRecipient( + id: String, + request: AddRecipientRequest + ): NetworkResult + + suspend fun removeShareRecipient( + id: String, + clazz: String, + value: String, + instance: String? = null + ): NetworkResult + + suspend fun updateShareProperty( + id: String, + request: UpdateSharePropertyRequest + ): NetworkResult + + suspend fun updateSharePermission( + id: String, + request: UpdateSharePermissionRequest + ): NetworkResult + + suspend fun updateSharePermissionPreset( + id: String, + request: UpdateSharePermissionPresetRequest + ): NetworkResult + + suspend fun updateShareRecipientSecret( + id: String, + request: UpdateShareRecipientSecretRequest + ): NetworkResult + + suspend fun generateSecret(): NetworkResult + + suspend fun fetchSharingCapabilities(): NetworkResult +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareSavedState.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareSavedState.kt new file mode 100644 index 00000000..3b746273 --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareSavedState.kt @@ -0,0 +1,44 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.viewmodel + +import androidx.lifecycle.SavedStateHandle +import com.nextcloud.android.common.ui.share.model.ui.ShareEditorEntry +import kotlinx.coroutines.flow.StateFlow + +class ShareSavedState( + private val handle: SavedStateHandle +) { + companion object { + private const val KEY_ACTIVE_SHARE_ID = "active_share_id" + private const val KEY_EDITOR_ENTRY = "editor_entry" + private const val KEY_SEARCH_QUERY = "search_query" + } + + var activeShareId: String? + get() = handle[KEY_ACTIVE_SHARE_ID] + set(value) { + handle[KEY_ACTIVE_SHARE_ID] = value + } + + var editorEntry: ShareEditorEntry + get() = + handle + .get(KEY_EDITOR_ENTRY) + ?.let { name -> ShareEditorEntry.entries.firstOrNull { it.name == name } } + ?: ShareEditorEntry.EDIT + set(value) { + handle[KEY_EDITOR_ENTRY] = value.name + } + + val searchQuery: StateFlow = handle.getStateFlow(KEY_SEARCH_QUERY, "") + + fun updateSearchQuery(query: String) { + handle[KEY_SEARCH_QUERY] = query + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareViewModel.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareViewModel.kt new file mode 100644 index 00000000..2683aa0e --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareViewModel.kt @@ -0,0 +1,471 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.viewmodel + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.nextcloud.android.common.ui.R +import com.nextcloud.android.common.ui.network.model.NetworkResult +import com.nextcloud.android.common.ui.network.model.dataOrElse +import com.nextcloud.android.common.ui.share.model.api.permission.PermissionPreset +import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient +import com.nextcloud.android.common.ui.share.model.api.request.AddRecipientRequest +import com.nextcloud.android.common.ui.share.model.api.request.AddSourceRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionPresetRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePermissionRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateSharePropertyRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareRecipientSecretRequest +import com.nextcloud.android.common.ui.share.model.api.request.UpdateShareStateRequest +import com.nextcloud.android.common.ui.share.model.api.share.Share +import com.nextcloud.android.common.ui.share.model.api.source.Source +import com.nextcloud.android.common.ui.share.model.api.state.ShareState +import com.nextcloud.android.common.ui.share.model.ui.ActiveShareState +import com.nextcloud.android.common.ui.share.model.ui.ShareCategory +import com.nextcloud.android.common.ui.share.model.ui.ShareEditorEntry +import com.nextcloud.android.common.ui.share.model.ui.ShareScreenState +import com.nextcloud.android.common.ui.share.model.ui.activeOnly +import com.nextcloud.android.common.ui.share.repository.ShareRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.mapLatest +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.util.UUID +import kotlin.time.Duration.Companion.milliseconds + +class ShareViewModel( + private val repository: ShareRepository, + private val sourceId: String, + savedStateHandle: SavedStateHandle +) : ViewModel() { + + companion object { + private const val SEARCH_DEBOUNCE_DELAY = 300L + private const val SEARCH_SUBSCRIPTION_TIMEOUT = 5_000L + private const val RECIPIENT_SEARCH_LIMIT = 10 + private const val RECIPIENT_SEARCH_OFFSET = 0 + private const val SHARES_PAGE_SIZE = 100 + private const val MAX_SHARE_PAGES = 20 + } + + private val savedState = ShareSavedState(savedStateHandle) + + private val _state = MutableStateFlow(ShareScreenState.Loading) + val state: StateFlow = _state + + private val _isPreparingLink = MutableStateFlow(false) + val isPreparingLink: StateFlow = _isPreparingLink + + private val _activeShare = MutableStateFlow(ActiveShareState.None) + val activeShare: StateFlow = _activeShare + + private val _editorEntry = MutableStateFlow(savedState.editorEntry) + val editorEntry: StateFlow = _editorEntry + + private val _permissionPresets = MutableStateFlow>(emptyList()) + val permissionPresets: StateFlow> = _permissionPresets + + private val _errorMessageId = MutableStateFlow(null) + val errorMessageId: StateFlow = _errorMessageId + + private val _propertyErrors = MutableStateFlow>(emptyMap()) + val propertyErrors: StateFlow> = _propertyErrors + + private val _pendingProperties = MutableStateFlow>(emptySet()) + val pendingProperties: StateFlow> = _pendingProperties + + private val currentShares: List + get() = (_state.value as? ShareScreenState.Loaded)?.shares ?: emptyList() + + private val propertyUpdateJobs = mutableMapOf() + + val searchQuery: StateFlow = savedState.searchQuery + + @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class) + val recipientSearchResults: StateFlow> = searchQuery + .debounce(SEARCH_DEBOUNCE_DELAY.milliseconds) + .distinctUntilChanged() + .filter { it.isNotBlank() } + .mapLatest { query -> searchRecipients(query) } + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(SEARCH_SUBSCRIPTION_TIMEOUT), emptyList()) + + private var secretUpdateJob: Job? = null + + init { + loadInitialData() + } + + private fun loadInitialData() { + viewModelScope.launch(Dispatchers.IO) { + launch { loadSharingCapabilities() } + launch { restoreActiveShare() } + loadShares() + } + } + + private suspend fun loadSharingCapabilities() { + val result = repository.fetchSharingCapabilities() + if (result is NetworkResult.Success) { + _permissionPresets.update { + result.data.permissionPresets + } + } + } + + private suspend fun restoreActiveShare() { + if (_activeShare.value != ActiveShareState.None) return + val restored = savedState.activeShareId?.let { fetchRestorableShare(it) } ?: return + + updateActiveShare(ActiveShareState.Editing(restored)) + replaceInList(restored) + } + + private suspend fun fetchRestorableShare(id: String): Share? { + val result = repository.fetchShare(id) + if (result !is NetworkResult.Success) return null + return result.data.takeIf { savedState.activeShareId == id } + } + + // region search query + fun onSearchQueryChanged(query: String) { + savedState.updateSearchQuery(query) + } + + private suspend fun searchRecipients(query: String): List { + val result = repository.fetchRecipients(null, query, RECIPIENT_SEARCH_LIMIT, RECIPIENT_SEARCH_OFFSET) + return (result as? NetworkResult.Success)?.data ?: emptyList() + } + // endregion + + // region shares list + fun refreshShares() { + val state = _state.value as? ShareScreenState.Loaded ?: return + if (state.refreshing) return + + viewModelScope.launch(Dispatchers.IO) { + setRefreshing(true) + loadShares() + setRefreshing(false) + } + } + + private fun setRefreshing(refreshing: Boolean) { + _state.update { + if (it is ShareScreenState.Loaded) it.copy(refreshing = refreshing) else it + } + } + + private suspend fun loadShares() { + _errorMessageId.update { null } + val fetched = fetchAllShares() + publishShares(fetched?.activeOnly() ?: currentShares) + } + + // The server pages drafts and active shares together while the list only renders active ones, + // so a file with a page worth of abandoned drafts would otherwise hide every real share. + private suspend fun fetchAllShares(): List? { + val shares = mutableListOf() + var cursor: String? = null + var page = 0 + + while (page < MAX_SHARE_PAGES) { + val result = repository.fetchShares( + filterSourceTypeValue = sourceId, + limit = SHARES_PAGE_SIZE, + filterSourceTypeClass = Source.NODE_SOURCE_CLASS, + lastShareID = cursor + ) + val fetched = result.dataOrElse { _errorMessageId.update { R.string.share_view_fetch_error_message } } + ?: return null + + shares += fetched + if (fetched.size < SHARES_PAGE_SIZE) break + + cursor = fetched.last().id + page++ + } + + return shares + } + // endregion + + // region create + fun createDraftShare() { + viewModelScope.launch(Dispatchers.IO) { + _errorMessageId.update { null } + + val result = repository.createDraftShare() + val draft = result.dataOrElse { _errorMessageId.update { R.string.share_view_create_error_message } } + ?: return@launch + + updateEditorEntry(ShareEditorEntry.EDIT) + updateActiveShare(draft.toActiveShare()) + + applySource(draft.id, sourceId) + } + } + // endregion + + // region state + fun updateState(id: String, shareState: ShareState) { + viewModelScope.launch(Dispatchers.IO) { + val updated = applyState(id, shareState) ?: return@launch + + if (shareState == ShareState.ACTIVE) { + updateActiveShare(ActiveShareState.None) + } else { + refreshActiveShare(updated.toActiveShare()) + } + replaceInList(updated) + } + } + + fun prepareLinkForCopy(id: String) { + if (_isPreparingLink.value) return + + viewModelScope.launch(Dispatchers.IO) { + _isPreparingLink.update { true } + + val updated = applyState(id, ShareState.ACTIVE) + if (updated != null) { + refreshActiveShare(ActiveShareState.Activating(updated)) + replaceInList(updated) + } + + _isPreparingLink.update { false } + } + } + + fun onLinkCopied() { + val activating = _activeShare.value as? ActiveShareState.Activating ?: return + updateActiveShare(ActiveShareState.Editing(activating.share)) + } + + private suspend fun applyState(id: String, shareState: ShareState): Share? { + val result = repository.updateShareState(id, UpdateShareStateRequest(shareState)) + return result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + } + // endregion + + // region sources + private suspend fun applySource(id: String, value: String) { + val result = repository.addShareSource(id, AddSourceRequest(Source.NODE_SOURCE_CLASS, value)) + val updated = result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + ?: return + refreshActiveShare(updated.toActiveShare()) + replaceInList(updated) + } + // endregion + + // region recipients + fun addRecipient(id: String, clazz: String, value: String, instance: String? = null) { + viewModelScope.launch(Dispatchers.IO) { + val result = repository.addShareRecipient(id, AddRecipientRequest(clazz, value, instance)) + val updated = result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + ?: return@launch + refreshActiveShare(updated.toActiveShare()) + replaceInList(updated) + } + } + + fun selectCategory(category: ShareCategory, share: Share) { + when (category) { + ShareCategory.Anyone -> { + removeRecipients(share) { it.clazz != Recipient.TOKEN_RECIPIENT_CLASS } + if (share.recipients.none { it.clazz == Recipient.TOKEN_RECIPIENT_CLASS }) { + addRecipient( + id = share.id, + clazz = Recipient.TOKEN_RECIPIENT_CLASS, + value = UUID.randomUUID().toString(), + instance = null + ) + } + } + + ShareCategory.Invited -> { + removeRecipients(share) { it.clazz == Recipient.TOKEN_RECIPIENT_CLASS } + } + } + } + + private fun removeRecipients(share: Share, predicate: (Recipient) -> Boolean) { + share.recipients + .filter(predicate) + .forEach { removeRecipient(share.id, it.clazz, it.value, it.instance) } + } + + fun removeRecipient(id: String, clazz: String, value: String, instance: String? = null) { + viewModelScope.launch(Dispatchers.IO) { + val result = repository.removeShareRecipient(id, clazz, value, instance) + val updated = result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + ?: return@launch + refreshActiveShare(updated.toActiveShare()) + replaceInList(updated) + } + } + + fun updateRecipientSecret(shareId: String, recipient: Recipient, secret: String) { + secretUpdateJob?.cancel() + secretUpdateJob = viewModelScope.launch(Dispatchers.IO) { + val request = UpdateShareRecipientSecretRequest( + clazz = recipient.clazz, + value = recipient.value, + instance = recipient.instance, + secret = secret + ) + val result = repository.updateShareRecipientSecret(shareId, request) + val updated = result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + ?: return@launch + refreshActiveShare(updated.toActiveShare()) + replaceInList(updated) + } + } + + suspend fun generateSecret(): String? = withContext(Dispatchers.IO) { + _errorMessageId.update { null } + val result = repository.generateSecret() + result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + } + // endregion + + // region properties + fun updateProperty(shareId: String, clazz: String, value: String?) { + propertyUpdateJobs[clazz]?.cancel() + _pendingProperties.update { it + clazz } + if (value.isNullOrEmpty()) { + _propertyErrors.update { it - clazz } + } + propertyUpdateJobs[clazz] = viewModelScope.launch(Dispatchers.IO) { + when (val result = repository.updateShareProperty(shareId, UpdateSharePropertyRequest(clazz, value))) { + is NetworkResult.Success -> { + _propertyErrors.update { it - clazz } + refreshActiveShare(result.data.toActiveShare()) + replaceInList(result.data) + } + + is NetworkResult.ServerError -> { + if (!value.isNullOrEmpty()) { + _propertyErrors.update { it + (clazz to result.response.ocs.data) } + } + } + + is NetworkResult.NetworkException -> { + if (!value.isNullOrEmpty()) { + _propertyErrors.update { it + (clazz to null) } + } + } + } + _pendingProperties.update { it - clazz } + } + } + // endregion + + // region permissions + fun updatePermission(id: String, clazz: String, enabled: Boolean) { + viewModelScope.launch(Dispatchers.IO) { + val result = repository.updateSharePermission(id, UpdateSharePermissionRequest(clazz, enabled)) + val updated = result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + ?: return@launch + replaceInList(updated) + } + } + + fun updatePermissionPreset(id: String, presetClass: String, updateActiveShare: Boolean) { + viewModelScope.launch(Dispatchers.IO) { + val result = repository.updateSharePermissionPreset(id, UpdateSharePermissionPresetRequest(presetClass)) + val updated = result.dataOrElse { _errorMessageId.update { R.string.share_view_update_error_message } } + ?: return@launch + if (updateActiveShare) { + refreshActiveShare(updated.toActiveShare()) + } + replaceInList(updated) + } + } + // endregion + + // region delete + fun deleteShare(id: String) { + viewModelScope.launch(Dispatchers.IO) { + val result = repository.deleteShare(id) + result.dataOrElse { _errorMessageId.update { R.string.share_view_delete_error_message } } ?: return@launch + + publishShares(currentShares.filterNot { it.id == id }) + + val editingShare = _activeShare.value + if (editingShare is ActiveShareState.Editing && editingShare.share.id == id) { + updateActiveShare(ActiveShareState.None) + } + } + } + // endregion + + // region ui helpers + fun updateErrorMessage(value: Int?) { + _errorMessageId.update { value } + } + + fun setActiveShare(value: Share?, entry: ShareEditorEntry = ShareEditorEntry.EDIT) { + _propertyErrors.update { emptyMap() } + _pendingProperties.update { emptySet() } + updateEditorEntry(entry) + updateActiveShare(value?.toActiveShare() ?: ActiveShareState.None) + } + // endregion + + // region private + private fun updateEditorEntry(entry: ShareEditorEntry) { + _editorEntry.value = entry + savedState.editorEntry = entry + } + + private fun updateActiveShare(value: ActiveShareState) { + _activeShare.value = value + savedState.activeShareId = value.shareOrNull?.id + } + + private fun refreshActiveShare(value: ActiveShareState) { + val id = value.shareOrNull?.id ?: return + if (_activeShare.value.shareOrNull?.id != id) return + updateActiveShare(value) + } + + // The list only ever holds active shares, so a draft being edited never reaches it and an + // activated one is inserted rather than silently dropped. + private fun replaceInList(updated: Share) { + val current = currentShares + val index = current.indexOfFirst { it.id == updated.id } + val isActive = updated.shareState == ShareState.ACTIVE + + val shares = when { + index >= 0 && isActive -> current.toMutableList().apply { this[index] = updated } + index >= 0 -> current.filterNot { it.id == updated.id } + isActive -> listOf(updated) + current + else -> return + } + + publishShares(shares) + } + + private fun publishShares(shares: List) { + _state.update { + if (shares.isEmpty()) ShareScreenState.Empty else ShareScreenState.Loaded(shares, false) + } + } + // endregion +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareViewModelFactory.kt b/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareViewModelFactory.kt new file mode 100644 index 00000000..cea0cdda --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/share/viewmodel/ShareViewModelFactory.kt @@ -0,0 +1,33 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.viewmodel + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.createSavedStateHandle +import androidx.lifecycle.viewmodel.CreationExtras +import com.nextcloud.android.common.ui.share.repository.ShareRepository + +class ShareViewModelFactory( + private val sourceId: String, + private val repositoryProvider: () -> ShareRepository +) : ViewModelProvider.Factory { + @Suppress("UNCHECKED_CAST") + override fun create( + modelClass: Class, + extras: CreationExtras + ): T { + require(modelClass.isAssignableFrom(ShareViewModel::class.java)) { + "ShareViewModelFactory cannot create ${modelClass.name}" + } + + val savedStateHandle: SavedStateHandle = extras.createSavedStateHandle() + return ShareViewModel(repositoryProvider(), sourceId, savedStateHandle) as T + } +} diff --git a/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/StringExtensions.kt b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/StringExtensions.kt new file mode 100644 index 00000000..954245fe --- /dev/null +++ b/ui/src/main/java/com/nextcloud/android/common/ui/util/extensions/StringExtensions.kt @@ -0,0 +1,12 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.util.extensions + +object Strings { + const val EMPTY = "" +} diff --git a/ui/src/main/res/drawable/ic_anyone.xml b/ui/src/main/res/drawable/ic_anyone.xml new file mode 100644 index 00000000..4e16a67b --- /dev/null +++ b/ui/src/main/res/drawable/ic_anyone.xml @@ -0,0 +1,9 @@ + + + diff --git a/ui/src/main/res/drawable/ic_calendar.xml b/ui/src/main/res/drawable/ic_calendar.xml new file mode 100644 index 00000000..9e205862 --- /dev/null +++ b/ui/src/main/res/drawable/ic_calendar.xml @@ -0,0 +1,24 @@ + + + + diff --git a/ui/src/main/res/drawable/ic_cancel.xml b/ui/src/main/res/drawable/ic_cancel.xml new file mode 100644 index 00000000..5d968727 --- /dev/null +++ b/ui/src/main/res/drawable/ic_cancel.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/ui/src/main/res/drawable/ic_link.xml b/ui/src/main/res/drawable/ic_link.xml new file mode 100644 index 00000000..3cb49187 --- /dev/null +++ b/ui/src/main/res/drawable/ic_link.xml @@ -0,0 +1,16 @@ + + + + diff --git a/ui/src/main/res/drawable/ic_person_add.xml b/ui/src/main/res/drawable/ic_person_add.xml new file mode 100644 index 00000000..db9f2514 --- /dev/null +++ b/ui/src/main/res/drawable/ic_person_add.xml @@ -0,0 +1,9 @@ + + + diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml new file mode 100644 index 00000000..a74584db --- /dev/null +++ b/ui/src/main/res/values/strings.xml @@ -0,0 +1,52 @@ + + + + OK + Cancel + + Share link + Share link (%1$d) + + Share "%s" + + Settings + + Recipient + Clear recipient + + Custom link + The link can be changed to be easy to remember, but do not set it to something that is easy to guess. + Refresh link + + Not shared + No result + + Copied + Copy private link + Copy public link + Send + Share public link… + + Edit + Send email + Delete + Delete share? + This share will be permanently removed. + + Failed to fetch shares. + Failed to delete share. + Failed to create share. + Failed to update share. + + Change permission + Participants + Can… + + Invited people + Anyone + \ No newline at end of file diff --git a/ui/src/test/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/ShareDateFormatterTest.kt b/ui/src/test/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/ShareDateFormatterTest.kt new file mode 100644 index 00000000..c4661a51 --- /dev/null +++ b/ui/src/test/java/com/nextcloud/android/common/ui/share/component/property/datepicker/util/ShareDateFormatterTest.kt @@ -0,0 +1,82 @@ +/* + * Nextcloud Android Common Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ + +package com.nextcloud.android.common.ui.share.component.property.datepicker.util + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotEquals +import org.junit.Before +import org.junit.Test +import java.time.LocalDate +import java.time.format.DateTimeFormatter +import java.time.format.FormatStyle +import java.util.Locale + +class ShareDateFormatterTest { + + private lateinit var originalLocale: Locale + + @Before + fun setUp() { + originalLocale = Locale.getDefault() + } + + @After + fun tearDown() { + Locale.setDefault(originalLocale) + } + + @Test + fun `displays expiration date with Turkish format when device locale is Turkish`() { + assertLocalizedDisplay(TURKISH) + } + + @Test + fun `displays expiration date with English format when device locale is English`() { + assertLocalizedDisplay(ENGLISH) + } + + @Test + fun `displays expiration date with device locale format for other languages`() { + assertLocalizedDisplay(GERMAN) + } + + @Test + fun `expiration date display differs per device locale`() { + val turkish = displayFor(TURKISH) + val english = displayFor(ENGLISH) + val german = displayFor(GERMAN) + + assertNotEquals(turkish, english) + assertNotEquals(turkish, german) + assertNotEquals(english, german) + } + + private fun assertLocalizedDisplay(locale: Locale) { + val expected = DateTimeFormatter + .ofLocalizedDate(FormatStyle.SHORT) + .withLocale(locale) + .format(DATE) + + assertEquals(expected, displayFor(locale)) + } + + private fun displayFor(locale: Locale): String { + Locale.setDefault(locale) + return ShareDateFormatter().formatIsoForDisplay(ISO_DATE) + } + + private companion object { + private val TURKISH: Locale = Locale.forLanguageTag("tr") + private val ENGLISH: Locale = Locale.forLanguageTag("en") + private val GERMAN: Locale = Locale.forLanguageTag("de") + + private const val ISO_DATE = "2026-12-31" + private val DATE: LocalDate = LocalDate.of(2026, 12, 31) + } +}