Skip to content

Commit

Permalink
Move to different pullrefresh lib
Browse files Browse the repository at this point in the history
  • Loading branch information
wingio committed Nov 27, 2023
1 parent b19ddfd commit 0092303
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
2 changes: 2 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,7 @@ dependencies {
implementation(libs.bundles.room)
implementation(libs.bundles.voyager)

implementation(libs.pullrefresh)

ksp(libs.androidx.room.compiler)
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package xyz.wingio.dimett.ui.components

import androidx.compose.foundation.layout.BoxScope
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.PullRefreshState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import dev.materii.pullrefresh.PullRefreshIndicator
import dev.materii.pullrefresh.PullRefreshState

@Composable
@OptIn(ExperimentalMaterialApi::class)
fun BoxScope.RefreshIndicator(
refreshing: Boolean,
state: PullRefreshState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.outlined.Home
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.LocalContentColor
Expand All @@ -32,6 +29,8 @@ import androidx.paging.compose.itemKey
import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabOptions
import dev.materii.pullrefresh.pullRefresh
import dev.materii.pullrefresh.rememberPullRefreshState
import xyz.wingio.dimett.R
import xyz.wingio.dimett.ui.components.RefreshIndicator
import xyz.wingio.dimett.ui.components.Text
Expand All @@ -52,7 +51,6 @@ class FeedTab : Tab {
override fun Content() = Screen()

@Composable
@OptIn(ExperimentalMaterialApi::class)
private fun Screen(
viewModel: FeedViewModel = getScreenModel()
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.source.ProgressiveMediaSource
import androidx.media3.ui.AspectRatioFrameLayout
import androidx.media3.ui.PlayerView
import coil.annotation.ExperimentalCoilApi
import xyz.wingio.dimett.rest.dto.post.MediaAttachment
import xyz.wingio.dimett.ui.components.Text

@kotlin.OptIn(ExperimentalCoilApi::class)
@Composable
@OptIn(androidx.media3.common.util.UnstableApi::class)
fun SingleGifAttachment(
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coi
coil-gif = { group = "io.coil-kt", name = "coil-gif", version.ref = "coil" }
compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
compose-image-blurhash = { group = "com.github.orlando-dev-code", name = "compose-image-blurhash", version.ref = "compose-image-blurhash" }
compose-material = { group = "androidx.compose.material", name = "material" }
compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
compose-material3 = { group = "androidx.compose.material3", name = "material3" }
compose-ui = { group = "androidx.compose.ui", name = "ui" }
Expand All @@ -54,6 +53,7 @@ ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-conte
ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
pullrefresh = { group = "dev.materii.pullrefresh", name = "pullrefresh", version = "1.1.0" }
simpleast-core = { group = "com.github.MateriiApps.SimplerAST", name = "simpleast-core", version.ref = "simpleast-core" }
voyager-koin = { group = "cafe.adriel.voyager", name = "voyager-koin", version.ref = "voyager" }
voyager-navigator = { group = "cafe.adriel.voyager", name = "voyager-navigator", version.ref = "voyager" }
Expand All @@ -64,7 +64,7 @@ voyager-transitions = { group = "cafe.adriel.voyager", name = "voyager-transitio
accompanist = ["accompanist-systemuicontroller", "accompanist-pager", "accompanist-pager-indicators"]
androidx = ["core-ktx", "androidx-browser", "androidx-lifecycle-runtime-ktx", "androidx-activity-compose", "androidx-paging-compose", "androidx-emoji2"]
coil = ["coil-compose", "coil", "coil-gif"]
compose = ["compose-ui", "compose-ui-graphics", "compose-ui-tooling-preview", "compose-material3", "compose-material", "compose-material-icons-extended"]
compose = ["compose-ui", "compose-ui-graphics", "compose-ui-tooling-preview", "compose-material3", "compose-material-icons-extended"]
github = ["compose-image-blurhash", "simpleast-core"]
koin = ["koin-core", "koin-androidx-compose", "koin-android"]
kotlinx = ["kotlinx-datetime"]
Expand Down

0 comments on commit 0092303

Please sign in to comment.