updating commons and target SDK to 31

This commit is contained in:
tibbi 2022-04-11 10:36:23 +02:00
parent b70071a023
commit 631fd2fe32
21 changed files with 139 additions and 88 deletions

View File

@ -9,12 +9,12 @@ if (keystorePropertiesFile.exists()) {
}
android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
applicationId "com.simplemobiletools.filemanager.pro"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode 116
versionName "6.12.0"
multiDexEnabled true
@ -63,7 +63,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:4ef63f88a3'
implementation 'com.github.SimpleMobileTools:Simple-Commons:00a03ee29f'
implementation 'com.github.Stericson:RootTools:df729dcb13'
implementation 'com.github.Stericson:RootShell:1.6'
implementation 'com.alexvasilkov:gesture-views:2.5.2'

View File

@ -23,9 +23,12 @@
<activity
android:name=".activities.SplashActivity"
android:exported="false"
android:theme="@style/SplashTheme" />
<activity android:name=".activities.MainActivity">
<activity
android:name=".activities.MainActivity"
android:exported="true">
<meta-data
android:name="android.app.default_searchable"
@ -57,10 +60,12 @@
<activity
android:name=".activities.MimeTypesActivity"
android:exported="false"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name=".activities.ReadTextActivity"
android:exported="true"
android:label="@string/file_editor">
<meta-data
@ -80,6 +85,7 @@
<activity
android:name=".activities.DecompressActivity"
android:exported="true"
android:label="@string/decompress">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -90,6 +96,7 @@
<activity
android:name=".activities.SaveAsActivity"
android:exported="true"
android:label="@string/save_as">
<intent-filter>
<action android:name="android.intent.action.SEND" />
@ -101,6 +108,7 @@
<activity
android:name=".activities.SettingsActivity"
android:exported="true"
android:label="@string/settings"
android:parentActivityName=".activities.MainActivity">
@ -112,16 +120,19 @@
<activity
android:name=".activities.FavoritesActivity"
android:exported="false"
android:label="@string/favorites"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:exported="false"
android:label="@string/about"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
android:exported="false"
android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity" />
@ -138,6 +149,7 @@
<activity-alias
android:name=".activities.SplashActivity.Red"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_red"
android:roundIcon="@mipmap/ic_launcher_red"
android:targetActivity=".activities.SplashActivity">
@ -151,6 +163,7 @@
<activity-alias
android:name=".activities.SplashActivity.Pink"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_pink"
android:roundIcon="@mipmap/ic_launcher_pink"
android:targetActivity=".activities.SplashActivity">
@ -164,6 +177,7 @@
<activity-alias
android:name=".activities.SplashActivity.Purple"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_purple"
android:roundIcon="@mipmap/ic_launcher_purple"
android:targetActivity=".activities.SplashActivity">
@ -177,6 +191,7 @@
<activity-alias
android:name=".activities.SplashActivity.Deep_purple"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_purple"
android:roundIcon="@mipmap/ic_launcher_deep_purple"
android:targetActivity=".activities.SplashActivity">
@ -190,6 +205,7 @@
<activity-alias
android:name=".activities.SplashActivity.Indigo"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_indigo"
android:roundIcon="@mipmap/ic_launcher_indigo"
android:targetActivity=".activities.SplashActivity">
@ -203,6 +219,7 @@
<activity-alias
android:name=".activities.SplashActivity.Blue"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue"
android:roundIcon="@mipmap/ic_launcher_blue"
android:targetActivity=".activities.SplashActivity">
@ -216,6 +233,7 @@
<activity-alias
android:name=".activities.SplashActivity.Light_blue"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_blue"
android:roundIcon="@mipmap/ic_launcher_light_blue"
android:targetActivity=".activities.SplashActivity">
@ -229,6 +247,7 @@
<activity-alias
android:name=".activities.SplashActivity.Cyan"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_cyan"
android:roundIcon="@mipmap/ic_launcher_cyan"
android:targetActivity=".activities.SplashActivity">
@ -242,6 +261,7 @@
<activity-alias
android:name=".activities.SplashActivity.Teal"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_teal"
android:roundIcon="@mipmap/ic_launcher_teal"
android:targetActivity=".activities.SplashActivity">
@ -255,6 +275,7 @@
<activity-alias
android:name=".activities.SplashActivity.Green"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_green"
android:roundIcon="@mipmap/ic_launcher_green"
android:targetActivity=".activities.SplashActivity">
@ -268,6 +289,7 @@
<activity-alias
android:name=".activities.SplashActivity.Light_green"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_green"
android:roundIcon="@mipmap/ic_launcher_light_green"
android:targetActivity=".activities.SplashActivity">
@ -281,6 +303,7 @@
<activity-alias
android:name=".activities.SplashActivity.Lime"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_lime"
android:roundIcon="@mipmap/ic_launcher_lime"
android:targetActivity=".activities.SplashActivity">
@ -294,6 +317,7 @@
<activity-alias
android:name=".activities.SplashActivity.Yellow"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_yellow"
android:roundIcon="@mipmap/ic_launcher_yellow"
android:targetActivity=".activities.SplashActivity">
@ -307,6 +331,7 @@
<activity-alias
android:name=".activities.SplashActivity.Amber"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_amber"
android:roundIcon="@mipmap/ic_launcher_amber"
android:targetActivity=".activities.SplashActivity">
@ -320,6 +345,7 @@
<activity-alias
android:name=".activities.SplashActivity.Orange"
android:enabled="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
android:targetActivity=".activities.SplashActivity">
@ -332,6 +358,7 @@
<activity-alias
android:name=".activities.SplashActivity.Deep_orange"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_orange"
android:roundIcon="@mipmap/ic_launcher_deep_orange"
android:targetActivity=".activities.SplashActivity">
@ -345,6 +372,7 @@
<activity-alias
android:name=".activities.SplashActivity.Brown"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_brown"
android:roundIcon="@mipmap/ic_launcher_brown"
android:targetActivity=".activities.SplashActivity">
@ -358,6 +386,7 @@
<activity-alias
android:name=".activities.SplashActivity.Blue_grey"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue_grey"
android:roundIcon="@mipmap/ic_launcher_blue_grey"
android:targetActivity=".activities.SplashActivity">
@ -371,6 +400,7 @@
<activity-alias
android:name=".activities.SplashActivity.Grey_black"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_grey_black"
android:roundIcon="@mipmap/ic_launcher_grey_black"
android:targetActivity=".activities.SplashActivity">

