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.

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

Jump to bottom

feat(ui): swipe up and down to switch between articles #589

Merged
merged 18 commits into from
Feb 6, 2024
Merged

feat(ui): swipe up and down to switch between articles #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
178c771
build(deps): bump up dependencies, compile sdk, and gradle version (#…
JunkFood02 Jan 30, 2024
069e090
fix(i18n): configuration loss when switching locale (#541)
JunkFood02 Jan 30, 2024
66b1d51
feat(i18n): add languages to in-app language picker (#571)
JunkFood02 Jan 31, 2024
3598ca7
fix(ui): ProgressIndicator crashes in m3 1.1.2
JunkFood02 Jan 31, 2024
be72b4d
fix(ui): NavigationBarItem color
JunkFood02 Jan 31, 2024
d6df7ce
feat(ui): grey out read articles even if starred (#547)
MauroGuida Jan 30, 2024
b567e9a
refactor(ui): improve add account dialog
Ashinch Feb 1, 2024
4827add
fix(ui): accessing listState on io thread causes app to crash
JunkFood02 Feb 1, 2024
0fe19b5
fix(ui): NavigationBar text color
JunkFood02 Feb 1, 2024
0c31475
feat(ui): show full screen image viewer when clicking on images (#578)
JunkFood02 Feb 3, 2024
8a8f2a7
feat(ui): add crash report activity to handle uncaught exceptions (#576)
JunkFood02 Feb 3, 2024
0e8c834
feat(ui): swipe up and down to switch between articles (WIP)
JunkFood02 Feb 5, 2024
e08abfa
feat(ui): update animation
JunkFood02 Feb 6, 2024
e9be750
docs(ui): add comments on pull to load implementation
JunkFood02 Feb 6, 2024
9995bcf
feat(ui): move the indicator to another file
JunkFood02 Feb 6, 2024
fc6aa81
build: revert changes
JunkFood02 Feb 6, 2024
54dce17
feat(ui): make the transition directions match the content changes
JunkFood02 Feb 6, 2024
8f6b142
Merge branch 'main' into swipe_to_load
Ashinch Feb 6, 2024
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: 1 addition & 1 deletion app/src/main/java/me/ash/reader/ui/component/reader/Reader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fun LazyListScope.Reader(
onImageClick: ((imgUrl: String, altText: String) -> Unit)? = null,
onLinkClick: (String) -> Unit
) {
Log.i("RLog", "Reader: ")
// Log.i("RLog", "Reader: ")
htmlFormattedText(
inputStream = content.byteInputStream(),
subheadUpperCase = subheadUpperCase,
Expand Down
106 changes: 59 additions & 47 deletions app/src/main/java/me/ash/reader/ui/page/home/reading/Content.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,47 @@
package me.ash.reader.ui.page.home.reading

import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.tween
import androidx.compose.animation.expandVertically
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleIn
import androidx.compose.animation.shrinkVertically
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.text.selection.DisableSelection
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.KeyboardArrowDown
import androidx.compose.material.icons.outlined.KeyboardArrowUp
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import me.ash.reader.infrastructure.preference.LocalOpenLink
import me.ash.reader.infrastructure.preference.LocalOpenLinkSpecificBrowser
import me.ash.reader.infrastructure.preference.LocalReadingSubheadUpperCase
import me.ash.reader.ui.component.base.RYExtensibleVisibility
import me.ash.reader.ui.component.reader.Reader
import me.ash.reader.ui.ext.drawVerticalScrollbar
import me.ash.reader.ui.ext.openURL
import me.ash.reader.ui.ext.pagerAnimate
import java.util.*
import kotlin.math.abs

@Composable
fun Content(
modifier: Modifier = Modifier,
content: String,
feedName: String,
title: String,
Expand All @@ -31,60 +50,52 @@ fun Content(
publishedDate: Date,
listState: LazyListState,
isLoading: Boolean,
pullToLoadState: PullToLoadState,
onImageClick: ((imgUrl: String, altText: String) -> Unit)? = null,
) {
val context = LocalContext.current
val subheadUpperCase = LocalReadingSubheadUpperCase.current
val openLink = LocalOpenLink.current
val openLinkSpecificBrowser = LocalOpenLinkSpecificBrowser.current

SelectionContainer {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.drawVerticalScrollbar(listState),
state = listState,
) {
item {
// Top bar height
Spacer(modifier = Modifier.height(64.dp))
// padding
Spacer(modifier = Modifier.height(22.dp))
Column(
modifier = Modifier
.padding(horizontal = 12.dp)
) {
DisableSelection {
Metadata(
feedName = feedName,
title = title,
author = author,
link = link,
publishedDate = publishedDate,
)
}
}
}
item {
Spacer(modifier = Modifier.height(22.dp))
RYExtensibleVisibility(visible = isLoading) {
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center,
if (isLoading) {
Column {
CircularProgressIndicator(
modifier = Modifier
.size(30.dp),
color = MaterialTheme.colorScheme.onSurface,
)
}
} else {

SelectionContainer {
LazyColumn(
modifier = modifier
.fillMaxSize()
.drawVerticalScrollbar(listState)
.offset(x = 0.dp, y = (pullToLoadState.offsetFraction * 80).dp),
state = listState,
) {
item {
// Top bar height
Spacer(modifier = Modifier.height(64.dp))
// padding
Spacer(modifier = Modifier.height(22.dp))
Column(
modifier = Modifier
.padding(horizontal = 12.dp)
) {
Column {
Spacer(modifier = Modifier.height(22.dp))
CircularProgressIndicator(
modifier = Modifier
.size(30.dp),
color = MaterialTheme.colorScheme.onSurface,
DisableSelection {
Metadata(
feedName = feedName,
title = title,
author = author,
link = link,
publishedDate = publishedDate,
)
Spacer(modifier = Modifier.height(22.dp))
}
}
}
}
if (!isLoading) {
Reader(
context = context,
subheadUpperCase = subheadUpperCase.value,
Expand All @@ -95,10 +106,11 @@ fun Content(
context.openURL(it, openLink, openLinkSpecificBrowser)
}
)
}
item {
Spacer(modifier = Modifier.height(128.dp))
Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))

item {
Spacer(modifier = Modifier.height(128.dp))
Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
}
}
}
}
Expand Down
Loading
Loading