Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3899c50 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Apps: Upstream lifecycle dependencies 

- ViewModelProviders.of() which was part of lifecycle-extensions has been deprecated
- Switch to latest version of lifecycle-viewmodel-ktx as dependency and migrate required
  code to use ViewModelProvider()

References:
- [1]: https://developer.android.com/jetpack/androidx/releases/lifecycle#declaring_dependencies
- [2]: https://twitter.com/ianhlake/status/1159159590476382208



Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent 41ba24be

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ dependencies { 
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

//    implementation 'com.android.support:design:27.1.1'

    implementation 'androidx.recyclerview:recyclerview:1.0.0'

    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'

    testImplementation 'junit:junit:4.12'

    implementation 'org.bouncycastle:bcpg-jdk15on:1.60'
@@ -71,7 +70,8 @@ dependencies { 


    implementation "androidx.preference:preference-ktx:1.1.0"



    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'

    // Lifecycle

    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"

app/src/main/java/foundation/e/apps/categories/ApplicationsFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.view.ViewGroup 
import android.widget.TextView

import androidx.fragment.app.Fragment

import androidx.lifecycle.Observer

import androidx.lifecycle.ViewModelProviders

import androidx.lifecycle.ViewModelProvider

import androidx.recyclerview.widget.LinearLayoutManager

import foundation.e.apps.R

import foundation.e.apps.categories.model.Category
@@ -39,7 +39,7 @@ class ApplicationsFragment() : Fragment() { 
    var color:Int = 0;



    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

        categoriesViewModel = ViewModelProviders.of(activity!!).get(CategoriesViewModel::class.java)

        categoriesViewModel = ViewModelProvider(this).get(CategoriesViewModel::class.java)



        val view = inflater.inflate(R.layout.fragment_application_categories, container, false)

        view.categories_list.layoutManager = LinearLayoutManager(context)

app/src/main/java/foundation/e/apps/categories/GamesFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.view.ViewGroup 
import android.widget.TextView

import androidx.fragment.app.Fragment

import androidx.lifecycle.Observer

import androidx.lifecycle.ViewModelProviders

import androidx.lifecycle.ViewModelProvider

import androidx.recyclerview.widget.LinearLayoutManager

import foundation.e.apps.R

import foundation.e.apps.categories.viewmodel.CategoriesViewModel
@@ -38,7 +38,7 @@ class GamesFragment() : Fragment() { 
    var color:Int = 0;



    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

        categoriesViewModel = ViewModelProviders.of(activity!!).get(CategoriesViewModel::class.java)

        categoriesViewModel = ViewModelProvider(this).get(CategoriesViewModel::class.java)



        val view = inflater.inflate(R.layout.fragment_games_categories, container, false)

        view.categories_list.layoutManager = LinearLayoutManager(context)

app/src/main/java/foundation/e/apps/categories/PwasFragment.kt

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import android.view.ViewGroup 
import android.widget.TextView

import androidx.fragment.app.Fragment

import androidx.lifecycle.Observer

import androidx.lifecycle.ViewModelProviders

import androidx.lifecycle.ViewModelProvider

import androidx.recyclerview.widget.LinearLayoutManager

import foundation.e.apps.R

import foundation.e.apps.categories.viewmodel.CategoriesViewModel
@@ -18,7 +18,7 @@ class PwasFragment : Fragment() { 
    private lateinit var categoriesViewModel: CategoriesViewModel



    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

        categoriesViewModel = ViewModelProviders.of(activity!!).get(CategoriesViewModel::class.java)

        categoriesViewModel = ViewModelProvider(this).get(CategoriesViewModel::class.java)



        val view = inflater.inflate(R.layout.fragment_application_categories, container, false)

        view.categories_list.layoutManager = LinearLayoutManager(context)

app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.appcompat.app.AppCompatActivity 
import androidx.appcompat.view.ContextThemeWrapper

import androidx.appcompat.widget.Toolbar

import androidx.lifecycle.Observer

import androidx.lifecycle.ViewModelProviders

import androidx.lifecycle.ViewModelProvider

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.RecyclerView

import com.google.android.material.snackbar.Snackbar
@@ -75,7 +75,7 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio 
        category = intent.getSerializableExtra(CATEGORY_KEY) as Category

        supportActionBar?.title = category.getTitle()



        categoryViewModel = ViewModelProviders.of(this).get(CategoryViewModel::class.java)

        categoryViewModel = ViewModelProvider(this).get(CategoryViewModel::class.java)

        recyclerView = findViewById(R.id.app_list)

        val loadMoreContainer = findViewById<RelativeLayout>(R.id.load_more_container)

        progressBar = findViewById(R.id.progress_bar)