Skip to content

Commit 5bcd833

Browse files
committed
update commons to 4.4.8
1 parent f81fb06 commit 5bcd833

File tree

7 files changed

+24
-27
lines changed

7 files changed

+24
-27
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ext {
4545
}
4646

4747
dependencies {
48-
implementation 'com.simplemobiletools:commons:4.2.8'
48+
implementation 'com.simplemobiletools:commons:4.4.8'
4949

5050
implementation files('../libs/RootTools.jar')
5151

app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@
1717

1818
<activity
1919
android:name=".activities.SplashActivity"
20-
android:theme="@style/SplashTheme">
21-
<intent-filter>
22-
<action android:name="android.intent.action.MAIN"/>
23-
24-
<category android:name="android.intent.category.LAUNCHER"/>
25-
</intent-filter>
26-
</activity>
20+
android:theme="@style/SplashTheme"/>
2721

2822
<activity android:name=".activities.MainActivity">
2923

@@ -105,19 +99,6 @@
10599
android:resource="@xml/provider_paths"/>
106100
</provider>
107101

108-
<!-- Do not append ".Orange" to the default alias "name", it would remove the old homescreen launcher of users at upgrade -->
109-
<activity-alias
110-
android:name=".activities.SplashActivity"
111-
android:enabled="true"
112-
android:icon="@mipmap/ic_launcher"
113-
android:roundIcon="@mipmap/ic_launcher"
114-
android:targetActivity=".activities.SplashActivity">
115-
<intent-filter>
116-
<action android:name="android.intent.action.MAIN"/>
117-
<category android:name="android.intent.category.LAUNCHER"/>
118-
</intent-filter>
119-
</activity-alias>
120-
121102
<activity-alias
122103
android:name=".activities.SplashActivity.Red"
123104
android:enabled="false"
@@ -300,6 +281,18 @@
300281
</intent-filter>
301282
</activity-alias>
302283

284+
<activity-alias
285+
android:name=".activities.SplashActivity.Orange"
286+
android:enabled="true"
287+
android:icon="@mipmap/ic_launcher"
288+
android:roundIcon="@mipmap/ic_launcher"
289+
android:targetActivity=".activities.SplashActivity">
290+
<intent-filter>
291+
<action android:name="android.intent.action.MAIN"/>
292+
<category android:name="android.intent.category.LAUNCHER"/>
293+
</intent-filter>
294+
</activity-alias>
295+
303296
<activity-alias
304297
android:name=".activities.SplashActivity.Deep_orange"
305298
android:enabled="false"

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,13 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
9999

100100
override fun getSelectableItemCount() = fileDirItems.size
101101

102+
override fun getIsItemSelectable(position: Int) = true
103+
102104
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.list_item, parent)
103105

104106
override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
105107
val fileDirItem = fileDirItems[position]
106-
val view = holder.bindView(fileDirItem, true) { itemView, layoutPosition ->
108+
val view = holder.bindView(fileDirItem, true, true) { itemView, layoutPosition ->
107109
setupView(itemView, fileDirItem)
108110
}
109111
bindViewHolder(holder, position, view)

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayL
3838

3939
override fun getSelectableItemCount() = favorites.size
4040

41+
override fun getIsItemSelectable(position: Int) = true
42+
4143
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_manage_favorite, parent)
4244

4345
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
4446
val favorite = favorites[position]
45-
val view = holder.bindView(favorite) { itemView, layoutPosition ->
47+
val view = holder.bindView(favorite, true, true) { itemView, layoutPosition ->
4648
setupView(itemView, favorite)
4749
}
4850
bindViewHolder(holder, position, view)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
161161

162162
getRecyclerLayoutManager().onRestoreInstanceState(scrollStates[currentPath])
163163
items_list.onGlobalLayout {
164-
items_fastscroller.setScrollTo(items_list.computeVerticalScrollOffset())
164+
items_fastscroller.setScrollToY(items_list.computeVerticalScrollOffset())
165165
}
166166
}
167167
}
@@ -299,7 +299,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
299299
override fun deleteFiles(files: ArrayList<FileDirItem>) {
300300
val hasFolder = files.any { it.isDirectory }
301301
val firstPath = files.firstOrNull()?.path
302-
if (firstPath == null || firstPath.isEmpty()) {
302+
if (firstPath == null || firstPath.isEmpty() || context == null) {
303303
return
304304
}
305305

app/src/main/res/menu/cab.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
app:showAsAction="ifRoom"/>
1414
<item
1515
android:id="@+id/cab_rename"
16-
android:icon="@drawable/ic_rename"
16+
android:icon="@drawable/ic_rename_new"
1717
android:title="@string/rename"
1818
app:showAsAction="ifRoom"/>
1919
<item

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.50'
4+
ext.kotlin_version = '1.2.51'
55

66
repositories {
77
jcenter()

0 commit comments

Comments
 (0)