From 31ec69cae87a34cd631188169e2bd5c5b8e509f3 Mon Sep 17 00:00:00 2001 From: vipulkumar Date: Mon, 18 Mar 2024 12:00:20 +0530 Subject: [PATCH] Github release changes --- gradle.properties | 2 +- settings.gradle | 4 +- .../org/kafka/common/extensions/elevation.kt | 40 +++++++++++++++---- .../org/kafka/homepage/recent/RecentScreen.kt | 2 +- .../main/java/org/kafka/item/files/Files.kt | 2 +- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index fd4a0d72..5dee0758 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ android.enableR8.fullMode=true # Run 'aapt optimize' on resources to minimize their APK size impact. android.enableResourceOptimizations=true -org.gradle.jvmargs=-Xmx3072m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx6020m -Dfile.encoding=UTF-8 # https://docs.gradle.org/7.6/userguide/configuration_cache.html org.gradle.unsafe.configuration-cache=true diff --git a/settings.gradle b/settings.gradle index 7de09988..bf852b2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -54,5 +54,5 @@ include ':ui:webview' include ':core-playback' include ':ui-playback' -project(':core-playback').projectDir = new File(settingsDir, '/Sarahang/core-playback') -project(':ui-playback').projectDir = new File(settingsDir, '/Sarahang/ui-playback') +project(':core-playback').projectDir = new File(settingsDir, '../Sarahang/core-playback') +project(':ui-playback').projectDir = new File(settingsDir, '../Sarahang/ui-playback') diff --git a/ui/common/src/main/java/org/kafka/common/extensions/elevation.kt b/ui/common/src/main/java/org/kafka/common/extensions/elevation.kt index c158d9af..53085b16 100644 --- a/ui/common/src/main/java/org/kafka/common/extensions/elevation.kt +++ b/ui/common/src/main/java/org/kafka/common/extensions/elevation.kt @@ -1,17 +1,41 @@ package org.kafka.common.extensions +import androidx.compose.foundation.ScrollState import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.lazy.grid.LazyGridState +import androidx.compose.runtime.derivedStateOf import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import ui.common.theme.theme.Dimens -object Elevation { - val LazyListState.elevation: Dp - get() = if (firstVisibleItemIndex == 0) { - // For the first element, use the minimum of scroll offset and default elevation - // i.e. a value between 0 and 4.dp - minOf(firstVisibleItemScrollOffset.toFloat().dp, 24.dp) +val ScrollState.elevation + get() = derivedStateOf { + this.run { ((value / 100) * 2).coerceAtMost(MaxElevation).dp } ?: 0.dp + } + +val LazyListState.elevation: Dp + get() = if (firstVisibleItemIndex == 0) { + // For the first element, use the minimum of scroll offset and default elevation + // i.e. a value between 0 and 4.dp + minOf(firstVisibleItemScrollOffset.toFloat().dp, 24.dp) + } else { + // If not the first element, always set elevation and show the shadow + 24.dp + } + + +val LazyListState?.elevation + get() = derivedStateOf { + if (this?.firstVisibleItemIndex == 0) { + minOf(firstVisibleItemScrollOffset.toFloat().dp, MaxElevation.dp) } else { - // If not the first element, always set elevation and show the shadow - 24.dp + Dimens.Spacing20 } + } + + +fun LazyGridState.elevation(maxElevation: Int = 40) = derivedStateOf { + this.run { firstVisibleItemScrollOffset.coerceAtMost(maxElevation) }.dp } + +private const val MaxElevation = 20 diff --git a/ui/homepage/src/main/java/org/kafka/homepage/recent/RecentScreen.kt b/ui/homepage/src/main/java/org/kafka/homepage/recent/RecentScreen.kt index f4c02243..db45f7ed 100644 --- a/ui/homepage/src/main/java/org/kafka/homepage/recent/RecentScreen.kt +++ b/ui/homepage/src/main/java/org/kafka/homepage/recent/RecentScreen.kt @@ -16,7 +16,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.kafka.data.entities.RecentItem import kotlinx.collections.immutable.ImmutableList -import org.kafka.common.extensions.Elevation.elevation +import org.kafka.common.extensions.elevation import org.kafka.common.widgets.shadowMaterial import org.kafka.homepage.R import org.kafka.navigation.LocalNavigator diff --git a/ui/item/src/main/java/org/kafka/item/files/Files.kt b/ui/item/src/main/java/org/kafka/item/files/Files.kt index cad02e46..820deec3 100644 --- a/ui/item/src/main/java/org/kafka/item/files/Files.kt +++ b/ui/item/src/main/java/org/kafka/item/files/Files.kt @@ -16,7 +16,7 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.kafka.data.entities.File import kotlinx.coroutines.CoroutineScope -import org.kafka.common.extensions.Elevation.elevation +import org.kafka.common.extensions.elevation import org.kafka.common.test.testTagUi import org.kafka.common.widgets.shadowMaterial import org.kafka.navigation.LocalNavigator