From a10459c08a0cce089f78c1250bc8c6855a9b8f50 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Thu, 23 Dec 2021 13:37:26 +0530 Subject: [PATCH] Fixed Search fragment keyboard visibility bug https://github.com/RetroMusicPlayer/RetroMusicPlayer/issues/1185 --- app/build.gradle | 2 ++ app/src/main/assets/{oldindex.html => license.html} | 2 ++ .../monkey/retromusic/activities/LicenseActivity.kt | 2 +- .../retromusic/fragments/other/UserInfoFragment.kt | 12 +----------- .../retromusic/fragments/search/SearchFragment.kt | 8 ++++++++ app/src/main/res/layout/fragment_user_info.xml | 9 +++------ 6 files changed, 17 insertions(+), 18 deletions(-) rename app/src/main/assets/{oldindex.html => license.html} (95%) diff --git a/app/build.gradle b/app/build.gradle index 9434086f0..233110c89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,6 +153,8 @@ dependencies { implementation 'com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0' + implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:3.0.0-RC3' + implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5' implementation 'com.github.Adonai:jaudiotagger:2.3.15' implementation 'com.anjlab.android.iab.v3:library:2.0.3' diff --git a/app/src/main/assets/oldindex.html b/app/src/main/assets/license.html similarity index 95% rename from app/src/main/assets/oldindex.html rename to app/src/main/assets/license.html index 6bf739e0d..5c375daf0 100644 --- a/app/src/main/assets/oldindex.html +++ b/app/src/main/assets/license.html @@ -66,6 +66,8 @@ title="Slidr">Slidr by Drew Heavner

FadingEdgeLayout by bosphere

+

KeyboardVisibilityEvent by Yasuhiro SHIMIZU

Icons by Austin Andrews

Material Design City Wallpaper

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt index 4110b26a0..e4d6a8f40 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt @@ -39,7 +39,7 @@ class LicenseActivity : AbsThemeActivity() { ToolbarContentTintHelper.colorBackButton(binding.toolbar) try { val buf = StringBuilder() - val json = assets.open("oldindex.html") + val json = assets.open("license.html") BufferedReader(InputStreamReader(json, StandardCharsets.UTF_8)).use { br -> var str: String? while (br.readLine().also { str = it } != null) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt index 8827c4e2b..a1d749fd6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt @@ -16,7 +16,6 @@ package code.name.monkey.retromusic.fragments.other import android.app.Activity import android.content.Intent -import android.content.res.ColorStateList import android.graphics.Bitmap import android.graphics.Color import android.net.Uri @@ -31,8 +30,6 @@ import androidx.core.view.doOnPreDraw import androidx.core.view.updateLayoutParams import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import code.name.monkey.appthemehelper.util.ColorUtil -import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.Constants.USER_BANNER import code.name.monkey.retromusic.Constants.USER_PROFILE import code.name.monkey.retromusic.R @@ -87,6 +84,7 @@ class UserInfoFragment : Fragment() { applyToolbar(binding.toolbar) binding.nameContainer.accentColor() + binding.next.accentColor() binding.name.setText(PreferenceUtil.userName) binding.userImage.setOnClickListener { @@ -111,14 +109,6 @@ class UserInfoFragment : Fragment() { findNavController().navigateUp() } - val textColor = - MaterialValueHelper.getPrimaryTextColor( - requireContext(), - ColorUtil.isColorLight(accentColor()) - ) - binding.next.backgroundTintList = ColorStateList.valueOf(accentColor()) - binding.next.iconTint = ColorStateList.valueOf(textColor) - binding.next.setTextColor(textColor) loadProfile() postponeEnterTransition() view.doOnPreDraw { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt index 9e909e4d0..fbb625079 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt @@ -43,6 +43,7 @@ import com.google.android.material.chip.ChipGroup import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.textfield.TextInputEditText import com.google.android.material.transition.MaterialSharedAxis +import net.yslibrary.android.keyboardvisibilityevent.KeyboardVisibilityEvent import java.util.* import kotlin.collections.ArrayList @@ -100,6 +101,13 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWa bottomMargin = it } }) + KeyboardVisibilityEvent.setEventListener(requireActivity(), viewLifecycleOwner) { + if (it) { + binding.keyboardPopup.isGone = true + } else { + binding.keyboardPopup.show() + } + } binding.appBarLayout.statusBarForeground = MaterialShapeDrawable.createWithElevationOverlay(requireContext()) } diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml index 8b80eb218..f355c0bd8 100644 --- a/app/src/main/res/layout/fragment_user_info.xml +++ b/app/src/main/res/layout/fragment_user_info.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorSurface" android:fitsSystemWindows="true" android:orientation="vertical"> @@ -12,8 +11,7 @@ android:id="@+id/appBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fitsSystemWindows="true" - app:liftOnScroll="true"> + android:fitsSystemWindows="true"> - - +