Adds search engine icon to searchbar
parent
2fb7881a06
commit
3079af1d36
|
@ -4,6 +4,8 @@
|
||||||
|
|
||||||
package org.mozilla.fenix.home
|
package org.mozilla.fenix.home
|
||||||
|
|
||||||
|
import android.content.res.Resources
|
||||||
|
import android.graphics.drawable.BitmapDrawable
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.transition.TransitionInflater
|
import android.transition.TransitionInflater
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
|
@ -18,6 +20,9 @@ import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.home.sessions.SessionsComponent
|
import org.mozilla.fenix.home.sessions.SessionsComponent
|
||||||
import org.mozilla.fenix.home.sessions.layoutComponents
|
import org.mozilla.fenix.home.sessions.layoutComponents
|
||||||
import org.mozilla.fenix.mvi.ActionBusFactory
|
import org.mozilla.fenix.mvi.ActionBusFactory
|
||||||
|
import org.mozilla.fenix.ext.requireComponents
|
||||||
|
import kotlin.math.roundToInt
|
||||||
|
|
||||||
|
|
||||||
class HomeFragment : Fragment() {
|
class HomeFragment : Fragment() {
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
|
@ -31,10 +36,16 @@ class HomeFragment : Fragment() {
|
||||||
super.onViewCreated(view, savedInstanceState)
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
|
||||||
// Hide buttons that aren't used yet to prevent confusion
|
// Hide buttons that aren't used yet to prevent confusion
|
||||||
menuButton.visibility = View.GONE
|
// menuButton.visibility = View.GONE
|
||||||
privateBrowsingButton.visibility = View.GONE
|
// privateBrowsingButton.visibility = View.GONE
|
||||||
|
|
||||||
|
val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext()).let {
|
||||||
|
BitmapDrawable(resources, it.icon)
|
||||||
|
}
|
||||||
|
|
||||||
toolbar_wrapper.clipToOutline = false
|
toolbar_wrapper.clipToOutline = false
|
||||||
|
toolbar.setCompoundDrawablesWithIntrinsicBounds(searchIcon, null, null, null)
|
||||||
|
toolbar.compoundDrawablePadding = (12f * Resources.getSystem().displayMetrics.density).roundToInt()
|
||||||
toolbar.setOnClickListener { it ->
|
toolbar.setOnClickListener { it ->
|
||||||
val extras = FragmentNavigator.Extras.Builder().addSharedElement(
|
val extras = FragmentNavigator.Extras.Builder().addSharedElement(
|
||||||
toolbar, ViewCompat.getTransitionName(toolbar)!!
|
toolbar, ViewCompat.getTransitionName(toolbar)!!
|
||||||
|
|
|
@ -8,11 +8,6 @@
|
||||||
<stroke android:width="1dp"
|
<stroke android:width="1dp"
|
||||||
android:color="@color/searchStroke"/>
|
android:color="@color/searchStroke"/>
|
||||||
|
|
||||||
<padding android:left="2dp"
|
|
||||||
android:top="2dp"
|
|
||||||
android:right="2dp"
|
|
||||||
android:bottom="2dp"/>
|
|
||||||
|
|
||||||
<corners android:bottomRightRadius="8dp"
|
<corners android:bottomRightRadius="8dp"
|
||||||
android:bottomLeftRadius="8dp"
|
android:bottomLeftRadius="8dp"
|
||||||
android:topLeftRadius="8dp"
|
android:topLeftRadius="8dp"
|
||||||
|
|
|
@ -59,9 +59,12 @@
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="40dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="8dp"
|
android:paddingStart="12sp"
|
||||||
android:background="@android:color/white"
|
android:paddingEnd="12sp"
|
||||||
|
android:paddingTop="16sp"
|
||||||
|
android:paddingBottom="16sp"
|
||||||
|
android:drawablePadding="12sp"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
|
|
Loading…
Reference in New Issue