From: Soren Stoutner Date: Sat, 23 Feb 2019 04:01:23 +0000 (-0700) Subject: Impliment scrolling of the app bar. https://redmine.stoutner.com/issues/8 X-Git-Tag: v2.17~4 X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff_plain;h=be5c6472390dd054ffb15593388bc103944a99e4 Impliment scrolling of the app bar. https://redmine.stoutner.com/issues/8 --- diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 7958d0d2..a2c18eb6 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -68,7 +68,7 @@ @@ -78,8 +78,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 75dac502..419007b0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -2,24 +2,35 @@ diff --git a/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java b/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java index c3aae5d4..60f22aac 100644 --- a/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java +++ b/app/src/free/java/com/stoutner/privacybrowser/helpers/AdHelper.java @@ -71,7 +71,7 @@ public class AdHelper { // Cast the generic view to an AdView. AdView adView = (AdView) view; - // Save the layout parameters. They are used when programatically recreating the add below. + // Save the layout parameters. They are used when programatically recreating the ad below. RelativeLayout.LayoutParams adViewLayoutParameters = (RelativeLayout.LayoutParams) adView.getLayoutParams(); // Remove the AdView. diff --git a/app/src/free/res/layout/adview.xml b/app/src/free/res/layout/adview.xml new file mode 100644 index 00000000..28d09acb --- /dev/null +++ b/app/src/free/res/layout/adview.xml @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file diff --git a/app/src/free/res/layout/main_webview.xml b/app/src/free/res/layout/main_webview.xml deleted file mode 100644 index 53fd4652..00000000 --- a/app/src/free/res/layout/main_webview.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html index 3b458ae2..6b5bed03 100644 --- a/app/src/main/assets/de/about_licenses_dark.html +++ b/app/src/main/assets/de/about_licenses_dark.html @@ -101,7 +101,6 @@

arrow_forward.

bookmarks.

bug_report.

-

call_to_action.

camera_enhance.

chrome_reader_mode.

close.

@@ -117,7 +116,6 @@

file_download.

find_in_page.

folder.

-

fullscreen.

home.

image.

import_contacts.

@@ -132,6 +130,7 @@

map.

more.

new releases.

+

payment.

question_answer.

refresh.

save.

diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html index 6df4e523..3d4fdb3c 100644 --- a/app/src/main/assets/de/about_licenses_light.html +++ b/app/src/main/assets/de/about_licenses_light.html @@ -101,7 +101,6 @@

arrow_forward.

bookmarks.

bug_report.

-

call_to_action.

camera_enhance.

chrome_reader_mode.

close.

@@ -117,7 +116,6 @@

file_download.

find_in_page.

folder.

-

fullscreen.

home.

image.

import_contacts.

@@ -132,6 +130,7 @@

map.

more.

new releases.

+

payment.

question_answer.

refresh.

save.

diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html index fb7fb8a5..296d3567 100644 --- a/app/src/main/assets/en/about_licenses_dark.html +++ b/app/src/main/assets/en/about_licenses_dark.html @@ -99,7 +99,6 @@

arrow_forward.

bookmarks.

bug_report.

-

call_to_action.

camera_enhance.

chrome_reader_mode.

close.

@@ -115,7 +114,6 @@

file_download.

find_in_page.

folder.

-

fullscreen.

home.

image.

import_contacts.

@@ -130,6 +128,7 @@

map.

more.

new releases.

+

payment.

question_answer.

refresh.

save.

diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html index 2afc9628..1a29f139 100644 --- a/app/src/main/assets/en/about_licenses_light.html +++ b/app/src/main/assets/en/about_licenses_light.html @@ -100,7 +100,6 @@

arrow_forward.

bookmarks.

bug_report.

-

call_to_action.

camera_enhance.

chrome_reader_mode.

close.

@@ -116,7 +115,6 @@

file_download.

find_in_page.

folder.

-

fullscreen.

home.

image.

import_contacts.

@@ -131,6 +129,7 @@

map.

more.

new releases.

+

payment.

question_answer.

refresh.

save.

