Skip to content

Commit f00f0e1

Browse files
committed
updating Commons with AndroidX and recyclerview-selector
1 parent 1fa30b2 commit f00f0e1

File tree

18 files changed

+139
-123
lines changed

18 files changed

+139
-123
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222

2323
buildTypes {
2424
debug {
25-
applicationIdSuffix ".debug"
25+
applicationIdSuffix ".debug"
2626
}
2727
release {
2828
minifyEnabled true
@@ -42,7 +42,7 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation 'com.simplemobiletools:commons:4.8.8'
45+
implementation 'com.simplemobiletools:commons:4.9.18'
4646

4747
implementation files('../libs/RootTools.jar')
4848
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
100100

101101
<provider
102-
android:name="android.support.v4.content.FileProvider"
102+
android:name="androidx.core.content.FileProvider"
103103
android:authorities="${applicationId}.provider"
104104
android:exported="false"
105105
android:grantUriPermissions="true">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
3737

3838
ManageFavoritesAdapter(this, favorites, this, manage_favorites_list) { }.apply {
3939
manage_favorites_list.adapter = this
40+
initSelectionTracker()
4041
}
4142
}
4243

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import android.content.Intent
88
import android.media.RingtoneManager
99
import android.os.Bundle
1010
import android.os.Handler
11-
import android.support.v4.view.MenuItemCompat
12-
import android.support.v7.widget.SearchView
1311
import android.view.Menu
1412
import android.view.MenuItem
13+
import androidx.appcompat.widget.SearchView
14+
import androidx.core.view.MenuItemCompat
1515
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
1616
import com.simplemobiletools.commons.extensions.*
1717
import com.simplemobiletools.commons.helpers.*
@@ -26,7 +26,7 @@ import com.simplemobiletools.filemanager.fragments.ItemsFragment
2626
import com.simplemobiletools.filemanager.helpers.RootHelpers
2727
import com.stericson.RootTools.RootTools
2828
import kotlinx.android.synthetic.main.activity_main.*
29-
import kotlinx.android.synthetic.main.items_fragment.*
29+
import kotlinx.android.synthetic.main.items_fragment.view.*
3030
import java.io.File
3131
import java.util.*
3232

@@ -258,7 +258,7 @@ class MainActivity : SimpleActivity() {
258258
}
259259

260260
override fun onBackPressed() {
261-
if (fragment.breadcrumbs.childCount <= 1) {
261+
if (fragment.mView.breadcrumbs.childCount <= 1) {
262262
if (!wasBackJustPressed) {
263263
wasBackJustPressed = true
264264
toast(R.string.press_back_again)
@@ -269,8 +269,8 @@ class MainActivity : SimpleActivity() {
269269
finish()
270270
}
271271
} else {
272-
fragment.breadcrumbs.removeBreadcrumb()
273-
openPath(fragment.breadcrumbs.getLastItem().path)
272+
fragment.mView.breadcrumbs.removeBreadcrumb()
273+
openPath(fragment.mView.breadcrumbs.getLastItem().path)
274274
}
275275
}
276276

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/ReadTextActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import android.app.SearchManager
44
import android.content.Context
55
import android.net.Uri
66
import android.os.Bundle
7-
import android.support.v4.view.MenuItemCompat
8-
import android.support.v7.widget.SearchView
97
import android.view.Menu
108
import android.view.MenuItem
9+
import androidx.appcompat.widget.SearchView
10+
import androidx.core.view.MenuItemCompat
1111
import com.simplemobiletools.commons.extensions.*
1212
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
1313
import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
@@ -62,7 +62,7 @@ class ReadTextActivity : SimpleActivity() {
6262
(searchMenuItem!!.actionView as SearchView).apply {
6363
setSearchableInfo(searchManager.getSearchableInfo(componentName))
6464
isSubmitButtonEnabled = false
65-
setOnQueryTextListener(object : android.support.v7.widget.SearchView.OnQueryTextListener {
65+
setOnQueryTextListener(object : SearchView.OnQueryTextListener {
6666
override fun onQueryTextSubmit(query: String) = false
6767

6868
override fun onQueryTextChange(newText: String): Boolean {

0 commit comments

Comments
 (0)