Bump target API to 35 (Android 15). https://redmine.stoutner.com/issues/1237

diff --git a/app/build.gradle b/app/build.gradle
index 36116ccf184d33ed6e2e0ff6f3bdf5726ffe64df..4abe6ac39a8e0af7951f6fa534dd893748157b6e 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,20 +1,20 @@
-/*
- * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2016-2024 Soren Stoutner <soren@stoutner.com>

  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *

- * Privacy Browser Android is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.

  *
  *

- * Privacy Browser Android is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.

  *
  *

- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser Android.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 plugins {
  */
 
 plugins {


@@ -23,11 +23,11 @@ plugins {
 }
 
 android {
 }
 
 android {

-    compileSdk 34
+    compileSdk 35

 
     defaultConfig {
         minSdk 26
 
     defaultConfig {
         minSdk 26

-        targetSdk 34
+        targetSdk 35

         versionCode 75
         versionName "3.18.1"
         resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'pt-rBR', 'ru', 'tr', 'zh-rCN']
         versionCode 75
         versionName "3.18.1"
         resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'pt-rBR', 'ru', 'tr', 'zh-rCN']


@@ -88,9 +88,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'

-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'

     implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
     implementation 'androidx.drawerlayout:drawerlayout:1.2.0'

-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'

     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'


@@ -100,5 +100,5 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
 
     // Include the Google material library.
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
 
     // Include the Google material library.

-    implementation 'com.google.android.material:material:1.13.0-alpha07'
+    implementation 'com.google.android.material:material:1.13.0-alpha08'

 }
 }

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt
index 77019932b8a14323d42c6a0e94ed33f251e08b45..f0b89d98ad846ff6036948b47304b1078206ffd2 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt
@@ -1,26 +1,25 @@
-/*
- * Copyright 2018-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2018-2024 Soren Stoutner <soren@stoutner.com>

  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *

- * Privacy Browser Android is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.

  *
  *

- * Privacy Browser Android is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.

  *
  *

- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 package com.stoutner.privacybrowser.activities
 
 import android.content.Intent
  */
 
 package com.stoutner.privacybrowser.activities
 
 import android.content.Intent

-import android.content.pm.PackageManager

 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler


@@ -236,12 +235,8 @@ class ImportExportActivity : AppCompatActivity() {
         // Display the home arrow on the support action bar.
         actionBar.setDisplayHomeAsUpEnabled(true)
 
         // Display the home arrow on the support action bar.
         actionBar.setDisplayHomeAsUpEnabled(true)
 

-        // Find out if OpenKeychain is installed.
-        openKeychainInstalled = try {
-            packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0).versionName.isNotEmpty()
-        } catch (exception: PackageManager.NameNotFoundException) {
-            false
-        }
+        // Find out if OpenKeychain is installed.  If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is `false`.
+        openKeychainInstalled = packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0).versionName?.isNotEmpty() ?: false

 
         // Get handles for the views.
         scrollView = findViewById(R.id.scrollview)
 
         // Get handles for the views.
         scrollView = findViewById(R.id.scrollview)

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
index 4adec9e59c7b657369894c19de6874e221021d7a..418fb47e82df9872e6ae0cc3e44bb5a97a03d0cd 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt
@@ -1,22 +1,22 @@
-/*
- * Copyright 2015-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2015-2024 Soren Stoutner <soren@stoutner.com>

  *
  * Download cookie code contributed 2017 Hendrik Knackstedt.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  *
  * Download cookie code contributed 2017 Hendrik Knackstedt.  Copyright assigned to Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *

- * Privacy Browser Android is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.

  *
  *

- * Privacy Browser Android is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.

  *
  *

- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser Android.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 package com.stoutner.privacybrowser.activities
  */
 
 package com.stoutner.privacybrowser.activities


@@ -369,6 +369,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
     private var defaultUltraPrivacy = true
     private var defaultWideViewport = true
     private var displayAdditionalAppBarIcons = false
     private var defaultUltraPrivacy = true
     private var defaultWideViewport = true
     private var displayAdditionalAppBarIcons = false

+    private var displayUnderCutouts = false

     private var displayingFullScreenVideo = false
     private var domainsDatabaseHelper: DomainsDatabaseHelper? = null
     private var downloadWithExternalApp = false
     private var displayingFullScreenVideo = false
     private var domainsDatabaseHelper: DomainsDatabaseHelper? = null
     private var downloadWithExternalApp = false


@@ -515,14 +516,19 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
         val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
         bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false)
         displayAdditionalAppBarIcons = sharedPreferences.getBoolean(getString(R.string.display_additional_app_bar_icons_key), false)
         val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
         bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false)
         displayAdditionalAppBarIcons = sharedPreferences.getBoolean(getString(R.string.display_additional_app_bar_icons_key), false)

