Skip to content

Commit 78b1d63

Browse files
committed
refactor: migrate away from deprecated onBackPressed()
1 parent 1df3eb1 commit 78b1d63

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class MainActivity : SimpleActivity(), Calculator {
102102
override fun onResume() {
103103
super.onResume()
104104
setupTopAppBar(binding.mainAppbar!!)
105+
setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainAppbar)
105106
if (storedTextColor != config.textColor) {
106107
binding.calculatorHolder?.let { updateViewColors(it, getProperTextColor()) }
107108
}

app/src/main/res/layout-land/activity_main.xml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,28 @@
88
tools:context="org.fossify.math.activities.MainActivity"
99
tools:ignore="HardcodedText">
1010

11-
<com.google.android.material.appbar.MaterialToolbar
12-
android:id="@+id/main_toolbar"
11+
<org.fossify.commons.views.MyAppBarLayout
12+
android:id="@+id/main_appbar"
1313
android:layout_width="match_parent"
14-
android:layout_height="?attr/actionBarSize"
15-
android:background="@color/color_primary"
16-
app:menu="@menu/menu"
17-
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
14+
android:layout_height="wrap_content">
15+
16+
<com.google.android.material.appbar.MaterialToolbar
17+
android:id="@+id/main_toolbar"
18+
android:layout_width="match_parent"
19+
android:layout_height="?attr/actionBarSize"
20+
android:background="@color/color_primary"
21+
app:menu="@menu/menu"
22+
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
23+
24+
</org.fossify.commons.views.MyAppBarLayout>
1825

1926
<androidx.core.widget.NestedScrollView
2027
android:id="@+id/main_nested_scrollview"
2128
android:layout_width="match_parent"
2229
android:layout_height="match_parent"
23-
android:layout_marginTop="?attr/actionBarSize"
2430
android:fillViewport="true"
25-
android:scrollbars="none">
31+
android:scrollbars="none"
32+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
2633

2734
<LinearLayout
2835
android:id="@+id/calculator_holder"

0 commit comments

Comments
 (0)