Skip to content

Commit ce4bb54

Browse files
committed
refactor: update edge-to-edge implementation
1 parent 75b5980 commit ce4bb54

File tree

4 files changed

+7
-14
lines changed

4 files changed

+7
-14
lines changed

app/src/main/kotlin/org/fossify/clock/activities/AlarmActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class AlarmActivity : SimpleActivity() {
5252
private val binding by viewBinding(ActivityAlarmBinding::inflate)
5353

5454
override fun onCreate(savedInstanceState: Bundle?) {
55-
isMaterialActivity = true
5655
super.onCreate(savedInstanceState)
5756
setContentView(binding.root)
5857
showOverLockscreen()

app/src/main/kotlin/org/fossify/clock/activities/IntentHandlerActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class IntentHandlerActivity : SimpleActivity() {
5858
}
5959

6060
override fun onCreate(savedInstanceState: Bundle?) {
61-
isMaterialActivity = true
6261
super.onCreate(savedInstanceState)
6362

6463
handleIntent(intent)

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,16 @@ class MainActivity : SimpleActivity() {
6565
private val binding: ActivityMainBinding by viewBinding(ActivityMainBinding::inflate)
6666

6767
override fun onCreate(savedInstanceState: Bundle?) {
68-
isMaterialActivity = true
6968
super.onCreate(savedInstanceState)
7069
setContentView(binding.root)
7170
appLaunched(BuildConfig.APPLICATION_ID)
7271
setupOptionsMenu()
7372
refreshMenuItems()
7473

75-
updateMaterialActivityViews(
76-
mainCoordinatorLayout = binding.mainCoordinator,
77-
nestedView = binding.mainHolder,
78-
useTransparentNavigation = false,
79-
useTopSearchMenu = false
74+
updateEdgeToEdge(
75+
topAppBar = binding.mainToolbar,
76+
scrollingView = binding.viewPager,
77+
bottomBar = binding.mainTabsHolder
8078
)
8179

8280
storeStateVariables()

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,12 @@ class SettingsActivity : SimpleActivity() {
6969
}
7070

7171
override fun onCreate(savedInstanceState: Bundle?) {
72-
isMaterialActivity = true
7372
super.onCreate(savedInstanceState)
7473
setContentView(binding.root)
7574

76-
updateMaterialActivityViews(
77-
mainCoordinatorLayout = binding.settingsCoordinator,
78-
nestedView = binding.settingsHolder,
79-
useTransparentNavigation = true,
80-
useTopSearchMenu = false
75+
updateEdgeToEdge(
76+
topAppBar = binding.settingsToolbar,
77+
scrollingView = binding.settingsNestedScrollview,
8178
)
8279
setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsToolbar)
8380
}

0 commit comments

Comments
 (0)