fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-02-18 12:50:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly update some colors on change

Browse Source
This commit is contained in:
tibbi 2021-05-19 22:15:02 +02:00
parent b526ae5df2
commit 2150ad15e6
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,9 +80,8 @@ class MainActivity : SimpleActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
val adjustedPrimaryColor = getAdjustedPrimaryColor()
getAllFragments().forEach { getAllFragments().forEach {
it?.setupColors(config.textColor, adjustedPrimaryColor) it?.setupColors(config.textColor, config.primaryColor)
} }
if (storedFontSize != config.fontSize) { if (storedFontSize != config.fontSize) {
@ -101,9 +100,10 @@ class MainActivity : SimpleActivity() {
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor) main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor)
} }
val adjustedPrimaryColor = getAdjustedPrimaryColor()
main_tabs_holder.background = ColorDrawable(config.backgroundColor) main_tabs_holder.background = ColorDrawable(config.backgroundColor)
main_tabs_holder.setSelectedTabIndicatorColor(getAdjustedPrimaryColor()) main_tabs_holder.setSelectedTabIndicatorColor(adjustedPrimaryColor)
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor()) main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(adjustedPrimaryColor)
if (main_view_pager.adapter == null) { if (main_view_pager.adapter == null) {
initFragments() initFragments()

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

@ -3,7 +3,6 @@ package com.simplemobiletools.filemanager.pro.adapters
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.PagerAdapter
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.filemanager.pro.R 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
@ -18,7 +17,7 @@ class ViewPagerAdapter(val activity: SimpleActivity) : PagerAdapter() {
(view as MyViewPagerFragment).apply { (view as MyViewPagerFragment).apply {
setupFragment(activity) setupFragment(activity)
setupColors(activity.config.textColor, activity.getAdjustedPrimaryColor()) setupColors(activity.config.textColor, activity.config.primaryColor)
} }
return view return view

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

@ -47,11 +47,12 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
} }
} }
override fun setupColors(textColor: Int, adjustedPrimaryColor: Int) { override fun setupColors(textColor: Int, primaryColor: Int) {
context!!.updateTextColors(this) context!!.updateTextColors(this)
items_fastscroller.updatePrimaryColor() items_fastscroller.updatePrimaryColor()
storedItems = ArrayList() storedItems = ArrayList()
getRecyclerAdapter()?.apply { getRecyclerAdapter()?.apply {
updatePrimaryColor(primaryColor)
updateTextColor(textColor) updateTextColor(textColor)
initDrawables() initDrawables()
} }

2
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt
View File

@ -36,7 +36,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
abstract fun setupFragment(activity: SimpleActivity) abstract fun setupFragment(activity: SimpleActivity)
abstract fun setupColors(textColor: Int, adjustedPrimaryColor: Int) abstract fun setupColors(textColor: Int, primaryColor: Int)
abstract fun setupFontSize() abstract fun setupFontSize()

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

@ -59,7 +59,15 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
recents_list.scheduleLayoutAnimation() recents_list.scheduleLayoutAnimation()
} }
override fun setupColors(textColor: Int, adjustedPrimaryColor: Int) {} override fun setupColors(textColor: Int, primaryColor: Int) {
recents_placeholder.setTextColor(textColor)
getRecyclerAdapter()?.apply {
updatePrimaryColor(primaryColor)
updateTextColor(textColor)
initDrawables()
}
}
private fun setupLayoutManager() { private fun setupLayoutManager() {
if (context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_GRID) { if (context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_GRID) {