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

Commit 78c41c0c authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue_2346' into 'master' 

Issue 2346

See merge request e/apps/apps!47
parents f44852a3 ee44fcd0

app/e-ui-sdk.jar

+10.1 KiB (122 KiB)

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View original file
View changed file

app/src/main/java/foundation/e/apps/MainActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS 
                return true

            }

            R.id.menu_search -> {

                item?.setIcon(R.drawable.ic_menu_search)

                item?.setIcon(lineageos.platform.R.drawable.ic_search)

                showFragment(searchFragment)

                return true

            }
@@ -214,7 +214,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS 
                return true

            }

            R.id.menu_settings -> {

                item?.setIcon(lineageos.platform.R.drawable.ic_camera_settings)

                item?.setIcon(lineageos.platform.R.drawable.ic_settings)

                showFragment(SettingsFragment())

                return true

            }

app/src/main/java/foundation/e/apps/search/SearchFragment.kt

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.view.ViewGroup 
import android.view.inputmethod.InputMethodManager

import android.widget.*

import androidx.appcompat.widget.SearchView

import androidx.core.content.ContextCompat

import androidx.cursoradapter.widget.CursorAdapter

import androidx.cursoradapter.widget.SimpleCursorAdapter

import androidx.fragment.app.Fragment
@@ -43,6 +44,7 @@ import foundation.e.apps.search.viewmodel.SearchViewModel 
import foundation.e.apps.utils.Constants

import foundation.e.apps.utils.Constants.SUGGESTION_KEY





class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.OnSuggestionListener {

    private lateinit var searchViewModel: SearchViewModel

    private var focusView: View? = null

app/src/main/res/drawable/ic_menu_settings.xml

+2 −2
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="576dp"

    android:height="512dp"

    android:width="24dp"

    android:height="21dp"

    android:viewportWidth="576"

    android:viewportHeight="512">

    <path

app/src/main/res/layout/fragment_search.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
        android:layout_height="?attr/actionBarSize"

        android:background="?attr/colorPrimary"

        android:elevation="@dimen/default_elevation"

        android:padding="@dimen/layout_padding_medium"

        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"

        app:theme="@style/ToolbarTheme"

        app:collapseIcon="@drawable/app_border_neutral"

        app:layout_constraintTop_toTopOf="parent"

        app:popupTheme="@style/AlertDialog.AppCompat.Light">
@@ -38,6 +37,7 @@ 
            android:id="@+id/search_view"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            app:searchIcon="@lineageos.platform:drawable/ic_search"

            app:iconifiedByDefault="false" />



    </androidx.appcompat.widget.Toolbar>