From 7a558f68f5a71a6e35d1f27633769bde66ff9335 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2023 17:48:24 +0100 Subject: [PATCH 1/4] fixing a top Search menu related glitch --- app/build.gradle | 2 +- .../smsmessenger/activities/MainActivity.kt | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ab23e4d4..a05b17d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:ae8c57858f' + implementation 'com.github.SimpleMobileTools:Simple-Commons:71f9297e2e' 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 d869b7c4..4e0db7c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -141,21 +141,25 @@ class MainActivity : SimpleActivity() { main_menu.getToolbar().inflateMenu(R.menu.menu_main) main_menu.toggleHideOnScroll(true) main_menu.setupMenu() - main_menu.onSearchOpenListener = { - search_holder.fadeIn() - conversations_fab.beGone() - } main_menu.onSearchClosedListener = { search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction { search_holder.beGone() searchTextChanged("", true) }.start() - - conversations_fab.beVisible() } main_menu.onSearchTextChangedListener = { text -> + if (text.isNotEmpty()) { + if (search_holder.alpha < 1f) { + search_holder.fadeIn() + } + } else { + search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction { + search_holder.beGone() + searchTextChanged("", true) + }.start() + } searchTextChanged(text) } From c5a880b5f1aefe72ce5043b70651ec36e19ae12f Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2023 17:49:54 +0100 Subject: [PATCH 2/4] adding a helper function to avoid duplication --- .../smsmessenger/activities/MainActivity.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 4e0db7c6..604f443d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -143,10 +143,7 @@ class MainActivity : SimpleActivity() { main_menu.setupMenu() main_menu.onSearchClosedListener = { - search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction { - search_holder.beGone() - searchTextChanged("", true) - }.start() + fadeOutSearch() } main_menu.onSearchTextChangedListener = { text -> @@ -155,10 +152,7 @@ class MainActivity : SimpleActivity() { search_holder.fadeIn() } } else { - search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction { - search_holder.beGone() - searchTextChanged("", true) - }.start() + fadeOutSearch() } searchTextChanged(text) } @@ -384,6 +378,13 @@ class MainActivity : SimpleActivity() { } } + private fun fadeOutSearch() { + search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction { + search_holder.beGone() + searchTextChanged("", true) + }.start() + } + @SuppressLint("NotifyDataSetChanged") private fun notifyDatasetChanged() { getOrCreateConversationsAdapter().notifyDataSetChanged() From 848ee99c0b8906ed87e6f78bff3c498ef70095a1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2023 17:53:52 +0100 Subject: [PATCH 3/4] update version to 5.17.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a05b17d1..08e0620c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.simplemobiletools.smsmessenger" minSdkVersion 23 targetSdkVersion 33 - versionCode 68 - versionName "5.17.0" + versionCode 69 + versionName "5.17.1" setProperty("archivesBaseName", "sms-messenger") } From e91ff116789602d162ae76d367928b4506cc2f7c Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2023 17:53:59 +0100 Subject: [PATCH 4/4] updating changelog --- CHANGELOG.md | 5 +++++ fastlane/metadata/android/en-US/changelogs/69.txt | 1 + 2 files changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/69.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 37038109..30d5ae35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 5.17.1 *(2023-01-06)* +---------------------------- + + * Fixed a glitch with the top Search menu on some devices + Version 5.17.0 *(2023-01-03)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/69.txt b/fastlane/metadata/android/en-US/changelogs/69.txt new file mode 100644 index 00000000..a67b5305 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/69.txt @@ -0,0 +1 @@ +* Fixed a glitch with the top Search menu on some devices