Pixelfed/PixelDroid-App-Android
1
0
Fork 0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2024-12-23 05:27:37 +01:00
Code Issues Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Matthieu 2020-12-19 21:12:56 +01:00
parent 10a96a33d4
commit 08f8bbcc13
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle
View File

@ -79,7 +79,7 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
implementation 'androidx.paging:paging-runtime-ktx:3.0.0-alpha10'
implementation 'androidx.paging:paging-runtime-ktx:3.0.0-alpha11'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0'
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
@ -87,16 +87,16 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0'
// Use the most recent version of CameraX
def camerax_version = '1.0.0-beta12'
implementation "androidx.camera:camera-core:${camerax_version}"
implementation "androidx.camera:camera-camera2:${camerax_version}"
def cameraX_version = '1.0.0-rc01'
implementation "androidx.camera:camera-core:${cameraX_version}"
implementation "androidx.camera:camera-camera2:${cameraX_version}"
// CameraX Lifecycle library
implementation "androidx.camera:camera-lifecycle:$camerax_version"
implementation "androidx.camera:camera-lifecycle:$cameraX_version"
// CameraX View class
implementation 'androidx.camera:camera-view:1.0.0-alpha19'
implementation 'androidx.camera:camera-view:1.0.0-alpha20'
def room_version = "2.3.0-alpha03"
def room_version = "2.3.0-alpha04"
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"

1
app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/CachedFeedFragment.kt
View File

@ -38,6 +38,7 @@ open class CachedFeedFragment<T: FeedContentDatabase> : BaseFragment() {
private var job: Job? = null
@ExperimentalPagingApi
internal fun launch() {
// Make sure we cancel the previous job before creating a new one
job?.cancel()

1
app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedContentRepository.kt
View File

@ -37,6 +37,7 @@ class FeedContentRepository<T: FeedContentDatabase> @ExperimentalPagingApi
* [FeedContentDatabase], exposed as a stream of data that will emit
* every time we get more data from the network.
*/
@ExperimentalPagingApi
fun stream(): Flow<PagingData<T>> {
val pagingSourceFactory = {

1
app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedViewModel.kt
View File

@ -30,6 +30,7 @@ class FeedViewModel<T: FeedContentDatabase>(private val repository: FeedContentR
private var currentResult: Flow<PagingData<T>>? = null
@ExperimentalPagingApi
fun flow(): Flow<PagingData<T>> {
val lastResult = currentResult
if (lastResult != null) {

2
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.4.20'
ext.kotlin_version = '1.4.21'
repositories {
google()
jcenter()