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

Commit 3c59a4cf authored by Aayush Gupta's avatar Aayush Gupta
Browse files

updates: Migrate to viewBinding 

- Kotlin Android Extensions is deprecated
- It has important advantages over using findViewById

Ref:
- [1]: https://developer.android.com/topic/libraries/view-binding/migration
- [2]: https://developer.android.com/topic/libraries/view-binding#findviewbyid



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

app/src/main/java/foundation/e/apps/updates/UpdatesFragment.kt

+26 −18
Original line number Original line Diff line number Diff line
@@ -25,24 +25,24 @@ import android.os.Handler 
import android.view.LayoutInflater

import android.view.LayoutInflater

import android.view.View

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup

import android.widget.Button

import android.widget.LinearLayout

import android.widget.ProgressBar

import android.widget.ProgressBar

import android.widget.TextView

import androidx.fragment.app.Fragment

import androidx.fragment.app.Fragment

import androidx.lifecycle.Observer

import androidx.lifecycle.Observer

import androidx.lifecycle.ViewModelProvider

import androidx.lifecycle.ViewModelProvider

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.RecyclerView

import androidx.recyclerview.widget.RecyclerView

import foundation.e.apps.R

import foundation.e.apps.application.model.Application

import foundation.e.apps.application.model.Application

import foundation.e.apps.application.model.State

import foundation.e.apps.application.model.State

import foundation.e.apps.applicationmanager.ApplicationManager

import foundation.e.apps.applicationmanager.ApplicationManager

import foundation.e.apps.common.ApplicationListAdapter

import foundation.e.apps.common.ApplicationListAdapter

import foundation.e.apps.databinding.FragmentUpdatesBinding

import foundation.e.apps.updates.viewmodel.UpdatesViewModel

import foundation.e.apps.updates.viewmodel.UpdatesViewModel









class UpdatesFragment() : Fragment() {

class UpdatesFragment() : Fragment() {

    private var _binding: FragmentUpdatesBinding? = null

    private val binding get() = _binding!!



    private lateinit var updatesViewModel: UpdatesViewModel

    private lateinit var updatesViewModel: UpdatesViewModel

    private var applicationManager: ApplicationManager? = null

    private var applicationManager: ApplicationManager? = null

    private lateinit var recyclerView: RecyclerView

    private lateinit var recyclerView: RecyclerView
@@ -56,28 +56,31 @@ class UpdatesFragment() : Fragment() { 
    }

    }





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

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

        _binding = FragmentUpdatesBinding.inflate(inflater, container, false)



        if (applicationManager == null) {

        if (applicationManager == null) {

            return null

            return null

        }

        }





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



        updatesViewModel = ViewModelProvider(this).get(UpdatesViewModel::class.java)

        updatesViewModel = ViewModelProvider(this).get(UpdatesViewModel::class.java)

        recyclerView = view.findViewById(R.id.app_list)



        val updateAll = view.findViewById<Button>(R.id.update_all)

        // Fragment variables

        recyclerView = binding.appList

        reloadProgressBar = binding.progressBar2

        val updateAll = binding.updateAll

        val splashContainer = binding.updatesSplashLayout.splashContainer

        val progressBar = binding.progressBar

        val errorContainer = binding.errorLayout.errorContainer

        val errorDescription = binding.errorLayout.errorDescription

        val errorResolve = binding.errorLayout.errorResolve



        updateAll.setTextColor(accentColorOS)

        updateAll.setTextColor(accentColorOS)

        val splashContainer = view.findViewById<LinearLayout>(R.id.splash_container)

        val progressBar = view.findViewById<ProgressBar>(R.id.progress_bar)

        progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.MULTIPLY)

        progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.MULTIPLY)

        reloadProgressBar = view.findViewById<ProgressBar>(R.id.progress_bar2)

        reloadProgressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.MULTIPLY)

        reloadProgressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.MULTIPLY)





        val errorContainer = view.findViewById<LinearLayout>(R.id.error_container)

        val errorDescription = view.findViewById<TextView>(R.id.error_description)



        //set accent color to Error button (Retry )

        //set accent color to Error button (Retry )

        view.findViewById<TextView>(R.id.error_resolve).setTextColor(Color.parseColor("#ffffff"))

        errorResolve.setTextColor(Color.parseColor("#ffffff"))

        view.findViewById<TextView>(R.id.error_resolve).setBackgroundColor(accentColorOS)

        errorResolve.setBackgroundColor(accentColorOS)









        // Initialise UI elements

        // Initialise UI elements
@@ -95,7 +98,7 @@ class UpdatesFragment() : Fragment() { 
        reloadProgressBar.visibility = View.GONE

        reloadProgressBar.visibility = View.GONE

        errorContainer.visibility = View.GONE

        errorContainer.visibility = View.GONE

        splashContainer.visibility = View.GONE

        splashContainer.visibility = View.GONE

        view.findViewById<TextView>(R.id.error_resolve).setOnClickListener {

        errorResolve.setOnClickListener {

            updateAll.isEnabled = false

            updateAll.isEnabled = false

            progressBar.visibility = View.VISIBLE

            progressBar.visibility = View.VISIBLE

            updatesViewModel.loadApplicationList(requireContext())

            updatesViewModel.loadApplicationList(requireContext())
@@ -147,7 +150,7 @@ class UpdatesFragment() : Fragment() { 
        updatesViewModel.loadApplicationList(requireContext())

        updatesViewModel.loadApplicationList(requireContext())









        return view

        return binding.root

    }

    }





    override fun onResume() {

    override fun onResume() {
@@ -167,6 +170,11 @@ class UpdatesFragment() : Fragment() { 
        }

        }

    }

    }





    override fun onDestroyView() {

        super.onDestroyView()

        _binding = null

    }



    fun decrementApplicationUses() {

    fun decrementApplicationUses() {

        if (::updatesViewModel.isInitialized) {

        if (::updatesViewModel.isInitialized) {

            updatesViewModel.getApplications().value?.let {

            updatesViewModel.getApplications().value?.let {

app/src/main/res/layout/fragment_updates.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,7 @@ 
        app:layout_constraintTop_toBottomOf="@id/progress_bar2"/>

        app:layout_constraintTop_toBottomOf="@id/progress_bar2"/>





    <include

    <include

        android:id="@+id/updates_splash_layout"

        layout="@layout/updates_splash_layout"

        layout="@layout/updates_splash_layout"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"
@@ -101,6 +102,7 @@ 
        app:layout_constraintTop_toBottomOf="@id/toolbar" />

        app:layout_constraintTop_toBottomOf="@id/toolbar" />





    <include

    <include

        android:id="@+id/error_layout"

        layout="@layout/error_layout"

        layout="@layout/error_layout"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"