From 6f5545ef08d10c53eb077d22dfbf7ae11cc4074d Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Mon, 22 Sep 2025 20:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B1=E4=BA=AB=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E7=9A=84=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt | 3 +++ .../io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt | 4 ++-- .../java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt | 3 +-- app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt | 7 ++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt index fb64b4e68..06978a16e 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/info/BookInfoActivity.kt @@ -32,6 +32,7 @@ import com.google.android.material.color.DynamicColors import com.google.android.material.color.DynamicColorsOptions import com.google.android.material.color.MaterialColors import com.google.android.material.transition.platform.MaterialContainerTransform +import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback import io.legato.kazusa.R import io.legato.kazusa.base.VMBaseActivity import io.legato.kazusa.constant.BookType @@ -171,6 +172,8 @@ class BookInfoActivity : @SuppressLint("PrivateResource") override fun onCreate(savedInstanceState: Bundle?) { postponeEnterTransition() + setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback()) + setExitSharedElementCallback(MaterialContainerTransformSharedElementCallback()) val transform = MaterialContainerTransform().apply { addTarget(binding.cdCov) scrimColor = Color.TRANSPARENT diff --git a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt index 011cfd13e..ff36c74c5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/manga/ReadMangaActivity.kt @@ -445,7 +445,7 @@ class ReadMangaActivity : VMBaseActivity 0) { - val paddingPx = (width * paddingDp / 100).toInt() + val paddingPx = (width * paddingDp / 100) recyclerView.setPadding(paddingPx, 0, paddingPx, 0) } } diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt index 5999085dd..bc6f6fcd1 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt @@ -18,13 +18,11 @@ import androidx.activity.addCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.PopupMenu -import androidx.core.view.doOnPreDraw import androidx.core.view.get import androidx.core.view.size import androidx.lifecycle.lifecycleScope import com.google.android.material.transition.platform.MaterialContainerTransform import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback -import com.google.android.material.transition.platform.MaterialSharedAxis import com.jaredrummler.android.colorpicker.ColorPickerDialogListener import io.legato.kazusa.BuildConfig import io.legato.kazusa.R @@ -266,6 +264,7 @@ class ReadBookActivity : BaseReadBookActivity(), if (AppConfig.sharedElementEnterTransitionEnable) { setEnterSharedElementCallback(MaterialContainerTransformSharedElementCallback()) + setExitSharedElementCallback(MaterialContainerTransformSharedElementCallback()) val transform = MaterialContainerTransform().apply { addTarget(binding.root) scrimColor = Color.TRANSPARENT diff --git a/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt b/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt index 350337296..d986a8422 100644 --- a/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/main/MainActivity.kt @@ -14,7 +14,6 @@ import android.widget.ImageView import androidx.activity.addCallback import androidx.activity.viewModels import androidx.core.view.get -import androidx.core.view.isVisible import androidx.core.view.postDelayed import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager @@ -24,6 +23,7 @@ import androidx.viewpager.widget.ViewPager import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton import com.google.android.material.navigation.NavigationBarView +import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback import io.legato.kazusa.BuildConfig import io.legato.kazusa.R import io.legato.kazusa.base.VMBaseActivity @@ -40,7 +40,6 @@ import io.legato.kazusa.help.storage.Backup import io.legato.kazusa.lib.dialogs.alert import io.legato.kazusa.service.BaseReadAloudService import io.legato.kazusa.ui.about.CrashLogsDialog -import io.legato.kazusa.ui.book.read.ReadBookActivity import io.legato.kazusa.ui.book.search.SearchActivity import io.legato.kazusa.ui.main.bookshelf.BaseBookshelfFragment import io.legato.kazusa.ui.main.bookshelf.books.BookshelfFragment1 @@ -49,10 +48,8 @@ import io.legato.kazusa.ui.main.bookshelf.books.BookshelfFragment3 import io.legato.kazusa.ui.main.explore.ExploreFragment import io.legato.kazusa.ui.main.my.MyFragment import io.legato.kazusa.ui.main.rss.RssFragment -import io.legato.kazusa.ui.welcome.WelcomeActivity import io.legato.kazusa.ui.widget.dialog.TextDialog import io.legato.kazusa.utils.dpToPx -import io.legato.kazusa.utils.getPrefBoolean import io.legato.kazusa.utils.gone import io.legato.kazusa.utils.hideSoftInput import io.legato.kazusa.utils.observeEvent @@ -108,7 +105,7 @@ class MainActivity : VMBaseActivity(), override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + setExitSharedElementCallback(MaterialContainerTransformSharedElementCallback()) if (savedInstanceState != null) { pagePosition = savedInstanceState.getInt("currentPagePosition", 0) }