chore: bump target SDK version to 35 (#132)

* chore: bump target SDK version to 35 * chore: bump target SDK version to 36 * refactor: update edge-to-edge implementation * refactor: update edge-to-edge implementation * refactor: update edge-to-edge implementation * refactor: migrate away from deprecated onBackPressed() * chore(deps): update org.fossify.commons to 5.5.0 * docs: update changelog * build: bump detekt return count limit * chore: update lint baselines
2025-12-23 15:51:26 -05:00 · 2025-10-26 22:57:46 +05:30
parent 335f117666
commit ba8a43eee2
14 changed files with 276 additions and 220 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+### Changed
+
+- Compatibility updates for Android 15 & 16
+
 ## [1.1.0] - 2025-07-05

 ### Added
--- a/app/detekt-baseline.xml
+++ b/app/detekt-baseline.xml
@@ -27,8 +27,6 @@
    <ID>NestedBlockDepth:CalculatorImpl.kt$CalculatorImpl$fun handleOperation(operation: String)</ID>
    <ID>NestedBlockDepth:ConverterView.kt$ConverterView$fun deleteCharacter()</ID>
    <ID>NestedBlockDepth:ConverterView.kt$ConverterView$private fun updateBottomValue()</ID>
-    <ID>ReturnCount:CalculatorImpl.kt$CalculatorImpl$fun turnToNegative(): Boolean</ID>
-    <ID>ReturnCount:ConverterView.kt$ConverterView$private fun checkTemperatureLimits(value: String): String</ID>
    <ID>TooGenericExceptionCaught:Context.kt$e: Exception</ID>
    <ID>TooManyFunctions:CalculatorImpl.kt$CalculatorImpl</ID>
    <ID>TooManyFunctions:ConverterView.kt$ConverterView : LinearLayout</ID>
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
--- a/app/src/main/kotlin/org/fossify/math/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/math/activities/MainActivity.kt
@@ -51,19 +51,13 @@ class MainActivity : SimpleActivity(), Calculator {
    private val binding by viewBinding(ActivityMainBinding::inflate)

    override fun onCreate(savedInstanceState: Bundle?) {
-        isMaterialActivity = true
        super.onCreate(savedInstanceState)
        setContentView(binding.root)
        appLaunched(BuildConfig.APPLICATION_ID)
        setupOptionsMenu()
        refreshMenuItems()
-        updateMaterialActivityViews(
-            mainCoordinatorLayout = binding.mainCoordinator,
-            nestedView = null,
-            useTransparentNavigation = false,
-            useTopSearchMenu = false
-        )
-        setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainToolbar)
+        setupEdgeToEdge(padBottomSystem = listOf(binding.mainNestedScrollview))
+        setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainAppbar!!)

        if (savedInstanceState != null) {
            saveCalculatorState = savedInstanceState.getCharSequence(CALCULATOR_STATE) as String
@@ -107,7 +101,8 @@ class MainActivity : SimpleActivity(), Calculator {

    override fun onResume() {
        super.onResume()
-        setupToolbar(binding.mainToolbar)
+        setupTopAppBar(binding.mainAppbar!!)
+        setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainAppbar)
        if (storedTextColor != config.textColor) {
            binding.calculatorHolder?.let { updateViewColors(it, getProperTextColor()) }
        }
--- a/app/src/main/kotlin/org/fossify/math/activities/UnitConverterActivity.kt
+++ b/app/src/main/kotlin/org/fossify/math/activities/UnitConverterActivity.kt
@@ -39,7 +39,6 @@ class UnitConverterActivity : SimpleActivity(), ConverterView.OnUnitChangedListe
    }

    override fun onCreate(savedInstanceState: Bundle?) {
-        isMaterialActivity = true
        super.onCreate(savedInstanceState)
        setContentView(binding.root)

@@ -48,13 +47,8 @@ class UnitConverterActivity : SimpleActivity(), ConverterView.OnUnitChangedListe
            setupOptionsMenu()
        }

-        updateMaterialActivityViews(
-            mainCoordinatorLayout = binding.unitConverterCoordinator,
-            nestedView = null,
-            useTransparentNavigation = false,
-            useTopSearchMenu = false
-        )
-        setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterToolbar)
+        setupEdgeToEdge(padBottomSystem = listOf(binding.nestedScrollview))
+        setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterAppbar)

        val converter = Converter.ALL.getOrNull(intent.getIntExtra(EXTRA_CONVERTER_ID, 0))