-        val displayUnderCutouts = sharedPreferences.getBoolean(getString(R.string.display_under_cutouts_key), false)
-
-        // Display under cutouts if specified.  This must be done here as it doesn't appear to work correctly if handled after the app is fully initialized.
-        if (displayUnderCutouts) {
-            if (Build.VERSION.SDK_INT >= 30)
-                window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
-            else if (Build.VERSION.SDK_INT >= 28)
-                window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+
+        // Displaying under cutouts currently only works on API < 35.  <https://redmine.stoutner.com/issues/1238>
+        if (Build.VERSION.SDK_INT < 35) {
+            // Get the display under cutouts preference.
+            displayUnderCutouts = sharedPreferences.getBoolean(getString(R.string.display_under_cutouts_key), false)
+
+            // Set the display under cutouts mode.  This must be done here as it doesn't appear to work correctly if handled after the app is fully initialized.
+            if (displayUnderCutouts) {
+                if (Build.VERSION.SDK_INT >= 30)
+                    window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
+                else if (Build.VERSION.SDK_INT >= 28)
+                    window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            }

         }
 
         // Get the entry values string arrays.
         }
 
         // Get the entry values string arrays.


@@ -3610,13 +3616,21 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
 
                 // Set the default app bar and status bar backgrounds.
                 appBarLayout.setBackgroundColor(colorBackgroundInt)
 
                 // Set the default app bar and status bar backgrounds.
                 appBarLayout.setBackgroundColor(colorBackgroundInt)

