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

adding some tab numbering changes

Browse Source
This commit is contained in:
tibbi
2021-05-21 12:30:41 +02:00
parent a48300e713
commit 90b9eee96f
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -58,7 +58,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:f07ca31126' implementation 'com.github.SimpleMobileTools:Simple-Commons:fe68ccdac8'
implementation 'com.github.Stericson:RootTools:df729dcb13' implementation 'com.github.Stericson:RootTools:df729dcb13'
implementation 'com.github.Stericson:RootShell:1.6' implementation 'com.github.Stericson:RootShell:1.6'
implementation 'com.alexvasilkov:gesture-views:2.5.2' implementation 'com.alexvasilkov:gesture-views:2.5.2'

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

@ -31,8 +31,7 @@ import com.simplemobiletools.filemanager.pro.fragments.ItemsFragment
import com.simplemobiletools.filemanager.pro.fragments.MyViewPagerFragment import com.simplemobiletools.filemanager.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT
import com.simplemobiletools.filemanager.pro.helpers.RootHelpers import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
import com.simplemobiletools.filemanager.pro.helpers.TAB_FILES import com.simplemobiletools.filemanager.pro.helpers.tabsList
import com.simplemobiletools.filemanager.pro.helpers.TAB_RECENTS
import com.stericson.RootTools.RootTools import com.stericson.RootTools.RootTools
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.items_fragment.* import kotlinx.android.synthetic.main.items_fragment.*
@ -591,14 +590,11 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun getInactiveTabIndexes(activeIndex: Int) = arrayListOf(TAB_FILES, TAB_RECENTS).filter { it != activeIndex } private fun getInactiveTabIndexes(activeIndex: Int) = (0 until tabsList.size).filter { it != activeIndex }
private fun getAllFragments(): ArrayList<MyViewPagerFragment?> = arrayListOf(items_fragment, recents_fragment) private fun getAllFragments(): ArrayList<MyViewPagerFragment?> = arrayListOf(items_fragment, recents_fragment)
private fun getCurrentFragment(): MyViewPagerFragment? = when (main_view_pager.currentItem) { private fun getCurrentFragment() = getAllFragments().getOrNull(main_view_pager.currentItem)
TAB_FILES -> items_fragment
else -> recents_fragment
}
private fun checkWhatsNewDialog() { private fun checkWhatsNewDialog() {
arrayListOf<Release>().apply { arrayListOf<Release>().apply {

7
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ViewPagerAdapter.kt
View File

@ -7,7 +7,6 @@ import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.activities.SimpleActivity import com.simplemobiletools.filemanager.pro.activities.SimpleActivity
import com.simplemobiletools.filemanager.pro.extensions.config import com.simplemobiletools.filemanager.pro.extensions.config
import com.simplemobiletools.filemanager.pro.fragments.MyViewPagerFragment import com.simplemobiletools.filemanager.pro.fragments.MyViewPagerFragment
import com.simplemobiletools.filemanager.pro.helpers.TAB_FILES
class ViewPagerAdapter(val activity: SimpleActivity) : PagerAdapter() { class ViewPagerAdapter(val activity: SimpleActivity) : PagerAdapter() {
override fun instantiateItem(container: ViewGroup, position: Int): Any { override fun instantiateItem(container: ViewGroup, position: Int): Any {
@ -31,8 +30,8 @@ class ViewPagerAdapter(val activity: SimpleActivity) : PagerAdapter() {
override fun isViewFromObject(view: View, item: Any) = view == item override fun isViewFromObject(view: View, item: Any) = view == item
private fun getFragment(position: Int) = when (position) { private fun getFragment(position: Int): Int {
TAB_FILES -> R.layout.items_fragment val fragments = arrayListOf(R.layout.items_fragment, R.layout.recents_fragment)
else -> R.layout.recents_fragment return fragments[position]
} }
} }

7
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt
View File

@ -1,5 +1,8 @@
package com.simplemobiletools.filemanager.pro.helpers package com.simplemobiletools.filemanager.pro.helpers
import com.simplemobiletools.commons.helpers.TAB_FILES
import com.simplemobiletools.commons.helpers.TAB_RECENT_FILES
const val PATH = "path" const val PATH = "path"
const val MAX_COLUMN_COUNT = 20 const val MAX_COLUMN_COUNT = 20
@ -25,5 +28,5 @@ const val OPEN_AS_AUDIO = 3
const val OPEN_AS_VIDEO = 4 const val OPEN_AS_VIDEO = 4
const val OPEN_AS_OTHER = 5 const val OPEN_AS_OTHER = 5
const val TAB_FILES = 0 const val ALL_TABS_MASK = TAB_FILES or TAB_RECENT_FILES
const val TAB_RECENTS = 1 val tabsList = arrayListOf(TAB_FILES, TAB_RECENT_FILES)