blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #431: Scroll-down on the home screen messes up everything

master
Colin Lee 2019-02-12 13:56:01 -06:00
parent b6ab865e44
commit 83f637e386
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -49,6 +49,7 @@ class HomeFragment : Fragment() {
val view = inflater.inflate(R.layout.fragment_home, container, false)
TabsComponent(view.homeLayout, bus, TabsState(requireComponents.core.sessionManager.sessions))
SessionsComponent(view.homeLayout, bus)
layoutComponents(view)
ActionBusFactory.get(this).logMergedObservables()
val activity = activity as HomeActivity
DefaultThemeManager.applyStatusBarTheme(activity.window, activity.themeManager, activity)
@ -61,8 +62,6 @@ class HomeFragment : Fragment() {
(activity as AppCompatActivity).supportActionBar?.hide()
layoutComponents(view.homeLayout)
getSafeManagedObservable<TabsAction>()
.subscribe {
when (it) {

56
app/src/main/java/org/mozilla/fenix/home/HomeLayouts.kt
View File

@ -4,40 +4,42 @@
package org.mozilla.fenix.home
import androidx.constraintlayout.widget.ConstraintLayout
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID
import kotlinx.android.synthetic.main.component_sessions.*
import kotlinx.android.synthetic.main.component_tabs.*
import kotlinx.android.synthetic.main.fragment_home.*
import kotlinx.android.synthetic.main.tab_list_header.*
import kotlinx.android.synthetic.main.component_sessions.view.*
import kotlinx.android.synthetic.main.component_tabs.view.*
import kotlinx.android.synthetic.main.fragment_home.view.*
import kotlinx.android.synthetic.main.tab_list_header.view.*
import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.BOTTOM
import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.END
import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.START
import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.TOP
import org.jetbrains.anko.constraint.layout.applyConstraintSet
fun HomeFragment.layoutComponents(layout: ConstraintLayout) {
layout.applyConstraintSet {
tabs_header {
connect(
TOP to BOTTOM of homeDivider,
START to START of tabs_list,
END to END of PARENT_ID
)
}
tabs_list {
connect(
TOP to BOTTOM of tabs_header,
START to START of PARENT_ID,
END to END of PARENT_ID
)
}
session_list {
connect(
TOP to BOTTOM of tabs_list,
START to START of PARENT_ID,
END to END of PARENT_ID
)
fun HomeFragment.layoutComponents(layout: View) {
with(layout) {
homeLayout.applyConstraintSet {
tabs_header {
connect(
TOP to BOTTOM of homeDivider,
START to START of tabs_list,
END to END of PARENT_ID
)
}
tabs_list {
connect(
TOP to BOTTOM of tabs_header,
START to START of PARENT_ID,
END to END of PARENT_ID
)
}
session_list {
connect(
TOP to BOTTOM of tabs_list,
START to START of PARENT_ID,
END to END of PARENT_ID
)
}
}
}
}