diff --git a/app/src/main/assets/es/about_licenses_dark.html b/app/src/main/assets/es/about_licenses_dark.html index f51a5b63..3cef43b9 100644 --- a/app/src/main/assets/es/about_licenses_dark.html +++ b/app/src/main/assets/es/about_licenses_dark.html @@ -1,7 +1,7 @@ + + + + + diff --git a/app/src/main/res/drawable/app_bar_disabled_light.xml b/app/src/main/res/drawable/app_bar_disabled_light.xml new file mode 100644 index 00000000..2f23e4f3 --- /dev/null +++ b/app/src/main/res/drawable/app_bar_disabled_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/app_bar_enabled_dark.xml b/app/src/main/res/drawable/app_bar_enabled_dark.xml new file mode 100644 index 00000000..efca7b21 --- /dev/null +++ b/app/src/main/res/drawable/app_bar_enabled_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/app_bar_enabled_light.xml b/app/src/main/res/drawable/app_bar_enabled_light.xml new file mode 100644 index 00000000..c0751cda --- /dev/null +++ b/app/src/main/res/drawable/app_bar_enabled_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/app_bar_ghosted_dark.xml b/app/src/main/res/drawable/app_bar_ghosted_dark.xml new file mode 100644 index 00000000..a854f04e --- /dev/null +++ b/app/src/main/res/drawable/app_bar_ghosted_dark.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/app_bar_ghosted_light.xml b/app/src/main/res/drawable/app_bar_ghosted_light.xml new file mode 100644 index 00000000..fba36f51 --- /dev/null +++ b/app/src/main/res/drawable/app_bar_ghosted_light.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/full_screen_disabled_dark.xml b/app/src/main/res/drawable/full_screen_disabled_dark.xml index 713f2fdb..72379619 100644 --- a/app/src/main/res/drawable/full_screen_disabled_dark.xml +++ b/app/src/main/res/drawable/full_screen_disabled_dark.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/full_screen_disabled_light.xml b/app/src/main/res/drawable/full_screen_disabled_light.xml index 74674ef5..a29123f8 100644 --- a/app/src/main/res/drawable/full_screen_disabled_light.xml +++ b/app/src/main/res/drawable/full_screen_disabled_light.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/full_screen_enabled_dark.xml b/app/src/main/res/drawable/full_screen_enabled_dark.xml index dd54e5ed..10998caa 100644 --- a/app/src/main/res/drawable/full_screen_enabled_dark.xml +++ b/app/src/main/res/drawable/full_screen_enabled_dark.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/full_screen_enabled_light.xml b/app/src/main/res/drawable/full_screen_enabled_light.xml index 09d74659..53329427 100644 --- a/app/src/main/res/drawable/full_screen_enabled_light.xml +++ b/app/src/main/res/drawable/full_screen_enabled_light.xml @@ -6,7 +6,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" > - + diff --git a/app/src/main/res/drawable/hide_system_bars_disabled_dark.xml b/app/src/main/res/drawable/hide_system_bars_disabled_dark.xml deleted file mode 100644 index e9a524fa..00000000 --- a/app/src/main/res/drawable/hide_system_bars_disabled_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/hide_system_bars_disabled_light.xml b/app/src/main/res/drawable/hide_system_bars_disabled_light.xml deleted file mode 100644 index 553b2642..00000000 --- a/app/src/main/res/drawable/hide_system_bars_disabled_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/hide_system_bars_enabled_dark.xml b/app/src/main/res/drawable/hide_system_bars_enabled_dark.xml deleted file mode 100644 index 24036ba6..00000000 --- a/app/src/main/res/drawable/hide_system_bars_enabled_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/hide_system_bars_enabled_light.xml b/app/src/main/res/drawable/hide_system_bars_enabled_light.xml deleted file mode 100644 index c095ea4f..00000000 --- a/app/src/main/res/drawable/hide_system_bars_enabled_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml b/app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml deleted file mode 100644 index 32d6baee..00000000 --- a/app/src/main/res/drawable/hide_system_bars_ghosted_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml b/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml deleted file mode 100644 index 28f03728..00000000 --- a/app/src/main/res/drawable/hide_system_bars_ghosted_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/translucent_bar_disabled_dark.xml b/app/src/main/res/drawable/translucent_bar_disabled_dark.xml deleted file mode 100644 index ad6341a8..00000000 --- a/app/src/main/res/drawable/translucent_bar_disabled_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/translucent_bar_disabled_light.xml b/app/src/main/res/drawable/translucent_bar_disabled_light.xml deleted file mode 100644 index 3b203629..00000000 --- a/app/src/main/res/drawable/translucent_bar_disabled_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/translucent_bar_enabled_dark.xml b/app/src/main/res/drawable/translucent_bar_enabled_dark.xml deleted file mode 100644 index b44db6d2..00000000 --- a/app/src/main/res/drawable/translucent_bar_enabled_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/translucent_bar_enabled_light.xml b/app/src/main/res/drawable/translucent_bar_enabled_light.xml deleted file mode 100644 index 0b48dfbc..00000000 --- a/app/src/main/res/drawable/translucent_bar_enabled_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/translucent_bar_ghosted_dark.xml b/app/src/main/res/drawable/translucent_bar_ghosted_dark.xml deleted file mode 100644 index 153d2804..00000000 --- a/app/src/main/res/drawable/translucent_bar_ghosted_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/translucent_bar_ghosted_light.xml b/app/src/main/res/drawable/translucent_bar_ghosted_light.xml deleted file mode 100644 index 4ae17b6f..00000000 --- a/app/src/main/res/drawable/translucent_bar_ghosted_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml index aafac66e..fdd09704 100644 --- a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml +++ b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml @@ -28,7 +28,7 @@ - - - + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/bookmarks_drawer.xml b/app/src/main/res/layout/bookmarks_drawer.xml index cd6e198c..58a0c119 100644 --- a/app/src/main/res/layout/bookmarks_drawer.xml +++ b/app/src/main/res/layout/bookmarks_drawer.xml @@ -22,12 +22,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/bookmarks_framelayout" android:layout_height="match_parent" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_gravity="end" > - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/main_drawerlayout.xml b/app/src/main/res/layout/main_drawerlayout.xml deleted file mode 100644 index ba9e9722..00000000 --- a/app/src/main/res/layout/main_drawerlayout.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/main_framelayout.xml b/app/src/main/res/layout/main_framelayout.xml new file mode 100644 index 00000000..9642decb --- /dev/null +++ b/app/src/main/res/layout/main_framelayout.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/main_webview.xml b/app/src/main/res/layout/main_webview.xml deleted file mode 100644 index 4b5b5b39..00000000 --- a/app/src/main/res/layout/main_webview.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bb114217..63337104 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -502,11 +502,6 @@ Pantalla completa Navegación de pantalla completa Doble toque para alternar a modo de navegación de pantalla completa. - Esconder barras del systema - Esconder las barras de estado y de navegación en el modo de navegación a pantalla completa. - Esto no funciona bien si el teclado es mostrado durante el modo de navegación a pantalla completa. - Barra de navegación translúcida - Hacer la barra de navegación translúcida en el modo de navegación a pantalla completa. Borrar todo Borra cookies, almacenamiento DOM, datos de formulario y la caché de WebView. A continuación borra manualmente los directorios “app_webview” y “cache”. @@ -544,10 +539,10 @@ Deslizar para actualizar Algunas webs no funcionan bien si la opción deslizar para actualizar está habilitada. - Descargar con app externa - El gestor de descargas de Android no funciona bien en algunos dispositivos. Mostrar iconos adicionales en la barra de aplicación Mostrar iconos en la barra de aplicaciones para refrescar el WebView y, si hay espacio, para alternar entre cookies y almacenamiento DOM. + Descargar con app externa + El gestor de descargas de Android no funciona bien en algunos dispositivos. Tema oscuro Cambiar el tema reiniciará Navegador Privado. Modo noche diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 79f51627..9c6a23b8 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -501,11 +501,6 @@ Schermo intero Navigazione a schermo intero Toccare due volte per avviare la navigazione a schermo intero. - Nascondi le barre di sistema - Nasconde la barra di stato e la barra di navigazione durante la navigazione a schermo intero. - Questa opzione non funziona perfettamente se si visualizza la tastiera durante la navigazione a schermo intero. - Barra di navigazione trasparente - Rende la barra di navigazione trasparente durante la navigazione a schermo intero. Elimina tutto Cancella i cookies, il DOM storage, i dati dei moduli e la cache di WebView. Cancella completamente le cartelle “app_webview” e “cache”. Elimina i cookie @@ -542,11 +537,11 @@ Swipe per aggiornare Alcuni siti non funzionano correttamente se questa opzione è abilitata. - Scarica con un\'applicazione esterna - Il download manager di Android potrebbe non funzionare correttamente su alcuni dispositivi. Mostra icone addizionali nella barra dell\'applicazione Mostra nella barra dell\'applicazione le icone per l\'aggiornamento di WebView e, se lo spazio è sufficiente, per l\'attivazione dei cookie e del DOM storage. + Scarica con un\'applicazione esterna + Il download manager di Android potrebbe non funzionare correttamente su alcuni dispositivi. Tema Dark La modifica del tema provocherà il riavvio di Privacy Browser. Modalità Notte diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a012beef..d9898476 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -495,10 +495,6 @@ Во весь экран Полноэкранный режим просмотра Двойное касание переключает режим просмотра. - Скрыть системные панели - Скрыть панели статуса и навигации в полноэкранном режиме просмотра. Это не работает при отображении клавиатуры во время полноэкранного просмотра. - Полупрозрачная навигационная панель - Панель навигации станет полупрозрачной в полноэкранном режиме просмотра. Очистить все Очищает файлы cookie, DOM-хранилище, данные формы и кэш WebView. Затем вручную удаляются все каталоги "app_webview" и "cache". Очистить файлы cookie @@ -535,10 +531,10 @@ Потянуть для обновления Некоторые веб-сайты могут работать некорректно при включении данной опции. - Загрузка с помощью внешнего приложения - Менеджер загрузок Android не работает на некоторых устройствах. Отображать дополнительные значки на панели приложения Отображать значки на панели приложения для обновления WebView и, при наличии места, для переключения файлов cookie и хранилища DOM + Загрузка с помощью внешнего приложения + Менеджер загрузок Android не работает на некоторых устройствах. Темная тема Изменение темы перезапускает Privacy Browser. Ночной режим diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2ebc0987..e50808f7 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -496,10 +496,6 @@ Tam Ekran Tam ekran modu Tam ekran moduna geçmek için çift dokun. - Sistem çubuğunu gizle - Tam ekran modunda durum ve gezinti çubuğunu gizler. Tam ekran modundayken klavye açıldığında iyi çalışmayabilir. - Yarı saydam gezinti çubuğu - Gezinti çubuğunu, tam ekran modunda yarı saydam yapar. Her şeyi temizle Çerezleri, DOM depolama alanını, form verisini ve Web Görünümü ön belleğini temizler. Sonrasında, manuel olarak bütün “app_webview” ve “cache” dizinlerini siler. @@ -537,10 +533,10 @@ Yenilemek için kaydır Bazı web siteleri, yenilemek için kaydır seçeneği etkin olduğunda iyi çalışmayabilir. - Harici uygulamayla indir - Android indirme yönetecisi bazı cihazlarda iyi çalışmayabilir. Ek uygulama çubuğu simgelerini göster Web Görünümünü yenilemek ve yer varsa çerezler ve DOM depolama alanını değiştirmek için uygulama çubuğunda simgeler gösterir. + Harici uygulamayla indir + Android indirme yönetecisi bazı cihazlarda iyi çalışmayabilir. Koyu tema Temayı değiştirmek Privacy Browser\'ı yeniden başlatacak. Gece modu diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b8bc4f52..c4e39018 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -552,11 +552,8 @@ Full Screen Full screen browsing mode Double-tap to toggle full screen browsing mode. - Hide system bars - Hide the status and navigation bars in full screen browsing mode. - This doesn’t work well if the keyboard is displayed during full screen browsing mode. - Translucent navigation bar - Make the navigation bar translucent in full screen browsing mode. + Hide the app bar + Hide the app bar that contains the URL. Clear everything Clears cookies, DOM storage, form data, and WebView’s cache. Then manually deletes the entire “app_webview” and “cache” directories. @@ -615,10 +612,12 @@ Swipe to refresh Some websites don’t work well if swipe to refresh is enabled. - Download with external app - Android’s download manager doesn’t work well on some devices. + Scroll the app bar + Scroll the app bar off the top of the screen when the WebView scrolls down. Display additional app bar icons Display icons in the app bar for refreshing the WebView and, if there is room, for toggling cookies and DOM storage. + Download with external app + Android’s download manager doesn’t work well on some devices. Dark theme Changing the theme will restart Privacy Browser. Night mode diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8c24d1a7..6176de60 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,7 +1,7 @@