diff --git a/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsLayouts.kt b/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsLayouts.kt index b0b3cd167..b96fa2c0c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsLayouts.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsLayouts.kt @@ -2,12 +2,8 @@ package org.mozilla.fenix.home.sessions import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID -import kotlinx.android.synthetic.main.component_sessions.* import kotlinx.android.synthetic.main.fragment_home.* -import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.BOTTOM -import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.TOP -import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.START -import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.END +import org.jetbrains.anko.constraint.layout.ConstraintSetBuilder.Side.* import org.jetbrains.anko.constraint.layout.applyConstraintSet import org.mozilla.fenix.home.HomeFragment diff --git a/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsUIView.kt b/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsUIView.kt index 70a748c50..cf0d04992 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessions/SessionsUIView.kt @@ -4,31 +4,21 @@ package org.mozilla.fenix.home.sessions -import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import io.reactivex.functions.Consumer -import kotlinx.android.synthetic.main.component_sessions.* import kotlinx.android.synthetic.main.fragment_home.* -import org.mozilla.fenix.R import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.UIView class SessionsUIView(container: ViewGroup, bus: ActionBusFactory) : UIView(container, bus) { - val view: ConstraintLayout = LayoutInflater.from(container.context) - .inflate(R.layout.component_sessions, container, true) as ConstraintLayout - private var sessionAdapter = SessionsAdapter() init { session_list.apply { - layoutManager = LinearLayoutManager(view.context) + layoutManager = LinearLayoutManager(container.context) adapter = sessionAdapter - setHasFixedSize(true) } } diff --git a/app/src/main/res/layout/component_sessions.xml b/app/src/main/res/layout/component_sessions.xml deleted file mode 100644 index 208178124..000000000 --- a/app/src/main/res/layout/component_sessions.xml +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f9a47041b..8116f6086 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -71,4 +71,16 @@ android:transitionName="firstTransitionName"/> + + \ No newline at end of file