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

Fix deprecated funcs

Browse Source 
Only fix kotlin code, because JAVA SUCKS
This commit is contained in:
tarsin committed 2023-02-01 15:07:13 +08:00
1 parent 3db6cc1a1c
commit fafe25fee4
9 files changed
+29 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/build.gradle
+2
View File
@@ -129,6 +129,8 @@ dependencies {
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.material3:material3"
implementation "androidx.core:core-ktx:1.10.0-alpha02"
implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha06"
implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
// https://developer.android.com/jetpack/androidx/releases/lifecycle
app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
+2 -1
View File
@@ -58,6 +58,7 @@ import com.hippo.ehviewer.client.data.GalleryInfo
import com.hippo.ehviewer.client.parser.FavoritesParser
import com.hippo.ehviewer.ui.CommonOperations
import com.hippo.ehviewer.widget.GalleryInfoContentHelper
import com.hippo.util.getParcelableCompat
import com.hippo.widget.ContentLayout
import com.hippo.widget.FabLayout
import com.hippo.widget.FabLayout.OnClickFabListener
@@ -149,7 +150,7 @@ class FavoritesScene : SearchBarScene(), OnDragHandlerListener, OnClickFabListen
}
private fun onRestore(savedInstanceState: Bundle) {
mUrlBuilder = savedInstanceState.getParcelable(KEY_URL_BUILDER)
mUrlBuilder = savedInstanceState.getParcelableCompat(KEY_URL_BUILDER)
if (mUrlBuilder == null) {
mUrlBuilder = FavListUrlBuilder()
}
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.kt
+3 -2
View File
@@ -72,6 +72,7 @@ import com.hippo.util.ExceptionUtils
import com.hippo.util.ReadableTime
import com.hippo.util.TextUrl
import com.hippo.util.addTextToClipboard
import com.hippo.util.getParcelableCompat
import com.hippo.view.ViewTransition
import com.hippo.widget.FabLayout
import com.hippo.widget.LinkifyTextView
@@ -116,7 +117,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
if (args == null) {
return
}
mGalleryDetail = args.getParcelable(KEY_GALLERY_DETAIL)
mGalleryDetail = args.getParcelableCompat(KEY_GALLERY_DETAIL)
mShowAllComments =
mGalleryDetail != null && mGalleryDetail!!.comments != null && !mGalleryDetail!!.comments!!.hasMore
}
@@ -126,7 +127,7 @@ class GalleryCommentsScene : BaseToolbarScene(), View.OnClickListener, OnRefresh
}
private fun onRestore(savedInstanceState: Bundle) {
mGalleryDetail = savedInstanceState.getParcelable(KEY_GALLERY_DETAIL)
mGalleryDetail = savedInstanceState.getParcelableCompat(KEY_GALLERY_DETAIL)
mShowAllComments =
mGalleryDetail != null && mGalleryDetail!!.comments != null && !mGalleryDetail!!.comments!!.hasMore
}
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt
+4 -3
View File
@@ -99,6 +99,7 @@ import com.hippo.util.AppHelper
import com.hippo.util.ExceptionUtils
import com.hippo.util.ReadableTime
import com.hippo.util.addTextToClipboard
import com.hippo.util.getParcelableCompat
import com.hippo.view.ViewTransition
import com.hippo.widget.AutoWrapLayout
import com.hippo.widget.LoadImageView
@@ -176,7 +177,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl
val action = args?.getString(KEY_ACTION) ?: return
mAction = action
if (ACTION_GALLERY_INFO == action) {
mGalleryInfo = args.getParcelable(KEY_GALLERY_INFO)
mGalleryInfo = args.getParcelableCompat(KEY_GALLERY_INFO)
// Add history
mGalleryInfo?.let { lifecycleScope.launchIO { EhDB.putHistoryInfo(it) } }
} else if (ACTION_GID_TOKEN == action) {
@@ -282,10 +283,10 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl
private fun onRestore(savedInstanceState: Bundle) {
mAction = savedInstanceState.getString(KEY_ACTION)
mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO)
mGalleryInfo = savedInstanceState.getParcelableCompat(KEY_GALLERY_INFO)
mGid = savedInstanceState.getLong(KEY_GID)
mToken = savedInstanceState.getString(KEY_TOKEN)
mGalleryDetail = savedInstanceState.getParcelable(KEY_GALLERY_DETAIL)
mGalleryDetail = savedInstanceState.getParcelableCompat(KEY_GALLERY_DETAIL)
mRequestId = savedInstanceState.getInt(KEY_REQUEST_ID)
}
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+2 -1
View File
@@ -92,6 +92,7 @@ import com.hippo.ehviewer.ui.CommonOperations
import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter
import com.hippo.ehviewer.widget.GalleryInfoContentHelper
import com.hippo.ehviewer.widget.SearchLayout
import com.hippo.util.getParcelableCompat
import com.hippo.view.BringOutTransition
import com.hippo.view.ViewTransition
import com.hippo.widget.FabLayout
@@ -235,7 +236,7 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
private fun onRestore(savedInstanceState: Bundle) {
mHasFirstRefresh = savedInstanceState.getBoolean(KEY_HAS_FIRST_REFRESH)
mUrlBuilder = savedInstanceState.getParcelable(KEY_LIST_URL_BUILDER)!!
mUrlBuilder = savedInstanceState.getParcelableCompat(KEY_LIST_URL_BUILDER)!!
mState = savedInstanceState.getInt(KEY_STATE)
}
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.kt
+3 -2
View File
@@ -43,6 +43,7 @@ import com.hippo.ehviewer.client.data.GalleryPreview
import com.hippo.ehviewer.client.data.PreviewSet
import com.hippo.ehviewer.client.exception.EhException
import com.hippo.ehviewer.databinding.SceneGalleryPreviewsBinding
import com.hippo.util.getParcelableCompat
import com.hippo.widget.ContentLayout.ContentHelper
import com.hippo.widget.LoadImageView
import com.hippo.widget.recyclerview.AutoGridLayoutManager
@@ -71,12 +72,12 @@ class GalleryPreviewsScene : BaseToolbarScene() {
private fun onInit() {
val args = arguments ?: return
mGalleryInfo = args.getParcelable(KEY_GALLERY_INFO)
mGalleryInfo = args.getParcelableCompat(KEY_GALLERY_INFO)
mNextPage = args.getBoolean(KEY_NEXT_PAGE)
}
private fun onRestore(savedInstanceState: Bundle) {
mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO)
mGalleryInfo = savedInstanceState.getParcelableCompat(KEY_GALLERY_INFO)
mHasFirstRefresh = savedInstanceState.getBoolean(KEY_HAS_FIRST_REFRESH)
}
app/src/main/java/com/hippo/util/BundleUtils.kt
+8
View File
@@ -0,0 +1,8 @@
package com.hippo.util
import android.os.Bundle
import androidx.core.os.BundleCompat
inline fun <reified T> Bundle.getParcelableCompat(key: String?): T? {
return BundleCompat.getParcelable(this, key, T::class.java)
}
app/src/main/java/com/hippo/widget/FabLayout.kt
+2 -1
View File
@@ -27,6 +27,7 @@ import androidx.activity.ComponentActivity
import androidx.activity.OnBackPressedCallback
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.hippo.ehviewer.R
import com.hippo.util.getParcelableCompat
import com.hippo.yorozuya.AnimationUtils
import com.hippo.yorozuya.SimpleAnimatorListener
@@ -401,7 +402,7 @@ class FabLayout @JvmOverloads constructor(
override fun onRestoreInstanceState(state: Parcelable) {
if (state is Bundle) {
super.onRestoreInstanceState(state.getParcelable(STATE_KEY_SUPER))
super.onRestoreInstanceState(state.getParcelableCompat(STATE_KEY_SUPER))
setAutoCancel(state.getBoolean(STATE_KEY_AUTO_CANCEL))
setExpanded(state.getBoolean(STATE_KEY_EXPANDED), false)
}
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+3 -2
View File
@@ -75,6 +75,7 @@ import com.hippo.ehviewer.ui.EhActivity
import com.hippo.image.Image
import com.hippo.unifile.UniFile
import com.hippo.util.ExceptionUtils
import com.hippo.util.getParcelableCompat
import com.hippo.yorozuya.FileUtils
import com.hippo.yorozuya.IOUtils
import dev.chrisbanes.insetter.applyInsetter
@@ -230,8 +231,8 @@ class ReaderActivity : EhActivity() {
private fun onRestore(savedInstanceState: Bundle) {
mAction = savedInstanceState.getString(KEY_ACTION)
mFilename = savedInstanceState.getString(KEY_FILENAME)
mUri = savedInstanceState.getParcelable(KEY_URI)
mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO)
mUri = savedInstanceState.getParcelableCompat(KEY_URI)
mGalleryInfo = savedInstanceState.getParcelableCompat(KEY_GALLERY_INFO)
mPage = savedInstanceState.getInt(KEY_PAGE, -1)
mCurrentIndex = savedInstanceState.getInt(KEY_CURRENT_INDEX)
buildProvider()