diff --git a/core/src/main/java/org/futo/circles/core/view/LoadingRecyclerView.kt b/core/src/main/java/org/futo/circles/core/view/LoadingRecyclerView.kt index 63a3ba757898c3e5e52ac8e5796568decd25fa29..6d9c50ee26cd9dd7b38bc9bd253039dcfdb0e4b9 100644 --- a/core/src/main/java/org/futo/circles/core/view/LoadingRecyclerView.kt +++ b/core/src/main/java/org/futo/circles/core/view/LoadingRecyclerView.kt @@ -4,7 +4,7 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.view.View -import androidx.constraintlayout.widget.ConstraintLayout +import android.widget.FrameLayout import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ItemDecoration import com.google.android.material.floatingactionbutton.FloatingActionButton @@ -18,7 +18,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull class LoadingRecyclerView( context: Context, attrs: AttributeSet? = null -) : ConstraintLayout(context, attrs) { +) : FrameLayout(context, attrs) { private val binding = ViewLoadingRecyclerBinding.inflate(LayoutInflater.from(context), this) @@ -62,7 +62,7 @@ class LoadingRecyclerView( fun bindToFab(fab: FloatingActionButton) = binding.rvList.bindToFab(fab) - fun setIsPageLoading(isLoading:Boolean) = binding.pageLoading.setIsVisible(isLoading) + fun setIsPageLoading(isLoading: Boolean) = binding.pageLoading.setIsVisible(isLoading) private fun setupDataObserver() { with(binding) { diff --git a/core/src/main/res/layout/view_loading_recycler.xml b/core/src/main/res/layout/view_loading_recycler.xml index 34a975989c8d996dd3ea8ba3ab804b01fc0bcc8c..a8fb03b3b2351b51723a8eba1331075ea8b5443c 100644 --- a/core/src/main/res/layout/view_loading_recycler.xml +++ b/core/src/main/res/layout/view_loading_recycler.xml @@ -4,27 +4,23 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + android:orientation="vertical" + tools:parentTag="android.widget.FrameLayout"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/rvList" - android:layout_width="0dp" - android:layout_height="0dp" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> <FrameLayout android:id="@+id/pageLoading" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="bottom" android:background="?android:colorBackground" android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent"> + tools:visibility="visible"> <ProgressBar android:layout_width="wrap_content" @@ -39,20 +35,13 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:visibility="gone" - app:layout_constraintBottom_toBottomOf="@id/rvList" - app:layout_constraintEnd_toEndOf="@id/rvList" - app:layout_constraintStart_toStartOf="@id/rvList" - app:layout_constraintTop_toTopOf="@id/rvList" tools:visibility="visible" /> <FrameLayout android:id="@+id/lEmptyViewContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:layout_gravity="center" + android:visibility="gone" /> </merge> \ No newline at end of file