Skip to content

Commit 2be979e

Browse files
committed
moving the top search related code to Commons
1 parent d61b04f commit 2be979e

File tree

7 files changed

+13
-128
lines changed

7 files changed

+13
-128
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:16633112b0'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:afaa7603d1'
6767
implementation 'org.greenrobot:eventbus:3.3.1'
6868
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
6969
implementation 'com.github.tibbi:android-smsmms:33fcaf94d9'

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.simplemobiletools.smsmessenger.models.Events
3333
import com.simplemobiletools.smsmessenger.models.Message
3434
import com.simplemobiletools.smsmessenger.models.SearchResult
3535
import kotlinx.android.synthetic.main.activity_main.*
36-
import kotlinx.android.synthetic.main.menu_search.view.*
3736
import org.greenrobot.eventbus.EventBus
3837
import org.greenrobot.eventbus.Subscribe
3938
import org.greenrobot.eventbus.ThreadMode
@@ -139,7 +138,7 @@ class MainActivity : SimpleActivity() {
139138
}
140139

141140
private fun setupOptionsMenu() {
142-
main_menu.top_toolbar.inflateMenu(R.menu.menu_main)
141+
main_menu.getToolbar().inflateMenu(R.menu.menu_main)
143142
main_menu.setupMenu()
144143
main_menu.onSearchOpenListener = {
145144
search_holder.fadeIn()
@@ -159,7 +158,7 @@ class MainActivity : SimpleActivity() {
159158
searchTextChanged(text)
160159
}
161160

162-
main_menu.top_toolbar.setOnMenuItemClickListener { menuItem ->
161+
main_menu.getToolbar().setOnMenuItemClickListener { menuItem ->
163162
when (menuItem.itemId) {
164163
R.id.import_messages -> tryImportMessages()
165164
R.id.export_messages -> tryToExportMessages()
@@ -173,7 +172,7 @@ class MainActivity : SimpleActivity() {
173172
}
174173

175174
private fun refreshMenuItems() {
176-
main_menu.top_toolbar.menu.apply {
175+
main_menu.getToolbar().menu.apply {
177176
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
178177
}
179178
}

app/src/main/kotlin/com/simplemobiletools/smsmessenger/views/MySearchMenu.kt

Lines changed: 0 additions & 71 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<com.simplemobiletools.smsmessenger.views.MySearchMenu
8+
<com.simplemobiletools.commons.views.MySearchMenu
99
android:id="@+id/main_menu"
1010
android:layout_width="match_parent"
1111
android:layout_height="wrap_content" />

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

Lines changed: 0 additions & 49 deletions
This file was deleted.

app/src/main/res/menu/cab_conversations.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:ignore="AppCompatResource">
5+
tools:ignore="AppCompatResource,AlwaysShowAction">
66
<item
77
android:id="@+id/cab_delete"
88
android:icon="@drawable/ic_delete_vector"
9+
android:showAsAction="always"
910
android:title="@string/delete"
1011
app:showAsAction="always" />
1112
<item
1213
android:id="@+id/cab_add_number_to_contact"
1314
android:icon="@drawable/ic_add_person_vector"
15+
android:showAsAction="always"
1416
android:title="@string/add_number_to_contact"
1517
app:showAsAction="always" />
1618
<item
1719
android:id="@+id/cab_dial_number"
1820
android:icon="@drawable/ic_phone_vector"
21+
android:showAsAction="always"
1922
android:title="@string/dial_number"
2023
app:showAsAction="always" />
2124
<item

app/src/main/res/menu/cab_thread.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:ignore="AppCompatResource">
5+
tools:ignore="AppCompatResource,AlwaysShowAction">
66
<item
77
android:id="@+id/cab_copy_to_clipboard"
88
android:icon="@drawable/ic_copy_vector"
9+
android:showAsAction="always"
910
android:title="@string/copy_to_clipboard"
1011
app:showAsAction="always" />
1112
<item
1213
android:id="@+id/cab_share"
1314
android:icon="@drawable/ic_share_vector"
15+
android:showAsAction="always"
1416
android:title="@string/share"
1517
app:showAsAction="always" />
1618
<item
1719
android:id="@+id/cab_delete"
1820
android:icon="@drawable/ic_delete_vector"
21+
android:showAsAction="always"
1922
android:title="@string/delete"
2023
app:showAsAction="always" />
2124
<item

0 commit comments

Comments
 (0)