From a94835709a5871399463fb956812026699d6e3f9 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Tue, 28 Nov 2023 10:51:07 -0700 Subject: [PATCH] Add an option to display under the camera cutouts. https://redmine.stoutner.com/issues/1073 --- app/src/main/assets/de/about_changelog.html | 4 +-- app/src/main/assets/de/about_licenses.html | 3 +- app/src/main/assets/en/about_changelog.html | 4 +-- app/src/main/assets/en/about_licenses.html | 3 +- app/src/main/assets/es/about_changelog.html | 4 +-- app/src/main/assets/es/about_licenses.html | 3 +- app/src/main/assets/fr/about_changelog.html | 4 +-- app/src/main/assets/fr/about_licenses.html | 3 +- app/src/main/assets/it/about_changelog.html | 4 +-- app/src/main/assets/it/about_licenses.html | 3 +- .../main/assets/pt-rBR/about_changelog.html | 4 +-- .../main/assets/pt-rBR/about_licenses.html | 3 +- app/src/main/assets/ru/about_changelog.html | 4 +-- app/src/main/assets/ru/about_licenses.html | 3 +- ...unded_24.svg => list_alt_rounded_24px.svg} | 0 ...ubheader_rounded_weight400_grade0_48px.svg | 30 +++++++++++++++++++ app/src/main/assets/tr/about_changelog.html | 4 +-- app/src/main/assets/tr/about_licenses.html | 3 +- .../main/assets/zh-rCN/about_changelog.html | 4 +-- .../main/assets/zh-rCN/about_licenses.html | 3 +- .../activities/MainWebViewActivity.kt | 14 +++++++-- .../fragments/SettingsFragment.kt | 19 ++++++++++++ .../helpers/ImportExportDatabaseHelper.kt | 25 +++++++++++++++- .../main/res/drawable/app_bar_disabled.xml | 2 +- app/src/main/res/drawable/app_bar_enabled.xml | 2 +- app/src/main/res/drawable/app_bar_ghosted.xml | 2 +- .../res/drawable/clear_logcat_disabled.xml | 2 +- .../res/drawable/clear_logcat_enabled.xml | 2 +- .../display_under_cutouts_disabled.xml | 13 ++++++++ .../display_under_cutouts_enabled.xml | 13 ++++++++ .../res/drawable/full_screen_disabled.xml | 2 +- .../main/res/drawable/full_screen_enabled.xml | 2 +- app/src/main/res/values/strings.xml | 3 ++ app/src/main/res/xml/preferences.xml | 6 ++++ 34 files changed, 162 insertions(+), 38 deletions(-) rename app/src/main/assets/shared_images/{list_alt_rounded_24.svg => list_alt_rounded_24px.svg} (100%) create mode 100644 app/src/main/assets/shared_images/subheader_rounded_weight400_grade0_48px.svg create mode 100644 app/src/main/res/drawable/display_under_cutouts_disabled.xml create mode 100644 app/src/main/res/drawable/display_under_cutouts_enabled.xml diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index c59780fa..3da79085 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -33,8 +33,8 @@ -

3.16 (Version Code 72)

20. November 2023 - Mindest-API 24, Ziel-API 34

3.16 (Version Code 72)

20. November 2023 - Mindest-API 24, Ziel-API 34

Add importing and exporting of bookmarks to an HTML file.
Open new tabs adjacent to the current tab.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (version code 72)

20 November 2023 - minimum API 24, target API 34

3.16 (version code 72)

20 November 2023 - minimum API 24, target API 34

Add importing and exporting of bookmarks to an HTML file.
Open new tabs adjacent to the current tab.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (cÃ³digo de versiÃ³n 72)

20 de noviembre de 2023 - API mÃnimo 24, API objetivo 34

3.16 (cÃ³digo de versiÃ³n 72)

20 de noviembre de 2023 - API mÃnimo 24, API objetivo 34

AÃ±adir la importaciÃ³n y exportaciÃ³n de favoritos a un archivo HTML.
Abrir nuevas pestaÃ±as adyacentes a la pestaÃ±a actual.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (version du code 72)

20 Novembre 2023 - API minimale : 24, API optimale : 34

3.16 (version du code 72)

20 Novembre 2023 - API minimale : 24, API optimale : 34

Add importing and exporting of bookmarks to an HTML file.
Open new tabs adjacent to the current tab.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (versione codice 72)

