yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak package layout

Browse Source
This commit is contained in:
tarsin committed 2023-06-07 15:31:33 +08:00
1 parent 223ebd6acd
commit c1ca6dcd5d
29 files changed
+52 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.kt
+1 -1
View File
@@ -42,8 +42,8 @@ import com.hippo.ehviewer.dao.DownloadInfo
import com.hippo.ehviewer.download.DownloadManager
import com.hippo.ehviewer.download.DownloadService
import com.hippo.ehviewer.download.downloadLocation
import com.hippo.ehviewer.ui.compose.DialogState
import com.hippo.ehviewer.ui.legacy.ListCheckBoxDialogBuilder
import com.hippo.ehviewer.ui.main.DialogState
import com.hippo.ehviewer.ui.scene.BaseScene
import com.hippo.ehviewer.util.requestPermission
import com.hippo.ehviewer.yorozuya.collect.LongList
app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt
+1 -1
View File
@@ -15,11 +15,11 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.hippo.ehviewer.Settings
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.login.CookieSignInScene
import com.hippo.ehviewer.ui.login.SelectSiteScreen
import com.hippo.ehviewer.ui.login.SignInScreen
import com.hippo.ehviewer.ui.login.WebviewSignInScreen
import com.hippo.ehviewer.ui.main.setMD3Content
import com.hippo.ehviewer.ui.settings.AboutScreen
import com.hippo.ehviewer.ui.settings.AdvancedScreen
import com.hippo.ehviewer.ui.settings.BaseScreen
app/src/main/java/com/hippo/ehviewer/ui/legacy/SimpleRatingView.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.AbstractComposeView
import com.google.accompanist.themeadapter.material3.Mdc3Theme
import com.hippo.ehviewer.ui.compose.GalleryListCardRating
import com.hippo.ehviewer.ui.main.GalleryListCardRating
class SimpleRatingView @JvmOverloads constructor(
context: Context,
app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
+1 -1
View File
@@ -59,7 +59,7 @@ import com.hippo.ehviewer.client.EhUtils
import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
import com.hippo.ehviewer.ui.compose.rememberDialogState
import com.hippo.ehviewer.ui.main.rememberDialogState
import com.hippo.ehviewer.util.ExceptionUtils
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.lang.withNonCancellableContext
app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
+1 -1
View File
@@ -66,7 +66,7 @@ import com.hippo.ehviewer.ui.FINISH_ROUTE_NAME
import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.SELECT_SITE_ROUTE_NAME
import com.hippo.ehviewer.ui.WEBVIEW_SIGN_IN_ROUTE_NAME
import com.hippo.ehviewer.ui.compose.rememberDialogState
import com.hippo.ehviewer.ui.main.rememberDialogState
import com.hippo.ehviewer.ui.openBrowser
import com.hippo.ehviewer.util.ExceptionUtils
import eu.kanade.tachiyomi.util.lang.launchIO
app/src/main/java/com/hippo/ehviewer/ui/compose/Card.kt → app/src/main/java/com/hippo/ehviewer/ui/main/Card.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.ColumnScope
app/src/main/java/com/hippo/ehviewer/ui/compose/CropDefaults.kt → app/src/main/java/com/hippo/ehviewer/ui/main/CropDefaults.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
object CropDefaults {
private const val CROP_MIN_ASPECT = 0.5F
app/src/main/java/com/hippo/ehviewer/ui/compose/DeferedComposable.kt → app/src/main/java/com/hippo/ehviewer/ui/main/DeferedComposable.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
app/src/main/java/com/hippo/ehviewer/ui/compose/Dialog.kt → app/src/main/java/com/hippo/ehviewer/ui/main/Dialog.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
app/src/main/java/com/hippo/ehviewer/ui/compose/Dummy.kt → app/src/main/java/com/hippo/ehviewer/ui/main/Dummy.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.combinedClickable
app/src/main/java/com/hippo/ehviewer/ui/compose/RatingWidget.kt → app/src/main/java/com/hippo/ehviewer/ui/main/RatingWidget.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
app/src/main/java/com/hippo/ehviewer/ui/compose/RememberGlobally.kt → app/src/main/java/com/hippo/ehviewer/ui/main/RememberGlobally.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
app/src/main/java/com/hippo/ehviewer/ui/compose/State.kt → app/src/main/java/com/hippo/ehviewer/ui/main/State.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
app/src/main/java/com/hippo/ehviewer/ui/compose/Theme.kt → app/src/main/java/com/hippo/ehviewer/ui/main/Theme.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose
package com.hippo.ehviewer.ui.main
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
app/src/main/java/com/hippo/ehviewer/ui/compose/data/EhAsyncThumb.kt → app/src/main/java/com/hippo/ehviewer/ui/main/data/EhAsyncThumb.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose.data
package com.hippo.ehviewer.ui.main.data
import androidx.compose.runtime.Composable
import androidx.compose.runtime.ReadOnlyComposable
@@ -14,7 +14,7 @@ import coil.compose.AsyncImagePainter
import coil.request.ImageRequest
import com.hippo.ehviewer.client.data.GalleryInfo
import com.hippo.ehviewer.coil.imageRequest
import com.hippo.ehviewer.ui.compose.CropDefaults
import com.hippo.ehviewer.ui.main.CropDefaults
@Composable
@ReadOnlyComposable
app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryDetail.kt → app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryDetail.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose.data
package com.hippo.ehviewer.ui.main.data
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryInfo.kt → app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryInfo.kt
+4 -4
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose.data
package com.hippo.ehviewer.ui.main.data
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp
import com.hippo.ehviewer.client.EhUtils
import com.hippo.ehviewer.client.data.GalleryInfo
import com.hippo.ehviewer.download.DownloadManager
import com.hippo.ehviewer.ui.compose.CrystalCard
import com.hippo.ehviewer.ui.compose.ElevatedCard
import com.hippo.ehviewer.ui.compose.GalleryListCardRating
import com.hippo.ehviewer.ui.main.CrystalCard
import com.hippo.ehviewer.ui.main.ElevatedCard
import com.hippo.ehviewer.ui.main.GalleryListCardRating
@Composable
fun GalleryInfoListItem(
app/src/main/java/com/hippo/ehviewer/ui/compose/data/GalleryPreview.kt → app/src/main/java/com/hippo/ehviewer/ui/main/data/GalleryPreview.kt
+3 -3
View File
@@ -1,4 +1,4 @@
package com.hippo.ehviewer.ui.compose.data
package com.hippo.ehviewer.ui.main.data
import android.graphics.drawable.BitmapDrawable
import androidx.compose.foundation.layout.Box
@@ -27,8 +27,8 @@ import coil.request.ImageRequest
import com.hippo.ehviewer.client.data.GalleryPreview
import com.hippo.ehviewer.client.data.NormalGalleryPreview
import com.hippo.ehviewer.coil.imageRequest
import com.hippo.ehviewer.ui.compose.CropDefaults
import com.hippo.ehviewer.ui.compose.CrystalCard
import com.hippo.ehviewer.ui.main.CropDefaults
import com.hippo.ehviewer.ui.main.CrystalCard
@Composable
@ReadOnlyComposable
app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
+3 -3
View File
@@ -77,9 +77,6 @@ import com.hippo.ehviewer.download.DownloadService
import com.hippo.ehviewer.download.DownloadService.Companion.clear
import com.hippo.ehviewer.spider.SpiderDen
import com.hippo.ehviewer.spider.putToDownloadDir
import com.hippo.ehviewer.ui.compose.CropDefaults
import com.hippo.ehviewer.ui.compose.data.requestOf
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.legacy.AutoStaggeredGridLayoutManager
import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder
@@ -93,6 +90,9 @@ import com.hippo.ehviewer.ui.legacy.FastScroller.OnDragHandlerListener
import com.hippo.ehviewer.ui.legacy.HandlerDrawable
import com.hippo.ehviewer.ui.legacy.STRATEGY_MIN_SIZE
import com.hippo.ehviewer.ui.legacy.ViewTransition
import com.hippo.ehviewer.ui.main.CropDefaults
import com.hippo.ehviewer.ui.main.data.requestOf
import com.hippo.ehviewer.ui.main.setMD3Content
import com.hippo.ehviewer.ui.navToReader
import com.hippo.ehviewer.util.sendTo
import com.hippo.ehviewer.yorozuya.FileUtils
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+5 -5
View File
@@ -151,11 +151,6 @@ import com.hippo.ehviewer.ui.GalleryInfoBottomSheet
import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.MainActivity
import com.hippo.ehviewer.ui.addToFavorites
import com.hippo.ehviewer.ui.compose.CrystalCard
import com.hippo.ehviewer.ui.compose.GalleryDetailRating
import com.hippo.ehviewer.ui.compose.data.EhPreviewItem
import com.hippo.ehviewer.ui.compose.data.GalleryDetailHeaderCard
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
import com.hippo.ehviewer.ui.legacy.CheckBoxDialogBuilder
import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
@@ -164,6 +159,11 @@ import com.hippo.ehviewer.ui.legacy.GalleryRatingBar.OnUserRateListener
import com.hippo.ehviewer.ui.legacy.ObservedTextView
import com.hippo.ehviewer.ui.legacy.URLImageGetter
import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount
import com.hippo.ehviewer.ui.main.CrystalCard
import com.hippo.ehviewer.ui.main.GalleryDetailRating
import com.hippo.ehviewer.ui.main.data.EhPreviewItem
import com.hippo.ehviewer.ui.main.data.GalleryDetailHeaderCard
import com.hippo.ehviewer.ui.main.setMD3Content
import com.hippo.ehviewer.ui.navToReader
import com.hippo.ehviewer.ui.openBrowser
import com.hippo.ehviewer.ui.removeFromFavorites
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryHolder.kt
+2 -2
View File
@@ -36,8 +36,8 @@ import com.google.accompanist.themeadapter.material3.Mdc3Theme
import com.hippo.ehviewer.Settings
import com.hippo.ehviewer.Settings.listThumbSize
import com.hippo.ehviewer.client.data.GalleryInfo
import com.hippo.ehviewer.ui.compose.data.GalleryInfoGridItem
import com.hippo.ehviewer.ui.compose.data.GalleryInfoListItem
import com.hippo.ehviewer.ui.main.data.GalleryInfoGridItem
import com.hippo.ehviewer.ui.main.data.GalleryInfoListItem
import eu.kanade.tachiyomi.util.system.pxToDp
abstract class GalleryHolder(composeView: CheckableComposeView) : RecyclerView.ViewHolder(composeView) {
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+2 -2
View File
@@ -78,8 +78,6 @@ import com.hippo.ehviewer.databinding.ItemDrawerListBinding
import com.hippo.ehviewer.databinding.SceneGalleryListBinding
import com.hippo.ehviewer.download.DownloadManager
import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener
import com.hippo.ehviewer.ui.compose.DialogState
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.doGalleryInfoAction
import com.hippo.ehviewer.ui.legacy.AddDeleteDrawable
import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
@@ -94,6 +92,8 @@ import com.hippo.ehviewer.ui.legacy.GalleryInfoContentHelper
import com.hippo.ehviewer.ui.legacy.SearchLayout
import com.hippo.ehviewer.ui.legacy.ViewTransition
import com.hippo.ehviewer.ui.legacy.WindowInsetsAnimationHelper
import com.hippo.ehviewer.ui.main.DialogState
import com.hippo.ehviewer.ui.main.setMD3Content
import com.hippo.ehviewer.util.getParcelableCompat
import com.hippo.ehviewer.yorozuya.AnimationUtils
import com.hippo.ehviewer.yorozuya.SimpleAnimatorListener
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewScreen.kt
+4 -4
View File
@@ -55,11 +55,11 @@ import com.hippo.ehviewer.client.data.GalleryDetail
import com.hippo.ehviewer.client.data.GalleryPreview
import com.hippo.ehviewer.coil.imageRequest
import com.hippo.ehviewer.coil.justDownload
import com.hippo.ehviewer.ui.compose.data.EhPreviewItem
import com.hippo.ehviewer.ui.compose.rememberDialogState
import com.hippo.ehviewer.ui.compose.rememberMemorized
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.legacy.calculateSuitableSpanCount
import com.hippo.ehviewer.ui.main.data.EhPreviewItem
import com.hippo.ehviewer.ui.main.rememberDialogState
import com.hippo.ehviewer.ui.main.rememberMemorized
import com.hippo.ehviewer.ui.main.setMD3Content
import com.hippo.ehviewer.ui.navToReader
import com.hippo.ehviewer.util.getParcelableCompat
import kotlinx.coroutines.Dispatchers
app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt
+4 -4
View File
@@ -65,11 +65,11 @@ import com.hippo.ehviewer.EhDB
import com.hippo.ehviewer.R
import com.hippo.ehviewer.Settings.listThumbSize
import com.hippo.ehviewer.client.data.GalleryInfo
import com.hippo.ehviewer.ui.compose.Deferred
import com.hippo.ehviewer.ui.compose.data.GalleryInfoListItem
import com.hippo.ehviewer.ui.compose.rememberDialogState
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.doGalleryInfoAction
import com.hippo.ehviewer.ui.main.Deferred
import com.hippo.ehviewer.ui.main.data.GalleryInfoListItem
import com.hippo.ehviewer.ui.main.rememberDialogState
import com.hippo.ehviewer.ui.main.setMD3Content
import eu.kanade.tachiyomi.util.lang.launchIO
import eu.kanade.tachiyomi.util.system.pxToDp
import kotlinx.coroutines.delay
app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp
import androidx.navigation.fragment.findNavController
import com.hippo.ehviewer.R
import com.hippo.ehviewer.client.EhEngine
import com.hippo.ehviewer.ui.compose.setMD3Content
import com.hippo.ehviewer.ui.main.setMD3Content
import com.hippo.ehviewer.util.ExceptionUtils
import eu.kanade.tachiyomi.util.lang.withUIContext
import moe.tarsin.coroutines.runSuspendCatching
app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
+1 -1
View File
@@ -40,8 +40,8 @@ import com.hippo.ehviewer.client.EhEngine
import com.hippo.ehviewer.client.data.FavListUrlBuilder
import com.hippo.ehviewer.client.systemDns
import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.compose.observed
import com.hippo.ehviewer.ui.legacy.EditTextDialogBuilder
import com.hippo.ehviewer.ui.main.observed
import com.hippo.ehviewer.util.LogCat
import com.hippo.ehviewer.util.ReadableTime
import kotlinx.coroutines.Dispatchers
app/src/main/java/com/hippo/ehviewer/ui/settings/DownloadScreen.kt
+2 -2
View File
@@ -37,10 +37,10 @@ import com.hippo.ehviewer.download.downloadLocation
import com.hippo.ehviewer.spider.SpiderQueen
import com.hippo.ehviewer.spider.readCompatFromUniFile
import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.compose.observed
import com.hippo.ehviewer.ui.compose.rememberedAccessor
import com.hippo.ehviewer.ui.keepNoMediaFileStatus
import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
import com.hippo.ehviewer.ui.main.observed
import com.hippo.ehviewer.ui.main.rememberedAccessor
import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.util.lang.launchNonCancellable
import kotlinx.coroutines.Dispatchers
app/src/main/java/com/hippo/ehviewer/ui/settings/EhScreen.kt
+2 -2
View File
@@ -50,9 +50,9 @@ import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.MYTAGS_SCREEN
import com.hippo.ehviewer.ui.SIGN_IN_ROUTE_NAME
import com.hippo.ehviewer.ui.UCONFIG_SCREEN
import com.hippo.ehviewer.ui.compose.observed
import com.hippo.ehviewer.ui.compose.rememberedAccessor
import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
import com.hippo.ehviewer.ui.main.observed
import com.hippo.ehviewer.ui.main.rememberedAccessor
import com.hippo.ehviewer.util.whisperClipboard
import eu.kanade.tachiyomi.util.lang.withUIContext
import kotlinx.coroutines.Dispatchers
app/src/main/java/com/hippo/ehviewer/ui/settings/SecurityScreen.kt
+2 -2
View File
@@ -18,9 +18,9 @@ import androidx.compose.ui.res.stringResource
import com.hippo.ehviewer.R
import com.hippo.ehviewer.Settings
import com.hippo.ehviewer.ui.LocalNavController
import com.hippo.ehviewer.ui.compose.observed
import com.hippo.ehviewer.ui.compose.rememberedAccessor
import com.hippo.ehviewer.ui.isAuthenticationSupported
import com.hippo.ehviewer.ui.main.observed
import com.hippo.ehviewer.ui.main.rememberedAccessor
@Composable
fun SecurityScreen() {