Skip to content

Commit 6a88111

Browse files
committed
migrate activities to viewbinding
1 parent 505839c commit 6a88111

8 files changed

Lines changed: 344 additions & 286 deletions

File tree

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1111
import com.simplemobiletools.commons.helpers.isOreoPlus
1212
import com.simplemobiletools.filemanager.pro.R
1313
import com.simplemobiletools.filemanager.pro.adapters.DecompressItemsAdapter
14+
import com.simplemobiletools.filemanager.pro.databinding.ActivityDecompressBinding
1415
import com.simplemobiletools.filemanager.pro.extensions.config
1516
import com.simplemobiletools.filemanager.pro.models.ListItem
16-
import kotlinx.android.synthetic.main.activity_decompress.*
1717
import net.lingala.zip4j.exception.ZipException
1818
import net.lingala.zip4j.exception.ZipException.Type
1919
import net.lingala.zip4j.io.inputstream.ZipInputStream
@@ -26,6 +26,7 @@ class DecompressActivity : SimpleActivity() {
2626
}
2727

2828
private val allFiles = ArrayList<ListItem>()
29+
private lateinit var binding: ActivityDecompressBinding
2930
private var currentPath = ""
3031
private var uri: Uri? = null
3132
private var password: String? = null
@@ -34,10 +35,13 @@ class DecompressActivity : SimpleActivity() {
3435
override fun onCreate(savedInstanceState: Bundle?) {
3536
isMaterialActivity = true
3637
super.onCreate(savedInstanceState)
37-
setContentView(R.layout.activity_decompress)
38+
binding = ActivityDecompressBinding.inflate(layoutInflater)
39+
setContentView(binding.root)
3840
setupOptionsMenu()
39-
updateMaterialActivityViews(decompress_coordinator, decompress_list, useTransparentNavigation = true, useTopSearchMenu = false)
40-
setupMaterialScrollListener(decompress_list, decompress_toolbar)
41+
binding.apply {
42+
updateMaterialActivityViews(decompressCoordinator, decompressList, useTransparentNavigation = true, useTopSearchMenu = false)
43+
setupMaterialScrollListener(decompressList, decompressToolbar)
44+
}
4145

4246
uri = intent.data
4347
if (uri == null) {
@@ -48,13 +52,13 @@ class DecompressActivity : SimpleActivity() {
4852
password = savedInstanceState?.getString(PASSWORD, null)
4953

5054
val realPath = getRealPathFromURI(uri!!)
51-
decompress_toolbar.title = realPath?.getFilenameFromPath() ?: Uri.decode(uri.toString().getFilenameFromPath())
55+
binding.decompressToolbar.title = realPath?.getFilenameFromPath() ?: Uri.decode(uri.toString().getFilenameFromPath())
5256
setupFilesList()
5357
}
5458

5559
override fun onResume() {
5660
super.onResume()
57-
setupToolbar(decompress_toolbar, NavigationIcon.Arrow)
61+
setupToolbar(binding.decompressToolbar, NavigationIcon.Arrow)
5862
}
5963

6064
override fun onSaveInstanceState(outState: Bundle) {
@@ -63,7 +67,7 @@ class DecompressActivity : SimpleActivity() {
6367
}
6468

6569
private fun setupOptionsMenu() {
66-
decompress_toolbar.setOnMenuItemClickListener { menuItem ->
70+
binding.decompressToolbar.setOnMenuItemClickListener { menuItem ->
6771
when (menuItem.itemId) {
6872
R.id.decompress -> decompressFiles()
6973
else -> return@setOnMenuItemClickListener false
@@ -90,12 +94,12 @@ class DecompressActivity : SimpleActivity() {
9094
currentPath = path
9195
try {
9296
val listItems = getFolderItems(currentPath)
93-
DecompressItemsAdapter(this, listItems, decompress_list) {
97+
DecompressItemsAdapter(this, listItems, binding.decompressList) {
9498
if ((it as ListItem).isDirectory) {
9599
updateCurrentPath(it.path)
96100
}
97101
}.apply {
98-
decompress_list.adapter = this
102+
binding.decompressList.adapter = this
99103
}
100104
} catch (e: Exception) {
101105
showErrorToast(e)

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

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,32 @@ import com.simplemobiletools.commons.helpers.NavigationIcon
1010
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1111
import com.simplemobiletools.filemanager.pro.R
1212
import com.simplemobiletools.filemanager.pro.adapters.ManageFavoritesAdapter
13+
import com.simplemobiletools.filemanager.pro.databinding.ActivityFavoritesBinding
1314
import com.simplemobiletools.filemanager.pro.extensions.config
14-
import kotlinx.android.synthetic.main.activity_favorites.*
1515

1616
class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
17+
private lateinit var binding: ActivityFavoritesBinding
1718

1819
override fun onCreate(savedInstanceState: Bundle?) {
1920
isMaterialActivity = true
2021
super.onCreate(savedInstanceState)
21-
setContentView(R.layout.activity_favorites)
22+
binding = ActivityFavoritesBinding.inflate(layoutInflater)
23+
setContentView(binding.root)
2224
setupOptionsMenu()
2325
updateFavorites()
24-
updateMaterialActivityViews(manage_favorites_coordinator, manage_favorites_list, useTransparentNavigation = true, useTopSearchMenu = false)
25-
setupMaterialScrollListener(manage_favorites_list, manage_favorites_toolbar)
26+
binding.apply {
27+
updateMaterialActivityViews(manageFavoritesCoordinator, manageFavoritesList, useTransparentNavigation = true, useTopSearchMenu = false)
28+
setupMaterialScrollListener(manageFavoritesList, manageFavoritesToolbar)
29+
}
2630
}
2731

2832
override fun onResume() {
2933
super.onResume()
30-
setupToolbar(manage_favorites_toolbar, NavigationIcon.Arrow)
34+
setupToolbar(binding.manageFavoritesToolbar, NavigationIcon.Arrow)
3135
}
3236

3337
private fun setupOptionsMenu() {
34-
manage_favorites_toolbar.setOnMenuItemClickListener { menuItem ->
38+
binding.manageFavoritesToolbar.setOnMenuItemClickListener { menuItem ->
3539
when (menuItem.itemId) {
3640
R.id.add_favorite -> addFavorite()
3741
else -> return@setOnMenuItemClickListener false
@@ -41,22 +45,24 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
4145
}
4246

4347
private fun updateFavorites() {
44-
val favorites = ArrayList<String>()
45-
config.favorites.mapTo(favorites) { it }
46-
manage_favorites_placeholder.beVisibleIf(favorites.isEmpty())
47-
manage_favorites_placeholder.setTextColor(getProperTextColor())
48+
binding.apply {
49+
val favorites = ArrayList<String>()
50+
config.favorites.mapTo(favorites) { it }
51+
manageFavoritesPlaceholder.beVisibleIf(favorites.isEmpty())
52+
manageFavoritesPlaceholder.setTextColor(getProperTextColor())
4853

49-
manage_favorites_placeholder_2.apply {
50-
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
51-
beVisibleIf(favorites.isEmpty())
52-
setTextColor(getProperPrimaryColor())
53-
setOnClickListener {
54-
addFavorite()
54+
manageFavoritesPlaceholder2.apply {
55+
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
56+
beVisibleIf(favorites.isEmpty())
57+
setTextColor(getProperPrimaryColor())
58+
setOnClickListener {
59+
addFavorite()
60+
}
5561
}
56-
}
5762

58-
ManageFavoritesAdapter(this, favorites, this, manage_favorites_list) { }.apply {
59-
manage_favorites_list.adapter = this
63+
ManageFavoritesAdapter(this@FavoritesActivity, favorites, this@FavoritesActivity, manageFavoritesList) { }.apply {
64+
manageFavoritesList.adapter = this
65+
}
6066
}
6167
}
6268

0 commit comments

Comments
 (0)