-                window.statusBarColor = colorBackgroundInt
+
+                // Set the background color if the API < 35 (Android 15).  https://redmine.stoutner.com/issues/1169
+                @Suppress("DEPRECATION")
+                if (Build.VERSION.SDK_INT < 35)
+                    window.statusBarColor = colorBackgroundInt

             }
 
             ProxyHelper.TOR -> {
                 // Set the app bar and status bar backgrounds to indicate proxying is enabled.
                 appBarLayout.setBackgroundResource(R.color.blue_background)
             }
 
             ProxyHelper.TOR -> {
                 // Set the app bar and status bar backgrounds to indicate proxying is enabled.
                 appBarLayout.setBackgroundResource(R.color.blue_background)

-                window.statusBarColor = getColor(R.color.blue_background)
+
+                // Set the background color if the API < 35 (Android 15).  https://redmine.stoutner.com/issues/1169
+                @Suppress("DEPRECATION")
+                if (Build.VERSION.SDK_INT < 35)
+                    window.statusBarColor = getColor(R.color.blue_background)

 
                 // Check to see if Orbot is installed.
                 try {
 
                 // Check to see if Orbot is installed.
                 try {


@@ -3667,7 +3681,11 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
             ProxyHelper.I2P -> {
                 // Set the app bar and status bar backgrounds to indicate proxying is enabled.
                 appBarLayout.setBackgroundResource(R.color.blue_background)
             ProxyHelper.I2P -> {
                 // Set the app bar and status bar backgrounds to indicate proxying is enabled.
                 appBarLayout.setBackgroundResource(R.color.blue_background)

-                window.statusBarColor = getColor(R.color.blue_background)
+
+                // Set the background color if the API < 35 (Android 15).  https://redmine.stoutner.com/issues/1169
+                @Suppress("DEPRECATION")
+                if (Build.VERSION.SDK_INT < 35)
+                    window.statusBarColor = getColor(R.color.blue_background)

 
                 // Check to see if I2P is installed.
                 try {
 
                 // Check to see if I2P is installed.
                 try {


@@ -3699,7 +3717,11 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
             ProxyHelper.CUSTOM -> {
                 // Set the app bar and status bar backgrounds to indicate proxying is enabled.
                 appBarLayout.setBackgroundResource(R.color.blue_background)
             ProxyHelper.CUSTOM -> {
                 // Set the app bar and status bar backgrounds to indicate proxying is enabled.
                 appBarLayout.setBackgroundResource(R.color.blue_background)

-                window.statusBarColor = getColor(R.color.blue_background)
+
+                // Set the background color if the API < 35 (Android 15).  https://redmine.stoutner.com/issues/1169
+                @Suppress("DEPRECATION")
+                if (Build.VERSION.SDK_INT < 35)
+                    window.statusBarColor = getColor(R.color.blue_background)

             }
         }
 
             }
         }
 


@@ -4091,6 +4113,13 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
 
         // Apply the appropriate full screen mode flags.
         if (fullScreenBrowsingModeEnabled && inFullScreenBrowsingMode) {  // Privacy Browser is currently in full screen browsing mode.
 
         // Apply the appropriate full screen mode flags.
         if (fullScreenBrowsingModeEnabled && inFullScreenBrowsingMode) {  // Privacy Browser is currently in full screen browsing mode.

+            // Handle display under cutouts for API < 35.  <https://redmine.stoutner.com/issues/1238>
+            if (Build.VERSION.SDK_INT < 35) {
+                // Disable fits system windows if display under cutouts is enabled.
+                if (displayUnderCutouts)
+                    rootFrameLayout.fitsSystemWindows = false
+            }
+

             // Hide the app bar if specified.
             if (hideAppBar) {
                 // Hide the tab linear layout.
             // Hide the app bar if specified.
             if (hideAppBar) {
                 // Hide the tab linear layout.


@@ -4111,6 +4140,13 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
             @Suppress("DEPRECATION")
             rootFrameLayout.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
         } else {  // Switch to normal viewing mode.
             @Suppress("DEPRECATION")
             rootFrameLayout.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
         } else {  // Switch to normal viewing mode.

+            // Handle display under cutouts for API < 35.  <https://redmine.stoutner.com/issues/1238>
+            if (Build.VERSION.SDK_INT < 35) {
+                // Enable fits system windows if display under cutouts is enabled.
+                if (displayUnderCutouts)
+                    rootFrameLayout.fitsSystemWindows = true
+            }
+

             // Remove the `SYSTEM_UI` flags from the root frame layout.  The deprecated command can be switched to `WindowInsetsController` once the minimum API >= 30.
             @Suppress("DEPRECATION")
             rootFrameLayout.systemUiVisibility = 0
             // Remove the `SYSTEM_UI` flags from the root frame layout.  The deprecated command can be switched to `WindowInsetsController` once the minimum API >= 30.
             @Suppress("DEPRECATION")
             rootFrameLayout.systemUiVisibility = 0


@@ -4708,6 +4744,13 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
 
                     // Toggle the full screen browsing mode.
                     if (inFullScreenBrowsingMode) {  // Switch to full screen mode.
 
                     // Toggle the full screen browsing mode.
                     if (inFullScreenBrowsingMode) {  // Switch to full screen mode.

+                        // Handle display under cutouts for API < 35.  <https://redmine.stoutner.com/issues/1238>
+                        if (Build.VERSION.SDK_INT < 35) {
+                            // Disable fits system windows if display under cutouts is enabled.
+                            if (displayUnderCutouts)
+                                rootFrameLayout.fitsSystemWindows = false
+                        }
+

                         // Hide the app bar if specified.
                         if (hideAppBar) {  // App bar hiding is enabled.
                             // Close the find on page bar if it is visible.
                         // Hide the app bar if specified.
                         if (hideAppBar) {  // App bar hiding is enabled.
                             // Close the find on page bar if it is visible.


@@ -4764,6 +4807,13 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
                         @Suppress("DEPRECATION")
                         rootFrameLayout.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                     } else {  // Switch to normal viewing mode.
                         @Suppress("DEPRECATION")
                         rootFrameLayout.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                     } else {  // Switch to normal viewing mode.

+                        // Handle display under cutouts for API < 35.  <https://redmine.stoutner.com/issues/1238>
+                        if (Build.VERSION.SDK_INT < 35) {
+                            // Enable fits system windows if display under cutouts is enabled.
+                            if (displayUnderCutouts)
+                                rootFrameLayout.fitsSystemWindows = true
+                        }
+

                         // Show the app bar if it was hidden.
                         if (hideAppBar) {
                             // Show the tab linear layout.
                         // Show the app bar if it was hidden.
                         if (hideAppBar) {
                             // Show the tab linear layout.


@@ -5033,6 +5083,13 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook
 
             // Enter full screen video.
             override fun onShowCustomView(video: View, callback: CustomViewCallback) {
 
             // Enter full screen video.
             override fun onShowCustomView(video: View, callback: CustomViewCallback) {

+                // Handle display under cutouts for API < 35.  <https://redmine.stoutner.com/issues/1238>
+                if (Build.VERSION.SDK_INT < 35) {
+                    // Disable fits system windows if display under cutouts is enabled.
+                    if (displayUnderCutouts)
+                        rootFrameLayout.fitsSystemWindows = false
+                }
+

                 // Set the full screen video flag.
                 displayingFullScreenVideo = true
 
                 // Set the full screen video flag.
                 displayingFullScreenVideo = true
 

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt
index 4c8da5684ac4532dffba39bbf9dda2f88e30c558..ad884b8177896540bb6502c256accf4f07a1384a 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt
@@ -1,20 +1,20 @@
-/*
- * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2016-2024 Soren Stoutner <soren@stoutner.com>

  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *

- * Privacy Browser Android is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.

  *
  *

- * Privacy Browser Android is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.

  *
  *

- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 package com.stoutner.privacybrowser.fragments
  */
 
 package com.stoutner.privacybrowser.fragments


@@ -397,14 +397,8 @@ class AboutVersionFragment : Fragment() {
         val webViewPackageName = webViewPackageInfo.packageName
         val webViewVersion = webViewPackageInfo.versionName
 
         val webViewPackageName = webViewPackageInfo.packageName
         val webViewVersion = webViewPackageInfo.versionName
 

-        // Get the Orbot version name if Orbot is installed.
-        val orbot: String = try {
-            // Store the version name.
-            requireContext().packageManager.getPackageInfo("org.torproject.android", 0).versionName
-        } catch (exception: PackageManager.NameNotFoundException) {  // Orbot is not installed.
-            // Store an empty string.
-            ""
-        }
+        // Get the Orbot version name if Orbot is installed.  If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is an empty string.
+        val orbot: String = requireContext().packageManager.getPackageInfo("org.torproject.android", 0)?.versionName ?: ""

 
         // Get the I2P version name if I2P is installed.
         val i2p: String = try {
 
         // Get the I2P version name if I2P is installed.
         val i2p: String = try {


@@ -420,14 +414,8 @@ class AboutVersionFragment : Fragment() {
             }
         }
 
             }
         }
 

-        // Get the OpenKeychain version name if it is installed.
-        val openKeychain: String = try {
-            // Store the version name.
-            requireContext().packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0).versionName
-        } catch (exception: PackageManager.NameNotFoundException) {  // OpenKeychain is not installed.
-            // Store an empty string.
-            ""
-        }
+        // Get the OpenKeychain version name if it is installed.  If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is an empty string.
+        val openKeychain: String = requireContext().packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0)?.versionName ?: ""

 
         // Create a spannable string builder for the hardware and software text views that need multiple colors of text.
         val brandStringBuilder = SpannableStringBuilder(brandLabel + brand)
 
         // Create a spannable string builder for the hardware and software text views that need multiple colors of text.
         val brandStringBuilder = SpannableStringBuilder(brandLabel + brand)


@@ -568,8 +556,7 @@ class AboutVersionFragment : Fragment() {
             // Get the first package signature.  Suppress the lint warning about the need to be careful in implementing comparison of certificates for security purposes.
             // Once the minimum API >= 28, `GET_SIGNING_CERTIFICATES` can be used instead.  Once the minimum API >= 33, the newer `getPackageInfo()` may be used.
             @Suppress("DEPRECATION")
             // Get the first package signature.  Suppress the lint warning about the need to be careful in implementing comparison of certificates for security purposes.
             // Once the minimum API >= 28, `GET_SIGNING_CERTIFICATES` can be used instead.  Once the minimum API >= 33, the newer `getPackageInfo()` may be used.
             @Suppress("DEPRECATION")

-            @SuppressLint("PackageManagerGetSignatures") val packageSignature = requireContext().packageManager.getPackageInfo(requireContext().packageName,PackageManager.GET_SIGNATURES)
-                .signatures[0]
+            @SuppressLint("PackageManagerGetSignatures") val packageSignature = requireContext().packageManager.getPackageInfo(requireContext().packageName,PackageManager.GET_SIGNATURES).signatures!![0]

 
             // Convert the signature to a byte array input stream.
             val certificateByteArrayInputStream: InputStream = ByteArrayInputStream(packageSignature.toByteArray())
 
             // Convert the signature to a byte array input stream.
             val certificateByteArrayInputStream: InputStream = ByteArrayInputStream(packageSignature.toByteArray())

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt
index 7333aff1233ad4755613b42eb597665822e0f09b..490faf466d19bb9da5095f0d4e7ab45628957b85 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt
@@ -1,20 +1,20 @@
-/*
- * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2016-2024 Soren Stoutner <soren@stoutner.com>

  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *

- * Privacy Browser Android is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.

  *
  *

- * Privacy Browser Android is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.

  *
  *

- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 package com.stoutner.privacybrowser.fragments
  */
 
 package com.stoutner.privacybrowser.fragments


@@ -33,6 +33,7 @@ import android.widget.ArrayAdapter
 
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.Preference
 
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.Preference

+import androidx.preference.PreferenceCategory

 import androidx.preference.PreferenceFragmentCompat
 
 import com.stoutner.privacybrowser.R
 import androidx.preference.PreferenceFragmentCompat
 
 import com.stoutner.privacybrowser.R


@@ -181,6 +182,15 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val fullScreenBrowsingMode = sharedPreferences.getBoolean(getString(R.string.full_screen_browsing_mode_key), false)
         val clearEverything = sharedPreferences.getBoolean(getString(R.string.clear_everything_key), true)
 
         val fullScreenBrowsingMode = sharedPreferences.getBoolean(getString(R.string.full_screen_browsing_mode_key), false)
         val clearEverything = sharedPreferences.getBoolean(getString(R.string.clear_everything_key), true)
 

+        // Remove the display under cutouts preferences if the API is >= 35 as Google broke this functionality.  <https://redmine.stoutner.com/issues/1238>
+        if (Build.VERSION.SDK_INT >= 35) {
+            // Get a handle for the full screen category.
+            val fullScreenCategory = findPreference<PreferenceCategory>(getString(R.string.full_screen_category_key))!!
+
+            // Remove the display under cutouts preferences.
+            fullScreenCategory.removePreference(displayUnderCutoutsPreference)
+        }
+

         // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled.
         fanboySocialBlockingListPreference.isEnabled = !fanboyAnnoyanceListEnabled
 
         // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled.
         fanboySocialBlockingListPreference.isEnabled = !fanboyAnnoyanceListEnabled
 

diff --git a/app/src/main/res/layout/about_bottom_appbar.xml b/app/src/main/res/layout/about_bottom_appbar.xml
index c231b07845c24162b35c823b23e07193e14c0cf5..e6752ae84bd597d089fa79753179ee397743261f 100644 (file)
--- a/app/src/main/res/layout/about_bottom_appbar.xml
+++ b/app/src/main/res/layout/about_bottom_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright © 2016-2017,2019-2023 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/about_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/about_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the view pager above the app bar layout.
        `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
 
     <!-- The linear layout with `orientation="vertical"` keeps the view pager above the app bar layout.
        `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->

diff --git a/app/src/main/res/layout/about_top_appbar.xml b/app/src/main/res/layout/about_top_appbar.xml
index 47144216b24d1a107079f5b4f8b29d43f33af7f8..63db2dcbfe2b74ac2fd12654479f40f1bf2bfec3 100644 (file)
--- a/app/src/main/res/layout/about_top_appbar.xml
+++ b/app/src/main/res/layout/about_top_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright © 2016-2017,2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2017, 2019-2020, 2022-2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/about_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/about_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the view pager below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the view pager below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/bookmarks_bottom_appbar.xml b/app/src/main/res/layout/bookmarks_bottom_appbar.xml
index 2f54dafdb11195e4391af7d7b6b107d966470a5e..5ddd61617ecbf4ae37923745bed5bd9b9fd6baf1 100644 (file)
--- a/app/src/main/res/layout/bookmarks_bottom_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_bottom_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/bookmarks_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/bookmarks_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout.  `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout.  `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/bookmarks_top_appbar.xml b/app/src/main/res/layout/bookmarks_top_appbar.xml
index 9ba8a12035ceb532c65238771fb2243fecee2412..f21fc536566c99c7b15722e4eb8ea2f4503ec2eb 100644 (file)
--- a/app/src/main/res/layout/bookmarks_top_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_top_appbar.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/bookmarks_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/bookmarks_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/domains_bottom_appbar.xml b/app/src/main/res/layout/domains_bottom_appbar.xml
index 7fc27db45929376ba3e881fb3dab6f7c49195585..8680c3b7587a4d2199c700d224afb067f2e2cd6a 100644 (file)
--- a/app/src/main/res/layout/domains_bottom_appbar.xml
+++ b/app/src/main/res/layout/domains_bottom_appbar.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2017, 2019-2022, 2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2017, 2019-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/domains_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/domains_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/layout/domains_top_appbar.xml b/app/src/main/res/layout/domains_top_appbar.xml
index 101cfe366a823e0fd7256f3770c117fe33d64af5..53892f4014d494ae0f2301cbad00287a1d7e1da6 100644 (file)
--- a/app/src/main/res/layout/domains_top_appbar.xml
+++ b/app/src/main/res/layout/domains_top_appbar.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2017, 2019-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2017, 2019-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/domains_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/domains_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/layout/guide_bottom_appbar.xml b/app/src/main/res/layout/guide_bottom_appbar.xml
index 3a6a41304c06c8aba86926e044a60e63d6e9d838..4e1873b0b2e0be5051df0df2bc6a9f7311727771 100644 (file)
--- a/app/src/main/res/layout/guide_bottom_appbar.xml
+++ b/app/src/main/res/layout/guide_bottom_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright © 2016-2017,2019-2023 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/guide_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/guide_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the view pager above the app bar layout.
         `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
 
     <!-- The linear layout with `orientation="vertical"` keeps the view pager above the app bar layout.
         `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->

diff --git a/app/src/main/res/layout/guide_top_appbar.xml b/app/src/main/res/layout/guide_top_appbar.xml
index f3a3d1ef023ce35805b899553c9dd9cd5129d48c..66d632fb941612afa40b0b43b4ffd950159855e3 100644 (file)
--- a/app/src/main/res/layout/guide_top_appbar.xml
+++ b/app/src/main/res/layout/guide_top_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright © 2016-2017,2019-2023 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/guide_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/guide_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the view pager below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the view pager below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/import_export_bottom_appbar.xml b/app/src/main/res/layout/import_export_bottom_appbar.xml
index f72fe66158d61f1a48b8390b373fcc471ae6611e..125b155b9a4c9012d53a6534db196e868368567a 100644 (file)
--- a/app/src/main/res/layout/import_export_bottom_appbar.xml
+++ b/app/src/main/res/layout/import_export_bottom_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2018-2023 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2018-2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/import_export_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/import_export_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/import_export_top_appbar.xml b/app/src/main/res/layout/import_export_top_appbar.xml
index 8bb586f44fc7ebcfbb28bea33836e18ca6b3728c..99f586ba38149d0c7b19fa2e4f31c4ef1f8e3245 100644 (file)
--- a/app/src/main/res/layout/import_export_top_appbar.xml
+++ b/app/src/main/res/layout/import_export_top_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2018-2023 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2018-2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/import_export_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/import_export_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/logcat_bottom_appbar.xml b/app/src/main/res/layout/logcat_bottom_appbar.xml
index 1db3a353301721fa33bb6f0340a9b557f0bf1529..e88f3c9f3367f0598da55439a7f33e6cf434b148 100644 (file)
--- a/app/src/main/res/layout/logcat_bottom_appbar.xml
+++ b/app/src/main/res/layout/logcat_bottom_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2018-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2018-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout.  `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout.  `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/logcat_top_appbar.xml b/app/src/main/res/layout/logcat_top_appbar.xml
index a11dcd9388909ff70c1c1c789ddc6a638997c69a..cbdbb3c64b46c3eeda70578142cd7923f7849eb9 100644 (file)
--- a/app/src/main/res/layout/logcat_top_appbar.xml
+++ b/app/src/main/res/layout/logcat_top_appbar.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2018-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2018-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
index d11ae7cf42f533b90b490be994fc66fd73112398..c78a783fa506e6c1578c3dadb0d6d6e8f75313c2 100644 (file)
--- a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2015-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2015-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <FrameLayout
     android:id="@+id/root_framelayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
 <FrameLayout
     android:id="@+id/root_framelayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawerlayout"
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawerlayout"

diff --git a/app/src/main/res/layout/main_framelayout_top_appbar.xml b/app/src/main/res/layout/main_framelayout_top_appbar.xml
index ea289cd7f9900747277ea7b3e72fa0c95663ee0c..4bf59f5cf63163462b4b8659c92698f7ad838b41 100644 (file)
--- a/app/src/main/res/layout/main_framelayout_top_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_top_appbar.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2015-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2015-2017, 2019-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <FrameLayout
     android:id="@+id/root_framelayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
 <FrameLayout
     android:id="@+id/root_framelayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawerlayout"
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawerlayout"

diff --git a/app/src/main/res/layout/requests_bottom_appbar.xml b/app/src/main/res/layout/requests_bottom_appbar.xml
index 79d88c66e977d96288325a70e1292a7766fead57..02bc0e40787d77126c0a026c647a9ab82fe2f16c 100644 (file)
--- a/app/src/main/res/layout/requests_bottom_appbar.xml
+++ b/app/src/main/res/layout/requests_bottom_appbar.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2018-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/requests_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/requests_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/requests_top_appbar.xml b/app/src/main/res/layout/requests_top_appbar.xml
index 4eedff1f5548f2089ceb05af6977cd3401ab6603..94465b228584ee99283632407bf07eadc13b5dbc 100644 (file)
--- a/app/src/main/res/layout/requests_top_appbar.xml
+++ b/app/src/main/res/layout/requests_top_appbar.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2018-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/requests_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/requests_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/settings_bottom_appbar.xml b/app/src/main/res/layout/settings_bottom_appbar.xml
index 0163886a1f9527c4565f86a1b5f88edfb490515d..b1cf8abbf6e7ca9001f4ee612c9c3738549515dc 100644 (file)
--- a/app/src/main/res/layout/settings_bottom_appbar.xml
+++ b/app/src/main/res/layout/settings_bottom_appbar.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2021-2022 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2021-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the app bar layout below the main content. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the app bar layout below the main content. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/settings_top_appbar.xml b/app/src/main/res/layout/settings_top_appbar.xml
index ec5dc3f3c40b174075d3cccae9326fc026741ad4..1b4424285446286fcf345f40f8c4d1043c05dfb5 100644 (file)
--- a/app/src/main/res/layout/settings_top_appbar.xml
+++ b/app/src/main/res/layout/settings_top_appbar.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2021-2022 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2021-2022, 2024 Soren Stoutner <soren@stoutner.com>

 
 

-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.

 
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"

-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the main content below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the main content below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/view_headers_bottom_appbar.xml b/app/src/main/res/layout/view_headers_bottom_appbar.xml
index 7dbab777110dba15b8072f2b9462b2dcd161c519..252535d5afbe3bae89fb32ec47415c05d5fe6fe9 100644 (file)
--- a/app/src/main/res/layout/view_headers_bottom_appbar.xml
+++ b/app/src/main/res/layout/view_headers_bottom_appbar.xml
@@ -1,33 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2017-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

-<!-- Setting the layout root to be `focusableInTouchMode` prevents the URL toolbar from stealing focus on launch and opening the keyboard. -->
+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"

+    xmlns:app="http://schemas.android.com/apk/res-auto"

     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true"

-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout.  `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` keeps the content above the app bar layout.  `app:layout_dodgeInsetEdges="bottom"` as a child of a coordinator layout moves the view above snackbars. -->
     <LinearLayout

diff --git a/app/src/main/res/layout/view_headers_top_appbar.xml b/app/src/main/res/layout/view_headers_top_appbar.xml
index 34207a5b629cb13031a2e85d393650cd7d8b0256..7f5b5a4539745c05006fdf101f24ea2a1afd966f 100644 (file)
--- a/app/src/main/res/layout/view_headers_top_appbar.xml
+++ b/app/src/main/res/layout/view_headers_top_appbar.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2017-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 

-<!-- Setting the layout root to be `focusableInTouchMode` prevents the URL toolbar from stealing focus on launch and opening the keyboard. -->
+<!-- `android:fitsSystemWindows="true"` is required for correct layout starting with API >= 35 (Android 15) -->

 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"


@@ -27,7 +28,8 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:focusable="true"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:focusable="true"

-    android:focusableInTouchMode="true" >
+    android:focusableInTouchMode="true"
+    android:fitsSystemWindows="true" >

 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout
 
     <!-- The linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 088a35343f8e0e81535bf0b8352d5a0a6b34c336..6800f07496b83f5e5c1e96d8f7b00c1243f07322 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -282,6 +282,8 @@
     <string name="selected">Ausgewählt:\u0020 %1$d</string>
     <string name="move_up">Nach oben verschieben</string>
     <string name="move_down">Nach unten verschieben</string>
     <string name="selected">Ausgewählt:\u0020 %1$d</string>
     <string name="move_up">Nach oben verschieben</string>
     <string name="move_down">Nach unten verschieben</string>

+    <string name="move_to_top">Nach oben bewegen</string>
+    <string name="move_to_bottom">Nach unten bewegen</string>

     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="select_all">Alle auswählen</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="select_all">Alle auswählen</string>


@@ -351,8 +353,11 @@
     <string name="add_domain">Domain hinzufügen</string>
     <string name="domain_name_already_exists">Domain existiert bereits</string>
     <string name="add">Hinzufügen</string>
     <string name="add_domain">Domain hinzufügen</string>
     <string name="domain_name_already_exists">Domain existiert bereits</string>
     <string name="add">Hinzufügen</string>

+    <string name="delete_all">Alle löschen</string>
+    <string name="delete_all_domain_settings">Alle Domain-Einstellungen löschen?</string>

     <string name="domain_name">Domainname</string>
     <string name="domain_deleted">Domain gelöscht</string>
     <string name="domain_name">Domainname</string>
     <string name="domain_deleted">Domain gelöscht</string>

+    <string name="all_domains_deleted">Alle Domains gelöscht</string>

     <string name="domain_name_instructions">*. kann als Wildcard-Subdomain verwendet werden (z.B. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>Systemeinstellung</item>
     <string name="domain_name_instructions">*. kann als Wildcard-Subdomain verwendet werden (z.B. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>Systemeinstellung</item>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 37717b41e6ea1d0aff51aa63d6a8db60704f1cce..65bcc8d39defa451cb89a484ea76144bf6d24389 100644 (file)
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -350,8 +350,11 @@
     <string name="add_domain">Añadir dominio</string>
     <string name="domain_name_already_exists">El nombre de dominio ya existe</string>
     <string name="add">Añadir</string>
     <string name="add_domain">Añadir dominio</string>
     <string name="domain_name_already_exists">El nombre de dominio ya existe</string>
     <string name="add">Añadir</string>

+    <string name="delete_all">Borrar todo</string>
+    <string name="delete_all_domain_settings">¿Borrar todas las configuraciones de dominio?</string>

     <string name="domain_name">Nombre de dominio</string>
     <string name="domain_deleted">Dominio borrado</string>
     <string name="domain_name">Nombre de dominio</string>
     <string name="domain_deleted">Dominio borrado</string>

+    <string name="all_domains_deleted">Todos los dominios eliminados</string>

     <string name="domain_name_instructions">*. puede ser añadido a un dominio para incluir todos los subdominios (p.ej. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>Por defecto del sistema</item>
     <string name="domain_name_instructions">*. puede ser añadido a un dominio para incluir todos los subdominios (p.ej. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>Por defecto del sistema</item>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 12bc57e235c497b000aa4e057c4d51244a6c6e0b..3cb6f38f45dcd284ed02b053b99f44f8b8c1eb11 100644 (file)
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -18,7 +18,7 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License

-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <https://www.gnu.org/licenses/>. -->

 
 <!-- `tools:ignore="MissingTranslation"` allows release APKs to be built if translation strings are missing.  The missing strings will fall back to English. -->
 <resources>
 
 <!-- `tools:ignore="MissingTranslation"` allows release APKs to be built if translation strings are missing.  The missing strings will fall back to English. -->
 <resources>


@@ -278,6 +278,8 @@
     <string name="selected">Selectionnés : %1$d</string>
     <string name="move_up">Monter</string>
     <string name="move_down">Descendre</string>
     <string name="selected">Selectionnés : %1$d</string>
     <string name="move_up">Monter</string>
     <string name="move_down">Descendre</string>

+    <string name="move_to_top">Déplacer en haut</string>
+    <string name="move_to_bottom">Déplacer en bas</string>

     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
     <string name="select_all">Tout sélectionner</string>
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
     <string name="select_all">Tout sélectionner</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b0f0d5d790bcdeee3ac0cc8afe7e2f41a57b4f18..90f62100b55c7441f88565069bc152d452de94ee 100644 (file)
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -349,8 +349,11 @@
     <string name="add_domain">Aggiungi Dominio</string>
     <string name="domain_name_already_exists">Il nome del Dominio è già esistente</string>
     <string name="add">Aggiungi</string>
     <string name="add_domain">Aggiungi Dominio</string>
     <string name="domain_name_already_exists">Il nome del Dominio è già esistente</string>
     <string name="add">Aggiungi</string>

+    <string name="delete_all">Elimina tutto</string>
+    <string name="delete_all_domain_settings">Eliminare tutte le impostaizoni dei domini?</string>

     <string name="domain_name">Nome del Dominio</string>
     <string name="domain_deleted">Dominio Eliminato</string>
     <string name="domain_name">Nome del Dominio</string>
     <string name="domain_deleted">Dominio Eliminato</string>

+    <string name="all_domains_deleted">Eliminati tutti i domini</string>

     <string name="domain_name_instructions">è possibile anteporre *. a un dominio per includere tutti i sottodomini (es. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>Default di Sistema</item>
     <string name="domain_name_instructions">è possibile anteporre *. a un dominio per includere tutti i sottodomini (es. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>Default di Sistema</item>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ed71aba35b800005ac28e417d4136986ec987b54..aae2a01cb9964cd4f89651d0cedf62b06c11ff52 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -346,8 +346,11 @@
     <string name="add_domain">Добавление домена</string>
     <string name="domain_name_already_exists">Доменное имя уже существует</string>
     <string name="add">Добавить</string>
     <string name="add_domain">Добавление домена</string>
     <string name="domain_name_already_exists">Доменное имя уже существует</string>
     <string name="add">Добавить</string>

+    <string name="delete_all">Удалить все</string>
+    <string name="delete_all_domain_settings">Удалить все настройки домена?</string>

     <string name="domain_name">Имя домена</string>
     <string name="domain_deleted">Домен удален</string>
     <string name="domain_name">Имя домена</string>
     <string name="domain_deleted">Домен удален</string>

+    <string name="all_domains_deleted">Все домены удалены</string>

     <string name="domain_name_instructions">добавьте *. для включения всех поддоменов (напр. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>По умолчанию</item>
     <string name="domain_name_instructions">добавьте *. для включения всех поддоменов (напр. *.stoutner.com)</string>
     <string-array name="javascript_array">
         <item>По умолчанию</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 20b18f864faef2b1dd6b98fcce6a3b76258a77df..2208ef7d94461658f60cdb0c1d3bd738cc1d7bbc 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2015-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2015-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <https://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 <!-- `tools:ignore="MissingTranslation"` allows release APKs to be built if translation strings are missing.  The missing strings will fall back to English. -->
 <resources
 
 <!-- `tools:ignore="MissingTranslation"` allows release APKs to be built if translation strings are missing.  The missing strings will fall back to English. -->
 <resources


@@ -793,6 +794,7 @@
     <string name="fanboys_social_blocking_list_key" translatable="false">fanboys_social_blocking_list</string>
     <string name="font_size_key" translatable="false">font_size</string>
     <string name="full_screen_browsing_mode_key" translatable="false">full_screen_browsing_mode</string>
     <string name="fanboys_social_blocking_list_key" translatable="false">fanboys_social_blocking_list</string>
     <string name="font_size_key" translatable="false">font_size</string>
     <string name="full_screen_browsing_mode_key" translatable="false">full_screen_browsing_mode</string>

+    <string name="full_screen_category_key" translatable="false">full_screen</string>

     <string name="general_category_key" translatable="false">general</string>
     <string name="hide_app_bar_key" translatable="false">hide_app_bar</string>
     <string name="display_under_cutouts_key" translatable="false">display_under_cutouts</string>
     <string name="general_category_key" translatable="false">general</string>
     <string name="hide_app_bar_key" translatable="false">hide_app_bar</string>
     <string name="display_under_cutouts_key" translatable="false">display_under_cutouts</string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 1b21b9daa6df84ac8a008f040b65f5cbf8d4c6d1..fa9737a7cb0f3ecd9ec17df802629408184229a7 100644 (file)
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--

-  Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
+  SPDX-License-Identifier: GPL-3.0-or-later
+  SPDX-FileCopyrightText: 2016-2024 Soren Stoutner <soren@stoutner.com>

 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 

-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.

 
 

-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.

 
 

-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
+  You should have received a copy of the GNU General Public License along with
+  this program.  If not, see <https://www.gnu.org/licenses/>. -->

 
 <PreferenceScreen
     xmlns:app="http://schemas.android.com/apk/res-auto"
 
 <PreferenceScreen
     xmlns:app="http://schemas.android.com/apk/res-auto"


@@ -174,7 +175,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
     </PreferenceCategory>
 
     <PreferenceCategory

-        app:key="full_screen"
+        app:key="@string/full_screen_category_key"

         app:title="@string/full_screen" >
 
         <SwitchPreferenceCompat
         app:title="@string/full_screen" >
 
         <SwitchPreferenceCompat

diff --git a/build.gradle b/build.gradle
index 8088fb4fbab1caf80b007aae6b9944455fecbc69..f227d64322a1cc1ffa8e5e9b990dd560f587e2ff 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,20 @@
-/*
- * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2016-2024 Soren Stoutner <soren@stoutner.com>

  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *

- * Privacy Browser Android is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.

  *
  *

- * Privacy Browser Android is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.

  *
  *

- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser Android.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
  */
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.


@@ -26,7 +26,7 @@ buildscript {
     }
 
     dependencies {
     }
 
     dependencies {

-        classpath 'com.android.tools.build:gradle:8.7.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'

         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
 
         // NOTE: Do not place your application dependencies here; they belong
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20"
 
         // NOTE: Do not place your application dependencies here; they belong