@@ -114,7 +108,7 @@ class UnitConverterActivity : SimpleActivity(), ConverterView.OnUnitChangedListe
    override fun onResume() {
        super.onResume()

-        setupToolbar(binding.unitConverterToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.unitConverterAppbar, NavigationIcon.Arrow)
        binding.viewUnitConverter.viewConverter.root.updateColors()
        binding.viewUnitConverter.converterHolder.let {
            updateViewColors(it, getProperTextColor())
--- a/app/src/main/kotlin/org/fossify/math/activities/UnitConverterPickerActivity.kt
+++ b/app/src/main/kotlin/org/fossify/math/activities/UnitConverterPickerActivity.kt
@@ -16,16 +16,13 @@ class UnitConverterPickerActivity : SimpleActivity() {
    private val binding by viewBinding(ActivityUnitConverterPickerBinding::inflate)

    override fun onCreate(savedInstanceState: Bundle?) {
-        isMaterialActivity = true
        super.onCreate(savedInstanceState)
        setContentView(binding.root)
-        updateMaterialActivityViews(
-            mainCoordinatorLayout = binding.unitConverterPickerCoordinator,
-            nestedView = null,
-            useTransparentNavigation = false,
-            useTopSearchMenu = false
+        setupEdgeToEdge(padBottomSystem = listOf(binding.unitTypesGrid))
+        setupMaterialScrollListener(
+            binding.unitTypesGrid,
+            binding.unitConverterPickerAppbar
        )
-        setupMaterialScrollListener(binding.unitTypesGrid, binding.unitConverterPickerToolbar)

        binding.unitTypesGrid.layoutManager =
            AutoGridLayoutManager(this, resources.getDimensionPixelSize(R.dimen.unit_type_size))
@@ -42,7 +39,7 @@ class UnitConverterPickerActivity : SimpleActivity() {
    override fun onResume() {
        super.onResume()

-        setupToolbar(binding.unitConverterPickerToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.unitConverterPickerAppbar, NavigationIcon.Arrow)

        if (config.preventPhoneFromSleeping) {
            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
--- a/app/src/main/kotlin/org/fossify/math/activities/WidgetConfigureActivity.kt
+++ b/app/src/main/kotlin/org/fossify/math/activities/WidgetConfigureActivity.kt
@@ -40,6 +40,7 @@ class WidgetConfigureActivity : SimpleActivity() {
        super.onCreate(savedInstanceState)
        setResult(RESULT_CANCELED)
        setContentView(binding.root)
+        setupEdgeToEdge(padTopSystem = listOf(binding.root), padBottomSystem = listOf(binding.root))
        initVariables()

        val isCustomizingColors = intent.extras?.getBoolean(IS_CUSTOMIZING_COLORS) ?: false
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -8,21 +8,28 @@
    tools:context="org.fossify.math.activities.MainActivity"
    tools:ignore="HardcodedText">

-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/main_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/main_appbar"
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:menu="@menu/menu"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/main_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>

    <androidx.core.widget.NestedScrollView
        android:id="@+id/main_nested_scrollview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
        android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <LinearLayout
            android:id="@+id/calculator_holder"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,21 +8,28 @@
    tools:context="org.fossify.math.activities.MainActivity"
    tools:ignore="HardcodedText">

-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/main_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/main_appbar"
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:menu="@menu/menu"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/main_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>

    <androidx.core.widget.NestedScrollView
        android:id="@+id/main_nested_scrollview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
        android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <include
            layout="@layout/view_calculator"
--- a/app/src/main/res/layout/activity_unit_converter.xml
+++ b/app/src/main/res/layout/activity_unit_converter.xml
@@ -9,20 +9,27 @@
    tools:context="org.fossify.math.activities.UnitConverterActivity"
    tools:ignore="HardcodedText">

-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/unit_converter_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/unit_converter_appbar"
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/unit_converter_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>

    <androidx.core.widget.NestedScrollView
        android:id="@+id/nested_scrollview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
        android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <include
            android:id="@+id/view_unit_converter"
--- a/app/src/main/res/layout/activity_unit_converter_picker.xml
+++ b/app/src/main/res/layout/activity_unit_converter_picker.xml
@@ -9,22 +9,29 @@
    tools:context="org.fossify.math.activities.UnitConverterActivity"
    tools:ignore="HardcodedText">

-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/unit_converter_picker_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/unit_converter_picker_appbar"
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/unit_converter_picker_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>

    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/unit_types_grid"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_marginStart="@dimen/activity_margin"
-        android:layout_marginTop="?attr/actionBarSize"
        android:layout_marginEnd="@dimen/activity_margin"
        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
        app:spanCount="4"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
        tools:itemCount="20"
        tools:listitem="@layout/item_unit_type" />

--- a/detekt.yml
+++ b/detekt.yml
@@ -40,6 +40,11 @@ style:
    maxLineLength: 120
    excludePackageStatements: true
    excludeImportStatements: true
+  ReturnCount:
+    active: true
+    max: 4
+    excludeGuardClauses: true
+    excludes: ["**/test/**", "**/androidTest/**"]

 naming:
  FunctionNaming:
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,12 +21,12 @@ evalex = "3.5.0"
 #Room
 room = "2.8.2"
 #Fossify
-commons = "5.4.0"
+commons = "5.5.0"
 #Gradle
 gradlePlugins-agp = "8.11.1"
 #build
-app-build-compileSDKVersion = "34"
-app-build-targetSDK = "34"
+app-build-compileSDKVersion = "36"
+app-build-targetSDK = "36"
 app-build-minimumSDK = "26"
 app-build-javaVersion = "VERSION_17"
 app-build-kotlinJVMTarget = "17"
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,6 +11,7 @@ dependencyResolutionManagement {
        google()
        mavenCentral()
        maven { setUrl("https://jitpack.io") }
+        mavenLocal()
    }
 }
 include(":app")