Skip to content

Commit 4a09d03

Browse files
authored
Merge pull request #740 from fatihergin/feature/use-binding-extensions-to-inflate-activies
use binding extension to inflate activities
2 parents 9c730b8 + 7473587 commit 4a09d03

8 files changed

Lines changed: 20 additions & 13 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DecompressActivity : SimpleActivity() {
2626
private const val PASSWORD = "password"
2727
}
2828

29-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityDecompressBinding.inflate(layoutInflater) }
29+
private val binding by viewBinding(ActivityDecompressBinding::inflate)
3030
private val allFiles = ArrayList<ListItem>()
3131
private var currentPath = ""
3232
private var uri: Uri? = null

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog
66
import com.simplemobiletools.commons.extensions.beVisibleIf
77
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
88
import com.simplemobiletools.commons.extensions.getProperTextColor
9+
import com.simplemobiletools.commons.extensions.viewBinding
910
import com.simplemobiletools.commons.helpers.NavigationIcon
1011
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1112
import com.simplemobiletools.filemanager.pro.R
@@ -14,7 +15,7 @@ import com.simplemobiletools.filemanager.pro.databinding.ActivityFavoritesBindin
1415
import com.simplemobiletools.filemanager.pro.extensions.config
1516

1617
class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
17-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityFavoritesBinding.inflate(layoutInflater) }
18+
private val binding by viewBinding(ActivityFavoritesBinding::inflate)
1819

1920
override fun onCreate(savedInstanceState: Bundle?) {
2021
isMaterialActivity = true

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@ import me.grantland.widget.AutofitHelper
4343
import java.io.File
4444

4545
class MainActivity : SimpleActivity() {
46-
private val BACK_PRESS_TIMEOUT = 5000
47-
private val MANAGE_STORAGE_RC = 201
48-
private val PICKED_PATH = "picked_path"
49-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMainBinding.inflate(layoutInflater) }
46+
companion object {
47+
private const val BACK_PRESS_TIMEOUT = 5000
48+
private const val MANAGE_STORAGE_RC = 201
49+
private const val PICKED_PATH = "picked_path"
50+
}
51+
52+
private val binding by viewBinding(ActivityMainBinding::inflate)
5053

5154
private var wasBackJustPressed = false
5255
private var mIsPasswordProtectionPending = false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import com.simplemobiletools.filemanager.pro.models.ListItem
3232
import java.util.Locale
3333

3434
class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
35-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMimetypesBinding.inflate(layoutInflater) }
35+
private val binding by viewBinding(ActivityMimetypesBinding::inflate)
3636
private var isSearchOpen = false
3737
private var currentMimeType = ""
3838
private var lastSearchedText = ""

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import com.simplemobiletools.filemanager.pro.extensions.showSystemUI
2222
import com.simplemobiletools.filemanager.pro.helpers.PdfDocumentAdapter
2323

2424
class PDFViewerActivity : SimpleActivity() {
25-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityPdfViewerBinding.inflate(layoutInflater) }
25+
private val binding by viewBinding(ActivityPdfViewerBinding::inflate)
2626
private var realFilePath = ""
2727
private var isFullScreen = false
2828
private var passwordDialog: EnterPasswordDialog? = null

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ import java.io.File
2929
import java.io.OutputStream
3030

3131
class ReadTextActivity : SimpleActivity() {
32-
private val SELECT_SAVE_FILE_INTENT = 1
33-
private val SELECT_SAVE_FILE_AND_EXIT_INTENT = 2
34-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityReadTextBinding.inflate(layoutInflater) }
32+
companion object {
33+
private const val SELECT_SAVE_FILE_INTENT = 1
34+
private const val SELECT_SAVE_FILE_AND_EXIT_INTENT = 2
35+
}
36+
37+
private val binding by viewBinding(ActivityReadTextBinding::inflate)
3538

3639
private var filePath = ""
3740
private var originalText = ""

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.simplemobiletools.filemanager.pro.extensions.config
1313
import java.io.File
1414

1515
class SaveAsActivity : SimpleActivity() {
16-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivitySaveAsBinding.inflate(layoutInflater) }
16+
private val binding by viewBinding(ActivitySaveAsBinding::inflate)
1717

1818
override fun onCreate(savedInstanceState: Bundle?) {
1919
super.onCreate(savedInstanceState)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import java.util.Locale
1818
import kotlin.system.exitProcess
1919

2020
class SettingsActivity : SimpleActivity() {
21-
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivitySettingsBinding.inflate(layoutInflater) }
21+
private val binding by viewBinding(ActivitySettingsBinding::inflate)
2222

2323
override fun onCreate(savedInstanceState: Bundle?) {
2424
isMaterialActivity = true

0 commit comments

Comments
 (0)