Add dark theme colors to the swipe to refresh animation. https://redmine.stoutner...

diff --git a/app/src/main/assets/de/guide_tor_dark.html b/app/src/main/assets/de/guide_tor_dark.html
index 42d8c17880232633258698b6316eed8f823482ef..7305ec0f6ea62f9a8f7fb94c243418ed8ee1c7b6 100644 (file)
--- a/app/src/main/assets/de/guide_tor_dark.html
+++ b/app/src/main/assets/de/guide_tor_dark.html
@@ -81,7 +81,7 @@
         <img class="center" src="images/tor.png">
 
         <h3><img class="title" src="../shared_images/file_download_blue_dark.png"> Downloading Files Via Tor</h3>
-        <p>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.
+        <p>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.</p>
 

diff --git a/app/src/main/assets/de/guide_tor_light.html b/app/src/main/assets/de/guide_tor_light.html
index 709f442887c6f602b081ff08d4a236044a3569fe..c69c203b27e311ad41cb9f3cffb387c30888fc89 100644 (file)
--- a/app/src/main/assets/de/guide_tor_light.html
+++ b/app/src/main/assets/de/guide_tor_light.html
@@ -81,7 +81,7 @@
         <img class="center" src="images/tor.png">
 
         <h3><img class="title" src="../shared_images/file_download_blue_light.png"> Downloading Files Via Tor</h3>
-        <p>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.
+        <p>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.</p>
 

diff --git a/app/src/main/assets/en/guide_tor_dark.html b/app/src/main/assets/en/guide_tor_dark.html
index 41ee0695f721696dededaf196bae1517045e59e3..3e14eeb5b6a3c67ea13656ea5abeb17fddf43c57 100644 (file)
--- a/app/src/main/assets/en/guide_tor_dark.html
+++ b/app/src/main/assets/en/guide_tor_dark.html
@@ -76,7 +76,7 @@
         <img class="center" src="images/tor.png">
 
         <h3><img class="title" src="../shared_images/file_download_blue_dark.png"> Downloading Files Via Tor</h3>
-        <p>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.
+        <p>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.</p>
 

diff --git a/app/src/main/assets/en/guide_tor_light.html b/app/src/main/assets/en/guide_tor_light.html
index 6542134159a3502a16d1e370d6fb1a38fef4f0b4..1c67a5f6f7c2137e1c0f18ff1bde6f637a8cbc94 100644 (file)
--- a/app/src/main/assets/en/guide_tor_light.html
+++ b/app/src/main/assets/en/guide_tor_light.html
@@ -76,7 +76,7 @@
         <img class="center" src="images/tor.png">
 
         <h3><img class="title" src="../shared_images/file_download_blue_light.png"> Downloading Files Via Tor</h3>
-        <p>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.
+        <p>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.</p>
 

diff --git a/app/src/main/assets/es/guide_tor_dark.html b/app/src/main/assets/es/guide_tor_dark.html
index dc4aabdd9230c7590156410ae69ae95e6fa27115..85383c4ac89269550d2ec3dd63a32ac6eb62ed22 100644 (file)
--- a/app/src/main/assets/es/guide_tor_dark.html
+++ b/app/src/main/assets/es/guide_tor_dark.html
@@ -82,10 +82,10 @@
 
         <img class="center" src="images/tor.png">
 
-        <h3><img class="title" src="../shared_images/file_download_blue_dark.png"> Downloading Files Via Tor</h3>
-        <p>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.</p>
+        <h3><img class="title" src="../shared_images/file_download_blue_dark.png"> Descarga de archivos a través de Tor</h3>
+        <p>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.</p>
 
         <img class="center21" src="../shared_images/vpn_mode.png">
     </body>

diff --git a/app/src/main/assets/es/guide_tor_light.html b/app/src/main/assets/es/guide_tor_light.html
index b2f0b06c8d55b0a4346c7c115037151db54f57e8..891d34f21a0a69f49679584e8c9ecdfeb33ff872 100644 (file)
--- a/app/src/main/assets/es/guide_tor_light.html
+++ b/app/src/main/assets/es/guide_tor_light.html
@@ -82,10 +82,10 @@
 
         <img class="center" src="images/tor.png">
 
-        <h3><img class="title" src="../shared_images/file_download_blue_light.png"> Downloading Files Via Tor</h3>
-        <p>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.</p>
+        <h3><img class="title" src="../shared_images/file_download_blue_light.png"> Descarga de archivos a través de Tor</h3>
+        <p>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.</p>
 
         <img class="center21" src="../shared_images/vpn_mode.png">
     </body>

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 4627ff4c157110582ccb02b072b6c28c5d3c169c..d4ea56befcdc2432f2fa96655ccbb6780e137da8 100644 (file)
--- 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));