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

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

search: 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 3c59a4cf

app/src/main/java/foundation/e/apps/search/SearchFragment.kt

+31 −19
Original line number Diff line number Diff line
@@ -39,12 +39,16 @@ import foundation.e.apps.R 
import foundation.e.apps.application.model.Application

import foundation.e.apps.applicationmanager.ApplicationManager

import foundation.e.apps.common.ApplicationListAdapter

import foundation.e.apps.databinding.FragmentSearchBinding

import foundation.e.apps.search.viewmodel.SearchViewModel

import foundation.e.apps.utils.Constants

import foundation.e.apps.utils.Constants.SUGGESTION_KEY





class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.OnSuggestionListener {

    private var _binding: FragmentSearchBinding? = null

    private val binding get() = _binding!!



    private lateinit var searchViewModel: SearchViewModel

    private var focusView: View? = null

    private lateinit var searchView: SearchView
@@ -62,30 +66,33 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
    }



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

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



        setHasOptionsMenu(true)



        if (applicationManager == null) {

            return null

        }



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



        searchViewModel = ViewModelProvider(this).get(SearchViewModel::class.java)

        focusView = view.findViewById(R.id.view)

        searchView = view.findViewById(R.id.search_view)

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

        progressBar = view.findViewById(R.id.progress_bar)

        splashContainer = view.findViewById(R.id.splash_container)

        var error_resolve =view.findViewById<TextView>(R.id.error_resolve)

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

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

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



        // Fragment variables

        focusView = binding.view

        searchView = binding.searchView

        recyclerView = binding.appList

        progressBar = binding.progressBar

        splashContainer = binding.searchSplashLayout.splashContainer

        val errorResolve = binding.errorLayout.errorResolve

        val errorContainer = binding.errorLayout.errorContainer

        val errorDescription = binding.errorLayout.errorDescription

        val loadMoreContainer = binding.loadMoreContainer



        //set accent color to Error button (Retry )

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

        error_resolve.setBackgroundColor(accentColorOS)

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

        errorResolve.setBackgroundColor(accentColorOS)





        error_resolve.visibility=View.GONE

        errorResolve.visibility=View.GONE

        searchViewModel.initialise(applicationManager!!)

        recyclerView.visibility = View.GONE

        progressBar.visibility = View.GONE
@@ -96,7 +103,7 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
            splashContainer.visibility = View.GONE

        }

        errorContainer.visibility = View.GONE

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

        errorResolve.setOnClickListener {

            loadMoreContainer.visibility = View.GONE

            progressBar.visibility = View.VISIBLE

            onQueryTextSubmit(searchView.query.toString())
@@ -182,7 +189,7 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
        configureCloseButton(searchView)





        return view

        return binding.root

    }



    private fun automaticSearchMicroG() {
@@ -272,6 +279,11 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
        super.onResume()

    }



    override fun onDestroyView() {

        super.onDestroyView()

        _binding = null

    }



    fun decrementApplicationUses() {

        applicationList.forEach {

            it.decrementUses()

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

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
        app:layout_constraintTop_toTopOf="parent" />



    <include

        android:id="@+id/search_splash_layout"

        layout="@layout/search_splash_layout"

        android:layout_width="wrap_content"

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



    <include

        android:id="@+id/error_layout"

        layout="@layout/error_layout"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"