New text, use scroll views for small screens

app/src/main/res/layout/about.xml

@@ -45,55 +45,66 @@
         android:text="@string/app_copyright"
         android:textAppearance="@android:style/TextAppearance.Material.Small" />
 
-    <LinearLayout
-        android:layout_width="wrap_content"
+    <ScrollView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:orientation="horizontal">
+        android:orientation="vertical">
 
-        <Button
-            android:id="@+id/btnDonate"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/title_donate"
-            android:visibility="gone" />
+            android:orientation="vertical">
 
-        <Button
-            android:id="@+id/btnRate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/title_rate"
-            android:visibility="gone" />
-    </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:text="@string/msg_voluntary"
-        android:textAppearance="@android:style/TextAppearance.Material.Small"
-        android:textStyle="italic" />
+                <Button
+                    android:id="@+id/btnDonate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/title_donate"
+                    android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/tvThanks"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:text="@string/title_thanks"
-        android:textAppearance="@android:style/TextAppearance.Material.Medium"
-        android:visibility="gone" />
+                <Button
+                    android:id="@+id/btnRate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/title_rate"
+                    android:visibility="gone" />
+            </LinearLayout>
 
-    <TextView
-        android:id="@+id/tvLicense"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/app_license"
-        android:textAppearance="@android:style/TextAppearance.Material.Small"
-        android:textSize="12sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="16dp"
+                android:text="@string/msg_voluntary"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="italic" />
 
+            <TextView
+                android:id="@+id/tvThanks"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="16dp"
+                android:text="@string/title_thanks"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/tvLicense"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/app_license"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>

app/src/main/res/layout/vpn.xml

@@ -29,9 +29,30 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
+    <ScrollView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/msg_vpn"
-        android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+        android:layout_marginTop="8dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/msg_vpn"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/msg_dimming"
+                android:textAppearance="@android:style/TextAppearance.Material.Small"
+                android:textStyle="italic" />
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>

app/src/main/res/values-ar/strings.xml

@@ -34,6 +34,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Try NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Allow when screen is on</string>
     <string name="title_roaming">Block when roaming</string>

app/src/main/res/values-de/strings.xml

@@ -33,6 +33,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Probier NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Erlauben wenn Bildschirm an</string>
     <string name="title_roaming">Blockiere bei Roaming</string>

app/src/main/res/values-es/strings.xml

@@ -34,6 +34,7 @@ Por esta razón, por favor permite la conexión VPN en el próximo diálogo.
 Puesto que NetGuard no tiene permisos de internet, ya sabes que tu tráfico de internet no está siendo enviado a ninguna parte.</string>
     <string name="msg_try">Prueba NetGuard</string>
     <string name="msg_voluntary">Las donaciones son completamente voluntarias y no desbloquean ninguna funcionalidad. Las donaciones son una forma de mostrar tu apreciación por el trabajo hecho.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Permitir cuando la pantalla esté encendida</string>
     <string name="title_roaming">Bloquear cuando se esté en roaming</string>

app/src/main/res/values-fr/strings.xml

@@ -35,6 +35,7 @@ Netguard n\'a pas access a internet,vous savez que votre trafic Internet n\'est
 
     <string name="msg_try">Essayer NetGuard</string>
     <string name="msg_voluntary">Les dons sont completement a votre volonté et ils ne débloqueront aucune nouvelle fonctionalitée.
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 Faire un don est une de façon de montrer votre soutiens aux développeur et votre appréciation pour le travail accompli.</string>
 
     <string name="title_using">Accepter si l\'ecran est allumé</string>

app/src/main/res/values-it/strings.xml

@@ -35,6 +35,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Prova NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Permetti quando lo schermo è acceso</string>
     <string name="title_roaming">Blocca quando in roaming</string>

app/src/main/res/values-ja/strings.xml

@@ -23,6 +23,7 @@
     <string name="setting_vpn">Android VPN 設定を開く</string>
     <string name="msg_try">Try NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="summary_system">システムアプリケーションのルールを定義します (エキスパート向け)</string>
 

