From 51f746aa604a98c83340364b57f500cae7325abb Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 19 Dec 2018 11:15:35 -0700 Subject: [PATCH] Add dark theme colors to the swipe to refresh animation. https://redmine.stoutner.com/issues/242 --- app/src/main/assets/de/guide_tor_dark.html | 2 +- app/src/main/assets/de/guide_tor_light.html | 2 +- app/src/main/assets/en/guide_tor_dark.html | 2 +- app/src/main/assets/en/guide_tor_light.html | 2 +- app/src/main/assets/es/guide_tor_dark.html | 8 ++++---- app/src/main/assets/es/guide_tor_light.html | 8 ++++---- .../activities/MainWebViewActivity.java | 11 +++++++++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/src/main/assets/de/guide_tor_dark.html b/app/src/main/assets/de/guide_tor_dark.html index 42d8c178..7305ec0f 100644 --- a/app/src/main/assets/de/guide_tor_dark.html +++ b/app/src/main/assets/de/guide_tor_dark.html @@ -81,7 +81,7 @@

Downloading Files Via Tor

-

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be router through the Tor network, but file downloads will not. +

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be routed through the Tor network, but file downloads will not. This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. Users who want to download files via Orbot need to enable its VPN mode.

diff --git a/app/src/main/assets/de/guide_tor_light.html b/app/src/main/assets/de/guide_tor_light.html index 709f4428..c69c203b 100644 --- a/app/src/main/assets/de/guide_tor_light.html +++ b/app/src/main/assets/de/guide_tor_light.html @@ -81,7 +81,7 @@

Downloading Files Via Tor

-

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be router through the Tor network, but file downloads will not. +

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be routed through the Tor network, but file downloads will not. This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. Users who want to download files via Orbot need to enable its VPN mode.

diff --git a/app/src/main/assets/en/guide_tor_dark.html b/app/src/main/assets/en/guide_tor_dark.html index 41ee0695..3e14eeb5 100644 --- a/app/src/main/assets/en/guide_tor_dark.html +++ b/app/src/main/assets/en/guide_tor_dark.html @@ -76,7 +76,7 @@

Downloading Files Via Tor

-

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be router through the Tor network, but file downloads will not. +

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be routed through the Tor network, but file downloads will not. This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. Users who want to download files via Orbot need to enable its VPN mode.

diff --git a/app/src/main/assets/en/guide_tor_light.html b/app/src/main/assets/en/guide_tor_light.html index 65421341..1c67a5f6 100644 --- a/app/src/main/assets/en/guide_tor_light.html +++ b/app/src/main/assets/en/guide_tor_light.html @@ -76,7 +76,7 @@

Downloading Files Via Tor

-

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be router through the Tor network, but file downloads will not. +

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be routed through the Tor network, but file downloads will not. This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. Users who want to download files via Orbot need to enable its VPN mode.

diff --git a/app/src/main/assets/es/guide_tor_dark.html b/app/src/main/assets/es/guide_tor_dark.html index dc4aabdd..85383c4a 100644 --- a/app/src/main/assets/es/guide_tor_dark.html +++ b/app/src/main/assets/es/guide_tor_dark.html @@ -82,10 +82,10 @@ -

Downloading Files Via Tor

-

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be router through the Tor network, but file downloads will not. - This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. - Users who want to download files via Orbot need to enable its VPN mode.

+

Descarga de archivos a través de Tor

+

Cuando Orbot está operando en modo proxy, navegar por Internet usando Navegador Privado será enrutado a través de la red Tor, pero no en el caso de las descargas de archivos. + Esto es debido a que Navegador Privado utiliza el gestor de descargas integrado de Android para descargar archivos, que no tiene una opción de proxy. + Los usuarios que quieran descargar archivos a través de Orbot necesitan habilitar su modo VPN.

diff --git a/app/src/main/assets/es/guide_tor_light.html b/app/src/main/assets/es/guide_tor_light.html index b2f0b06c..891d34f2 100644 --- a/app/src/main/assets/es/guide_tor_light.html +++ b/app/src/main/assets/es/guide_tor_light.html @@ -82,10 +82,10 @@ -

Downloading Files Via Tor

-

When Orbot is operating in proxy mode, browsing the internet using Privacy Browser will be router through the Tor network, but file downloads will not. - This is because Privacy Browser uses Android’s builtin download manager to download files, which doesn't have a proxy option. - Users who want to download files via Orbot need to enable its VPN mode.

+

Descarga de archivos a través de Tor

+

Cuando Orbot está operando en modo proxy, navegar por Internet usando Navegador Privado será enrutado a través de la red Tor, pero no en el caso de las descargas de archivos. + Esto es debido a que Navegador Privado utiliza el gestor de descargas integrado de Android para descargar archivos, que no tiene una opción de proxy. + Los usuarios que quieran descargar archivos a través de Orbot necesitan habilitar su modo VPN.

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java index 4627ff4c..d4ea56be 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -815,11 +815,18 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook } }); - // Implement swipe to refresh + // Implement swipe to refresh. swipeRefreshLayout = findViewById(R.id.swipe_refreshlayout); - swipeRefreshLayout.setColorSchemeResources(R.color.blue_700); swipeRefreshLayout.setOnRefreshListener(() -> mainWebView.reload()); + // Set the swipe to refresh color according to the theme. + if (darkTheme) { + swipeRefreshLayout.setColorSchemeResources(R.color.blue_600); + swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.gray_850); + } else { + swipeRefreshLayout.setColorSchemeResources(R.color.blue_700); + } + // `DrawerTitle` identifies the `DrawerLayouts` in accessibility mode. drawerLayout.setDrawerTitle(GravityCompat.START, getString(R.string.navigation_drawer)); drawerLayout.setDrawerTitle(GravityCompat.END, getString(R.string.bookmarks)); -- 2.43.0