Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace some usages of findViewById

Browse Source 
(cherry picked from commit 5ef5087406f8915607b7d9452f2f17e8d46c2e3c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
This commit is contained in:
arkon 2020-07-12 19:29:39 -04:00 committed by Jobobby04
parent 3bd6b8524f
commit 00d5fd8fe4
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt
View File

@ -21,6 +21,7 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.shrinkOnScroll 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.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.android.view.clicks import reactivecircus.flowbinding.android.view.clicks
@ -197,7 +198,7 @@ class CategoryController :
R.id.action_delete -> { R.id.action_delete -> {
undoHelper = UndoHelper(adapter, this) undoHelper = UndoHelper(adapter, this)
undoHelper?.start( 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 R.string.snack_categories_deleted, R.string.action_undo, 3000
) )

3
app/src/main/java/eu/kanade/tachiyomi/ui/category/sources/SourceCategoryController.kt
View File

@ -20,6 +20,7 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.shrinkOnScroll 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.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.android.view.clicks import reactivecircus.flowbinding.android.view.clicks
@ -194,7 +195,7 @@ class SourceCategoryController :
R.id.action_delete -> { R.id.action_delete -> {
undoHelper = UndoHelper(adapter, this) undoHelper = UndoHelper(adapter, this)
undoHelper?.start( undoHelper?.start(
adapter.selectedPositions, activity!!.findViewById(R.id.root_coordinator), adapter.selectedPositions, root_coordinator,
R.string.snack_categories_deleted, R.string.action_undo, 3000 R.string.snack_categories_deleted, R.string.action_undo, 3000
) )

9
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -61,6 +61,8 @@ import exh.uconfig.WarnConfigureDialogController
import java.util.Date import java.util.Date
import java.util.LinkedList import java.util.LinkedList
import java.util.concurrent.TimeUnit 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.delay
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
@ -146,8 +148,7 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
true true
} }
val container: ViewGroup = findViewById(R.id.controller_container) val container: ViewGroup = binding.controllerContainer
router = Conductor.attachRouter(this, container, savedInstanceState) router = Conductor.attachRouter(this, container, savedInstanceState)
if (!router.hasRootController()) { if (!router.hasRootController()) {
// Set start screen // Set start screen
@ -510,8 +511,8 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
* collapsing AppBarLayout. * collapsing AppBarLayout.
*/ */
fun View.offsetAppbarHeight(activity: Activity) { fun View.offsetAppbarHeight(activity: Activity) {
val appbar: AppBarLayout = activity.findViewById(R.id.appbar) val appbar: AppBarLayout = activity.appbar
val tabs: TabLayout = activity.findViewById(R.id.tabs) val tabs: TabLayout = activity.tabs
appbar.addOnOffsetChangedListener( appbar.addOnOffsetChangedListener(
AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
val maxAbsOffset = appBarLayout.measuredHeight - tabs.measuredHeight val maxAbsOffset = appBarLayout.measuredHeight - tabs.measuredHeight

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View File

@ -13,7 +13,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode import androidx.appcompat.view.ActionMode
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.drawable.DrawableCompat import androidx.core.graphics.drawable.DrawableCompat
import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.ConcatAdapter
import androidx.recyclerview.widget.DividerItemDecoration 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.snack
import eu.kanade.tachiyomi.util.view.visible import eu.kanade.tachiyomi.util.view.visible
import java.io.IOException import java.io.IOException
import kotlinx.android.synthetic.main.main_activity.root_coordinator
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.NonCancellable
@ -619,7 +619,7 @@ class MangaController :
private fun toggleFavorite() { private fun toggleFavorite() {
val isNowFavorite = presenter.toggleFavorite() val isNowFavorite = presenter.toggleFavorite()
if (activity != null && !isNowFavorite && presenter.hasDownloads()) { if (activity != null && !isNowFavorite && presenter.hasDownloads()) {
activity!!.findViewById<CoordinatorLayout>(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) { setAction(R.string.action_delete) {
presenter.deleteDownloads() presenter.deleteDownloads()
} }