diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt index c01a5217a..ceb2b2038 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/main/MainActivity.kt @@ -2,6 +2,7 @@ package org.koitharu.kotatsu.ui.main import android.content.res.Configuration import android.os.Bundle +import android.view.Menu import android.view.MenuItem import androidx.appcompat.app.ActionBarDrawerToggle import androidx.fragment.app.Fragment @@ -13,6 +14,7 @@ import org.koitharu.kotatsu.ui.common.BaseActivity import org.koitharu.kotatsu.ui.main.list.favourites.FavouritesListFragment import org.koitharu.kotatsu.ui.main.list.history.HistoryListFragment import org.koitharu.kotatsu.ui.main.list.remote.RemoteListFragment +import org.koitharu.kotatsu.utils.SearchHelper class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener { @@ -47,8 +49,17 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList drawerToggle.onConfigurationChanged(newConfig) } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + menuInflater.inflate(R.menu.opt_main, menu) + menu?.findItem(R.id.action_search)?.let(SearchHelper::setupSearchView) + return super.onCreateOptionsMenu(menu) + } + override fun onOptionsItemSelected(item: MenuItem): Boolean { - return drawerToggle.onOptionsItemSelected(item) || super.onOptionsItemSelected(item) + return drawerToggle.onOptionsItemSelected(item) || when(item.itemId) { + + else -> super.onOptionsItemSelected(item) + } } override fun onNavigationItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/SearchHelper.kt b/app/src/main/java/org/koitharu/kotatsu/utils/SearchHelper.kt new file mode 100644 index 000000000..a101df1db --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/utils/SearchHelper.kt @@ -0,0 +1,13 @@ +package org.koitharu.kotatsu.utils + +import android.view.MenuItem +import androidx.appcompat.widget.SearchView + +object SearchHelper { + + @JvmStatic + fun setupSearchView(menuItem: MenuItem) { + val view = menuItem.actionView as? SearchView ?: return + //TODO + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 000000000..a5ad991bc --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/menu/opt_main.xml b/app/src/main/res/menu/opt_main.xml new file mode 100644 index 000000000..15f6118e3 --- /dev/null +++ b/app/src/main/res/menu/opt_main.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e5ccdd56..faba3e7c4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,4 +34,5 @@ Share Create shortcut… Share %s + Search \ No newline at end of file