app/src/main/res/values-ko/strings.xml

@@ -34,6 +34,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Try NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Allow when screen is on</string>
     <string name="title_roaming">Block when roaming</string>

app/src/main/res/values-nl/strings.xml

@@ -34,6 +34,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Probeer NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Sta toe als scherm aan is</string>
     <string name="title_roaming">Blokkeer bij roamen</string>

app/src/main/res/values-pl/strings.xml

@@ -34,6 +34,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Spróbuj NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Allow when screen is on</string>
     <string name="title_roaming">Blokuj gdy roaming</string>

app/src/main/res/values-ro/strings.xml

@@ -34,6 +34,7 @@ Din acest motiv la urmatoarea fereastra de dialog trebuie sa acceptati crearea c
 Cum NetGuard efectiv nu are permisiunea de a accesa internetul, esti sigur ca traficul tau de internet nu este redirectionat nicaieri.</string>
     <string name="msg_try">Incearca NetGuard</string>
     <string name="msg_voluntary">Donatiile sunt voluntare si nu deblocheaza vreo functie ascunsa. Donatiile sunt doar un mod de a iti arata aprecierea pentru munca depusa pentru aceasta aplicatie.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
  
     <string name="title_using">Permite doar cand ecranul este pornit</string>
     <string name="title_roaming">Blocheaza in roaming</string>

app/src/main/res/values-ru/strings.xml

@@ -32,6 +32,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Попробуйте новый фаервол NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Разрешить, когда экран включен</string>
     <string name="title_roaming">Блокировать в роуминге</string>

app/src/main/res/values-sk/strings.xml

@@ -34,6 +34,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Skúsiť NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Povoliť pri zapnutej obrazovke</string>
     <string name="title_roaming">Blokovať pri roamingu</string>

app/src/main/res/values-uk/strings.xml

@@ -31,6 +31,7 @@ Since NetGuard has no internet permission, you know your internet traffic is not
 
     <string name="msg_try">Спробуйте NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Дозволити, коли екран увімкнуто</string>
     <string name="title_roaming">Блокувати у роумінгу</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -34,6 +34,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">试用NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">亮屏时允许</string>
     <string name="title_roaming">漫游时阻止</string>

app/src/main/res/values/strings.xml

@@ -35,6 +35,7 @@ For this reason, please allow a VPN connection in the next dialog.
 Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>
     <string name="msg_try">Try NetGuard</string>
     <string name="msg_voluntary">Donations are completely voluntary and do not unlock any feature. Donations are meant as a way to show your appreciation for the work done.</string>
+    <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>
 
     <string name="title_using">Allow when screen is on</string>
     <string name="title_roaming">Block when roaming</string>

strings.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-grep -RIl "\<string name=\"msg_vpn" app/src/main/res | xargs sed -i -e '/msg_vpn/d'
-grep -RIl "\<string name=\"msg_completed" app/src/main/res | xargs sed -i -e '/msg_completed/a\
-\ \ \ \ <string name=\"msg_vpn\">NetGuard uses a local VPN as a sinkhole to block internet traffic.\
-For this reason, please allow a VPN connection in the next dialog.\
-Since NetGuard has no internet permission, you know your internet traffic is not being sent anywhere.</string>'
+#grep -RIl "\<string name=\"msg_vpn" app/src/main/res | xargs sed -i -e '/msg_vpn/d'
+grep -RIl "\<string name=\"msg_voluntary" app/src/main/res | xargs sed -i -e '/msg_voluntary/a\
+\ \ \ \ <string name="msg_dimming">If you cannot press OK in the next dialog, another (screen dimming) application is likely manipulating the screen.</string>'
 
 #grep -RIl "\<string name=\"summary_credentials" app/src/main/res | xargs sed -i -e 's/Prevent from being uninstalled/Prevent NetGuard from being uninstalled/g'