Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Depend on upstream Cascade #1256

Merged
merged 1 commit into from
Oct 9, 2023
Merged
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
2 changes: 2 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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") }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/jerboa/ui/components/home/Home.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading