Skip to content

Fix: Accept the feedback for the code style. #19

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.

Sign up for GitHub

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

Merged
wingio merged 1 commit into from
Dec 27, 2024
Merged

Fix: Accept the feedback for the code style. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions demo/src/main/java/dev/materii/pullrefresh/demo/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ class MainActivity : ComponentActivity() {
1 -> DragRefreshSample(
flipped = flipped,
pullRefreshState = pullRefreshState,
modifier = Modifier.fillMaxSize(),
isRefreshing = isRefreshing
modifier = Modifier.fillMaxSize()
)
}
}
Expand Down
34 changes: 11 additions & 23 deletions demo/src/main/java/dev/materii/pullrefresh/demo/sample/DragRefreshSample.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package dev.materii.pullrefresh.demo.sample

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
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.DragRefreshIndicator
import dev.materii.pullrefresh.DragRefreshLayout
import dev.materii.pullrefresh.PullRefreshState
Expand All @@ -19,8 +17,7 @@ import dev.materii.pullrefresh.PullRefreshState
fun DragRefreshSample(
flipped: Boolean,
pullRefreshState: PullRefreshState,
modifier: Modifier = Modifier,
isRefreshing: Boolean
modifier: Modifier = Modifier
) {
DragRefreshLayout(
modifier = modifier,
Expand All @@ -34,22 +31,13 @@ fun DragRefreshSample(
)
}
) {
LazyColumn(
Modifier.fillMaxSize(),
userScrollEnabled = !isRefreshing
Box(
modifier = Modifier
.fillMaxSize()
.verticalScroll(rememberScrollState()),
contentAlignment = Alignment.Center
) {
items(100) {
Text(
modifier = Modifier
.fillMaxWidth()
.padding(5.dp)
.background(
color = MaterialTheme.colorScheme.outline,
shape = RoundedCornerShape(10.dp)
)
.padding(10.dp), text = "No. $it"
)
}
Text(text = "Pull ${if (flipped) "up" else "down"} to refresh")
}
}
}
16 changes: 9 additions & 7 deletions pullrefresh/src/commonMain/kotlin/dev/materii/pullrefresh/PullRefreshState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,15 @@ class PullRefreshState internal constructor(
// We are flinging without having dragged the pull refresh (for example a fling inside
// a list) - don't consume
distancePulled == 0f -> 0f
velocity < 0f -> if (isRefreshTiming) {
// We need to prevent the fling upward when the refresh starts.
velocity
}else {
// If the velocity is negative, the fling is upwards, and we don't want to prevent
// the list from scrolling
0f
velocity < 0f -> {
if (isRefreshTiming) {
// We need to prevent the fling upward when the refresh starts.
velocity
} else {
// If the velocity is negative, the fling is upwards, and we don't want to prevent
// the list from scrolling
0f
}
}
// We are showing the indicator, and the fling is downwards - consume everything
else -> velocity
Expand Down