diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt index fb6fd22176..54ebc4048f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt @@ -2,21 +2,28 @@ package eu.kanade.tachiyomi.ui.base import android.content.Context import android.util.AttributeSet +import android.widget.TextView import androidx.appcompat.graphics.drawable.DrawerArrowDrawable import com.google.android.material.appbar.MaterialToolbar +import com.google.android.material.textview.MaterialTextView import eu.kanade.tachiyomi.R -import kotlinx.android.synthetic.main.main_activity.view.* class CenteredToolbar@JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : MaterialToolbar(context, attrs) { + private lateinit var toolbarTitle:TextView + override fun onFinishInflate() { + super.onFinishInflate() + toolbarTitle = findViewById(R.id.toolbar_title) + } + override fun setTitle(resId: Int) { if (navigationIcon is DrawerArrowDrawable) { super.setTitle(resId) - toolbar_title.text = null + toolbarTitle.text = null hideDropdown() } else { - toolbar_title.text = context.getString(resId) + toolbarTitle.text = context.getString(resId) super.setTitle(null) } } @@ -24,16 +31,16 @@ class CenteredToolbar@JvmOverloads constructor(context: Context, attrs: Attribut override fun setTitle(title: CharSequence?) { if (navigationIcon is DrawerArrowDrawable) { super.setTitle(title) - toolbar_title.text = "" + toolbarTitle.text = "" hideDropdown() } else { - toolbar_title.text = title + toolbarTitle.text = title super.setTitle(null) } } fun showDropdown(down: Boolean = true) { - toolbar_title.setCompoundDrawablesRelativeWithIntrinsicBounds( + toolbarTitle.setCompoundDrawablesRelativeWithIntrinsicBounds( R.drawable.ic_blank_24dp, 0, if (down) { @@ -46,6 +53,6 @@ class CenteredToolbar@JvmOverloads constructor(context: Context, attrs: Attribut } fun hideDropdown() { - toolbar_title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0) + toolbarTitle.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt index 76005cd677..0187e5c14d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt @@ -12,7 +12,6 @@ import com.bluelinelabs.conductor.ControllerChangeHandler import com.bluelinelabs.conductor.ControllerChangeType import com.bluelinelabs.conductor.RestoreViewOnCreateController import kotlinx.android.extensions.LayoutContainer -import kotlinx.android.synthetic.* import timber.log.Timber abstract class BaseController(bundle: Bundle? = null) : @@ -54,11 +53,6 @@ abstract class BaseController(bundle: Bundle? = null) : return inflateView(inflater, container) } - override fun onDestroyView(view: View) { - super.onDestroyView(view) - clearFindViewByIdCache() - } - abstract fun inflateView(inflater: LayoutInflater, container: ViewGroup): View open fun onViewCreated(view: View) { }