View File

@ -6,7 +6,8 @@ import android.view.Menu
import android.view.MenuItem
import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter
@ -38,12 +39,12 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
val favorites = ArrayList<String>()
config.favorites.mapTo(favorites) { it }
manage_favorites_placeholder.beVisibleIf(favorites.isEmpty())
manage_favorites_placeholder.setTextColor(config.textColor)
manage_favorites_placeholder.setTextColor(getProperTextColor())
manage_favorites_placeholder_2.apply {
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
beVisibleIf(favorites.isEmpty())
setTextColor(getAdjustedPrimaryColor())
setTextColor(getProperPrimaryColor())
setOnClickListener {
addFavorite()
}

View File

@ -47,7 +47,6 @@ import kotlinx.android.synthetic.main.items_fragment.view.*
import kotlinx.android.synthetic.main.recents_fragment.*
import kotlinx.android.synthetic.main.storage_fragment.*
import java.io.File
import java.util.*
class MainActivity : SimpleActivity() {
private val BACK_PRESS_TIMEOUT = 5000
@ -106,7 +105,7 @@ class MainActivity : SimpleActivity() {
}
getAllFragments().forEach {
it?.onResume(config.textColor, config.primaryColor)
it?.onResume(getProperTextColor())
}
if (storedFontSize != config.fontSize) {
@ -122,13 +121,13 @@ class MainActivity : SimpleActivity() {
}
getInactiveTabIndexes(main_view_pager.currentItem).forEach {
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor)
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
}
val adjustedPrimaryColor = getAdjustedPrimaryColor()
main_tabs_holder.background = ColorDrawable(config.backgroundColor)
main_tabs_holder.setSelectedTabIndicatorColor(adjustedPrimaryColor)
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(adjustedPrimaryColor)
val properPrimaryColor = getProperPrimaryColor()
main_tabs_holder.background = ColorDrawable(getProperBackgroundColor())
main_tabs_holder.setSelectedTabIndicatorColor(properPrimaryColor)
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(properPrimaryColor)
if (main_view_pager.adapter == null && mWasProtectionHandled) {
initFragments()
@ -401,11 +400,11 @@ class MainActivity : SimpleActivity() {
main_view_pager.currentItem = tabToOpen
main_tabs_holder.onTabSelectionChanged(
tabUnselectedAction = {
it.icon?.applyColorFilter(config.textColor)
it.icon?.applyColorFilter(getProperTextColor())
},
tabSelectedAction = {
main_view_pager.currentItem = it.position
it.icon?.applyColorFilter(getAdjustedPrimaryColor())
it.icon?.applyColorFilter(getProperPrimaryColor())
}
)
@ -450,24 +449,24 @@ class MainActivity : SimpleActivity() {
private fun setupTabColors(lastUsedTab: Int) {
main_tabs_holder.apply {
background = ColorDrawable(config.backgroundColor)
setSelectedTabIndicatorColor(getAdjustedPrimaryColor())
background = ColorDrawable(getProperBackgroundColor())
setSelectedTabIndicatorColor(getProperPrimaryColor())
getTabAt(lastUsedTab)?.apply {
select()
icon?.applyColorFilter(getAdjustedPrimaryColor())
icon?.applyColorFilter(getProperPrimaryColor())
}
getInactiveTabIndexes(lastUsedTab).forEach {
getTabAt(it)?.icon?.applyColorFilter(config.textColor)
getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
}
}
}
private fun updateTabColors() {
getInactiveTabIndexes(main_view_pager.currentItem).forEach {
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor)
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
}
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor())
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(getProperPrimaryColor())
}
private fun getTabIcon(position: Int): Drawable {
@ -477,7 +476,7 @@ class MainActivity : SimpleActivity() {
else -> R.drawable.ic_storage_vector
}
return resources.getColoredDrawableWithColor(drawableId, config.textColor)
return resources.getColoredDrawableWithColor(drawableId, getProperTextColor())
}
private fun getTabContentDescription(position: Int): String {
@ -641,7 +640,7 @@ class MainActivity : SimpleActivity() {
return
}
if (getCurrentFragment()!!.breadcrumbs.itemsCount <= 1) {
if (getCurrentFragment()!!.breadcrumbs.getItemCount() <= 1) {
if (!wasBackJustPressed && config.pressBackTwice) {
wasBackJustPressed = true
toast(R.string.press_back_again)

View File

@ -62,8 +62,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
reFetchItems()
}
val adjustedPrimaryColor = getAdjustedPrimaryColor()
mimetypes_fastscroller.updateColors(adjustedPrimaryColor)
mimetypes_fastscroller.updateColors(getProperPrimaryColor())
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {

View File

@ -291,8 +291,8 @@ class ReadTextActivity : SimpleActivity() {
false
})
search_wrapper.setBackgroundColor(config.primaryColor)
val contrastColor = config.primaryColor.getContrastColor()
search_wrapper.setBackgroundColor(getProperPrimaryColor())
val contrastColor = getProperPrimaryColor().getContrastColor()
arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach {
it.applyColorFilter(contrastColor)
}
@ -303,7 +303,7 @@ class ReadTextActivity : SimpleActivity() {
if (text.isNotBlank() && text.length > 1) {
searchMatches = read_text_view.value.searchMatches(text)
read_text_view.highlightText(text, getAdjustedPrimaryColor())
read_text_view.highlightText(text, getProperPrimaryColor())
}
if (searchMatches.isNotEmpty()) {

View File

@ -52,7 +52,7 @@ class SettingsActivity : SimpleActivity() {
settings_file_operations_label,
settings_security_label
).forEach {
it.setTextColor(getAdjustedPrimaryColor())
it.setTextColor(getProperPrimaryColor())
}
arrayOf(
@ -63,7 +63,7 @@ class SettingsActivity : SimpleActivity() {
settings_file_operations_holder,
settings_security_holder
).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
}
}

View File

@ -1,9 +1,6 @@
package com.simplemobiletools.filemanager.pro.adapters
import android.annotation.SuppressLint
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.content.pm.ShortcutInfo
@ -813,13 +810,13 @@ class ItemsAdapter(
view.apply {
if (listItem.isSectionTitle) {
item_icon.setImageDrawable(folderDrawable)
item_section.text = if (textToHighlight.isEmpty()) listItem.mName else listItem.mName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
item_section.text = if (textToHighlight.isEmpty()) listItem.mName else listItem.mName.highlightTextPart(textToHighlight, properPrimaryColor)
item_section.setTextColor(textColor)
item_section.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
} else if (!listItem.isGridTypeDivider) {
item_frame.isSelected = isSelected
val fileName = listItem.name
item_name.text = if (textToHighlight.isEmpty()) fileName else fileName.highlightTextPart(textToHighlight, adjustedPrimaryColor)
item_name.text = if (textToHighlight.isEmpty()) fileName else fileName.highlightTextPart(textToHighlight, properPrimaryColor)
item_name.setTextColor(textColor)
item_name.setTextSize(TypedValue.COMPLEX_UNIT_PX, if (isListViewType) fontSize else smallerFontSize)
@ -831,7 +828,7 @@ class ItemsAdapter(
item_check?.beVisibleIf(isSelected)
if (isSelected) {
item_check?.background?.applyColorFilter(adjustedPrimaryColor)
item_check?.background?.applyColorFilter(properPrimaryColor)
item_check?.applyColorFilter(contrastColor)
}

View File

@ -5,12 +5,12 @@ import android.view.View
import android.view.ViewGroup
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.extensions.config
import kotlinx.android.synthetic.main.item_manage_favorite.view.*
import java.util.*
class ManageFavoritesAdapter(
activity: BaseSimpleActivity, var favorites: ArrayList<String>, val listener: RefreshRecyclerViewListener?,
@ -61,7 +61,7 @@ class ManageFavoritesAdapter(
view.apply {
manage_favorite_title.apply {
text = favorite
setTextColor(config.textColor)
setTextColor(activity.getProperTextColor())
}
manage_favorite_holder?.isSelected = isSelected

View File

@ -3,6 +3,7 @@ package com.simplemobiletools.filemanager.pro.adapters
import android.view.View
import android.view.ViewGroup
import androidx.viewpager.widget.PagerAdapter
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.helpers.TAB_FILES
import com.simplemobiletools.commons.helpers.TAB_RECENT_FILES
import com.simplemobiletools.commons.helpers.TAB_STORAGE_ANALYSIS
@ -20,7 +21,7 @@ class ViewPagerAdapter(val activity: SimpleActivity) : PagerAdapter() {
(view as MyViewPagerFragment).apply {
setupFragment(activity)
onResume(activity.config.textColor, activity.config.primaryColor)
onResume(activity.getProperTextColor())
}
return view

View File

@ -8,7 +8,10 @@ import androidx.recyclerview.widget.GridLayoutManager
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.dialogs.StoragePickerDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.Breadcrumbs
import com.simplemobiletools.commons.views.MyGridLayoutManager
@ -24,11 +27,8 @@ import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT
import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
import com.simplemobiletools.filemanager.pro.models.ListItem
import kotlinx.android.synthetic.main.items_fragment.*
import kotlinx.android.synthetic.main.items_fragment.view.*
import java.io.File
import java.util.*
import kotlin.collections.ArrayList
class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), ItemOperationsListener,
Breadcrumbs.BreadcrumbsListener {
@ -50,16 +50,16 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
}
}
override fun onResume(textColor: Int, primaryColor: Int) {
override fun onResume(textColor: Int) {
context!!.updateTextColors(this)
storedItems = ArrayList()
getRecyclerAdapter()?.apply {
updatePrimaryColor(primaryColor)
updatePrimaryColor()
updateTextColor(textColor)
initDrawables()
}
items_fastscroller.updateColors(context!!.getAdjustedPrimaryColor())
items_fastscroller.updateColors(context!!.getProperPrimaryColor())
if (currentPath != "") {
breadcrumbs.updateColor(textColor)

View File

@ -36,7 +36,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
abstract fun setupFragment(activity: SimpleActivity)
abstract fun onResume(textColor: Int, primaryColor: Int)
abstract fun onResume(textColor: Int)
abstract fun refreshFragment()
}

View File

@ -8,7 +8,10 @@ import android.util.AttributeSet
import androidx.core.os.bundleOf
import androidx.recyclerview.widget.GridLayoutManager
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID
import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isOreoPlus
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.MyGridLayoutManager
import com.simplemobiletools.filemanager.pro.R
@ -21,7 +24,6 @@ import com.simplemobiletools.filemanager.pro.helpers.RootHelpers
import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener
import com.simplemobiletools.filemanager.pro.models.ListItem
import kotlinx.android.synthetic.main.recents_fragment.view.*
import java.util.*
class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), ItemOperationsListener {
private val RECENTS_LIMIT = 50
@ -66,11 +68,11 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}
}
override fun onResume(textColor: Int, primaryColor: Int) {
override fun onResume(textColor: Int) {
recents_placeholder.setTextColor(textColor)
getRecyclerAdapter()?.apply {
updatePrimaryColor(primaryColor)
updatePrimaryColor()
updateTextColor(textColor)
initDrawables()
}

View File

@ -19,7 +19,6 @@ import com.simplemobiletools.filemanager.pro.extensions.formatSizeThousand
import com.simplemobiletools.filemanager.pro.helpers.*
import kotlinx.android.synthetic.main.storage_fragment.view.*
import java.util.*
import kotlin.collections.HashMap
class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
private val SIZE_DIVIDER = 100000
@ -47,13 +46,13 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
override fun refreshFragment() {}
override fun onResume(textColor: Int, primaryColor: Int) {
override fun onResume(textColor: Int) {
getSizes()
context.updateTextColors(storage_fragment)
val adjustedPrimaryColor = context.getAdjustedPrimaryColor()
main_storage_usage_progressbar.setIndicatorColor(adjustedPrimaryColor)
main_storage_usage_progressbar.trackColor = adjustedPrimaryColor.adjustAlpha(0.3f)
val properPrimaryColor = context.getProperPrimaryColor()
main_storage_usage_progressbar.setIndicatorColor(properPrimaryColor)
main_storage_usage_progressbar.trackColor = properPrimaryColor.adjustAlpha(0.3f)
val redColor = context.resources.getColor(R.color.md_red_700)
images_progressbar.setIndicatorColor(redColor)

View File

@ -8,7 +8,8 @@ import androidx.appcompat.widget.AppCompatEditText
import com.alexvasilkov.gestures.GestureController
import com.alexvasilkov.gestures.State
import com.alexvasilkov.gestures.views.interfaces.GestureView
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.extensions.onGlobalLayout
import com.simplemobiletools.filemanager.pro.extensions.config
@ -38,8 +39,8 @@ class GestureEditText : AppCompatEditText, GestureView {
})
origSize = textSize
setTextColor(context.config.textColor)
setLinkTextColor(context.getAdjustedPrimaryColor())
setTextColor(context.getProperTextColor())
setLinkTextColor(context.getProperPrimaryColor())
val storedTextZoom = context.config.editorTextZoom
if (storedTextZoom != 0f) {

View File

@ -1,80 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AppCompatResource">
<item
android:id="@+id/cab_delete"
android:icon="@drawable/ic_delete_vector"
android:title="@string/delete"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/cab_confirm_selection"
android:icon="@drawable/ic_check_vector"
android:title="@string/confirm_selection"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/cab_properties"
android:icon="@drawable/ic_info_vector"
android:title="@string/properties"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/cab_rename"
android:icon="@drawable/ic_rename_vector"
android:title="@string/rename"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/cab_share"
android:icon="@drawable/ic_share_vector"
android:title="@string/share"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_hide"
android:icon="@drawable/ic_hide_vector"
android:title="@string/hide"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_unhide"
android:icon="@drawable/ic_unhide_vector"
android:title="@string/unhide"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_create_shortcut"
android:showAsAction="never"
android:title="@string/create_shortcut"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_copy_path"
android:showAsAction="never"
android:title="@string/copy_path"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_set_as"
android:showAsAction="never"
android:title="@string/set_as"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_open_with"
android:showAsAction="never"
android:title="@string/open_with"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_open_as"
android:showAsAction="never"
android:title="@string/open_as"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_copy_to"
android:showAsAction="never"
android:title="@string/copy_to"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_move_to"
android:showAsAction="never"
android:title="@string/move_to"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_compress"
android:showAsAction="never"
android:title="@string/compress"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_decompress"
android:showAsAction="never"
android:title="@string/decompress"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/cab_select_all"
android:icon="@drawable/ic_select_all_vector"
android:title="@string/select_all"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
</menu>

View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AppCompatResource">
<item
android:id="@+id/search"
android:icon="@drawable/ic_search_vector"
@ -44,22 +46,27 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/set_as_home"
android:showAsAction="never"
android:title="@string/set_as_home_folder"
app:showAsAction="never" />
<item
android:id="@+id/temporarily_show_hidden"
android:showAsAction="never"
android:title="@string/temporarily_show_hidden"
app:showAsAction="never" />
<item
android:id="@+id/stop_showing_hidden"
android:showAsAction="never"
android:title="@string/stop_showing_hidden"
app:showAsAction="never" />
<item
android:id="@+id/increase_column_count"
android:showAsAction="never"
android:title="@string/increase_column_count"
app:showAsAction="never" />
<item
android:id="@+id/reduce_column_count"
android:showAsAction="never"
android:title="@string/reduce_column_count"
app:showAsAction="never" />
<item

View File

@ -1,22 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AppCompatResource">
<item
android:id="@+id/menu_search"
android:icon="@drawable/ic_search_vector"
android:title="@string/search"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_save"
android:icon="@drawable/ic_save_vector"
android:title="@string/save_as"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_open_with"
android:showAsAction="never"
android:title="@string/open_with"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/menu_print"
android:showAsAction="never"
android:title="@string/print"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/add_favorite"
android:icon="@drawable/ic_plus_vector"
android:title="@string/add_favorites"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
</menu>

View File

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

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip