blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #141 - Adds autocomplete ot the search screen 

- Adds convenience extensions to Context and Fragment
- Imports more components from Android Components
master
Jeff Boek 2019-01-23 13:39:53 -08:00 committed by Emily Kager
parent a038b5f8e4
commit 480ae93a72
14 changed files with 148 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -72,12 +72,14 @@ dependencies {
implementation Deps.mozilla_concept_storage
implementation Deps.mozilla_browser_awesomebar
implementation Deps.mozilla_browser_domains
implementation Deps.mozilla_browser_engine_gecko_nightly
implementation Deps.mozilla_browser_session
implementation Deps.mozilla_browser_toolbar
implementation Deps.mozilla_feature_intent
implementation Deps.mozilla_feature_session
implementation Deps.mozilla_feature_toolbar
implementation Deps.mozilla_support_ktx
@ -89,4 +91,5 @@ dependencies {
x86Implementation Deps.geckoview_nightly_x86
implementation Deps.androidx_legacy
implementation Deps.android_arch_navigation
implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha09'
}

1
app/src/main/AndroidManifest.xml
View File

@ -8,6 +8,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:name=".FenixApplication"
android:theme="@style/LightAppTheme">
<activity android:name=".HomeActivity">
<intent-filter>

8
app/src/main/java/org/mozilla/fenix/FenixApplication.kt 100644
View File

@ -0,0 +1,8 @@
package org.mozilla.fenix
import android.app.Application
import org.mozilla.fenix.components.Components
class FenixApplication : Application() {
val components by lazy { Components(this) }
}

12
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -10,17 +10,9 @@ import android.util.AttributeSet
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import mozilla.components.concept.engine.EngineView
import mozilla.components.feature.intent.IntentProcessor
import mozilla.components.support.utils.SafeIntent
import org.mozilla.fenix.components.Core
import org.mozilla.fenix.ext.components
class HomeActivity : AppCompatActivity() {
val core by lazy { Core(this) }
val sessionId by lazy {
SafeIntent(intent).getStringExtra(IntentProcessor.ACTIVE_SESSION_ID)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_home)
@ -28,7 +20,7 @@ class HomeActivity : AppCompatActivity() {
override fun onCreateView(parent: View?, name: String?, context: Context, attrs: AttributeSet?): View? =
when (name) {
EngineView::class.java.name -> core.engine.createView(context, attrs).asView()
EngineView::class.java.name -> components.core.engine.createView(context, attrs).asView()
else -> super.onCreateView(parent, name, context, attrs)
}
}

6
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -13,8 +13,8 @@ import kotlinx.android.synthetic.main.fragment_browser.*
import mozilla.components.feature.session.SessionFeature
import mozilla.components.feature.session.SessionUseCases
import mozilla.components.support.ktx.android.arch.lifecycle.addObservers
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.requireComponents
class BrowserFragment : Fragment() {
@ -37,8 +37,8 @@ class BrowserFragment : Fragment() {
super.onViewCreated(view, savedInstanceState)
val sessionManager = (activity as HomeActivity).core.sessionManager
val sessionId = (activity as HomeActivity).sessionId
val sessionManager = requireComponents.core.sessionManager
val sessionId = "1"
sessionFeature = SessionFeature(
sessionManager,

12
app/src/main/java/org/mozilla/fenix/components/Components.kt 100644
View File

@ -0,0 +1,12 @@
package org.mozilla.fenix.components
import android.content.Context
/**
* Provides access to all components.
*/
class Components(private val context: Context) {
val core by lazy { Core(context) }
val search by lazy { Search(context) }
val useCases by lazy { UseCases(context, core.sessionManager, search.searchEngineManager) }
}

24
app/src/main/java/org/mozilla/fenix/components/Search.kt 100644
View File

@ -0,0 +1,24 @@
package org.mozilla.fenix.components
import android.content.Context
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import mozilla.components.browser.search.SearchEngineManager
/**
* Component group for all search engine integration related functionality.
*/
class Search(private val context: Context) {
/**
* This component provides access to a centralized registry of search engines.
*/
val searchEngineManager by lazy {
SearchEngineManager().apply {
GlobalScope.launch {
load(context).await()
}
}
}
}

21
app/src/main/java/org/mozilla/fenix/components/UseCases.kt 100644
View File

@ -0,0 +1,21 @@
package org.mozilla.fenix.components
import android.content.Context
import mozilla.components.browser.search.SearchEngineManager
import mozilla.components.browser.session.SessionManager
import mozilla.components.feature.search.SearchUseCases
import mozilla.components.feature.session.SessionUseCases
/**
* Component group for all use cases. Use cases are provided by feature
* modules and can be triggered by UI interactions.
*/
class UseCases(
private val context: Context,
private val sessionManager: SessionManager,
private val searchEngineManager: SearchEngineManager
) {
val searchUseCases by lazy { SearchUseCases(context, searchEngineManager, sessionManager) }
val sessionUseCases by lazy { SessionUseCases(sessionManager) }
}

42
app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt 100644
View File

@ -0,0 +1,42 @@
package org.mozilla.fenix.components.toolbar
import android.content.Context
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.OnLifecycleEvent
import mozilla.components.browser.domains.autocomplete.DomainAutocompleteProvider
import mozilla.components.browser.toolbar.BrowserToolbar
import mozilla.components.feature.toolbar.ToolbarAutocompleteFeature
import mozilla.components.feature.toolbar.ToolbarFeature
import org.mozilla.fenix.ext.components
class ToolbarIntegration(
context: Context,
toolbar: BrowserToolbar,
domainAutocompleteProvider: DomainAutocompleteProvider,
sessionId: String? = null
) : LifecycleObserver {
init {
ToolbarAutocompleteFeature(toolbar).apply {
addDomainProvider(domainAutocompleteProvider)
}
}
private val toolbarFeature: ToolbarFeature = ToolbarFeature(
toolbar,
context.components.core.sessionManager,
context.components.useCases.sessionUseCases.loadUrl,
{ searchTerms -> context.components.useCases.searchUseCases.defaultSearch.invoke(searchTerms) },
sessionId
)
@OnLifecycleEvent(Lifecycle.Event.ON_START)
fun start() {
toolbarFeature.start()
}
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
fun stop() {
toolbarFeature.stop()
}
}

11
app/src/main/java/org/mozilla/fenix/ext/Context.kt 100644
View File

@ -0,0 +1,11 @@
package org.mozilla.fenix.ext
import android.content.Context
import org.mozilla.fenix.FenixApplication
import org.mozilla.fenix.components.Components
val Context.application: FenixApplication
get() = applicationContext as FenixApplication
val Context.components: Components
get() = application.components

7
app/src/main/java/org/mozilla/fenix/ext/Fragment.kt 100644
View File

@ -0,0 +1,7 @@
package org.mozilla.fenix.ext
import androidx.fragment.app.Fragment
import org.mozilla.fenix.components.Components
val Fragment.requireComponents: Components
get() = requireContext().components

2
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -46,7 +46,7 @@ class HomeFragment : Fragment() {
val extras = FragmentNavigator.Extras.Builder().addSharedElement(
toolbar, ViewCompat.getTransitionName(toolbar)!!
).build()
Navigation.findNavController(it).navigate(R.id.action_homeFragment_to_browserFragment, null, null, extras)
Navigation.findNavController(it).navigate(R.id.action_homeFragment_to_searchFragment, null, null, extras)
}
session_list.apply {

11
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -11,7 +11,9 @@ import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import kotlinx.android.synthetic.main.fragment_search.*
import mozilla.components.browser.domains.autocomplete.ShippedDomainsProvider
import org.mozilla.fenix.R
import org.mozilla.fenix.components.toolbar.ToolbarIntegration
class SearchFragment : Fragment() {
override fun onCreateView(
@ -33,6 +35,15 @@ class SearchFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
lifecycle.addObserver(
ToolbarIntegration(
requireContext(),
toolbar,
ShippedDomainsProvider().also { it.initialize(requireContext()) },
"1")
)
toolbar_wrapper.clipToOutline = false
toolbar.apply {
textColor = ContextCompat.getColor(context, R.color.searchText)

2
buildSrc/src/main/java/Dependencies.kt
View File

@ -36,6 +36,7 @@ object Deps {
const val mozilla_concept_storage = "org.mozilla.components:concept-storage:${Versions.mozilla_android_components}"
const val mozilla_browser_awesomebar = "org.mozilla.components:browser-awesomebar:${Versions.mozilla_android_components}"
const val mozilla_browser_domains = "org.mozilla.components:browser-domains:${Versions.mozilla_android_components}"
const val mozilla_browser_engine_gecko_nightly = "org.mozilla.components:browser-engine-gecko-nightly:${Versions.mozilla_android_components}"
const val mozilla_browser_session = "org.mozilla.components:browser-session:${Versions.mozilla_android_components}"
const val mozilla_browser_toolbar = "org.mozilla.components:browser-toolbar:${Versions.mozilla_android_components}"
@ -43,6 +44,7 @@ object Deps {
const val mozilla_feature_intent = "org.mozilla.components:feature-intent:${Versions.mozilla_android_components}"
const val mozilla_feature_session = "org.mozilla.components:feature-session:${Versions.mozilla_android_components}"
const val mozilla_feature_storage = "org.mozilla.components:feature-storage:${Versions.mozilla_android_components}"
const val mozilla_feature_toolbar = "org.mozilla.components:feature-toolbar:${Versions.mozilla_android_components}"
const val mozilla_support_ktx = "org.mozilla.components:support-ktx:${Versions.mozilla_android_components}"