Merge branch 'master' into 'create_error_handling_structure' (96215098) · Commits · e / os / App Lounge

app/src/main/java/io/eelo/appinstaller/home/HomeFragment.kt

+5 −2

Original line number	Diff line number	Diff line
		@@ -23,17 +23,20 @@ class HomeFragment : Fragment() {
		private lateinit var imageCarousel: ViewPager
		private lateinit var categoryList: RecyclerView
		private lateinit var progressBar: ProgressBar
		private lateinit var installManager: InstallManager
		private var installManager: InstallManager? = null

		fun initialise(installManager: InstallManager) {
		this.installManager = installManager
		}

		override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
		if (installManager == null) {
		return null
		}
		val view = inflater.inflate(R.layout.fragment_home, container, false)

		homeViewModel = ViewModelProviders.of(activity!!).get(HomeViewModel::class.java)
		homeViewModel.initialise(installManager)
		homeViewModel.initialise(installManager!!)
		imageCarousel = view.findViewById(R.id.image_carousel)
		categoryList = view.findViewById(R.id.category_list)
		progressBar = view.findViewById(R.id.progress_bar)

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

+14 −6

Original line number	Diff line number	Diff line
		package io.eelo.appinstaller.search

		import android.app.Activity
		import android.arch.lifecycle.Observer
		import android.arch.lifecycle.ViewModelProviders
		import android.database.MatrixCursor
		import android.os.Bundle
		import android.provider.BaseColumns
		import android.support.v4.app.Fragment
		import android.support.v4.widget.CursorAdapter
		import android.support.v4.widget.SimpleCursorAdapter
		@@ -12,11 +15,11 @@ import android.support.v7.widget.SearchView
		import android.view.LayoutInflater
		import android.view.View
		import android.view.ViewGroup
		import io.eelo.appinstaller.R
		import android.provider.BaseColumns
		import android.database.MatrixCursor
		import android.view.inputmethod.InputMethodManager
		import android.widget.ProgressBar
		import io.eelo.appinstaller.R
		import io.eelo.appinstaller.application.model.Application
		import io.eelo.appinstaller.application.model.InstallManager
		import io.eelo.appinstaller.common.ApplicationListAdapter
		import io.eelo.appinstaller.search.viewModel.SearchViewModel
		import android.app.Activity
		@@ -29,7 +32,7 @@ import io.eelo.appinstaller.utils.Constants.SUGGESTION_KEY

		class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.OnSuggestionListener {
		private lateinit var searchViewModel: SearchViewModel
		private lateinit var focusView: View
		private var focusView: View? = null
		private lateinit var searchView: SearchView
		private lateinit var recyclerView: RecyclerView
		private lateinit var splashScreen: LinearLayout
		@@ -42,12 +45,15 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On
		}

		override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
		if (installManager == null) {
		return null
		}
		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()
		focusView!!.requestFocus()
		searchView = view.findViewById(R.id.search_view)
		recyclerView = view.findViewById(R.id.app_list)
		recyclerView.visibility = View.GONE
		@@ -168,7 +174,9 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On
		}

		override fun onResume() {
		focusView.requestFocus()
		focusView?.let {
		focusView!!.requestFocus()
		}
		super.onResume()
		}
		}

app/src/main/java/io/eelo/appinstaller/updates/UpdatesFragment.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,9 @@ class UpdatesFragment : Fragment() {
		}

		override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
		if (installManager == null) {
		return null
		}
		val view = inflater.inflate(R.layout.fragment_updates, container, false)

		updatesViewModel = ViewModelProviders.of(activity!!).get(UpdatesViewModel::class.java)