Skip to content

Commit 8501785

Browse files
committed
refactor: update edge-to-edge implementation
1 parent cc08a6c commit 8501785

4 files changed

Lines changed: 22 additions & 18 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
315315
topMargin = safeInsetTop
316316
}
317317

318-
val marginBottom =
319-
safeInsetBottom + navigationBarHeight + resources.getDimensionPixelSize(org.fossify.commons.R.dimen.bigger_margin)
318+
val systemBarsInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
319+
val marginBottom = systemBarsInsets.bottom + resources.getDimensionPixelSize(org.fossify.commons.R.dimen.bigger_margin)
320320

321321
binding.shutter.updateLayoutParams<ViewGroup.MarginLayoutParams> {
322322
bottomMargin = marginBottom

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,14 @@ class SettingsActivity : SimpleActivity() {
2626
setupOptionsMenu()
2727
refreshMenuItems()
2828

29-
updateEdgeToEdge(
30-
topAppBar = settingsToolbar,
31-
scrollingView = settingsNestedScrollview,
32-
)
33-
setupMaterialScrollListener(settingsNestedScrollview, settingsToolbar)
29+
setupEdgeToEdge(padBottomSystem = listOf(settingsNestedScrollview))
30+
setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsAppbar)
3431
}
3532
}
3633

3734
override fun onResume() {
3835
super.onResume()
39-
setupTopAppBar(binding.settingsToolbar, NavigationIcon.Arrow)
36+
setupTopAppBar(binding.settingsAppbar, NavigationIcon.Arrow)
4037

4138
setupCustomizeColors()
4239
setupUseEnglish()

app/src/main/res/layout/activity_settings.xml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,29 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent">
88

9-
<com.google.android.material.appbar.MaterialToolbar
10-
android:id="@+id/settings_toolbar"
9+
<org.fossify.commons.views.MyAppBarLayout
10+
android:id="@+id/settings_appbar"
1111
android:layout_width="match_parent"
12-
android:layout_height="?attr/actionBarSize"
13-
android:background="@color/color_primary"
14-
app:menu="@menu/menu"
15-
app:title="@string/settings"
16-
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
12+
android:layout_height="wrap_content">
13+
14+
<com.google.android.material.appbar.MaterialToolbar
15+
android:id="@+id/settings_toolbar"
16+
android:layout_width="match_parent"
17+
android:layout_height="?attr/actionBarSize"
18+
android:background="@color/color_primary"
19+
app:menu="@menu/menu"
20+
app:title="@string/settings"
21+
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
22+
23+
</org.fossify.commons.views.MyAppBarLayout>
1724

1825
<androidx.core.widget.NestedScrollView
1926
android:id="@+id/settings_nested_scrollview"
2027
android:layout_width="match_parent"
2128
android:layout_height="match_parent"
22-
android:layout_marginTop="?attr/actionBarSize"
2329
android:fillViewport="true"
24-
android:scrollbars="none">
30+
android:scrollbars="none"
31+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
2532

2633
<LinearLayout
2734
android:id="@+id/settings_holder"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ androidx-window = "1.5.0"
1111
androidx-camera = "1.4.2"
1212
androidx-ktx = "2.8.6"
1313
#Fossify
14-
commons = "5.4.0"
14+
commons = "6.0.0"
1515
#Gradle
1616
gradlePlugins-agp = "8.11.1"
1717
#build

0 commit comments

Comments
 (0)