Commit 2bf2aafc authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣

update toolbar and bottom bar hide/disappear throush all screens

parent 0af0d011
...@@ -99,7 +99,6 @@ class RoomParkMainActivity( ...@@ -99,7 +99,6 @@ class RoomParkMainActivity(
} else appBar.setGone(false) } else appBar.setGone(false)
showAll() showAll()
appBarScrollable(false) appBarScrollable(false)
Timber.d("NOTGONE")
headerToolbar.setGone(header==null) headerToolbar.setGone(header==null)
statusToolbar.setGone(status==null) statusToolbar.setGone(status==null)
header?.let { header?.let {
......
...@@ -11,6 +11,7 @@ import androidx.annotation.LayoutRes ...@@ -11,6 +11,7 @@ import androidx.annotation.LayoutRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import butterknife.ButterKnife import butterknife.ButterKnife
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.ICollapsingToolBar import com.biganto.visual.roompark.base.ICollapsingToolBar
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.mosby.mvi.BigantoMviController import com.biganto.visual.roompark.conductor.mosby.mvi.BigantoMviController
...@@ -46,6 +47,7 @@ abstract class BigantoBaseController<VS : BigantoBaseViewState,V: BigantoBaseCon ...@@ -46,6 +47,7 @@ abstract class BigantoBaseController<VS : BigantoBaseViewState,V: BigantoBaseCon
protected abstract fun getLayoutId(): Int protected abstract fun getLayoutId(): Int
lateinit var toolBar: ICollapsingToolBar lateinit var toolBar: ICollapsingToolBar
lateinit var bottomNavigation: IBottomNavigation
lateinit var snackbar: ISnackBarProvider lateinit var snackbar: ISnackBarProvider
override fun onAttach(view: View) { override fun onAttach(view: View) {
...@@ -74,9 +76,9 @@ abstract class BigantoBaseController<VS : BigantoBaseViewState,V: BigantoBaseCon ...@@ -74,9 +76,9 @@ abstract class BigantoBaseController<VS : BigantoBaseViewState,V: BigantoBaseCon
// instantiate the view // instantiate the view
ButterKnife.bind(this, view) ButterKnife.bind(this, view)
(activity as RoomParkMainActivity).let{ (activity as RoomParkMainActivity).let{
snackbar = ActivityModule.provideSnackBar(it) snackbar = ActivityModule.provideSnackBar(it)
toolBar = it toolBar = it
bottomNavigation = it
snackbar.bindRootView(toolBar.coordinatorLayout) snackbar.bindRootView(toolBar.coordinatorLayout)
} }
onViewBound(view) onViewBound(view)
......
...@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import butterknife.BindView import butterknife.BindView
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -132,8 +131,6 @@ class AlbumsScreenController : ...@@ -132,8 +131,6 @@ class AlbumsScreenController :
// @Inject // @Inject
// lateinit var ac: RoomParkMainActivity // lateinit var ac: RoomParkMainActivity
@Inject
lateinit var bottomNavigation: IBottomNavigation
override fun render(viewState: AlbumsScreenViewState) { override fun render(viewState: AlbumsScreenViewState) {
when(viewState){ when(viewState){
......
...@@ -12,7 +12,6 @@ import androidx.core.text.HtmlCompat ...@@ -12,7 +12,6 @@ import androidx.core.text.HtmlCompat
import butterknife.BindView import butterknife.BindView
import butterknife.OnClick import butterknife.OnClick
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.HeaderToolbarModel
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -88,6 +87,7 @@ class ArticleScreenController : ...@@ -88,6 +87,7 @@ class ArticleScreenController :
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
toolBar.setToolbar() toolBar.setToolbar()
bottomNavigation.hide()
bindRecycler() bindRecycler()
} }
......
...@@ -3,7 +3,6 @@ package com.biganto.visual.roompark.presentation.screen.auth ...@@ -3,7 +3,6 @@ package com.biganto.visual.roompark.presentation.screen.auth
import android.view.View import android.view.View
import butterknife.BindView import butterknife.BindView
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -75,9 +74,6 @@ class AuthScreenController : ...@@ -75,9 +74,6 @@ class AuthScreenController :
) )
} }
@Inject
lateinit var bottomNavigation: IBottomNavigation
@Inject @Inject
override lateinit var injectedPresenter: AuthScreenPresenter override lateinit var injectedPresenter: AuthScreenPresenter
......
...@@ -75,18 +75,6 @@ class DealScreenController : ...@@ -75,18 +75,6 @@ class DealScreenController :
@BindView(R.id.deal_to_pay_value_text_view) lateinit var dealSumToPay: MaterialTextView @BindView(R.id.deal_to_pay_value_text_view) lateinit var dealSumToPay: MaterialTextView
private fun setToolbar(){ private fun setToolbar(){
toolBar.showAll()
toolBar.appBar.setExpanded(false,false)
toolBar.appBar.liftOnScrollTargetViewId = R.id.favorites_cards_recycler_view
toolBar.appBar.setLiftable(true)
toolBar.appBarScrollable(false)
Timber.d("content insets : ${toolBar.topAppBar.contentInsetEnd}")
activity?.actionBar?.setDisplayShowTitleEnabled(false)
Timber.d(" bakc: ${toolBar.headerToolbarBack}")
toolBar.setToolbar(HeaderToolbarModel( toolBar.setToolbar(HeaderToolbarModel(
true true
,resources?.getString(R.string.deal_back_chevron_title) ,resources?.getString(R.string.deal_back_chevron_title)
...@@ -103,6 +91,7 @@ class DealScreenController : ...@@ -103,6 +91,7 @@ class DealScreenController :
) )
} }
detachDisposable.add( detachDisposable.add(
dealContainer.scrollChangeEvents() dealContainer.scrollChangeEvents()
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
...@@ -141,6 +130,7 @@ class DealScreenController : ...@@ -141,6 +130,7 @@ class DealScreenController :
} }
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
bottomNavigation.hide()
setToolbar() setToolbar()
bindRecycler() bindRecycler()
} }
......
...@@ -50,12 +50,6 @@ class DealsScreenController : ...@@ -50,12 +50,6 @@ class DealsScreenController :
} }
private fun setToolbar(){ private fun setToolbar(){
toolBar.showAll()
toolBar.appBar.setExpanded(false,false)
toolBar.appBar.liftOnScrollTargetViewId = R.id.favorites_cards_recycler_view
toolBar.appBar.setLiftable(true)
toolBar.appBarScrollable(false)
dealsRecyclerView.isNestedScrollingEnabled = false dealsRecyclerView.isNestedScrollingEnabled = false
toolBar.setToolbar( toolBar.setToolbar(
...@@ -71,6 +65,7 @@ class DealsScreenController : ...@@ -71,6 +65,7 @@ class DealsScreenController :
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
bottomNavigation.show()
setToolbar() setToolbar()
bindRecycler() bindRecycler()
detachDisposable.addAll( detachDisposable.addAll(
......
...@@ -161,17 +161,7 @@ class EstateScreenController : ...@@ -161,17 +161,7 @@ class EstateScreenController :
private fun setToolbar(){ private fun setToolbar(){
toolBar.showAll() toolBar.setToolbar(null, StatusToolbarModel())
// toolBar.appBar.setExpanded(false,false)
toolBar.topAppBar.title = "ИЗБРАННОЕ"
toolBar.appBar.liftOnScrollTargetViewId = R.id.favorites_cards_recycler_view
toolBar.appBar.setLiftable(true)
toolBar.appBarScrollable(false)
toolBar.setToolbar(
null, StatusToolbarModel()
)
toolBar.statusToolbar.findViewById<View>(R.id.back_cross).let { toolBar.statusToolbar.findViewById<View>(R.id.back_cross).let {
detachDisposable.add( detachDisposable.add(
it.clicks() it.clicks()
...@@ -179,7 +169,6 @@ class EstateScreenController : ...@@ -179,7 +169,6 @@ class EstateScreenController :
.subscribe { handleBack() } .subscribe { handleBack() }
) )
} }
detachDisposable.add( detachDisposable.add(
flatScroll.scrollChangeEvents() flatScroll.scrollChangeEvents()
// .debounce (25,TimeUnit.MILLISECONDS) // .debounce (25,TimeUnit.MILLISECONDS)
...@@ -219,6 +208,7 @@ class EstateScreenController : ...@@ -219,6 +208,7 @@ class EstateScreenController :
} }
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
bottomNavigation.hide()
setToolbar() setToolbar()
bindRecycler() bindRecycler()
} }
......
...@@ -40,11 +40,6 @@ class FavoritesScreenController : ...@@ -40,11 +40,6 @@ class FavoritesScreenController :
private fun setToolbar(){ private fun setToolbar(){
toolBar.showAll()
toolBar.appBar.setExpanded(false,false)
toolBar.appBar.liftOnScrollTargetViewId = R.id.favorites_cards_recycler_view
toolBar.appBar.setLiftable(true)
toolBar.appBarScrollable(false)
favoritesRecyclerView.isNestedScrollingEnabled = false favoritesRecyclerView.isNestedScrollingEnabled = false
toolBar.setToolbar( toolBar.setToolbar(
...@@ -70,6 +65,7 @@ class FavoritesScreenController : ...@@ -70,6 +65,7 @@ class FavoritesScreenController :
} }
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
bottomNavigation.show()
setToolbar() setToolbar()
bindRecycler() bindRecycler()
detachDisposable.addAll( detachDisposable.addAll(
......
...@@ -46,7 +46,7 @@ class ArticlesScreenController : ...@@ -46,7 +46,7 @@ class ArticlesScreenController :
private fun setToolbar() { private fun setToolbar() {
// articlesRecyclerView.isNestedScrollingEnabled = false articlesRecyclerView.isNestedScrollingEnabled = false
toolBar.setToolbar( toolBar.setToolbar(
HeaderToolbarModel( HeaderToolbarModel(
...@@ -71,17 +71,22 @@ class ArticlesScreenController : ...@@ -71,17 +71,22 @@ class ArticlesScreenController :
if (articlesRecyclerView.itemDecorationCount == 0) if (articlesRecyclerView.itemDecorationCount == 0)
articlesRecyclerView.addItemDecoration( articlesRecyclerView.addItemDecoration(
CeilsDecoration(1 CeilsDecoration(
, resources?.getDimensionPixelSize(R.dimen.ceil_grid_padding)) 1
, resources?.getDimensionPixelSize(R.dimen.ceil_grid_padding)
)
) )
(articlesRecyclerView.adapter as ArticlesAdapter) detachDisposable.add(
.onItemClicked.subscribe { (articlesRecyclerView.adapter as ArticlesAdapter)
router.pushController(RouterTransaction.with(ArticleScreenController(it.articleId))) .onItemClicked.subscribe {
} router.pushController(RouterTransaction.with(ArticleScreenController(it.articleId)))
}
)
} }
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
bottomNavigation.hide()
setToolbar() setToolbar()
bindRecycler() bindRecycler()
} }
......
...@@ -139,8 +139,7 @@ class FeedsScreenController : ...@@ -139,8 +139,7 @@ class FeedsScreenController :
.map { storedFeedsList[it.position] } .map { storedFeedsList[it.position] }
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
// toolBar.hideAll() bottomNavigation.show()
toolBar.setToolbar() toolBar.setToolbar()
bindRecycler() bindRecycler()
......
package com.biganto.visual.roompark.presentation.screen.home package com.biganto.visual.roompark.presentation.screen.home
import android.content.ContentValues.TAG
import android.util.Log
import android.view.View import android.view.View
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import butterknife.BindView import butterknife.BindView
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.ICollapsingToolBar
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -50,37 +46,19 @@ class HomeController : ...@@ -50,37 +46,19 @@ class HomeController :
getComponent() getComponent()
} }
@BindView(R.id.home_router_host) @BindView(R.id.home_router_host)
lateinit var viewpager: ViewPager lateinit var viewpager: ViewPager
@Inject
lateinit var tb: ICollapsingToolBar
@Inject
lateinit var bottomNavigation: IBottomNavigation
@Inject @Inject
override lateinit var injectedPresenter: HomeScreenPresenter override lateinit var injectedPresenter: HomeScreenPresenter
lateinit var pageAdapter : BNVRouterPagerAdapter private lateinit var pageAdapter : BNVRouterPagerAdapter
// @Inject
// lateinit var snacky:ISnackBarProvider
fun getComponent() = DaggerHomeScreenComponent fun getComponent() = DaggerHomeScreenComponent
.factory() .factory()
.create(RoomParkApplication.component,activity as RoomParkMainActivity) .create(RoomParkApplication.component,activity as RoomParkMainActivity)
.inject(this) .inject(this)
// @Inject
// lateinit var ac: RoomParkMainActivity
override fun render(viewState: HomeScreenViewState) { override fun render(viewState: HomeScreenViewState) {
when(viewState){ when(viewState){
is HomeScreenViewState.Idle -> render(viewState) is HomeScreenViewState.Idle -> render(viewState)
...@@ -89,13 +67,9 @@ class HomeController : ...@@ -89,13 +67,9 @@ class HomeController :
} }
private fun render(viewState: HomeScreenViewState.Idle){ private fun render(viewState: HomeScreenViewState.Idle){
} }
private fun render(viewState: HomeScreenViewState.ToScreen){ private fun render(viewState: HomeScreenViewState.ToScreen){
// snacky.showSnackBar("lul")
} }
...@@ -112,14 +86,12 @@ class HomeController : ...@@ -112,14 +86,12 @@ class HomeController :
if (backStackResult if (backStackResult
&& backStackSizeCondition && backStackSizeCondition
) )
return backStackResult return backStackResult
} else { } else {
Log.e(TAG, "handleBack called with getChildRouter(currentlySelectedItemId) == null.", Timber.e(IllegalStateException(
IllegalStateException( "handleBack called with getChildRouter(currentlySelectedItemId) == null.")
"handleBack called with getChildRouter(currentlySelectedItemId) == null.")) ,"handleBack called with getChildRouter(currentlySelectedItemId) == null.")
} }
return false return false
} }
......
...@@ -3,7 +3,9 @@ package com.biganto.visual.roompark.presentation.screen.home.home_routing ...@@ -3,7 +3,9 @@ package com.biganto.visual.roompark.presentation.screen.home.home_routing
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import android.util.SparseArray import android.util.SparseArray
import android.view.* import android.view.Menu
import android.view.MenuItem
import android.view.View
import androidx.annotation.IdRes import androidx.annotation.IdRes
import androidx.annotation.NonNull import androidx.annotation.NonNull
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -65,17 +67,8 @@ abstract class BottomNavigationController : ...@@ -65,17 +67,8 @@ abstract class BottomNavigationController :
constructor(args: Bundle) : super(args) constructor(args: Bundle) : super(args)
@NonNull override fun onViewBound(v: View) {
protected fun inflateView(@NonNull inflater: LayoutInflater, @NonNull container: ViewGroup): View {
return inflater.inflate(getLayoutId(), container, false)
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
val view = inflateView(inflater,container)
retainViewMode=RetainViewMode.RELEASE_DETACH retainViewMode=RetainViewMode.RELEASE_DETACH
Timber.d(" onCreateView: ${this::class}")
onViewBound(view)
return view
} }
@IdRes @IdRes
......
...@@ -48,9 +48,6 @@ class HomeBottomNavigationController(@IdRes toPage: Int = R.id.tab_feeds) ...@@ -48,9 +48,6 @@ class HomeBottomNavigationController(@IdRes toPage: Int = R.id.tab_feeds)
@Inject @Inject
lateinit var tb: ICollapsingToolBar lateinit var tb: ICollapsingToolBar
@Inject
lateinit var bottomNavigation: IBottomNavigation
@Inject @Inject
override lateinit var injectedPresenter: HomeScreenPresenter override lateinit var injectedPresenter: HomeScreenPresenter
......
...@@ -6,7 +6,6 @@ import androidx.core.os.bundleOf ...@@ -6,7 +6,6 @@ import androidx.core.os.bundleOf
import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2
import butterknife.BindView import butterknife.BindView
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -72,12 +71,6 @@ class PhotoScreenController : ...@@ -72,12 +71,6 @@ class PhotoScreenController :
,args.getInt(SELECTED_PHOTO_KEY)) ,args.getInt(SELECTED_PHOTO_KEY))
.inject(this) .inject(this)
// @Inject
// lateinit var ac: RoomParkMainActivity
@Inject
lateinit var bottomNavigation: IBottomNavigation
override fun render(viewState: PhotoScreenViewState) { override fun render(viewState: PhotoScreenViewState) {
Timber.d("render: $viewState") Timber.d("render: $viewState")
when(viewState){ when(viewState){
......
...@@ -74,12 +74,7 @@ class SettingsScreenController : ...@@ -74,12 +74,7 @@ class SettingsScreenController :
private fun setToolbar(){ private fun setToolbar(){
toolBar.showAll()
toolBar.appBar.setExpanded(false,true)
toolBar.appBar.liftOnScrollTargetViewId = R.id.nestedScrollContainer toolBar.appBar.liftOnScrollTargetViewId = R.id.nestedScrollContainer
toolBar.appBar.setLiftable(true)
toolBar.appBar.setLifted(true)
toolBar.appBarScrollable(false)
pushRecycler.isNestedScrollingEnabled = false pushRecycler.isNestedScrollingEnabled = false
cachedRecycler.isNestedScrollingEnabled = false cachedRecycler.isNestedScrollingEnabled = false
...@@ -90,8 +85,7 @@ class SettingsScreenController : ...@@ -90,8 +85,7 @@ class SettingsScreenController :
) )
} }
override fun onViewBound(v: View) { private fun bindRecycler(){
setToolbar()
pushRecycler.isNestedScrollingEnabled = true pushRecycler.isNestedScrollingEnabled = true
pushRecycler.layoutManager = pushRecycler.layoutManager =
LinearLayoutManager(activity, RecyclerView.VERTICAL, false) LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
...@@ -103,8 +97,12 @@ class SettingsScreenController : ...@@ -103,8 +97,12 @@ class SettingsScreenController :
LinearLayoutManager(activity, RecyclerView.VERTICAL, false) LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
cachedRecycler.adapter = CahcedListAdapter() cachedRecycler.adapter = CahcedListAdapter()
cachedRecycler.itemAnimator = null cachedRecycler.itemAnimator = null
}
override fun onViewBound(v: View) {
bottomNavigation.show()
setToolbar()
bindRecycler()
} }
override fun render(viewState: SettingsScreenViewState) { override fun render(viewState: SettingsScreenViewState) {
......
...@@ -2,7 +2,6 @@ package com.biganto.visual.roompark.presentation.screen.splash ...@@ -2,7 +2,6 @@ package com.biganto.visual.roompark.presentation.screen.splash
import android.view.View import android.view.View
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -24,7 +23,7 @@ class SplashScreenController : ...@@ -24,7 +23,7 @@ class SplashScreenController :
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
// toolBar.setToolbar() toolBar.setToolbar()
bottomNavigation.hide() bottomNavigation.hide()
} }
...@@ -46,12 +45,6 @@ class SplashScreenController : ...@@ -46,12 +45,6 @@ class SplashScreenController :
.create(RoomParkApplication.component,activity as RoomParkMainActivity) .create(RoomParkApplication.component,activity as RoomParkMainActivity)
.inject(this) .inject(this)
// @Inject
// lateinit var ac: RoomParkMainActivity
@Inject
lateinit var bottomNavigation: IBottomNavigation
override fun render(viewState: SplashScreenViewState) { override fun render(viewState: SplashScreenViewState) {
when(viewState){ when(viewState){
is SplashScreenViewState.Idle -> render(viewState) is SplashScreenViewState.Idle -> render(viewState)
......
...@@ -61,13 +61,6 @@ class FindFlatScreenController : ...@@ -61,13 +61,6 @@ class FindFlatScreenController :
} }
private fun setToolbar(){ private fun setToolbar(){
toolBar.showAll()
toolBar.appBar.setExpanded(false,true)
toolBar.appBar.liftOnScrollTargetViewId = R.id.favorites_cards_recycler_view
toolBar.appBar.setLiftable(true)
toolBar.appBar.setLifted(true)
toolBar.appBarScrollable(false)
toolBar.setToolbar( toolBar.setToolbar(
HeaderToolbarModel( HeaderToolbarModel(
false,null false,null
...@@ -98,6 +91,7 @@ class FindFlatScreenController : ...@@ -98,6 +91,7 @@ class FindFlatScreenController :
) )
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
bottomNavigation.show()
setToolbar() setToolbar()
estateTabs.forEach {estate -> estateTabs.forEach {estate ->
val tab = flatTabs.newTab() val tab = flatTabs.newTab()
......
...@@ -6,7 +6,6 @@ import android.view.View ...@@ -6,7 +6,6 @@ import android.view.View
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import butterknife.BindView import butterknife.BindView
import com.biganto.visual.roompark.R import com.biganto.visual.roompark.R
import com.biganto.visual.roompark.base.IBottomNavigation
import com.biganto.visual.roompark.base.RoomParkApplication import com.biganto.visual.roompark.base.RoomParkApplication
import com.biganto.visual.roompark.base.RoomParkMainActivity import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.conductor.BigantoBaseController import com.biganto.visual.roompark.conductor.BigantoBaseController
...@@ -51,7 +50,7 @@ class WebCamScreenController : ...@@ -51,7 +50,7 @@ class WebCamScreenController :
override fun onViewBound(v: View) { override fun onViewBound(v: View) {
toolBar.hideAll() toolBar.setToolbar()
bottomNavigation.hide() bottomNavigation.hide()
} }
...@@ -62,12 +61,6 @@ class WebCamScreenController : ...@@ -62,12 +61,6 @@ class WebCamScreenController :
@Inject @Inject
override lateinit var injectedPresenter: WebCamScreenPresenter override lateinit var injectedPresenter: WebCamScreenPresenter
// @Inject
// lateinit var snacky:ISnackBarProvider
lateinit var rpActivity: RoomParkMainActivity
fun getComponent() = DaggerWebCamScreenComponent fun getComponent() = DaggerWebCamScreenComponent
.factory() .factory()
.create(RoomParkApplication.component .create(RoomParkApplication.component
...@@ -75,12 +68,6 @@ class WebCamScreenController : ...@@ -75,12 +68,6 @@ class WebCamScreenController :
,args.getInt(SELECTED_CAM_INDEX_KEY)) ,args.getInt(SELECTED_CAM_INDEX_KEY))
.inject(this) .inject(this)
// @Inject
// lateinit var ac: RoomParkMainActivity
@Inject
lateinit var bottomNavigation: IBottomNavigation
override fun render(viewState: WebCamScreenViewState) { override fun render(viewState: WebCamScreenViewState) {
when(viewState){ when(viewState){
is WebCamScreenViewState.Idle -> render(viewState) is WebCamScreenViewState.Idle -> render(viewState)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment