Skip to content

Commit 4cc19c9

Browse files
committed
bind activities lazily
1 parent a380eb9 commit 4cc19c9

9 files changed

Lines changed: 12 additions & 21 deletions

File tree

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

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

29+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityDecompressBinding.inflate(layoutInflater) }
2930
private val allFiles = ArrayList<ListItem>()
30-
private lateinit var binding: ActivityDecompressBinding
3131
private var currentPath = ""
3232
private var uri: Uri? = null
3333
private var password: String? = null
@@ -36,7 +36,6 @@ class DecompressActivity : SimpleActivity() {
3636
override fun onCreate(savedInstanceState: Bundle?) {
3737
isMaterialActivity = true
3838
super.onCreate(savedInstanceState)
39-
binding = ActivityDecompressBinding.inflate(layoutInflater)
4039
setContentView(binding.root)
4140
setupOptionsMenu()
4241
binding.apply {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ import com.simplemobiletools.filemanager.pro.databinding.ActivityFavoritesBindin
1414
import com.simplemobiletools.filemanager.pro.extensions.config
1515

1616
class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
17-
private lateinit var binding: ActivityFavoritesBinding
17+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityFavoritesBinding.inflate(layoutInflater) }
1818

1919
override fun onCreate(savedInstanceState: Bundle?) {
2020
isMaterialActivity = true
2121
super.onCreate(savedInstanceState)
22-
binding = ActivityFavoritesBinding.inflate(layoutInflater)
2322
setContentView(binding.root)
2423
setupOptionsMenu()
2524
updateFavorites()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ class MainActivity : SimpleActivity() {
4646
private val BACK_PRESS_TIMEOUT = 5000
4747
private val MANAGE_STORAGE_RC = 201
4848
private val PICKED_PATH = "picked_path"
49-
private lateinit var binding: ActivityMainBinding
49+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMainBinding.inflate(layoutInflater) }
50+
5051
private var wasBackJustPressed = false
5152
private var mIsPasswordProtectionPending = false
5253
private var mWasProtectionHandled = false
@@ -60,7 +61,6 @@ class MainActivity : SimpleActivity() {
6061
override fun onCreate(savedInstanceState: Bundle?) {
6162
isMaterialActivity = true
6263
super.onCreate(savedInstanceState)
63-
binding = ActivityMainBinding.inflate(layoutInflater)
6464
setContentView(binding.root)
6565
appLaunched(BuildConfig.APPLICATION_ID)
6666
setupOptionsMenu()

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
@@ -32,7 +32,7 @@ import com.simplemobiletools.filemanager.pro.models.ListItem
3232
import java.util.Locale
3333

3434
class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
35-
private lateinit var binding: ActivityMimetypesBinding
35+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMimetypesBinding.inflate(layoutInflater) }
3636
private var isSearchOpen = false
3737
private var currentMimeType = ""
3838
private var lastSearchedText = ""
@@ -44,7 +44,6 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
4444
override fun onCreate(savedInstanceState: Bundle?) {
4545
isMaterialActivity = true
4646
super.onCreate(savedInstanceState)
47-
binding = ActivityMimetypesBinding.inflate(layoutInflater)
4847
setContentView(binding.root)
4948
setupOptionsMenu()
5049
refreshMenuItems()

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

Lines changed: 1 addition & 2 deletions
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 lateinit var binding: ActivityPdfViewerBinding
25+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityPdfViewerBinding.inflate(layoutInflater) }
2626
private var realFilePath = ""
2727
private var isFullScreen = false
2828
private var passwordDialog: EnterPasswordDialog? = null
@@ -31,7 +31,6 @@ class PDFViewerActivity : SimpleActivity() {
3131
showTransparentTop = true
3232

3333
super.onCreate(savedInstanceState)
34-
binding = ActivityPdfViewerBinding.inflate(layoutInflater)
3534
setContentView(binding.root)
3635

3736
if (checkAppSideloading()) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import java.io.OutputStream
3131
class ReadTextActivity : SimpleActivity() {
3232
private val SELECT_SAVE_FILE_INTENT = 1
3333
private val SELECT_SAVE_FILE_AND_EXIT_INTENT = 2
34+
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityReadTextBinding.inflate(layoutInflater) }
3435

3536
private var filePath = ""
3637
private var originalText = ""
@@ -39,7 +40,6 @@ class ReadTextActivity : SimpleActivity() {
3940
private var searchMatches = emptyList<Int>()
4041
private var isSearchActive = false
4142

42-
private lateinit var binding: ActivityReadTextBinding
4343
private lateinit var searchQueryET: MyEditText
4444
private lateinit var searchPrevBtn: ImageView
4545
private lateinit var searchNextBtn: ImageView
@@ -48,7 +48,6 @@ class ReadTextActivity : SimpleActivity() {
4848
override fun onCreate(savedInstanceState: Bundle?) {
4949
isMaterialActivity = true
5050
super.onCreate(savedInstanceState)
51-
binding = ActivityReadTextBinding.inflate(layoutInflater)
5251
setContentView(binding.root)
5352
setupOptionsMenu()
5453
binding.apply {

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

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

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

1818
override fun onCreate(savedInstanceState: Bundle?) {
1919
super.onCreate(savedInstanceState)
20-
binding = ActivitySaveAsBinding.inflate(layoutInflater)
2120
setContentView(binding.root)
2221

2322
if (intent.action == Intent.ACTION_SEND && intent.extras?.containsKey(Intent.EXTRA_STREAM) == true) {

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

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

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

2323
override fun onCreate(savedInstanceState: Bundle?) {
2424
isMaterialActivity = true
2525
super.onCreate(savedInstanceState)
26-
binding = ActivitySettingsBinding.inflate(layoutInflater)
2726
setContentView(binding.root)
2827
binding.apply {
2928
updateMaterialActivityViews(settingsCoordinator, settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -942,12 +942,10 @@ class ItemsAdapter(
942942
else -> {
943943
if (isListViewType) {
944944
ItemFileDirList
945+
} else if (viewType == TYPE_DIR) {
946+
ItemDirGrid
945947
} else {
946-
if (viewType == TYPE_DIR) {
947-
ItemDirGrid
948-
} else {
949-
ItemFileGrid
950-
}
948+
ItemFileGrid
951949
}
952950
}
953951
}

0 commit comments

Comments
 (0)