Skip to content

[Jetnews] Update to snapshot 7033025 #319

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
JolandaVerhoef merged 9 commits into from
Dec 16, 2020
Merged

[Jetnews] Update to snapshot 7033025 #319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d15fe93
[Jetnews] Update to snapshot 7024175
JolandaVerhoef Dec 10, 2020
b6abae4
[Jetnews] Update to snapshot 7030654
JolandaVerhoef Dec 14, 2020
741b5ad
[Jetnews] Apply spotless fixes
JolandaVerhoef Dec 14, 2020
17c6687
[Jetnews] Fix swipe to refresh using nested scrolling
JolandaVerhoef Dec 15, 2020
9325b2b
[Jetnews] Upgrade to snapshot 7033025
JolandaVerhoef Dec 15, 2020
8faa6b7
[Jetnews] Explain workaround for swipe to refresh
JolandaVerhoef Dec 15, 2020
3d1065c
Merge branch 'dev_alpha09' into jv/js_alpha09
JolandaVerhoef Dec 16, 2020
ba5c2fa
Merge branch 'dev_alpha09' into jv/js_alpha09
JolandaVerhoef Dec 16, 2020
73d3f51
Merge branch 'dev_alpha09' into jv/js_alpha09
JolandaVerhoef Dec 16, 2020
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
Prev Previous commit
Next Next commit
[Jetnews] Apply spotless fixes
  • Loading branch information
@JolandaVerhoef
JolandaVerhoef committed Dec 14, 2020
commit 741b5ada2e3445faec8d8247dc9d7ad93f8f94ff
7 changes: 4 additions & 3 deletions JetNews/app/src/main/java/com/example/jetnews/ui/SwipeToRefresh.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ fun SwipeToRefreshLayout(
)
) {
content()
Box(Modifier
.align(Alignment.TopCenter)
.offset { IntOffset(0, state.offset.value.roundToInt()) }
Box(
Modifier
.align(Alignment.TopCenter)
.offset { IntOffset(0, state.offset.value.roundToInt()) }
) {
if (state.offset.value != -refreshDistance) {
refreshIndicator()
Expand Down
1 change: 0 additions & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.example.jetnews.ui.theme

import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.Colors
import androidx.compose.material.MaterialTheme
import androidx.compose.material.darkColors
import androidx.compose.material.lightColors
Expand Down