From 00d5fd8fe4888e533ebb2c0f9f2fc4cb9b005122 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 12 Jul 2020 19:29:39 -0400 Subject: [PATCH] Replace some usages of findViewById (cherry picked from commit 5ef5087406f8915607b7d9452f2f17e8d46c2e3c) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt --- .../kanade/tachiyomi/ui/category/CategoryController.kt | 3 ++- .../ui/category/sources/SourceCategoryController.kt | 3 ++- .../java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 9 +++++---- .../java/eu/kanade/tachiyomi/ui/manga/MangaController.kt | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt index cce0b0203..5a5c27928 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt @@ -21,6 +21,7 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.shrinkOnScroll +import kotlinx.android.synthetic.main.main_activity.root_coordinator import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import reactivecircus.flowbinding.android.view.clicks @@ -197,7 +198,7 @@ class CategoryController : R.id.action_delete -> { undoHelper = UndoHelper(adapter, this) undoHelper?.start( - adapter.selectedPositions, activity!!.findViewById(R.id.root_coordinator), + adapter.selectedPositions, activity!!.root_coordinator, R.string.snack_categories_deleted, R.string.action_undo, 3000 ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt index 2ff9ddbe7..825b75d65 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt @@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.shrinkOnScroll +import kotlinx.android.synthetic.main.main_activity.root_coordinator import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import reactivecircus.flowbinding.android.view.clicks @@ -194,7 +195,7 @@ class SourceCategoryController : R.id.action_delete -> { undoHelper = UndoHelper(adapter, this) undoHelper?.start( - adapter.selectedPositions, activity!!.findViewById(R.id.root_coordinator), + adapter.selectedPositions, root_coordinator, R.string.snack_categories_deleted, R.string.action_undo, 3000 ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 2caf50c8b..a4672ac2b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -61,6 +61,8 @@ import exh.uconfig.WarnConfigureDialogController import java.util.Date import java.util.LinkedList import java.util.concurrent.TimeUnit +import kotlinx.android.synthetic.main.main_activity.appbar +import kotlinx.android.synthetic.main.main_activity.tabs import kotlinx.coroutines.delay import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -146,8 +148,7 @@ class MainActivity : BaseActivity() { true } - val container: ViewGroup = findViewById(R.id.controller_container) - + val container: ViewGroup = binding.controllerContainer router = Conductor.attachRouter(this, container, savedInstanceState) if (!router.hasRootController()) { // Set start screen @@ -510,8 +511,8 @@ class MainActivity : BaseActivity() { * collapsing AppBarLayout. */ fun View.offsetAppbarHeight(activity: Activity) { - val appbar: AppBarLayout = activity.findViewById(R.id.appbar) - val tabs: TabLayout = activity.findViewById(R.id.tabs) + val appbar: AppBarLayout = activity.appbar + val tabs: TabLayout = activity.tabs appbar.addOnOffsetChangedListener( AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> val maxAbsOffset = appBarLayout.measuredHeight - tabs.measuredHeight diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 0ba528309..acca05eeb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -13,7 +13,6 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode -import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.graphics.drawable.DrawableCompat import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.DividerItemDecoration @@ -71,6 +70,7 @@ import eu.kanade.tachiyomi.util.view.shrinkOnScroll import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.util.view.visible import java.io.IOException +import kotlinx.android.synthetic.main.main_activity.root_coordinator import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.NonCancellable @@ -619,7 +619,7 @@ class MangaController : private fun toggleFavorite() { val isNowFavorite = presenter.toggleFavorite() if (activity != null && !isNowFavorite && presenter.hasDownloads()) { - activity!!.findViewById(R.id.root_coordinator)?.snack(activity!!.getString(R.string.delete_downloads_for_manga)) { + activity!!.root_coordinator?.snack(activity!!.getString(R.string.delete_downloads_for_manga)) { setAction(R.string.action_delete) { presenter.deleteDownloads() }