user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed layout

Browse Source 
[Hitomi] Fixed image not loading
This commit is contained in:
tom5079
2021-12-26 12:28:52 +09:00
parent 3abd015505
commit 193db578f0
7 changed files with 110 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/xyz/quaver/pupil/sources/composable/MultipleFloatingActionButton.kt
View File

@@ -25,8 +25,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.Stop
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
@@ -35,12 +33,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
@@ -58,9 +51,9 @@ enum class FloatingActionButtonState(private val isExpanded: Boolean) {
}
data class SubFabItem(
val icon: Any, // ImageVector | Painter | ImageBitmap
val label: String? = null,
val onClick: ((SubFabItem) -> Unit)? = null
val onClick: ((SubFabItem) -> Unit)? = null,
val icon: @Composable () -> Unit
)
@Composable
@@ -99,33 +92,15 @@ fun MiniFloatingActionButton(
.scale(buttonScale),
onClick = { onClick?.invoke(item) },
elevation = elevation,
interactionSource = interactionSource
) {
when (item.icon) {
is ImageVector ->
Icon(item.icon, contentDescription = null)
is Painter ->
Icon(item.icon, contentDescription = null)
is ImageBitmap ->
Icon(item.icon, contentDescription = null)
else -> error("Icon is not ImageVector | Painter | ImageBitmap")
}
}
}
}
private class FloatingActionButtonItemProvider : PreviewParameterProvider<SubFabItem> {
override val values: Sequence<SubFabItem>
get() = sequenceOf(
SubFabItem(Icons.Default.PlayArrow, "Play"),
SubFabItem(Icons.Default.Stop, "Stop")
interactionSource = interactionSource,
content = item.icon
)
}
}
@Preview
@Composable
fun MultipleFloatingActionButton(
@PreviewParameter(provider = FloatingActionButtonItemProvider::class) items: List<SubFabItem>,
items: List<SubFabItem>,
modifier: Modifier = Modifier,
fabIcon: ImageVector = Icons.Default.Add,
visible: Boolean = true,

17
app/src/main/java/xyz/quaver/pupil/sources/composable/ReaderBase.kt
View File

@@ -242,11 +242,17 @@ open class ReaderBaseViewModel(app: Application) : AndroidViewModel(app), DIAwar
}
progressList[index] = flow.value
totalProgressMutex.withLock {
totalProgress++
}
}
}
"content" -> {
imageList[index] = Uri.parse(url)
progressList[index] = Float.POSITIVE_INFINITY
totalProgressMutex.withLock {
totalProgress++
}
}
else -> throw IllegalArgumentException("Expected URL scheme 'http(s)' or 'content' but was '$scheme'")
}
@@ -274,9 +280,10 @@ val ReaderOptions.Orientation.isReverse: Boolean
this == ReaderOptions.Orientation.VERTICAL_UP ||
this == ReaderOptions.Orientation.HORIZONTAL_LEFT
@ExperimentalMaterialApi
@Composable
fun ReaderOptionsSheet(readerOptions: ReaderOptions, onOptionsChange: (ReaderOptions.Builder.() -> Unit) -> Unit) {
CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.h6) {
CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.h6, LocalMinimumTouchTargetEnforcement provides false) {
Column(Modifier.padding(16.dp, 0.dp)) {
val layout = readerOptions.layout
val snap = readerOptions.snap
@@ -296,6 +303,7 @@ fun ReaderOptionsSheet(readerOptions: ReaderOptions, onOptionsChange: (ReaderOpt
ReaderOptions.Layout.DOUBLE_PAGE to DoubleImage,
ReaderOptions.Layout.AUTO to Icons.Default.AutoFixHigh
).forEach { (option, icon) ->
CompositionLocalProvider(LocalMinimumTouchTargetEnforcement provides true) {
IconButton(onClick = {
onOptionsChange {
setLayout(option)
@@ -312,6 +320,7 @@ fun ReaderOptionsSheet(readerOptions: ReaderOptions, onOptionsChange: (ReaderOpt
}
}
}
}
val infiniteTransition = rememberInfiniteTransition()
@@ -464,7 +473,6 @@ fun BoxScope.ReaderLazyList(
.align(Alignment.TopStart)
.nestedScroll(nestedScrollConnection),
state = state,
verticalArrangement = Arrangement.spacedBy(4.dp),
contentPadding = rememberInsetsPaddingValues(LocalWindowInsets.current.navigationBars),
reverseLayout = isReverse,
content = content
@@ -477,7 +485,6 @@ fun BoxScope.ReaderLazyList(
.align(Alignment.CenterStart)
.nestedScroll(nestedScrollConnection),
state = state,
horizontalArrangement = Arrangement.spacedBy(4.dp),
reverseLayout = isReverse,
content = content
)
@@ -716,7 +723,7 @@ fun ReaderBase(
val imageSources = remember { mutableStateListOf<ImageSource?>() }
val imageSizes = remember { mutableStateListOf<Size?>() }
LaunchedEffect(model.progressList.count { it.isFinite() }) {
LaunchedEffect(model.totalProgress) {
val size = model.progressList.size
if (imageSources.size != size)
@@ -734,7 +741,7 @@ fun ReaderBase(
if (imageSizes[i] == null && model.progressList[i] == Float.POSITIVE_INFINITY)
imageSources[i]?.let {
imageSizes[i] = it.imageSize
imageSizes[i] = runCatching { it.imageSize }.getOrNull()
}
}
}

6
app/src/main/java/xyz/quaver/pupil/sources/composable/SourceSelectDialog.kt
View File

@@ -25,6 +25,7 @@ import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
@@ -35,6 +36,7 @@ import org.kodein.di.compose.rememberInstance
import xyz.quaver.pupil.sources.Source
import xyz.quaver.pupil.sources.SourceEntries
@ExperimentalMaterialApi
@Composable
fun SourceSelectDialog(navController: NavController, currentSource: String? = null, onDismissRequest: () -> Unit = { }) {
SourceSelectDialog(currentSource = currentSource, onDismissRequest = onDismissRequest) {
@@ -45,8 +47,10 @@ fun SourceSelectDialog(navController: NavController, currentSource: String? = nu
}
}
@ExperimentalMaterialApi
@Composable
fun SourceSelectDialogItem(source: Source, isSelected: Boolean, onSelected: (Source) -> Unit = { }) {
CompositionLocalProvider(LocalMinimumTouchTargetEnforcement provides false) {
Row(
modifier = Modifier.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
@@ -80,7 +84,9 @@ fun SourceSelectDialogItem(source: Source, isSelected: Boolean, onSelected: (Sou
}
}
}
@ExperimentalMaterialApi
@Composable
fun SourceSelectDialog(currentSource: String? = null, onDismissRequest: () -> Unit = { }, onSelected: (Source) -> Unit = { }) {
val sourceEntries: SourceEntries by rememberInstance()

18
app/src/main/java/xyz/quaver/pupil/sources/hitomi/Hitomi.kt
View File

@@ -126,17 +126,20 @@ class Hitomi(app: Application) : Source(), DIAware {
model,
fabSubMenu = listOf(
SubFabItem(
painterResource(R.drawable.ic_jump),
stringResource(R.string.main_jump_title)
),
) {
Icon(painterResource(R.drawable.ic_jump), contentDescription = null)
},
SubFabItem(
Icons.Default.Shuffle,
stringResource(R.string.main_fab_random)
),
) {
Icon(Icons.Default.Shuffle, contentDescription = null)
},
SubFabItem(
painterResource(R.drawable.numeric),
stringResource(R.string.main_open_gallery_by_id)
)
) {
Icon(painterResource(R.drawable.numeric), contentDescription = null)
}
),
actions = {
var expanded by remember { mutableStateOf(false) }
@@ -205,9 +208,6 @@ class Hitomi(app: Application) : Source(), DIAware {
}
}
) { result ->
logger.info {
result.toString()
}
navController.navigate("hitomi.la/reader/${result.itemID}")
}
}

16
app/src/main/java/xyz/quaver/pupil/sources/hitomi/composable/SearchResultEntry.kt
View File

@@ -97,6 +97,7 @@ private fun String.wordCapitalize() : String {
return result.joinToString(" ")
}
@ExperimentalMaterialApi
@Composable
fun DetailedSearchResult(
result: HitomiSearchResult,
@@ -178,7 +179,9 @@ fun DetailedSearchResult(
Divider()
Row(
modifier = Modifier.fillMaxWidth().padding(8.dp),
modifier = Modifier
.fillMaxWidth()
.padding(8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
@@ -192,7 +195,9 @@ fun DetailedSearchResult(
if (result.itemID in bookmarks) Icons.Default.Star else Icons.Default.StarOutline,
contentDescription = null,
tint = Orange500,
modifier = Modifier.size(24.dp).clickable {
modifier = Modifier
.size(24.dp)
.clickable {
onBookmarkToggle(result.itemID)
}
)
@@ -201,7 +206,7 @@ fun DetailedSearchResult(
}
}
@OptIn(ExperimentalMaterialApi::class)
@ExperimentalMaterialApi
@Composable
fun TagGroup(
tags: List<String>,
@@ -212,8 +217,10 @@ fun TagGroup(
val bookmarkedTagsInList = bookmarks intersect tags.toSet()
CompositionLocalProvider(LocalMinimumTouchTargetEnforcement provides false) {
FlowRow(Modifier.padding(0.dp, 16.dp)) {
tags.sortedBy { if (bookmarkedTagsInList.contains(it)) 0 else 1 }.let { (if (isFolded) it.take(10) else it) }.forEach { tag ->
tags.sortedBy { if (bookmarkedTagsInList.contains(it)) 0 else 1 }
.let { (if (isFolded) it.take(10) else it) }.forEach { tag ->
TagChip(
tag = tag,
isFavorite = bookmarkedTagsInList.contains(tag),
@@ -238,6 +245,7 @@ fun TagGroup(
}
}
}
}
@OptIn(ExperimentalMaterialApi::class)
@Composable

2
app/src/main/java/xyz/quaver/pupil/sources/manatoki/viewmodel/MainViewModel.kt
View File

@@ -100,7 +100,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app), DIAware {
val misoPostList = doc.select(".miso-post-list")
misoPostList[4]
.select(".post-row > a").also { logger.info { it.size.toString() } }
.select(".post-row > a")
.forEach { entry ->
yield()
val itemID = entry.attr("href").takeLastWhile { it != '/' }

4
app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
View File

@@ -22,6 +22,7 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.*
import androidx.compose.runtime.saveable.rememberSaveable
@@ -46,7 +47,7 @@ import xyz.quaver.pupil.sources.SourceEntries
import xyz.quaver.pupil.sources.composable.SourceSelectDialog
import xyz.quaver.pupil.ui.theme.PupilTheme
@OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialApi::class)
class MainActivity : ComponentActivity(), DIAware {
override val di by closestDI()
@@ -54,7 +55,6 @@ class MainActivity : ComponentActivity(), DIAware {
private val logger = newLogger(LoggerFactory.default)
@OptIn(ExperimentalAnimationApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)