From ae8364965eeb6cb03a524cd77c9c733826929810 Mon Sep 17 00:00:00 2001
From: Paul Konstantin Gerke <paulkgerke@craftware.info>
Date: Sun, 14 Dec 2025 01:51:57 +0100
Subject: [PATCH 1/5] Implement edge-to-edge mode in the most simple manner,
 masking out the top-bar

---
 app/build.gradle                              |  8 +++----
 .../babybuddywidgets/MainActivity.kt          | 22 +++++++++++++++++++
 app/src/main/res/values-night/themes.xml      |  3 +--
 app/src/main/res/values/themes.xml            |  3 +--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 056fc54..5b72c9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,12 +80,12 @@ preBuild.dependsOn(invokeResourcesMakefile)
 preBuild.dependsOn(invokeHelpMakefile)
 
 android {
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId "eu.pkgsoftware.babybuddywidgets"
         minSdkVersion 27
-        targetSdk 35
+        targetSdk 36
         versionCode 53
         versionName "2.6.3"
 
@@ -147,12 +147,12 @@ dependencies {
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     implementation "androidx.camera:camera-view:$camerax_version"
 
-    implementation 'androidx.core:core-ktx:1.16.0'
+    implementation 'androidx.core:core-ktx:1.17.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'androidx.preference:preference:1.2.1'
+    implementation "androidx.preference:preference-ktx:1.2.1"
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
index 1fb715f..e11aada 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -9,6 +9,9 @@ import android.view.MotionEvent
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.FragmentContainerView
 import androidx.navigation.Navigation
 import androidx.preference.PreferenceManager
@@ -126,16 +129,26 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowCompat.enableEdgeToEdge(window)
 
         binding = ActivityMainBinding.inflate(
             layoutInflater
         ).let {
+            ViewCompat.setOnApplyWindowInsetsListener(it.root) { v, insets ->
+                val systemBars = insets.getInsets(
+                    WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+                )
+                v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+                WindowInsetsCompat.CONSUMED
+            }
+
             setContentView(it.root)
             setSupportActionBar(it.toolbar)
             it
         }
         enableBackNavigationButton(false)
         tutorialAccess
+
     }
 
     override fun onStart() {
@@ -382,17 +395,26 @@ class MainActivity : AppCompatActivity() {
     fun applyLightDarkMode() {
         PreferenceManager.getDefaultSharedPreferences(this).let { p ->
             val mode = p.getString("setting_dark_light_mode", "system")
+            var useLightStatusBar = true
             when (mode) {
                 "system" -> {
                     delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+                    useLightStatusBar = when (resources.configuration.uiMode and
+                        android.content.res.Configuration.UI_MODE_NIGHT_MASK) {
+                        android.content.res.Configuration.UI_MODE_NIGHT_YES -> false
+                        else -> true
+                    }
                 }
                 "light" -> {
                     delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_NO
+                    useLightStatusBar = true
                 }
                 "dark" -> {
                     delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
+                    useLightStatusBar = false
                 }
             }
+            WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = useLightStatusBar
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e7f904a..2098cd4 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,7 +3,6 @@
     <style name="Theme.BabyBuddyWidgets" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
 
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
@@ -14,7 +13,7 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="colorPopoverBackground">@color/semi_transparent_dark_background</item>
         <item name="colorPopoverTextColor">@color/white</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 41641d4..0b9ea73 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,6 @@
     <style name="Theme.BabyBuddyWidgets" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
 
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
@@ -14,7 +13,7 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="colorPopoverBackground">@color/semi_transparent_dark_background</item>
         <item name="colorPopoverTextColor">@color/white</item>

From 90b518fa356f8583a321fd0a5b83ba649b3092d5 Mon Sep 17 00:00:00 2001
From: "Paul K. Gerke" <paul@no.email>
Date: Sun, 23 Aug 2026 20:42:20 +0200
Subject: [PATCH 2/5] Fix edge2edge mode

---
 Gemfile.lock                                  | 305 ++++++++++--------
 app/build.gradle                              |   4 +-
 .../babybuddywidgets/MainActivity.kt          |   9 +-
 app/src/main/res/layout/activity_main.xml     |  50 ++-
 app/src/main/res/values-night/themes.xml      |  14 +
 app/src/main/res/values/attrs.xml             |  13 +-
 app/src/main/res/values/colors.xml            |   6 +
 app/src/main/res/values/themes.xml            |  14 +
 8 files changed, 257 insertions(+), 158 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index af30add..8f502e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,211 +1,254 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
-      rexml
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.835.0)
-    aws-sdk-core (3.185.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1281.0)
+    aws-sdk-core (3.254.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+      logger
+    aws-sdk-kms (1.130.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.229.0)
+      aws-sdk-core (~> 3, >= 3.254.1)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.6)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.104.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    erb (6.0.7)
+    excon (1.7.0)
+      logger
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.216.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
+      http-cookie (>= 1.0.0)
+    faraday-follow_redirects (0.5.0)
+      faraday (>= 1, < 3)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    faraday-retry (2.4.0)
+      faraday (~> 2.0)
+    fastimage (2.4.1)
+    fastlane (2.238.0)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
+      addressable (>= 2.9.0, < 3.0.0)
       artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 2.4.0, < 5.0.0)
+      colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
+      excon (>= 0.71.0, < 2.0.0)
+      faraday (~> 2.7)
+      faraday-cookie_jar (~> 0.0.8)
+      faraday-follow_redirects (~> 0.3)
+      faraday-multipart (~> 1.0)
+      faraday-retry (~> 2.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.3.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
+      irb (>= 1.8)
       json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
+      jwt (>= 2.10.3, < 4)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
+      multi_json (~> 1.12)
       multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      nkf (~> 0.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
+      terminal-table (~> 4)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-increment_version_code (0.4.3)
     fastlane-plugin-versioning_android (0.1.1)
+    fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.50.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
+    google-apis-androidpublisher_v3 (0.106.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (1.2.5)
+      addressable (~> 2.9)
+      faraday (~> 2.13)
+      faraday-follow_redirects (~> 0.3)
+      googleauth (~> 1.14)
+      mini_mime (~> 1.1)
+      multi_json (~> 1.11)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+      retriable (>= 3.1, < 5.0)
+    google-apis-iamcredentials_v1 (0.28.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.18.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.66.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.9.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-env (2.2.2)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.7.0)
+    google-cloud-storage (1.62.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
-      jwt (>= 1.4, < 3.0)
-      multi_json (~> 1.11)
+    google-logging-utils (0.2.0)
+    googleauth (1.17.3)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
       os (>= 0.9, < 2.0)
+      pstore (~> 0.1)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    io-console (0.9.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.1)
-    mini_magick (4.12.0)
+    json (2.21.2)
+    jwt (3.2.0)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
-    multipart-post (2.3.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
+    multi_json (1.21.1)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    nkf (0.3.0)
+    optparse (0.8.1)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.3)
-    rake (13.0.6)
+    ostruct (0.6.3)
+    plist (3.7.2)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    pstore (0.2.1)
+    public_suffix (7.0.5)
+    rake (13.4.2)
+    rbs (4.1.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
+      erb
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
+      tsort
+    reline (0.7.0)
+      io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.6)
-    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    retriable (4.2.0)
+    rexml (3.4.4)
+    rouge (3.28.0)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.22.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+      jwt (>= 1.5, < 4.0)
     simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     trailblazer-option (0.1.2)
+    tsort (0.2.0)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.28.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
+      base64
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      nkf
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -218,4 +261,4 @@ DEPENDENCIES
   fastlane-plugin-versioning_android
 
 BUNDLED WITH
-   2.4.10
+   2.5.22
diff --git a/app/build.gradle b/app/build.gradle
index 4aa0dbc..b61b966 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,8 +99,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     buildFeatures {
         viewBinding true
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
index 9f39a0b..20f71e0 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.InputEvent
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.Window
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
@@ -148,9 +149,12 @@ class MainActivity : AppCompatActivity() {
         ).let {
             ViewCompat.setOnApplyWindowInsetsListener(it.root) { v, insets ->
                 val systemBars = insets.getInsets(
-                    WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+                    WindowInsetsCompat.Type.systemBars()
                 )
-                v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+                v.setPadding(systemBars.left, 0, systemBars.right, 0)
+
+                binding.topSpacer.layoutParams.height = systemBars.top
+
                 WindowInsetsCompat.CONSUMED
             }
 
@@ -166,6 +170,7 @@ class MainActivity : AppCompatActivity() {
     override fun onStart() {
         super.onStart()
 
+        window.isNavigationBarContrastEnforced = true
         applyLightDarkMode()
 
         binding.root.let {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 667be7e..0f41ee0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,23 +34,6 @@
         android:padding="4dp"
         android:text="Sample text" />
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/Theme.BabyBuddyWidgets.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.BabyBuddyWidgets" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include layout="@layout/content_main" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -78,5 +61,38 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:attr/colorBackground"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/topSpacer"
+            android:layout_width="match_parent"
+            android:layout_height="20px"
+            android:background="?attr/primaryBgColor" />
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/Theme.BabyBuddyWidgets.AppBarOverlay">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/primaryColor"
+                app:popupTheme="@style/Theme.BabyBuddyWidgets" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <include layout="@layout/content_main" />
+
+    </LinearLayout>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 2098cd4..2bcf82b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -15,6 +15,20 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="primaryColor">@color/primary_color_dark</item>
+        <item name="primaryBgColor">@color/primary_bg_color_dark</item>
+        <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
+        <item name="appWidgetTextColor">@color/light_blue_50</item>
+        <item name="colorPopoverBackground">@color/semi_transparent_dark_background</item>
+        <item name="colorPopoverTextColor">@color/white</item>
+    </style>
+
+    <style name="AppWidgetAttrs">
+        <item name="primaryColor">@color/primary_color_dark</item>
+        <item name="primaryBgColor">@color/primary_bg_color_dark</item>
+
+        <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
+        <item name="appWidgetTextColor">@color/light_blue_50</item>
         <item name="colorPopoverBackground">@color/semi_transparent_dark_background</item>
         <item name="colorPopoverTextColor">@color/white</item>
     </style>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index bffd431..50fdaef 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,10 +1,11 @@
 <resources>
-    <declare-styleable name="AppWidgetAttrs">
-        <attr name="appWidgetBackgroundColor" format="color" />
-        <attr name="appWidgetTextColor" format="color" />
-        <attr name="colorPopoverBackground" format="color" />
-        <attr name="colorPopoverTextColor" format="color" />
-    </declare-styleable>
+    <attr name="primaryColor" format="color" />
+    <attr name="primaryBgColor" format="color" />
+
+    <attr name="appWidgetBackgroundColor" format="color" />
+    <attr name="appWidgetTextColor" format="color" />
+    <attr name="colorPopoverBackground" format="color" />
+    <attr name="colorPopoverTextColor" format="color" />
 
     <declare-styleable name="HorizontalNumberPicker">
         <attr name="textSize" format="dimension" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ed2a903..96e6cbb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,6 +25,12 @@
     <color name="very_transparent_dark_background">#44000000</color>
     <color name="very_transparent_light_background">#44FFFFFF</color>
 
+    <color name="primary_color">#6200EE</color>
+    <color name="primary_bg_color">#A466FF</color>
+
+    <color name="primary_color_dark">#4800B8</color>
+    <color name="primary_bg_color_dark">#27006A</color>
+
     <color name="timer_button_disabled">#FFDDDDDD</color>
     <color name="diaper_enabled">#FFFFFFBB</color>
     <color name="sleep_enabled">#FFBBBBFF</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0b9ea73..a9762d7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,12 +15,26 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="primaryColor">@color/primary_color</item>
+        <item name="primaryBgColor">@color/primary_bg_color</item>
+        <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
+        <item name="appWidgetTextColor">@color/light_blue_50</item>
         <item name="colorPopoverBackground">@color/semi_transparent_dark_background</item>
         <item name="colorPopoverTextColor">@color/white</item>
     </style>
 
     <style name="Theme.BabyBuddyWidgets.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
+    <style name="AppWidgetAttrs">
+        <item name="primaryColor">@color/primary_color</item>
+        <item name="primaryBgColor">@color/primary_bg_color</item>
+
+        <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
+        <item name="appWidgetTextColor">@color/light_blue_50</item>
+        <item name="colorPopoverBackground">@color/semi_transparent_dark_background</item>
+        <item name="colorPopoverTextColor">@color/white</item>
+    </style>
+
     <style name="ThemeOverlay.BabyBuddyWidgets.AppWidgetContainer" parent="">
         <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
         <item name="appWidgetTextColor">@color/light_blue_50</item>

From 6bff1f46935d483ba29f65ac8a7422f4a746b5d1 Mon Sep 17 00:00:00 2001
From: "Paul K. Gerke" <paul@no.email>
Date: Mon, 24 Aug 2026 10:14:10 +0200
Subject: [PATCH 3/5] Bump minSDK version

---
 app/build.gradle                                                | 2 +-
 .../main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b61b966..4655196 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -84,7 +84,7 @@ android {
 
     defaultConfig {
         applicationId "eu.pkgsoftware.babybuddywidgets"
-        minSdkVersion 27
+        minSdkVersion 29
         targetSdk 36
         versionCode 54
         versionName "2.6.4"
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
index 20f71e0..062425d 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -1,6 +1,7 @@
 package eu.pkgsoftware.babybuddywidgets
 
 import android.app.ProgressDialog
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.InputEvent
@@ -142,6 +143,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         WindowCompat.enableEdgeToEdge(window)
 
         binding = ActivityMainBinding.inflate(

From 1f04767727e54fdcc536fa3bb52ac53b610c754e Mon Sep 17 00:00:00 2001
From: "Paul K. Gerke" <paul@no.email>
Date: Mon, 24 Aug 2026 10:36:54 +0200
Subject: [PATCH 4/5] Bump sdk version (had to do some related work anyways)

---
 app/build.gradle                 | 4 ++--
 app/src/main/AndroidManifest.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4655196..f008ed7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,12 +80,12 @@ preBuild.dependsOn(invokeResourcesMakefile)
 preBuild.dependsOn(invokeHelpMakefile)
 
 android {
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId "eu.pkgsoftware.babybuddywidgets"
         minSdkVersion 29
-        targetSdk 36
+        targetSdk 37
         versionCode 54
         versionName "2.6.4"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7addfd..fca9f38 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission
         android:name="android.permission.CAMERA" />

From a2468d6b7c71b74eafbcdc07892ee47effaa3d26 Mon Sep 17 00:00:00 2001
From: "Paul K. Gerke" <paul@no.email>
Date: Mon, 24 Aug 2026 23:47:54 +0200
Subject: [PATCH 5/5] Fix layout, update sdk version

---
 3rdparty/patched-zxing-build.gradle       | 11 ++---
 app/src/main/res/layout/activity_main.xml | 60 +++++++++++------------
 app/src/main/res/values/themes.xml        |  2 +-
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/3rdparty/patched-zxing-build.gradle b/3rdparty/patched-zxing-build.gradle
index 0740f85..65e7724 100644
--- a/3rdparty/patched-zxing-build.gradle
+++ b/3rdparty/patched-zxing-build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdk 35
+    compileSdk 37
     // ndk version 25 is known to support c++20 (see #386)
     // ndkVersion '25.1.8937393'
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 37
 
         ndk {
             // speed up build: compile only arm versions
@@ -25,11 +25,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     externalNativeBuild {
         cmake {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0f41ee0..dbb5b24 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,36 +34,6 @@
         android:padding="4dp"
         android:text="Sample text" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <eu.pkgsoftware.babybuddywidgets.widgets.InfoBubble
-            android:id="@+id/globalErrorBubble"
-            style="@style/WarningPill"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="64dp"
-            android:text="testmessage"
-            app:defaultDuration="5000"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <eu.pkgsoftware.babybuddywidgets.widgets.InfoBubble
-            android:id="@+id/globalSuccessBubble"
-            style="@style/SuccessPill"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="64dp"
-            android:text="testmessage"
-            app:defaultDuration="2000"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -95,4 +65,34 @@
 
     </LinearLayout>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <eu.pkgsoftware.babybuddywidgets.widgets.InfoBubble
+            android:id="@+id/globalErrorBubble"
+            style="@style/WarningPill"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="64dp"
+            android:text="testmessage"
+            app:defaultDuration="5000"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <eu.pkgsoftware.babybuddywidgets.widgets.InfoBubble
+            android:id="@+id/globalSuccessBubble"
+            style="@style/SuccessPill"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="64dp"
+            android:text="testmessage"
+            app:defaultDuration="2000"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a9762d7..60caa8b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -61,4 +61,4 @@
     <style name="SeparatorLine">
         <item name="android:background">@color/semi_transparent_dark_background</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>