Move inflation back to fragment to fix MotionLayout for now

mozilla-mobile · Jan 30, 2019 · 43986db · 43986db
1 parent b111b99
commit 43986db
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
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
@@ -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
@@ -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<SessionsState>(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
diff --git 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"/>
     </org.mozilla.fenix.home.SearchView>
 
+    <androidx.recyclerview.widget.RecyclerView
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/session_list"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="16dp"
+            app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
 </androidx.constraintlayout.motion.widget.MotionLayout>