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

Commit 298e168e authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Remove search splash screen

parent 9fa9eee5

app/src/main/java/io/eelo/appinstaller/search/SearchFragment.kt

+5 −18
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
    private var focusView: View? = null

    private lateinit var searchView: SearchView

    private lateinit var recyclerView: RecyclerView

    private lateinit var splashScreen: LinearLayout

    private lateinit var progressBar: ProgressBar

    private var applicationList = ArrayList<Application>()

    private var installManager: InstallManager? = null
@@ -49,24 +48,22 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
        val view = inflater.inflate(R.layout.fragment_search, container, false)



        searchViewModel = ViewModelProviders.of(activity!!).get(SearchViewModel::class.java)

        searchViewModel.initialise(installManager!!)

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

        focusView!!.requestFocus()

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

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

        recyclerView.visibility = View.GONE

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

        progressBar.visibility = View.GONE

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

        errorContainer.visibility = View.GONE

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



        searchViewModel.initialise(installManager!!)

        recyclerView.visibility = View.GONE

        progressBar.visibility = View.GONE

        errorContainer.visibility = View.GONE

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

            progressBar.visibility = View.VISIBLE

            onQueryTextSubmit(searchView.query.toString())

        }



        handleSplashScreen(view)



        // Initialise search view

        val from = arrayOf(SUGGESTION_KEY)

        val to = intArrayOf(android.R.id.text1)
@@ -115,20 +112,10 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On 
        return view

    }



    private fun handleSplashScreen(view: View) {

        splashScreen = view.findViewById(R.id.search_splash)

        if (searchViewModel.getScreenError().value == null && applicationList.isEmpty()) {

            splashScreen.visibility = View.VISIBLE

        } else {

            splashScreen.visibility = View.GONE

        }

    }



    override fun onQueryTextSubmit(query: String?): Boolean {

        query?.let {

            hideKeyboard(activity as Activity)

            focusView!!.requestFocus()

            splashScreen.visibility = View.GONE

            recyclerView.visibility = View.GONE

            progressBar.visibility = View.VISIBLE

            searchViewModel.onSearchQuerySubmitted(context!!, it)

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

+0 −9
Original line number Diff line number Diff line
@@ -31,15 +31,6 @@ 
        android:focusable="true"

        android:focusableInTouchMode="true" />



    <include

        layout="@layout/search_splash_layout"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

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



    <include

        layout="@layout/error_layout"

        android:layout_width="wrap_content"

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

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/search_splash"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:gravity="center"

    android:orientation="vertical"

    android:padding="@dimen/layout_padding_large">



    <ImageView

        android:id="@+id/search_icon"

        android:layout_width="64dp"

        android:layout_height="64dp"

        android:src="@drawable/ic_menu_search"

        android:tint="@android:color/darker_gray" />



    <TextView

        android:id="@+id/search_description"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/layout_margin_large"

        android:layout_marginTop="@dimen/layout_margin_large"

        android:layout_marginEnd="@dimen/layout_margin_large"

        android:maxLines="2"

        android:text="@string/search_description"

        android:textAlignment="center"

        android:textColor="@android:color/darker_gray"

        android:textSize="@dimen/text_size_large" />



</LinearLayout>
 
 No newline at end of file