Skip to content

Commit c351cfd

Browse files
committed
update
1 parent b6d52b2 commit c351cfd

File tree

4 files changed

+63
-9
lines changed

4 files changed

+63
-9
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,22 @@
5555
</activity>
5656

5757

58+
<activity
59+
android:name=".demo4.Demo4Activity"
60+
android:label="@string/title_demo4"
61+
android:launchMode="singleTop"
62+
android:theme="@style/AppTheme.NoActionBar">
63+
<intent-filter>
64+
<action android:name="android.intent.action.SEARCH" />
65+
</intent-filter>
66+
67+
<meta-data
68+
android:name="android.app.searchable"
69+
android:resource="@xml/searchable" />
70+
71+
</activity>
72+
73+
5874
<provider
5975
android:name="danbroid.searchviewdemo.CheeseSuggestionsProvider"
6076
android:authorities="danbroid.searchviewdemo.CheeseSuggestionsProvider"

app/src/main/java/danbroid/searchviewdemo/MainActivity.kt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,14 @@ import android.view.MenuItem
66
import danbroid.searchviewdemo.demo1.Demo1Activity
77
import danbroid.searchviewdemo.demo2.Demo2Activity
88
import danbroid.searchviewdemo.demo3.Demo3Activity
9-
import org.slf4j.LoggerFactory
9+
import danbroid.searchviewdemo.demo4.Demo4Activity
1010

1111

1212
class MainActivity : BaseActivity() {
1313

1414
override fun onCreate(savedInstanceState: Bundle?) {
1515
super.onCreate(savedInstanceState)
1616

17-
val log = LoggerFactory.getLogger("THANG")
18-
log.trace("TRACE")
19-
log.debug("DEBUG")
20-
log.info("INFO")
21-
log.warn("WARN")
22-
log.error("ERROR")
23-
2417
addButton("Dark Suggestion DropDown") {
2518
startActivity(Intent(this, Demo2Activity::class.java))
2619
}
@@ -29,9 +22,13 @@ class MainActivity : BaseActivity() {
2922
startActivity(Intent(this, Demo3Activity::class.java))
3023
}
3124

32-
addButton ("Custom Suggestion DropDown") {
25+
addButton("Custom Suggestion DropDown") {
3326
startActivity(Intent(this, Demo1Activity::class.java))
3427
}
28+
29+
addButton("Demo4") {
30+
startActivity(Intent(this, Demo4Activity::class.java))
31+
}
3532
}
3633

3734
override fun configureSearchMenu(menuItem: MenuItem) {
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package danbroid.searchviewdemo.demo4
2+
3+
import android.os.Bundle
4+
import android.view.MenuItem
5+
import danbroid.searchviewdemo.BaseActivity
6+
import danbroid.searchviewdemo.R
7+
8+
9+
private val log by lazy {
10+
org.slf4j.LoggerFactory.getLogger(Demo4Activity::class.java)
11+
}
12+
13+
class Demo4Activity : BaseActivity() {
14+
15+
override fun configureSearchMenu(menuItem: MenuItem) {
16+
}
17+
18+
override fun onOptionsItemSelected(item: MenuItem): Boolean =
19+
when (item.itemId) {
20+
R.id.action_search -> {
21+
onSearchRequested()
22+
true
23+
}
24+
else -> super.onOptionsItemSelected(item)
25+
}
26+
27+
28+
override fun onSearchRequested(): Boolean {
29+
log.trace("onSearchRequested()")
30+
return super.onSearchRequested()
31+
}
32+
33+
34+
override fun startSearch(initialQuery: String?, selectInitialQuery: Boolean, appSearchData: Bundle?, globalSearch: Boolean) {
35+
log.trace("startSearch() initalQuery: $initialQuery selectInitialQuery: $selectInitialQuery appSearchData: $appSearchData globalSearch: $globalSearch")
36+
super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch)
37+
}
38+
39+
40+
}

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<string name="lbl_about">About</string>
77
<string name="title_demo2">Demo 2</string>
88
<string name="title_demo3">Demo 3</string>
9+
<string name="title_demo4">Demo4</string>
910
</resources>

0 commit comments

Comments
 (0)