Skip to content

Commit 631fd2f

Browse files
tibbitibbi
committed
updating commons and target SDK to 31
1 parent b70071a commit 631fd2f

21 files changed

+139
-88
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ if (keystorePropertiesFile.exists()) {
99
}
1010

1111
android {
12-
compileSdkVersion 30
12+
compileSdkVersion 31
1313

1414
defaultConfig {
1515
applicationId "com.simplemobiletools.filemanager.pro"
1616
minSdkVersion 21
17-
targetSdkVersion 30
17+
targetSdkVersion 31
1818
versionCode 116
1919
versionName "6.12.0"
2020
multiDexEnabled true
@@ -63,7 +63,7 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:4ef63f88a3'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:00a03ee29f'
6767
implementation 'com.github.Stericson:RootTools:df729dcb13'
6868
implementation 'com.github.Stericson:RootShell:1.6'
6969
implementation 'com.alexvasilkov:gesture-views:2.5.2'

‎app/src/main/AndroidManifest.xml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323

2424
<activity
2525
android:name=".activities.SplashActivity"
26+
android:exported="false"
2627
android:theme="@style/SplashTheme" />
2728

28-
<activity android:name=".activities.MainActivity">
29+
<activity
30+
android:name=".activities.MainActivity"
31+
android:exported="true">
2932

3033
<meta-data
3134
android:name="android.app.default_searchable"
@@ -57,10 +60,12 @@
5760

5861
<activity
5962
android:name=".activities.MimeTypesActivity"
63+
android:exported="false"
6064
android:parentActivityName=".activities.MainActivity" />
6165

6266
<activity
6367
android:name=".activities.ReadTextActivity"
68+
android:exported="true"
6469
android:label="@string/file_editor">
6570

6671
<meta-data
@@ -80,6 +85,7 @@
8085

8186
<activity
8287
android:name=".activities.DecompressActivity"
88+
android:exported="true"
8389
android:label="@string/decompress">
8490
<intent-filter>
8591
<action android:name="android.intent.action.VIEW" />
@@ -90,6 +96,7 @@
9096

9197
<activity
9298
android:name=".activities.SaveAsActivity"
99+
android:exported="true"
93100
android:label="@string/save_as">
94101
<intent-filter>
95102
<action android:name="android.intent.action.SEND" />
@@ -101,6 +108,7 @@
101108

102109
<activity
103110
android:name=".activities.SettingsActivity"
111+
android:exported="true"
104112
android:label="@string/settings"
105113
android:parentActivityName=".activities.MainActivity">
106114

@@ -112,16 +120,19 @@
112120

113121
<activity
114122
android:name=".activities.FavoritesActivity"
123+
android:exported="false"
115124
android:label="@string/favorites"
116125
android:parentActivityName=".activities.MainActivity" />
117126

118127
<activity
119128
android:name="com.simplemobiletools.commons.activities.AboutActivity"
129+
android:exported="false"
120130
android:label="@string/about"
121131
android:parentActivityName=".activities.MainActivity" />
122132

123133
<activity
124134
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
135+
android:exported="false"
125136
android:label="@string/customize_colors"
126137
android:parentActivityName=".activities.SettingsActivity" />
127138

@@ -138,6 +149,7 @@
138149
<activity-alias
139150
android:name=".activities.SplashActivity.Red"
140151
android:enabled="false"
152+
android:exported="true"
141153
android:icon="@mipmap/ic_launcher_red"
142154
android:roundIcon="@mipmap/ic_launcher_red"
143155
android:targetActivity=".activities.SplashActivity">
@@ -151,6 +163,7 @@
151163
<activity-alias
152164
android:name=".activities.SplashActivity.Pink"
153165
android:enabled="false"
166+
android:exported="true"
154167
android:icon="@mipmap/ic_launcher_pink"
155168
android:roundIcon="@mipmap/ic_launcher_pink"
156169
android:targetActivity=".activities.SplashActivity">
@@ -164,6 +177,7 @@
164177
<activity-alias
165178
android:name=".activities.SplashActivity.Purple"
166179
android:enabled="false"
180+
android:exported="true"
167181
android:icon="@mipmap/ic_launcher_purple"
168182
android:roundIcon="@mipmap/ic_launcher_purple"
169183
android:targetActivity=".activities.SplashActivity">
@@ -177,6 +191,7 @@
177191
<activity-alias
178192
android:name=".activities.SplashActivity.Deep_purple"
179193
android:enabled="false"
194+
android:exported="true"
180195
android:icon="@mipmap/ic_launcher_deep_purple"
181196
android:roundIcon="@mipmap/ic_launcher_deep_purple"
182197
android:targetActivity=".activities.SplashActivity">
@@ -190,6 +205,7 @@
190205
<activity-alias
191206
android:name=".activities.SplashActivity.Indigo"
192207
android:enabled="false"
208+
android:exported="true"
193209
android:icon="@mipmap/ic_launcher_indigo"
194210
android:roundIcon="@mipmap/ic_launcher_indigo"
195211
android:targetActivity=".activities.SplashActivity">
@@ -203,6 +219,7 @@
203219
<activity-alias
204220
android:name=".activities.SplashActivity.Blue"
205221
android:enabled="false"
222+
android:exported="true"
206223
android:icon="@mipmap/ic_launcher_blue"
207224
android:roundIcon="@mipmap/ic_launcher_blue"
208225
android:targetActivity=".activities.SplashActivity">
@@ -216,6 +233,7 @@
216233
<activity-alias
217234
android:name=".activities.SplashActivity.Light_blue"
218235
android:enabled="false"
236+
android:exported="true"
219237
android:icon="@mipmap/ic_launcher_light_blue"
220238
android:roundIcon="@mipmap/ic_launcher_light_blue"
221239
android:targetActivity=".activities.SplashActivity">
@@ -229,6 +247,7 @@
229247
<activity-alias
230248
android:name=".activities.SplashActivity.Cyan"
231249
android:enabled="false"
250+
android:exported="true"
232251
android:icon="@mipmap/ic_launcher_cyan"
233252
android:roundIcon="@mipmap/ic_launcher_cyan"
234253
android:targetActivity=".activities.SplashActivity">
@@ -242,6 +261,7 @@
242261
<activity-alias
243262
android:name=".activities.SplashActivity.Teal"
244263
android:enabled="false"
264+
android:exported="true"
245265
android:icon="@mipmap/ic_launcher_teal"
246266
android:roundIcon="@mipmap/ic_launcher_teal"
247267
android:targetActivity=".activities.SplashActivity">
@@ -255,6 +275,7 @@
255275
<activity-alias
256276
android:name=".activities.SplashActivity.Green"
257277
android:enabled="false"
278+
android:exported="true"
258279
android:icon="@mipmap/ic_launcher_green"
259280
android:roundIcon="@mipmap/ic_launcher_green"
260281
android:targetActivity=".activities.SplashActivity">
@@ -268,6 +289,7 @@
268289
<activity-alias
269290
android:name=".activities.SplashActivity.Light_green"
270291
android:enabled="false"
292+
android:exported="true"
271293
android:icon="@mipmap/ic_launcher_light_green"
272294
android:roundIcon="@mipmap/ic_launcher_light_green"
273295
android:targetActivity=".activities.SplashActivity">
@@ -281,6 +303,7 @@
281303
<activity-alias
282304
android:name=".activities.SplashActivity.Lime"
283305
android:enabled="false"
306+
android:exported="true"
284307
android:icon="@mipmap/ic_launcher_lime"
285308
android:roundIcon="@mipmap/ic_launcher_lime"
286309
android:targetActivity=".activities.SplashActivity">
@@ -294,6 +317,7 @@
294317
<activity-alias
295318
android:name=".activities.SplashActivity.Yellow"
296319
android:enabled="false"
320+
android:exported="true"
297321
android:icon="@mipmap/ic_launcher_yellow"
298322
android:roundIcon="@mipmap/ic_launcher_yellow"
299323
android:targetActivity=".activities.SplashActivity">
@@ -307,6 +331,7 @@
307331
<activity-alias
308332
android:name=".activities.SplashActivity.Amber"
309333
android:enabled="false"
334+
android:exported="true"
310335
android:icon="@mipmap/ic_launcher_amber"
311336
android:roundIcon="@mipmap/ic_launcher_amber"
312337
android:targetActivity=".activities.SplashActivity">
@@ -320,6 +345,7 @@
320345
<activity-alias
321346
android:name=".activities.SplashActivity.Orange"
322347
android:enabled="true"
348+
android:exported="true"
323349
android:icon="@mipmap/ic_launcher"
324350
android:roundIcon="@mipmap/ic_launcher"
325351
android:targetActivity=".activities.SplashActivity">
@@ -332,6 +358,7 @@
332358
<activity-alias
333359
android:name=".activities.SplashActivity.Deep_orange"
334360
android:enabled="false"
361+
android:exported="true"
335362
android:icon="@mipmap/ic_launcher_deep_orange"
336363
android:roundIcon="@mipmap/ic_launcher_deep_orange"
337364
android:targetActivity=".activities.SplashActivity">
@@ -345,6 +372,7 @@
345372
<activity-alias
346373
android:name=".activities.SplashActivity.Brown"
347374
android:enabled="false"
375+
android:exported="true"
348376
android:icon="@mipmap/ic_launcher_brown"
349377
android:roundIcon="@mipmap/ic_launcher_brown"
350378
android:targetActivity=".activities.SplashActivity">
@@ -358,6 +386,7 @@
358386
<activity-alias
359387
android:name=".activities.SplashActivity.Blue_grey"
360388
android:enabled="false"
389+
android:exported="true"
361390
android:icon="@mipmap/ic_launcher_blue_grey"
362391
android:roundIcon="@mipmap/ic_launcher_blue_grey"
363392
android:targetActivity=".activities.SplashActivity">
@@ -371,6 +400,7 @@
371400
<activity-alias
372401
android:name=".activities.SplashActivity.Grey_black"
373402
android:enabled="false"
403+
android:exported="true"
374404
android:icon="@mipmap/ic_launcher_grey_black"
375405
android:roundIcon="@mipmap/ic_launcher_grey_black"
376406
android:targetActivity=".activities.SplashActivity">

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/FavoritesActivity.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import android.view.Menu
66
import android.view.MenuItem
77
import com.simplemobiletools.commons.dialogs.FilePickerDialog
88
import com.simplemobiletools.commons.extensions.beVisibleIf
9-
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
9+
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
10+
import com.simplemobiletools.commons.extensions.getProperTextColor
1011
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1112
import com.simplemobiletools.filemanager.pro.R
1213
import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter
@@ -38,12 +39,12 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
3839
val favorites = ArrayList<String>()
3940
config.favorites.mapTo(favorites) { it }
4041
manage_favorites_placeholder.beVisibleIf(favorites.isEmpty())
41-
manage_favorites_placeholder.setTextColor(config.textColor)
42+
manage_favorites_placeholder.setTextColor(getProperTextColor())
4243

4344
manage_favorites_placeholder_2.apply {
4445
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
4546
beVisibleIf(favorites.isEmpty())
46-
setTextColor(getAdjustedPrimaryColor())
47+
setTextColor(getProperPrimaryColor())
4748
setOnClickListener {
4849
addFavorite()
4950
}

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import kotlinx.android.synthetic.main.items_fragment.view.*
4747
import kotlinx.android.synthetic.main.recents_fragment.*
4848
import kotlinx.android.synthetic.main.storage_fragment.*
4949
import java.io.File
50-
import java.util.*
5150

5251
class MainActivity : SimpleActivity() {
5352
private val BACK_PRESS_TIMEOUT = 5000
@@ -106,7 +105,7 @@ class MainActivity : SimpleActivity() {
106105
}
107106

108107
getAllFragments().forEach {
109-
it?.onResume(config.textColor, config.primaryColor)
108+
it?.onResume(getProperTextColor())
110109
}
111110

112111
if (storedFontSize != config.fontSize) {
@@ -122,13 +121,13 @@ class MainActivity : SimpleActivity() {
122121
}
123122

124123
getInactiveTabIndexes(main_view_pager.currentItem).forEach {
125-
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor)
124+
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
126125
}
127126

128-
val adjustedPrimaryColor = getAdjustedPrimaryColor()
129-
main_tabs_holder.background = ColorDrawable(config.backgroundColor)
130-
main_tabs_holder.setSelectedTabIndicatorColor(adjustedPrimaryColor)
131-
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(adjustedPrimaryColor)
127+
val properPrimaryColor = getProperPrimaryColor()
128+
main_tabs_holder.background = ColorDrawable(getProperBackgroundColor())
129+
main_tabs_holder.setSelectedTabIndicatorColor(properPrimaryColor)
130+
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(properPrimaryColor)
132131

133132
if (main_view_pager.adapter == null && mWasProtectionHandled) {
134133
initFragments()
@@ -401,11 +400,11 @@ class MainActivity : SimpleActivity() {
401400
main_view_pager.currentItem = tabToOpen
402401
main_tabs_holder.onTabSelectionChanged(
403402
tabUnselectedAction = {
404-
it.icon?.applyColorFilter(config.textColor)
403+
it.icon?.applyColorFilter(getProperTextColor())
405404
},
406405
tabSelectedAction = {
407406
main_view_pager.currentItem = it.position
408-
it.icon?.applyColorFilter(getAdjustedPrimaryColor())
407+
it.icon?.applyColorFilter(getProperPrimaryColor())
409408
}
410409
)
411410

@@ -450,24 +449,24 @@ class MainActivity : SimpleActivity() {
450449

451450
private fun setupTabColors(lastUsedTab: Int) {
452451
main_tabs_holder.apply {
453-
background = ColorDrawable(config.backgroundColor)
454-
setSelectedTabIndicatorColor(getAdjustedPrimaryColor())
452+
background = ColorDrawable(getProperBackgroundColor())
453+
setSelectedTabIndicatorColor(getProperPrimaryColor())
455454
getTabAt(lastUsedTab)?.apply {
456455
select()
457-
icon?.applyColorFilter(getAdjustedPrimaryColor())
456+
icon?.applyColorFilter(getProperPrimaryColor())
458457
}
459458

460459
getInactiveTabIndexes(lastUsedTab).forEach {
461-
getTabAt(it)?.icon?.applyColorFilter(config.textColor)
460+
getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
462461
}
463462
}
464463
}
465464

466465
private fun updateTabColors() {
467466
getInactiveTabIndexes(main_view_pager.currentItem).forEach {
468-
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(config.textColor)
467+
main_tabs_holder.getTabAt(it)?.icon?.applyColorFilter(getProperTextColor())
469468
}
470-
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(getAdjustedPrimaryColor())
469+
main_tabs_holder.getTabAt(main_view_pager.currentItem)?.icon?.applyColorFilter(getProperPrimaryColor())
471470
}
472471

473472
private fun getTabIcon(position: Int): Drawable {
@@ -477,7 +476,7 @@ class MainActivity : SimpleActivity() {
477476
else -> R.drawable.ic_storage_vector
478477
}
479478

480-
return resources.getColoredDrawableWithColor(drawableId, config.textColor)
479+
return resources.getColoredDrawableWithColor(drawableId, getProperTextColor())
481480
}
482481

483482
private fun getTabContentDescription(position: Int): String {
@@ -641,7 +640,7 @@ class MainActivity : SimpleActivity() {
641640
return
642641
}
643642

644-
if (getCurrentFragment()!!.breadcrumbs.itemsCount <= 1) {
643+
if (getCurrentFragment()!!.breadcrumbs.getItemCount() <= 1) {
645644
if (!wasBackJustPressed && config.pressBackTwice) {
646645
wasBackJustPressed = true
647646
toast(R.string.press_back_again)

‎app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
6262
reFetchItems()
6363
}
6464

65-
val adjustedPrimaryColor = getAdjustedPrimaryColor()
66-
mimetypes_fastscroller.updateColors(adjustedPrimaryColor)
65+
mimetypes_fastscroller.updateColors(getProperPrimaryColor())
6766
}
6867

6968
override fun onCreateOptionsMenu(menu: Menu): Boolean {

0 commit comments

Comments
 (0)