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

Commit 113579bb authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '316-Fix_searchView_seach_icon_placement_issue' into 'main' 

316-Fix_searchView_seach_icon_placement_issue

See merge request !79
parents 78c5afa3 e978af23

app/ui/base/src/main/res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
        <item name="android:textColorSecondary">@color/color_default_ternary_text</item>

        <item name="android:windowBackground">@color/color_default_primary_dark</item>

        <item name="android:background">@color/color_default_primary_dark</item>

        <item name="searchViewStyle">@style/CustomSearchView</item>

    </style>



    <style name="ActionModeTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
@@ -24,4 +25,8 @@ 
        <item name="android:textColorSecondary">@color/color_default_primary_text</item>

    </style>



    <style name="CustomSearchView" parent="Widget.AppCompat.SearchView">

        <item name="searchHintIcon">@null</item>

    </style>



</resources>
 
 No newline at end of file

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+4 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,10 @@ open class MessageList : 
        searchView = searchItem.actionView as SearchView

        searchView.maxWidth = Int.MAX_VALUE

        searchView.queryHint = resources.getString(R.string.search_action)

        val searchEditText = searchView.findViewById(androidx.appcompat.R.id.search_src_text) as SearchView.SearchAutoComplete

        val searchIcon = ContextCompat.getDrawable(this, R.drawable.ic_magnify)

        searchEditText.setCompoundDrawablesWithIntrinsicBounds(searchIcon, null, null, null)

        searchEditText.compoundDrawablePadding = resources.getDimensionPixelSize(R.dimen.search_icon_searchView_padding)

        val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager

        searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName))

        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {

app/ui/legacy/src/main/res/values/dimensions.xml

+2 −0
Original line number Diff line number Diff line
@@ -7,4 +7,6 @@ 
    <dimen name="input_label_vertical_spacing">8dp</dimen>

    <dimen name="input_label_horizontal_spacing">4dp</dimen>

    <dimen name="account_setup_margin_between_items_incoming_and_outgoing">12dp</dimen>



    <dimen name="search_icon_searchView_padding">14dp</dimen>

</resources>