chore: bump target SDK version to 35

CHANGELOG.md

@@ -6,6 +6,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.2] - 2025-10-18
 ### Changed
 - Updated translations

app/detekt-baseline.xml

@@ -28,7 +28,6 @@
     <ID>MaxLineLength:VectorFloodFiller.kt$VectorFloodFiller$// if we're not below the bottom of the bitmap and the pixel below this one is within the color tolerance</ID>
     <ID>MaxLineLength:VectorFloodFiller.kt$VectorFloodFiller$return red &gt;= startColorRed - tolerance &amp;&amp; red &lt;= startColorRed + tolerance &amp;&amp; green &gt;= startColorGreen - tolerance &amp;&amp; green &lt;= startColorGreen + tolerance &amp;&amp; blue &gt;= startColorBlue - tolerance &amp;&amp; blue &lt;= startColorBlue + tolerance</ID>
     <ID>NestedBlockDepth:MyPath.kt$MyPath$fun readObject(pathData: String, activity: Activity)</ID>
-    <ID>ReturnCount:MyCanvas.kt$MyCanvas$override fun onTouchEvent(event: MotionEvent): Boolean</ID>
     <ID>SerialVersionUIDInSerializableClass:MyPath.kt$MyPath : PathSerializable</ID>
     <ID>SerialVersionUIDInSerializableClass:Svg.kt$Svg$SPath : Serializable</ID>
     <ID>SerialVersionUIDInSerializableClass:Svg.kt$Svg$SRect : Serializable</ID>

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

@@ -103,6 +103,10 @@ class MainActivity : SimpleActivity(), CanvasListener {
         setupOptionsMenu()
         refreshMenuItems()
 
+        setupEdgeToEdge(
+            padBottomSystem = listOf(binding.mainScrollview, binding.strokeWidthBar),
+        )
+
         eyeDropper = EyeDropper(binding.myCanvas) { selectedColor ->
             setColor(selectedColor)
         }
@@ -163,7 +167,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
 
     override fun onResume() {
         super.onResume()
-        setupToolbar(binding.mainToolbar, statusBarColor = getProperBackgroundColor())
+        setupTopAppBar(binding.mainAppbar, topBarColor = getProperBackgroundColor())
 
         binding.apply {
             val isShowBrushSizeEnabled = config.showBrushSize
@@ -234,7 +238,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
         }
     }
 
-    override fun onBackPressed() {
+    override fun onBackPressedCompat(): Boolean {
         val hasUnsavedChanges = savedPathsHash != binding.myCanvas.getDrawingHashCode()
         if (hasUnsavedChanges && System.currentTimeMillis() - lastSavePromptTS > SAVE_DISCARD_PROMPT_INTERVAL) {
             lastSavePromptTS = System.currentTimeMillis()
@@ -248,12 +252,12 @@ class MainActivity : SimpleActivity(), CanvasListener {
                 if (it) {
                     trySaveImage()
                 } else {
-                    super.onBackPressed()
+                    performDefaultBack()
                 }
             }
-        } else {
-            super.onBackPressed()
+            return true
         }
+        return false
     }
 
     private fun launchSettings() {

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

@@ -15,24 +15,18 @@ class SettingsActivity : SimpleActivity() {
     private val binding by viewBinding(ActivitySettingsBinding::inflate)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        isMaterialActivity = true
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
         binding.apply {
-            updateMaterialActivityViews(
-                settingsCoordinator,
-                settingsHolder,
-                useTransparentNavigation = true,
-                useTopSearchMenu = false
-            )
-            setupMaterialScrollListener(settingsNestedScrollview, settingsToolbar)
+            setupEdgeToEdge(padBottomSystem = listOf(settingsNestedScrollview))
+            setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsAppbar)
         }
     }
 
     override fun onResume() {
         super.onResume()
-        setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.settingsAppbar, NavigationIcon.Arrow)
 
         setupCustomizeColors()
         setupUseEnglish()

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

@@ -5,21 +5,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <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>
 
     <org.fossify.commons.views.MyScrollView
         android:id="@+id/main_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">
 
         <RelativeLayout
             android:id="@+id/main_holder"

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

@@ -6,21 +6,28 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/settings_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/settings_appbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:title="@string/settings"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/settings_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/settings"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/settings_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/settings_holder"

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:

gradle/libs.versions.toml

@@ -7,12 +7,12 @@ detektCompose = "0.4.27"
 #AndroidX
 androidx-print = "1.1.0"
 #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"

settings.gradle.kts

@@ -11,6 +11,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven { setUrl("https://jitpack.io") }
+        mavenLocal()
     }
 }
 include(":app")