Skip to content

Commit f7d9051

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

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class DecompressActivity : SimpleActivity() {
6969

7070
override fun onResume() {
7171
super.onResume()
72-
setupToolbar(binding.decompressToolbar, NavigationIcon.Arrow)
72+
setupTopAppBar(binding.decompressToolbar, NavigationIcon.Arrow)
7373
}
7474

7575
override fun onSaveInstanceState(outState: Bundle) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class FavoritesActivity : SimpleActivity(), RefreshRecyclerViewListener {
3030

3131
override fun onResume() {
3232
super.onResume()
33-
setupToolbar(binding.manageFavoritesToolbar, NavigationIcon.Arrow)
33+
setupTopAppBar(binding.manageFavoritesToolbar, NavigationIcon.Arrow)
3434
}
3535

3636
private fun setupOptionsMenu() {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ class MainActivity : SimpleActivity() {
110110
storeStateVariables()
111111
setupTabs()
112112

113-
updateEdgeToEdge(topAppBar = binding.mainSearchMenu.getToolbar())
113+
updateEdgeToEdge(
114+
topAppBar = binding.mainMenu.getToolbar(),
115+
bottomBar = binding.mainTabsHolder
116+
)
114117

115118
if (savedInstanceState == null) {
116119
config.temporarilyShowHidden = false
@@ -275,7 +278,6 @@ class MainActivity : SimpleActivity() {
275278
}
276279

277280
private fun updateMenuColors() {
278-
updateStatusbarColor(getProperBackgroundColor())
279281
binding.mainMenu.updateColors()
280282
}
281283

@@ -418,7 +420,6 @@ class MainActivity : SimpleActivity() {
418420
}
419421

420422
val bottomBarColor = getBottomNavigationBackgroundColor()
421-
updateNavigationBarColor(bottomBarColor)
422423
mainTabsHolder.setBackgroundColor(bottomBarColor)
423424
}
424425
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
8484

8585
override fun onResume() {
8686
super.onResume()
87-
setupToolbar(binding.mimetypesToolbar, NavigationIcon.Arrow, searchMenuItem = searchMenuItem)
87+
setupTopAppBar(binding.mimetypesToolbar, NavigationIcon.Arrow, searchMenuItem = searchMenuItem)
8888
}
8989

9090
private fun refreshMenuItems() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class ReadTextActivity : SimpleActivity() {
9595

9696
override fun onResume() {
9797
super.onResume()
98-
setupToolbar(binding.readTextToolbar, NavigationIcon.Arrow)
98+
setupTopAppBar(binding.readTextToolbar, NavigationIcon.Arrow)
9999
}
100100

101101
override fun onSaveInstanceState(outState: Bundle) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class SaveAsActivity : SimpleActivity() {
7979

8080
override fun onResume() {
8181
super.onResume()
82-
setupToolbar(binding.activitySaveAsToolbar, NavigationIcon.Arrow)
82+
setupTopAppBar(binding.activitySaveAsToolbar, NavigationIcon.Arrow)
8383
}
8484

8585
private fun sanitizeFilename(filename: String): String {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class SettingsActivity : SimpleActivity() {
3131

3232
override fun onResume() {
3333
super.onResume()
34-
setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
34+
setupTopAppBar(binding.settingsToolbar, NavigationIcon.Arrow)
3535

3636
setupCustomizeColors()
3737
setupUseEnglish()

0 commit comments

Comments
 (0)