20 Novembre 2023 - minima API 24, target API 34

3.16 (versione codice 72)

20 Novembre 2023 - minima API 24, target API 34

Aggiunta la possibilitÃ di importare e esportare i segnalibri in un file HTML.
Apertura delle nuove schede di fianco alla scheda in uso.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (cÃ³digo de versÃ£o 72)

20 de novembro de 2023 - minimum API 24, target API 34

3.16 (cÃ³digo de versÃ£o 72)

20 de novembro de 2023 - minimum API 24, target API 34

Add importing and exporting of bookmarks to an HTML file.
Open new tabs adjacent to the current tab.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 72)

3.16 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 72)

ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð¸Ð¼Ð¿Ð¾ÑÑÐ°/ÑÐºÑÐ¿Ð¾ÑÑÐ° Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð² HTML-ÑÐ°Ð¹Ð».
ÐÐ¾Ð²ÑÐµ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ ÑÐµÐ¿ÐµÑÑ Ð¾ÑÐºÑÑÐ²Ð°ÑÑÑÑ ÑÑÐ´Ð¾Ð¼ Ñ ÑÐµÐºÑÑÐµÐ¹.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (version code 72)

20 KasÄ±m 2023 - minimum API 24, target API 34

3.16 (version code 72)

20 KasÄ±m 2023 - minimum API 24, target API 34

Add importing and exporting of bookmarks to an HTML file.
Open new tabs adjacent to the current tab.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

3.16 (version code 72)

20 November 2023 - æä½æ¯æAPI 24, æé«æ¯æAPI 34

3.16 (version code 72)

20 November 2023 - æä½æ¯æAPI 24, æé«æ¯æAPI 34

Add importing and exporting of bookmarks to an HTML file.
Open new tabs adjacent to the current tab.

language.

link_off.

list.

list_alt_rounded_24.

list_alt_rounded_24px.

local_activity.

location_off.

lock.

smartphone.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

