fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

make isSearchOpen private to MainActivity

Browse Source
This commit is contained in:
tibbi
2018-04-15 21:57:28 +02:00
parent fc86018bda
commit b0b3dca249
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -45,7 +45,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.17.19' implementation 'com.simplemobiletools:commons:3.19.0'
implementation files('../libs/RootTools.jar') implementation files('../libs/RootTools.jar')

7
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
View File

@@ -31,8 +31,7 @@ import java.io.File
import java.util.* import java.util.*
class MainActivity : SimpleActivity() { class MainActivity : SimpleActivity() {
var isSearchOpen = false private var isSearchOpen = false
private val BACK_PRESS_TIMEOUT = 5000 private val BACK_PRESS_TIMEOUT = 5000
private val PICKED_PATH = "picked_path" private val PICKED_PATH = "picked_path"
private var wasBackJustPressed = false private var wasBackJustPressed = false
@@ -138,6 +137,7 @@ class MainActivity : SimpleActivity() {
MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener { MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener {
override fun onMenuItemActionExpand(item: MenuItem?): Boolean { override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
isSearchOpen = true isSearchOpen = true
fragment.searchOpened()
return true return true
} }
@@ -249,7 +249,8 @@ class MainActivity : SimpleActivity() {
private fun launchAbout() { private fun launchAbout() {
val faqItems = arrayListOf( val faqItems = arrayListOf(
FAQItem(R.string.faq_3_title_commons, R.string.faq_3_text_commons), FAQItem(R.string.faq_3_title_commons, R.string.faq_3_text_commons),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)) FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
)
startAboutActivity(R.string.app_name, LICENSE_MULTISELECT or LICENSE_GLIDE or LICENSE_PATTERN or LICENSE_REPRINT, startAboutActivity(R.string.app_name, LICENSE_MULTISELECT or LICENSE_GLIDE or LICENSE_PATTERN or LICENSE_REPRINT,
BuildConfig.VERSION_NAME, faqItems) BuildConfig.VERSION_NAME, faqItems)

10
app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
View File

@@ -37,13 +37,14 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
var isGetContentIntent = false var isGetContentIntent = false
var isGetRingtonePicker = false var isGetRingtonePicker = false
var isPickMultipleIntent = false var isPickMultipleIntent = false
var isFirstResume = true
var storedItems = ArrayList<FileDirItem>()
private var isFirstResume = true
private var showHidden = false private var showHidden = false
private var skipItemUpdating = false private var skipItemUpdating = false
private var isSearchOpen = false
private var scrollStates = HashMap<String, Parcelable>() private var scrollStates = HashMap<String, Parcelable>()
private var storedItems = ArrayList<FileDirItem>()
private var storedTextColor = 0 private var storedTextColor = 0
private lateinit var mView: View private lateinit var mView: View
@@ -241,7 +242,12 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
}.start() }.start()
} }
fun searchOpened() {
isSearchOpen = true
}
fun searchClosed() { fun searchClosed() {
isSearchOpen = false
if (!skipItemUpdating) { if (!skipItemUpdating) {
(items_list.adapter as? ItemsAdapter)?.updateItems(storedItems) (items_list.adapter as? ItemsAdapter)?.updateItems(storedItems)
} }

2
build.gradle
View File

@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.0' classpath 'com.android.tools.build:gradle:3.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong