Commit ee44fcd0 authored by narinder Rana's avatar narinder Rana Committed by Romain Hunault
Browse files

UI polishing

parent f44852a3
No preview for this file type
......@@ -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
}
......
......@@ -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
......
<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
......
......@@ -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>
......
......@@ -29,7 +29,7 @@
<ImageView
android:layout_width="64dp"
android:layout_height="64dp"
android:src="@drawable/ic_menu_search"
android:src="@lineageos.platform:drawable/ic_search"
android:tint="@android:color/darker_gray" />
<TextView
......
......@@ -33,7 +33,7 @@
<item
android:id="@+id/menu_search"
android:icon="@drawable/ic_menu_search"
android:icon="@lineageos.platform:drawable/ic_search"
android:orderInCategory="1"
android:title="@string/menu_search" />
......@@ -45,7 +45,7 @@
<item
android:id="@+id/menu_settings"
android:icon="@lineageos.platform:drawable/ic_camera_settings"
android:icon="@lineageos.platform:drawable/ic_settings"
android:orderInCategory="1"
android:title="@string/menu_settings" />
</menu>
\ No newline at end of file
......@@ -28,6 +28,7 @@
<color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
<color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
<color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
<color name="colorDivider">#CFD8DC</color>
<color name="color_category_icon">#78909C</color>
......
......@@ -74,4 +74,8 @@
<item name="android:windowBackground">@drawable/splash</item>
</style>
<style name="ToolbarTheme" parent="Widget.AppCompat.Toolbar">
<item name="colorControlNormal">@lineageos.platform:color/color_default_accent</item>
</style>
</resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment