diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0b4bfc7..9dac548 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,16 +68,16 @@ dependencies { implementation("androidx.fragment:fragment-ktx:1.3.0-alpha06") implementation("com.google.android.material:material:1.2.0-beta01") implementation("androidx.constraintlayout:constraintlayout:1.1.3") - implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01") - implementation("androidx.recyclerview:recyclerview:1.2.0-alpha03") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") + implementation("androidx.recyclerview:recyclerview:1.2.0-alpha04") implementation("androidx.annotation:annotation:1.1.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") implementation("androidx.preference:preference:1.1.1") - implementation("androidx.emoji:emoji-bundled:1.1.0-rc01") - implementation("androidx.paging:paging-runtime-ktx:3.0.0-alpha01") + implementation("androidx.emoji:emoji-bundled:1.1.0") + implementation("androidx.paging:paging-runtime-ktx:3.0.0-alpha02") implementation("androidx.viewpager2:viewpager2:1.0.0") implementation("androidx.room:room-ktx:$roomVersion") diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt b/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt index 053df22..f265086 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt @@ -26,7 +26,7 @@ import androidx.lifecycle.Observer import androidx.lifecycle.lifecycleScope import androidx.paging.ExperimentalPagingApi import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.MergeAdapter +import androidx.recyclerview.widget.ConcatAdapter import at.connyduck.pixelcat.R import at.connyduck.pixelcat.components.bottomsheet.accountselection.AccountSelectionBottomSheet import at.connyduck.pixelcat.components.bottomsheet.menu.MenuBottomSheet @@ -106,7 +106,7 @@ class ProfileFragment : DaggerFragment(R.layout.fragment_profile) { binding.profileRecyclerView.layoutManager = layoutManager - binding.profileRecyclerView.adapter = MergeAdapter(headerAdapter, imageAdapter) + binding.profileRecyclerView.adapter = ConcatAdapter(headerAdapter, imageAdapter) binding.profileRecyclerView.addItemDecoration(GridSpacingItemDecoration(IMAGE_COLUMN_COUNT, imageSpacing, 1)) viewModel.setAccountInfo(arg(ACCOUNT_ID))