diff --git a/app/build.gradle b/app/build.gradle
index a86b24a0..3a8e3faa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
}
dependencies {
- implementation 'com.github.SimpleMobileTools:Simple-Commons:16633112b0'
+ implementation 'com.github.SimpleMobileTools:Simple-Commons:afaa7603d1'
implementation 'org.greenrobot:eventbus:3.3.1'
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
implementation 'com.github.tibbi:android-smsmms:33fcaf94d9'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 6137a041..e31944bc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -33,7 +33,6 @@ import com.simplemobiletools.smsmessenger.models.Events
import com.simplemobiletools.smsmessenger.models.Message
import com.simplemobiletools.smsmessenger.models.SearchResult
import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.menu_search.view.*
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -139,7 +138,7 @@ class MainActivity : SimpleActivity() {
}
private fun setupOptionsMenu() {
- main_menu.top_toolbar.inflateMenu(R.menu.menu_main)
+ main_menu.getToolbar().inflateMenu(R.menu.menu_main)
main_menu.setupMenu()
main_menu.onSearchOpenListener = {
search_holder.fadeIn()
@@ -159,7 +158,7 @@ class MainActivity : SimpleActivity() {
searchTextChanged(text)
}
- main_menu.top_toolbar.setOnMenuItemClickListener { menuItem ->
+ main_menu.getToolbar().setOnMenuItemClickListener { menuItem ->
when (menuItem.itemId) {
R.id.import_messages -> tryImportMessages()
R.id.export_messages -> tryToExportMessages()
@@ -173,7 +172,7 @@ class MainActivity : SimpleActivity() {
}
private fun refreshMenuItems() {
- main_menu.top_toolbar.menu.apply {
+ main_menu.getToolbar().menu.apply {
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
}
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/views/MySearchMenu.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/views/MySearchMenu.kt
deleted file mode 100644
index e465a106..00000000
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/views/MySearchMenu.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.simplemobiletools.smsmessenger.views
-
-import android.app.Activity
-import android.content.Context
-import android.util.AttributeSet
-import com.google.android.material.appbar.AppBarLayout
-import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.LOWER_ALPHA
-import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA
-import com.simplemobiletools.smsmessenger.R
-import com.simplemobiletools.smsmessenger.activities.SimpleActivity
-import kotlinx.android.synthetic.main.menu_search.view.*
-
-class MySearchMenu(context: Context, attrs: AttributeSet) : AppBarLayout(context, attrs) {
- var isSearchOpen = false
- var onSearchOpenListener: (() -> Unit)? = null
- var onSearchClosedListener: (() -> Unit)? = null
- var onSearchTextChangedListener: ((text: String) -> Unit)? = null
-
- init {
- inflate(context, R.layout.menu_search, this)
- }
-
- fun setupMenu() {
- top_toolbar_search_icon.setOnClickListener {
- if (isSearchOpen) {
- closeSearch()
- } else {
- top_toolbar_search.requestFocus()
- (context as? Activity)?.showKeyboard(top_toolbar_search)
- }
- }
-
- top_toolbar_search.setOnFocusChangeListener { v, hasFocus ->
- if (hasFocus) {
- openSearch()
- }
- }
-
- top_toolbar_search.onTextChangeListener {
- onSearchTextChangedListener?.invoke(it)
- }
- }
-
- private fun openSearch() {
- isSearchOpen = true
- onSearchOpenListener?.invoke()
- top_toolbar_search_icon.setImageResource(R.drawable.ic_arrow_left_vector)
- }
-
- fun closeSearch() {
- isSearchOpen = false
- onSearchClosedListener?.invoke()
- top_toolbar_search.setText("")
- top_toolbar_search_icon.setImageResource(R.drawable.ic_search_vector)
- (context as? Activity)?.hideKeyboard()
- }
-
- fun updateColors() {
- val backgroundColor = context.getProperBackgroundColor()
- val contrastColor = backgroundColor.getContrastColor()
-
- setBackgroundColor(backgroundColor)
- top_app_bar_layout.setBackgroundColor(backgroundColor)
- top_toolbar_search_icon.applyColorFilter(contrastColor)
- top_toolbar_holder.background?.applyColorFilter(context.getProperPrimaryColor().adjustAlpha(LOWER_ALPHA))
- top_toolbar_search.setTextColor(contrastColor)
- top_toolbar_search.setHintTextColor(contrastColor.adjustAlpha(MEDIUM_ALPHA))
- (context as? SimpleActivity)?.updateTopBarColors(top_toolbar, backgroundColor)
- }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9f46effc..23ad6b6b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
diff --git a/app/src/main/res/layout/menu_search.xml b/app/src/main/res/layout/menu_search.xml
deleted file mode 100644
index 7352b983..00000000
--- a/app/src/main/res/layout/menu_search.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/menu/cab_conversations.xml b/app/src/main/res/menu/cab_conversations.xml
index f56bd3fb..883bc917 100644
--- a/app/src/main/res/menu/cab_conversations.xml
+++ b/app/src/main/res/menu/cab_conversations.xml
@@ -2,20 +2,23 @@