From 2e9162b99c5f0d5dae2ccb93016cd82cd16ff197 Mon Sep 17 00:00:00 2001 From: Yuriy Liskov Date: Mon, 27 Nov 2023 04:21:53 +0200 Subject: [PATCH] kbd show fixes --- MediaServiceCore | 2 +- SharedModules | 2 +- .../common/app/presenters/SearchPresenter.java | 2 +- .../liskovsoft/smartyoutubetv2/common/prefs/SearchData.java | 4 +++- .../smartyoutubetv2/common/proxy/WebProxyDialog.java | 2 +- .../smartyoutubetv2/common/utils/SimpleEditDialog.java | 2 +- gradle.properties | 3 ++- smarttubetv/build.gradle | 4 ++-- .../tv/ui/mod/leanback/search/SearchSupportFragment.java | 6 ++++-- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/MediaServiceCore b/MediaServiceCore index 26dd1ccde..ea75aaceb 160000 --- a/MediaServiceCore +++ b/MediaServiceCore @@ -1 +1 @@ -Subproject commit 26dd1ccde6046a47d43b2b63d62cd8b919ee12f2 +Subproject commit ea75aaceb4335e13a1c470b5a22ab5d09da7ee15 diff --git a/SharedModules b/SharedModules index 0e74ba252..142087192 160000 --- a/SharedModules +++ b/SharedModules @@ -1 +1 @@ -Subproject commit 0e74ba25297425a8ac7f14d761680b62a4b0721d +Subproject commit 142087192fe23ce89be00548d348f1622533649c diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/SearchPresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/SearchPresenter.java index 16d31f84f..4d41fbfdc 100644 --- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/SearchPresenter.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/SearchPresenter.java @@ -7,6 +7,7 @@ import com.liskovsoft.mediaserviceinterfaces.MediaService; import com.liskovsoft.mediaserviceinterfaces.data.MediaGroup; import com.liskovsoft.mediaserviceinterfaces.data.SearchOptions; import com.liskovsoft.sharedutils.mylogger.Log; +import com.liskovsoft.sharedutils.rx.RxHelper; import com.liskovsoft.smartyoutubetv2.common.R; import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video; import com.liskovsoft.smartyoutubetv2.common.app.models.data.VideoGroup; @@ -23,7 +24,6 @@ import com.liskovsoft.smartyoutubetv2.common.app.views.ViewManager; import com.liskovsoft.smartyoutubetv2.common.misc.MediaServiceManager; import com.liskovsoft.smartyoutubetv2.common.prefs.AccountsData; import com.liskovsoft.smartyoutubetv2.common.prefs.SearchData; -import com.liskovsoft.sharedutils.rx.RxHelper; import com.liskovsoft.smartyoutubetv2.common.utils.AppDialogUtil; import com.liskovsoft.youtubeapi.service.YouTubeMediaService; import io.reactivex.disposables.Disposable; diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/SearchData.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/SearchData.java index a06b5f25c..4c371672f 100644 --- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/SearchData.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/SearchData.java @@ -136,13 +136,15 @@ public class SearchData { mIsInstantVoiceSearchEnabled = Helpers.parseBoolean(split, 0, false); mSearchOptions = Helpers.parseInt(split, 1, 0); mIsFocusOnResultsEnabled = Helpers.parseBoolean(split, 2, true); - mIsKeyboardAutoShowEnabled = Helpers.parseBoolean(split, 3, false); + //mIsKeyboardAutoShowEnabled = Helpers.parseBoolean(split, 3, false); mIsTempBackgroundModeEnabled = Helpers.parseBoolean(split, 4, false); //mIsAltSpeechRecognizerEnabled mSpeechRecognizerType = Helpers.parseInt(split, 6, SPEECH_RECOGNIZER_SYSTEM); mIsTrendingSearchesEnabled = Helpers.parseBoolean(split, 7, true); mIsSearchHistoryDisabled = Helpers.parseBoolean(split, 8, false); mIsPopularSearchesDisabled = Helpers.parseBoolean(split, 9, false); + mIsKeyboardAutoShowEnabled = Helpers.parseBoolean(split, 10, true); + } private void persistData() { diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/proxy/WebProxyDialog.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/proxy/WebProxyDialog.java index c2fb6f910..7f80e11f9 100644 --- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/proxy/WebProxyDialog.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/proxy/WebProxyDialog.java @@ -152,7 +152,7 @@ public class WebProxyDialog { LayoutInflater inflater = LayoutInflater.from(mContext); View contentView = inflater.inflate(R.layout.web_proxy_dialog, null); - KeyHelpers.fixEnterKey( + KeyHelpers.fixShowKeyboard( contentView.findViewById(R.id.proxy_host), contentView.findViewById(R.id.proxy_port), contentView.findViewById(R.id.proxy_username), diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/SimpleEditDialog.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/SimpleEditDialog.java index 8638592ed..851088478 100644 --- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/SimpleEditDialog.java +++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/SimpleEditDialog.java @@ -28,7 +28,7 @@ public class SimpleEditDialog { View contentView = inflater.inflate(R.layout.simple_edit_dialog, null); EditText editField = contentView.findViewById(R.id.simple_edit_value); - KeyHelpers.fixEnterKey(editField); + KeyHelpers.fixShowKeyboard(editField); editField.setText(defaultValue); diff --git a/gradle.properties b/gradle.properties index 06786ae6d..4ca1b5c34 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,5 @@ android.jetifier.blacklist=bcprov # Get ready for minification android.enableR8.fullMode=true # Minification ram usage fix -org.gradle.jvmargs=-Xmx1024m \ No newline at end of file +#org.gradle.jvmargs=-Xmx1024m +org.gradle.jvmargs=-Xmx1500m \ No newline at end of file diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle index d98594c42..dee5af9bd 100644 --- a/smarttubetv/build.gradle +++ b/smarttubetv/build.gradle @@ -59,8 +59,8 @@ android { applicationId "com.liskovsoft.smarttubetv" minSdkVersion project.properties.minSdkVersion targetSdkVersion project.properties.targetSdkVersion - versionCode 1195 - versionName "20.05" + versionCode 1197 + versionName "20.07" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/search/SearchSupportFragment.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/search/SearchSupportFragment.java index 1048ba0a9..8b9c847ba 100644 --- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/search/SearchSupportFragment.java +++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/search/SearchSupportFragment.java @@ -344,7 +344,7 @@ public class SearchSupportFragment extends Fragment { } if (mIsKeyboardAutoShowEnabled && focused) { - Helpers.showKeyboard(v.getContext()); + Helpers.showKeyboardAlt(v.getContext(), v); } }); mSearchTextEditor.addTextChangedListener(new TextWatcher() { @@ -363,7 +363,9 @@ public class SearchSupportFragment extends Fragment { Utils.enableScreensaver(getActivity(), true); } }); - KeyHelpers.fixEnterKey(mSearchTextEditor); + if (!mIsKeyboardAutoShowEnabled) { + KeyHelpers.fixEnterKey(mSearchTextEditor); + } // BUGFIX: focus lost with keyboard??? //mSearchTextEditor.setOnKeyboardDismissListener(this::focusOnSearchField);