Pixelfed
/
Pixelcat-App-Android
mirror of https://github.com/pixelcatapp/Pixelcat
1
0
Fork 0
Code Issues Releases Wiki Activity

upgrade dependencies

This commit is contained in:
Konrad Pozniak 2020-06-27 21:04:37 +02:00
parent 0c6bf3cd96
commit 6ef2952313
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle.kts
View File

@ -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")

4
app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt
View File

@ -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))