Skip to content

Commit c37cb37

Browse files
committed
refactor: update edge-to-edge implementation
1 parent 30925fe commit c37cb37

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ class DecompressActivity : SimpleActivity() {
4545
private var filename = ""
4646

4747
override fun onCreate(savedInstanceState: Bundle?) {
48-
isMaterialActivity = true
4948
super.onCreate(savedInstanceState)
5049
setContentView(binding.root)
5150
setupOptionsMenu()
5251
binding.apply {
53-
updateMaterialActivityViews(decompressCoordinator, decompressList, useTransparentNavigation = true, useTopSearchMenu = false)
52+
updateEdgeToEdge(topAppBar = decompressToolbar, scrollingView = decompressList)
5453
setupMaterialScrollListener(decompressList, decompressToolbar)
5554
}
5655

app/src/main/kotlin/org/fossify/filemanager/activities/FavoritesActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
1818
private val binding by viewBinding(ActivityFavoritesBinding::inflate)
1919

2020
override fun onCreate(savedInstanceState: Bundle?) {
21-
isMaterialActivity = true
2221
super.onCreate(savedInstanceState)
2322
setContentView(binding.root)
2423
setupOptionsMenu()
2524
updateFavorites()
2625
binding.apply {
27-
updateMaterialActivityViews(manageFavoritesCoordinator, manageFavoritesList, useTransparentNavigation = true, useTopSearchMenu = false)
26+
updateEdgeToEdge(topAppBar = manageFavoritesToolbar, scrollingView = manageFavoritesList)
2827
setupMaterialScrollListener(manageFavoritesList, manageFavoritesToolbar)
2928
}
3029
}

app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ import org.fossify.filemanager.interfaces.ItemOperationsListener
7575
import java.io.File
7676

7777
class MainActivity : SimpleActivity() {
78+
override var isSearchBarEnabled = true
79+
7880
companion object {
7981
private const val BACK_PRESS_TIMEOUT = 5000
8082
private const val PICKED_PATH = "picked_path"
@@ -91,7 +93,6 @@ class MainActivity : SimpleActivity() {
9193
private var mStoredShowTabs = 0
9294

9395
override fun onCreate(savedInstanceState: Bundle?) {
94-
isMaterialActivity = true
9596
super.onCreate(savedInstanceState)
9697
setContentView(binding.root)
9798
appLaunched(BuildConfig.APPLICATION_ID)
@@ -109,7 +110,7 @@ class MainActivity : SimpleActivity() {
109110
storeStateVariables()
110111
setupTabs()
111112

112-
updateMaterialActivityViews(binding.mainCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = true)
113+
updateEdgeToEdge(topAppBar = binding.mainSearchMenu.getToolbar())
113114

114115
if (savedInstanceState == null) {
115116
config.temporarilyShowHidden = false

app/src/main/kotlin/org/fossify/filemanager/activities/MimeTypesActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
4444
private var currentVolume = PRIMARY_VOLUME_NAME
4545

4646
override fun onCreate(savedInstanceState: Bundle?) {
47-
isMaterialActivity = true
4847
super.onCreate(savedInstanceState)
4948
setContentView(binding.root)
5049
setupOptionsMenu()
5150
refreshMenuItems()
5251
binding.apply {
53-
updateMaterialActivityViews(mimetypesCoordinator, mimetypesList, useTransparentNavigation = true, useTopSearchMenu = false)
52+
updateEdgeToEdge(topAppBar = mimetypesToolbar, scrollingView = mimetypesList)
5453
setupMaterialScrollListener(mimetypesList, mimetypesToolbar)
5554
}
5655

app/src/main/kotlin/org/fossify/filemanager/activities/ReadTextActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,11 @@ class ReadTextActivity : SimpleActivity() {
5151
private lateinit var searchClearBtn: ImageView
5252

5353
override fun onCreate(savedInstanceState: Bundle?) {
54-
isMaterialActivity = true
5554
super.onCreate(savedInstanceState)
5655
setContentView(binding.root)
5756
setupOptionsMenu()
5857
binding.apply {
59-
updateMaterialActivityViews(readTextCoordinator, readTextView, useTransparentNavigation = true, useTopSearchMenu = false)
58+
updateEdgeToEdge(topAppBar = readTextToolbar, scrollingView = readTextView)
6059
setupMaterialScrollListener(readTextHolder, readTextToolbar)
6160
}
6261

app/src/main/kotlin/org/fossify/filemanager/activities/SettingsActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ class SettingsActivity : SimpleActivity() {
2121
private val binding by viewBinding(ActivitySettingsBinding::inflate)
2222

2323
override fun onCreate(savedInstanceState: Bundle?) {
24-
isMaterialActivity = true
2524
super.onCreate(savedInstanceState)
2625
setContentView(binding.root)
2726
binding.apply {
28-
updateMaterialActivityViews(settingsCoordinator, settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)
27+
updateEdgeToEdge(topAppBar = settingsToolbar, scrollingView = settingsNestedScrollview)
2928
setupMaterialScrollListener(settingsNestedScrollview, settingsToolbar)
3029
}
3130
}

0 commit comments

Comments
 (0)