Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ buildscript {
ext.versions = [
minSdk: 23,
compileSdk: 34,
kotlin: '1.9.10',
composeUi: '1.5.2',
composeCompiler: '1.5.3',
composeUiMaterial3: '1.1.2',
activityCompose: '1.7.2',
appCompat: '1.6.1',
kotlin: '2.0.0',
composeUi: '1.6.8',
composeUiMaterial3: '1.2.1',
activityCompose: '1.9.0',
appCompat: '1.7.0',
testParamInjector: '1.12',
recyclerView: '1.3.1',
ktx: '1.12.0',
recyclerView: '1.3.2',
ktx: '1.13.1',
paparazzi: '1.3.1',
roborazzi: '1.7.0-alpha-4',
]
Expand All @@ -23,7 +22,7 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.1.2"
classpath "com.android.tools.build:gradle:8.5.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
classpath "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.9.0"
Expand Down
4 changes: 1 addition & 3 deletions cascade-compose/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id "com.dropbox.dropshots" version "0.4.1"
id "wtf.emulator.gradle" version "0.15.1"
id "org.jetbrains.kotlin.plugin.compose" version "2.0.0"
}

apply plugin: 'com.android.library'
Expand All @@ -24,9 +25,6 @@ android {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = versions.composeCompiler
}
kotlinOptions {
jvmTarget = "1.8"
}
Expand Down
10 changes: 10 additions & 0 deletions cascade-compose/src/main/java/me/saket/cascade/Cascade.kt
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,21 @@ interface CascadeColumnScope : ColumnScope {
fun DropdownMenuItem(
text: @Composable () -> Unit,
children: @Composable CascadeColumnScope.() -> Unit,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
modifier: Modifier = Modifier,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
childrenHeader: @Composable CascadeColumnScope.() -> Unit = { DropdownMenuHeader(text = text) },
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
leadingIcon: @Composable (() -> Unit)? = null,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
trailingIcon: @Composable (() -> Unit)? = null,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
enabled: Boolean = true,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
colors: MenuItemColors = MenuDefaults.itemColors(),
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
contentPadding: PaddingValues = MenuDefaults.DropdownMenuItemContentPadding,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
DropdownMenuItem(
Expand Down Expand Up @@ -381,7 +389,9 @@ interface CascadeColumnScope : ColumnScope {
*/
@Composable
fun DropdownMenuHeader(
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
modifier: Modifier = Modifier,
@Suppress("ABSTRACT_COMPOSABLE_DEFAULT_PARAMETER_VALUE")
contentPadding: PaddingValues = PaddingValues(10.5.dp),
text: @Composable () -> Unit,
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package me.saket.cascade.internal

import androidx.compose.animation.core.ExperimentalTransitionApi
import androidx.compose.animation.core.MutableTransitionState
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.rememberTransition
import androidx.compose.animation.core.tween
import androidx.compose.animation.core.updateTransition
import androidx.compose.foundation.layout.Box
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
Expand Down Expand Up @@ -37,6 +38,7 @@ import androidx.compose.ui.unit.LayoutDirection
private const val InTransitionDuration = 300
private const val OutTransitionDuration = 300

@OptIn(ExperimentalTransitionApi::class)
@Composable
internal fun AnimateEntryExit(
modifier: Modifier = Modifier,
Expand All @@ -46,7 +48,7 @@ internal fun AnimateEntryExit(
shape: Shape,
content: @Composable () -> Unit
) {
val isExpandedTransition = updateTransition(expandedStates, label = "CascadeDropDownMenu")
val isExpandedTransition = rememberTransition(expandedStates, label = "CascadeDropDownMenu")
val scale by isExpandedTransition.animateFloat(
transitionSpec = {
tween(if (false isTransitioningTo true) InTransitionDuration else OutTransitionDuration)
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Feb 02 23:25:20 EST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading