Depend on upstream Cascade (#1256)

LemmyNet · Oct 9, 2023 · 843e453 · 843e453
1 parent a9da2b2
commit 843e453
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 1,027 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -132,6 +132,8 @@ dependencies {
     implementation("io.coil-kt:coil-svg:2.4.0")
     // Allows for proper subsampling of large images
     implementation("me.saket.telephoto:zoomable-image-coil:0.7.0-20230922.054002-2")
+    // Animated dropdowns
+    implementation("me.saket.cascade:cascade-compose:2.3.0")
 
     // crash handling
     implementation("com.github.FunkyMuse:Crashy:1.2.0")

diff --git a/app/src/main/java/com/jerboa/ui/components/common/DropdownMenu.kt b/app/src/main/java/com/jerboa/ui/components/common/DropdownMenu.kt
@@ -31,8 +31,8 @@ import com.jerboa.datatypes.types.SortType
 import com.jerboa.ui.theme.LARGE_PADDING
 import com.jerboa.ui.theme.POPUP_MENU_WIDTH_RATIO
 import com.jerboa.ui.theme.Shapes
-import com.jerboa.util.cascade.CascadeColumnScope
-import com.jerboa.util.cascade.CascadeDropdownMenu
+import me.saket.cascade.CascadeColumnScope
+import me.saket.cascade.CascadeDropdownMenu
 
 val isTopSort = { sort: SortType -> sort.name.startsWith("Top") }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/community/Community.kt b/app/src/main/java/com/jerboa/ui/components/community/Community.kt
@@ -24,7 +24,7 @@ import com.jerboa.ui.components.common.LargerCircularIcon
 import com.jerboa.ui.components.common.PictrsBannerImage
 import com.jerboa.ui.components.common.SortOptionsDropdown
 import com.jerboa.ui.theme.*
-import com.jerboa.util.cascade.CascadeDropdownMenu
+import me.saket.cascade.CascadeDropdownMenu
 
 @Composable
 fun CommunityTopSection(

diff --git a/app/src/main/java/com/jerboa/ui/components/home/Home.kt b/app/src/main/java/com/jerboa/ui/components/home/Home.kt
@@ -49,8 +49,8 @@ import com.jerboa.ui.components.common.MenuItem
 import com.jerboa.ui.components.common.MyMarkdownText
 import com.jerboa.ui.components.common.SortOptionsDropdown
 import com.jerboa.ui.theme.LARGE_PADDING
-import com.jerboa.util.cascade.CascadeDropdownMenu
 import kotlinx.collections.immutable.ImmutableList
+import me.saket.cascade.CascadeDropdownMenu
 
 @Composable
 fun HomeHeaderTitle(