mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

remove dependency to lifecycle-common-java8

Browse source
This commit is contained in:
Christophe Beyls 2020-04-21 13:09:41 +02:00
parent a410532aa1
commit 0cabd84732
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -80,7 +80,6 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version"

17
app/src/main/java/be/digitalia/fosdem/fragments/TracksFragment.kt
View file

@ -6,8 +6,8 @@ import android.view.View
import androidx.core.content.edit
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.observe
import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
import androidx.viewpager2.adapter.FragmentStateAdapter
@ -72,8 +72,8 @@ class TracksFragment : Fragment(R.layout.fragment_tracks), RecycledViewPoolProvi
}
}
viewLifecycleOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
override fun onStop(owner: LifecycleOwner) {
viewLifecycleOwner.lifecycle.addObserver(LifecycleEventObserver { source, event ->
if (event == Lifecycle.Event.ON_STOP) {
// Save the current page to preferences if it has changed
val page = holder.pager.currentItem
val prefs = requireActivity().getPreferences(Context.MODE_PRIVATE)
@ -83,13 +83,14 @@ class TracksFragment : Fragment(R.layout.fragment_tracks), RecycledViewPoolProvi
}
}
}
override fun onDestroy(owner: LifecycleOwner) {
recycledViewPool = null
}
})
}
override fun onDestroyView() {
super.onDestroyView()
recycledViewPool = null
}
override var recycledViewPool: RecycledViewPool? = null
private set

6
app/src/main/java/be/digitalia/fosdem/widgets/MultiChoiceHelper.kt
View file

@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode
import androidx.core.util.set
import androidx.core.util.size
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
@ -143,8 +143,8 @@ class MultiChoiceHelper(private val activity: AppCompatActivity, owner: SavedSta
}
}
private val adapterLifecycleObserver = object : DefaultLifecycleObserver {
override fun onDestroy(owner: LifecycleOwner) {
private val adapterLifecycleObserver = LifecycleEventObserver { _, event ->
if (event == Lifecycle.Event.ON_DESTROY) {
adapter = null
adapterLifecycle = null
choiceActionMode?.finish()