From a5d91968fc7e1e2be32554481d1a72ef17a58e6e Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 25 Jan 2025 20:55:57 -0700 Subject: [PATCH] Briefly open the Navigation Drawer when the app start with the bottom app bar. https://redmine.stoutner.com/issues/1267 --- app/src/main/assets/de/about_changelog.html | 7 +++++ app/src/main/assets/en/about_changelog.html | 7 +++++ app/src/main/assets/es/about_changelog.html | 7 +++++ app/src/main/assets/fr/about_changelog.html | 7 +++++ app/src/main/assets/it/about_changelog.html | 7 +++++ .../main/assets/pt-rBR/about_changelog.html | 7 +++++ app/src/main/assets/ru/about_changelog.html | 7 +++++ app/src/main/assets/tr/about_changelog.html | 7 +++++ .../main/assets/zh-rCN/about_changelog.html | 7 +++++ .../activities/MainWebViewActivity.kt | 26 +++++++++++++++++- .../adapters/WebViewStateAdapter.kt | 26 +++++++++--------- .../fragments/WebViewTabFragment.kt | 24 ++++++++--------- .../helpers/CheckFilterListHelper.kt | 27 ++++++++++--------- .../webview_framelayout_bottom_appbar.xml | 23 ++++++++-------- .../layout/webview_framelayout_top_appbar.xml | 23 ++++++++-------- .../metadata/android/en-US/changelogs/79.txt | 2 ++ .../metadata/android/es-ES/changelogs/79.txt | 2 ++ 17 files changed, 155 insertions(+), 61 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/79.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/79.txt diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 83488b3f..a4761461 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,6 +33,13 @@ +

3.19.3 (Code-Version 79)

28. Januar 2025 - Mindest-API 26, Ziel-API 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (Code-Version 78)

10. Januar 2025 - Mindest-API 26, Ziel-API 35

3.19.3 (version code 79)

28 January 2025 - minimum API 26, target API 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (version code 78)

10 January 2025 - minimum API 26, target API 35

3.19.3 (cÃ³digo de versiÃ³n 79)

28 de enero de 2025 - API mÃnimo 26, API objetivo 35

Corregir la posiciÃ³n de desplazamiento del cajÃ³n de navegaciÃ³n en Android <= 14 (API <= 34).
Desactivar el uso de la cachÃ© web.

3.19.2 (cÃ³digo de versiÃ³n 78)

10 de enero de 2025 - API mÃnimo 26, API objetivo 35

3.19.3 (version du code 79)

28 Janvier 2025 - API minimale : 26, API optimale : 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (version du code 78)

10 Janvier 2025 - API minimale : 26, API optimale : 35

3.19.3 (versione codice 79)

28 Gennaio 2025 - minima API 26, target API 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (versione codice 78)

10 Gennaio 2025 - minima API 26, target API 35

3.19.3 (cÃ³digo de versÃ£o 79)

28 de janeiro de 2025 - minimum API 26, target API 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (cÃ³digo de versÃ£o 78)

10 de janeiro de 2025 - minimum API 26, target API 35

3.19.3 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 79)

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 78)

3.19.3 (version code 79)

28 Ocak 2025 - minimum API 26, target API 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (version code 78)

10 Ocak 2025 - minimum API 26, target API 35

3.19.3 (version code 79)

28 January 2025 - æä½æ¯æAPI 26, æé«æ¯æAPI 35

Fix the navigation drawer scroll position on Android <= 14 (API <= 34).
Disable using the web cache.

3.19.2 (version code 78)

10 January 2025 - æä½æ¯æAPI 26, æé«æ¯æAPI 35

+ if (closeNavigationDrawer) { + // Reset the close navigation drawer flag. + closeNavigationDrawer = false + + // Close the navigation drawer. + drawerLayout.closeDrawer(GravityCompat.START) + } + } override fun onDrawerClosed(drawerView: View) {} @@ -6292,6 +6303,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook currentWebView!!.loadUrl(openFilePath) } } + // The view parameter cannot be removed because it is called from the layout onClick. fun openNavigationDrawer(@Suppress("UNUSED_PARAMETER")view: View) { // Open the navigation drawer. @@ -6453,6 +6465,18 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Stop the swipe to refresh indicator if it is running swipeRefreshLayout.isRefreshing = false + // Open the navigation drawer if the bottom app bar is enabled and this is the first tab. + if (displayingInitialTab && bottomAppBar) { + // Open the navigation drawer. + drawerLayout.openDrawer(GravityCompat.START) + + // Set the close navigation drawer flag. + closeNavigationDrawer = true + } + + // Set the displaying initial tab flag to be false. + displayingInitialTab = false + // Try to set the current WebView. This will fail if the WebView has not yet been populated. try { // Get the WebView tab fragment. diff --git a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt index d1663630..53c93df3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/adapters/WebViewStateAdapter.kt @@ -1,20 +1,20 @@ -/* - * Copyright 2019-2023 Soren Stoutner . +/* SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2019-2023 Soren Stoutner * - * This file is part of Privacy Browser Android . + * This file is part of 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 . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ package com.stoutner.privacybrowser.adapters diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt index f1e27ec0..a923ae79 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/WebViewTabFragment.kt @@ -1,20 +1,20 @@ -/* - * Copyright 2019-2020, 2022-2023 Soren Stoutner . +/* SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2019-2020, 2022-2023 Soren Stoutner * * This file is part of 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 . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ package com.stoutner.privacybrowser.fragments diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckFilterListHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckFilterListHelper.kt index f330fa0d..0358e16c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckFilterListHelper.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/CheckFilterListHelper.kt @@ -1,20 +1,21 @@ -/* - * Copyright 2018-2019,2021-2023 Soren Stoutner . + +/* SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2018-2019,2021-2023 Soren Stoutner * - * This file is part of Privacy Browser Android . + * This file is part of 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 . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ package com.stoutner.privacybrowser.helpers diff --git a/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml b/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml index db8dfddd..39c9f508 100644 --- a/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml +++ b/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + You should have received a copy of the GNU General Public License along with + this program. If not, see . -->

3.19.3 (Code-Version 79)

3.19.2 (Code-Version 78)

3.19.3 (version code 79)

3.19.2 (version code 78)

3.19.3 (cÃ³digo de versiÃ³n 79)

3.19.2 (cÃ³digo de versiÃ³n 78)

3.19.3 (version du code 79)

3.19.2 (version du code 78)

3.19.3 (versione codice 79)

3.19.2 (versione codice 78)

3.19.3 (cÃ³digo de versÃ£o 79)

3.19.2 (cÃ³digo de versÃ£o 78)

3.19.3 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 79)

3.19.2 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 78)

3.19.3 (version code 79)

3.19.2 (version code 78)

3.19.3 (version code 79)

3.19.2 (version code 78)

3.19.3 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 79)

3.19.2 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 78)