fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not close main screens Search on opening a folder

This commit is contained in:
tibbi 2020-06-07 16:33:14 +02:00
parent db9c5ec8e3
commit 97b19fe169
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View File

@ -207,25 +207,27 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
directories_horizontal_fastscroller.allowBubbleDisplay = config.showInfoBubble directories_horizontal_fastscroller.allowBubbleDisplay = config.showInfoBubble
directories_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble directories_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
directories_refresh_layout.isEnabled = config.enablePullToRefresh directories_refresh_layout.isEnabled = config.enablePullToRefresh
invalidateOptionsMenu()
directories_empty_placeholder.setTextColor(config.textColor) directories_empty_placeholder.setTextColor(config.textColor)
directories_empty_placeholder_2.setTextColor(getAdjustedPrimaryColor()) directories_empty_placeholder_2.setTextColor(getAdjustedPrimaryColor())
directories_switch_searching.setTextColor(getAdjustedPrimaryColor()) directories_switch_searching.setTextColor(getAdjustedPrimaryColor())
directories_switch_searching.underlineText() directories_switch_searching.underlineText()
if (mIsPasswordProtectionPending && !mWasProtectionHandled) { if (!mIsSearchOpen) {
handleAppPasswordProtection { invalidateOptionsMenu()
mWasProtectionHandled = it if (mIsPasswordProtectionPending && !mWasProtectionHandled) {
if (it) { handleAppPasswordProtection {
mIsPasswordProtectionPending = false mWasProtectionHandled = it
tryLoadGallery() if (it) {
} else { mIsPasswordProtectionPending = false
finish() tryLoadGallery()
} else {
finish()
}
} }
} else {
tryLoadGallery()
} }
} else {
tryLoadGallery()
} }
} }
@ -239,7 +241,6 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
override fun onStop() { override fun onStop() {
super.onStop() super.onStop()
mSearchMenuItem?.collapseActionView()
if (config.temporarilyShowHidden || config.tempSkipDeleteConfirmation) { if (config.temporarilyShowHidden || config.tempSkipDeleteConfirmation) {
mTempShowHiddenHandler.postDelayed({ mTempShowHiddenHandler.postDelayed({