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

Commit 825fae3b authored by jo's avatar jo
Browse files

don't load fragment automatically

parent 2eff0002
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -20,17 +20,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)
+10 −12
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,16 +15,13 @@ 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
import android.view.inputmethod.InputMethodManager
import io.eelo.appinstaller.application.model.InstallManager


class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.OnSuggestionListener {
@@ -39,6 +39,9 @@ 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)
@@ -133,9 +136,4 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On
        }
        inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
    }

    override fun onResume() {
        focusView.requestFocus()
        super.onResume()
    }
}
+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)