Skip to content

Commit 45432c9

Browse files
committed
refactor: update edge-to-edge implementation
1 parent 3cc1409 commit 45432c9

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

app/src/main/kotlin/org/fossify/phone/activities/ConferenceActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ class ConferenceActivity : SimpleActivity() {
1111
private val binding by viewBinding(ActivityConferenceBinding::inflate)
1212

1313
override fun onCreate(savedInstanceState: Bundle?) {
14-
isMaterialActivity = true
1514
super.onCreate(savedInstanceState)
1615
setContentView(binding.root)
1716
binding.apply {
18-
updateMaterialActivityViews(conferenceCoordinator, conferenceList, useTransparentNavigation = true, useTopSearchMenu = false)
17+
updateEdgeToEdge(topAppBar = conferenceToolbar, scrollingView = conferenceList)
1918
setupMaterialScrollListener(conferenceList, conferenceToolbar)
2019
conferenceList.adapter = ConferenceCallsAdapter(this@ConferenceActivity, conferenceList, ArrayList(CallManager.getConferenceCalls())) {}
2120
}

app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,9 @@ class DialpadActivity : SimpleActivity() {
9898
hasRussianLocale = Locale.getDefault().language == "ru"
9999

100100
binding.apply {
101-
updateMaterialActivityViews(
102-
mainCoordinatorLayout = dialpadCoordinator,
103-
nestedView = dialpadHolder,
104-
useTransparentNavigation = true,
105-
useTopSearchMenu = false
101+
updateEdgeToEdge(
102+
topAppBar = dialpadToolbar,
103+
scrollingView = dialpadList,
106104
)
107105
setupMaterialScrollListener(dialpadList, dialpadToolbar)
108106
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ import org.greenrobot.eventbus.Subscribe
4848
import org.greenrobot.eventbus.ThreadMode
4949

5050
class MainActivity : SimpleActivity() {
51+
override var isSearchBarEnabled = true
52+
5153
private val binding by viewBinding(ActivityMainBinding::inflate)
5254

5355
private var launchedDialer = false
@@ -57,13 +59,12 @@ class MainActivity : SimpleActivity() {
5759
var cachedContacts = ArrayList<Contact>()
5860

5961
override fun onCreate(savedInstanceState: Bundle?) {
60-
isMaterialActivity = true
6162
super.onCreate(savedInstanceState)
6263
setContentView(binding.root)
6364
appLaunched(BuildConfig.APPLICATION_ID)
6465
setupOptionsMenu()
6566
refreshMenuItems()
66-
updateMaterialActivityViews(binding.mainCoordinator, binding.mainHolder, useTransparentNavigation = false, useTopSearchMenu = true)
67+
updateEdgeToEdge(topAppBar = binding.mainSearchMenu.getToolbar())
6768

6869
EventBus.getDefault().register(this)
6970
launchedDialer = savedInstanceState?.getBoolean(OPEN_DIAL_PAD_AT_LAUNCH) ?: false

app/src/main/kotlin/org/fossify/phone/activities/ManageSpeedDialActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener {
2727
private var speedDialValues = mutableListOf<SpeedDial>()
2828

2929
override fun onCreate(savedInstanceState: Bundle?) {
30-
isMaterialActivity = true
3130
super.onCreate(savedInstanceState)
3231
setContentView(binding.root)
3332

3433
binding.apply {
35-
updateMaterialActivityViews(manageSpeedDialCoordinator, manageSpeedDialHolder, useTransparentNavigation = true, useTopSearchMenu = false)
34+
updateEdgeToEdge(topAppBar = manageSpeedDialToolbar, scrollingView = manageSpeedDialList)
3635
setupMaterialScrollListener(manageSpeedDialScrollview, manageSpeedDialToolbar)
3736

3837
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,13 @@ class SettingsActivity : SimpleActivity() {
7777
}
7878

7979
override fun onCreate(savedInstanceState: Bundle?) {
80-
isMaterialActivity = true
8180
super.onCreate(savedInstanceState)
8281
setContentView(binding.root)
8382
setupOptionsMenu()
8483
refreshMenuItems()
8584

8685
binding.apply {
87-
updateMaterialActivityViews(settingsCoordinator, settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)
86+
updateEdgeToEdge(topAppBar = settingsToolbar, scrollingView = settingsNestedScrollview)
8887
setupMaterialScrollListener(settingsNestedScrollview, settingsToolbar)
8988
}
9089
}

0 commit comments

Comments
 (0)