+ // + if (displayUnderCutouts) + importDatabase.execSQL("UPDATE $PREFERENCES_TABLE SET $DISPLAY_UNDER_CUTOUTS = 1") + else + importDatabase.execSQL("UPDATE $PREFERENCES_TABLE SET $DISPLAY_UNDER_CUTOUTS = 0") + } + + /* End of database upgrade logic. */ + // Get a cursor for the bookmarks table. val importBookmarksCursor = importDatabase.rawQuery("SELECT * FROM $BOOKMARKS_TABLE", null) @@ -736,6 +756,7 @@ class ImportExportDatabaseHelper { .putString(PROXY_CUSTOM_URL, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndexOrThrow(PROXY_CUSTOM_URL))) .putBoolean(FULL_SCREEN_BROWSING_MODE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(FULL_SCREEN_BROWSING_MODE)) == 1) .putBoolean(HIDE_APP_BAR, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(HIDE_APP_BAR)) == 1) + .putBoolean(DISPLAY_UNDER_CUTOUTS, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(DISPLAY_UNDER_CUTOUTS)) == 1) .putBoolean(CLEAR_EVERYTHING, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_EVERYTHING)) == 1) .putBoolean(CLEAR_COOKIES, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_COOKIES)) == 1) .putBoolean(CLEAR_DOM_STORAGE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_DOM_STORAGE)) == 1) @@ -947,6 +968,7 @@ class ImportExportDatabaseHelper { "$PROXY_CUSTOM_URL TEXT, " + "$FULL_SCREEN_BROWSING_MODE BOOLEAN, " + "$HIDE_APP_BAR BOOLEAN, " + + "$DISPLAY_UNDER_CUTOUTS BOOLEAN, " + "$CLEAR_EVERYTHING BOOLEAN, " + "$CLEAR_COOKIES BOOLEAN, " + "$CLEAR_DOM_STORAGE BOOLEAN, " + @@ -999,6 +1021,7 @@ class ImportExportDatabaseHelper { preferencesContentValues.put(PROXY_CUSTOM_URL, sharedPreferences.getString(PROXY_CUSTOM_URL, context.getString(R.string.proxy_custom_url_default_value))) preferencesContentValues.put(FULL_SCREEN_BROWSING_MODE, sharedPreferences.getBoolean(FULL_SCREEN_BROWSING_MODE, false)) preferencesContentValues.put(HIDE_APP_BAR, sharedPreferences.getBoolean(HIDE_APP_BAR, true)) + preferencesContentValues.put(DISPLAY_UNDER_CUTOUTS, sharedPreferences.getBoolean(DISPLAY_UNDER_CUTOUTS, false)) preferencesContentValues.put(CLEAR_EVERYTHING, sharedPreferences.getBoolean(CLEAR_EVERYTHING, true)) preferencesContentValues.put(CLEAR_COOKIES, sharedPreferences.getBoolean(CLEAR_COOKIES, true)) preferencesContentValues.put(CLEAR_DOM_STORAGE, sharedPreferences.getBoolean(CLEAR_DOM_STORAGE, true)) diff --git a/app/src/main/res/drawable/app_bar_disabled.xml b/app/src/main/res/drawable/app_bar_disabled.xml index c52c8eaf..9efc1177 100644 --- a/app/src/main/res/drawable/app_bar_disabled.xml +++ b/app/src/main/res/drawable/app_bar_disabled.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/drawable/app_bar_enabled.xml b/app/src/main/res/drawable/app_bar_enabled.xml index e2f3080c..fc17bee4 100644 --- a/app/src/main/res/drawable/app_bar_enabled.xml +++ b/app/src/main/res/drawable/app_bar_enabled.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/drawable/app_bar_ghosted.xml b/app/src/main/res/drawable/app_bar_ghosted.xml index 01865d3d..3b39fc6a 100644 --- a/app/src/main/res/drawable/app_bar_ghosted.xml +++ b/app/src/main/res/drawable/app_bar_ghosted.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/drawable/clear_logcat_disabled.xml b/app/src/main/res/drawable/clear_logcat_disabled.xml index bc6eb583..d6cb939a 100644 --- a/app/src/main/res/drawable/clear_logcat_disabled.xml +++ b/app/src/main/res/drawable/clear_logcat_disabled.xml @@ -1,4 +1,4 @@ - + + --> + + + + + diff --git a/app/src/main/res/drawable/display_under_cutouts_enabled.xml b/app/src/main/res/drawable/display_under_cutouts_enabled.xml new file mode 100644 index 00000000..bc413325 --- /dev/null +++ b/app/src/main/res/drawable/display_under_cutouts_enabled.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/full_screen_disabled.xml b/app/src/main/res/drawable/full_screen_disabled.xml index 4360947d..cb68b77f 100644 --- a/app/src/main/res/drawable/full_screen_disabled.xml +++ b/app/src/main/res/drawable/full_screen_disabled.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/drawable/full_screen_enabled.xml b/app/src/main/res/drawable/full_screen_enabled.xml index f9bf574d..f6cdf13d 100644 --- a/app/src/main/res/drawable/full_screen_enabled.xml +++ b/app/src/main/res/drawable/full_screen_enabled.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d4ca0221..8e731097 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -693,6 +693,8 @@ Double-tap to toggle full screen browsing mode. Hide the app bar Hide the app bar that contains the URL. + Display under cutouts + Draw the website under cutouts, like camera notches. Changing this setting will restart Privacy Browser. Clear everything Clears cookies, DOM storage, form data, the logcat, and WebViewâs cache. Then manually deletes the entire âapp_webviewâ and âcacheâ directories. @@ -777,6 +779,7 @@ full_screen_browsing_mode general hide_app_bar + display_under_cutouts homepage incognito_mode javascript diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 076206bb..ac2b6a4c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -195,6 +195,12 @@ app:title="@string/hide_app_bar" app:summary="@string/hide_app_bar_summary" app:defaultValue="true" /> + +

3.16 (Version Code 72)

3.16 (Version Code 72)

3.16 (version code 72)

3.16 (version code 72)

3.16 (cÃ³digo de versiÃ³n 72)

3.16 (cÃ³digo de versiÃ³n 72)

3.16 (version du code 72)

3.16 (version du code 72)

3.16 (versione codice 72)

3.16 (versione codice 72)

3.16 (cÃ³digo de versÃ£o 72)

3.16 (cÃ³digo de versÃ£o 72)

3.16 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 72)

3.16 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 72)

3.16 (version code 72)

3.16 (version code 72)

3.16 (version code 72)

3.16 (version code 72)

3.16 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 72)

3.16 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 72)