mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-01-03 05:44:14 +00:00
Code Issues Releases Wiki Activity

EOL

Browse source
This commit is contained in:
M66B 2023-08-19 09:18:52 +02:00
parent d909a6080e
commit 58a655cde8
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/res/layout/main.xml
View file

@ -4,12 +4,12 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingEnd="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingStart="@dimen/activity_horizontal_margin" android:paddingStart="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingEnd="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context=".ActivityMain"> tools:context=".ActivityMain">
<LinearLayout <LinearLayout
@ -27,6 +27,15 @@
android:textColor="?attr/colorOff" android:textColor="?attr/colorOff"
android:visibility="gone" /> android:visibility="gone" />
<TextView
android:id="@+id/tvEol"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/msg_eol"
android:textAppearance="@style/TextSmall"
android:textColor="?attr/colorOff" />
<LinearLayout <LinearLayout
android:id="@+id/llUsage" android:id="@+id/llUsage"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -48,8 +57,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:text="@android:string/ok" android:text="@android:string/ok"
android:textAppearance="@style/TextSmall" /> android:textAppearance="@style/TextSmall" />
</LinearLayout> </LinearLayout>
@ -76,8 +85,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:text="@android:string/ok" android:text="@android:string/ok"
android:textAppearance="@style/TextSmall" /> android:textAppearance="@style/TextSmall" />
</LinearLayout> </LinearLayout>
@ -117,8 +126,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:text="@android:string/ok" android:text="@android:string/ok"
android:textAppearance="@style/TextMedium" /> android:textAppearance="@style/TextMedium" />
</LinearLayout> </LinearLayout>
@ -144,8 +153,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:text="@android:string/ok" android:text="@android:string/ok"
android:textAppearance="@style/TextSmall" /> android:textAppearance="@style/TextSmall" />
</LinearLayout> </LinearLayout>
@ -171,8 +180,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:text="@android:string/ok" android:text="@android:string/ok"
android:textAppearance="@style/TextSmall" /> android:textAppearance="@style/TextSmall" />
</LinearLayout> </LinearLayout>
@ -206,8 +215,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:text="@string/app_support" android:text="@string/app_support"
android:textAppearance="@style/TextSmall" android:textAppearance="@style/TextSmall"
android:textColor="?attr/colorOff" android:textColor="?attr/colorOff"
@ -220,7 +229,7 @@
android:id="@+id/vwPopupAnchor" android:id="@+id/vwPopupAnchor"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" /> android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" />
</RelativeLayout> </RelativeLayout>

6
app/src/main/res/values/strings.xml
View file

@ -180,6 +180,12 @@
<string name="msg_hosts">%1$d allowed, %2$d blocked, %3$d hosts</string> <string name="msg_hosts">%1$d allowed, %2$d blocked, %3$d hosts</string>
<string name="msg_waiting">Waiting for event</string> <string name="msg_waiting">Waiting for event</string>
<string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string> <string name="msg_disabled">NetGuard is disabled, use the switch above to enable NetGuard</string>
<string name="msg_eol">
Google forces me to state that the app collects and shares email addresses when it does not.
I refuse to make false statements.
A meaningful discussion with Google appears to be impossible, and therefore this problem remains unsolved.
Google will soon remove the app from the Play Store and after that, there will be no point in maintaining and supporting this app anymore.
</string>
<string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based app</string> <string name="msg_revoked">NetGuard has been disabled, likely by using another VPN based app</string>
<string name="msg_installed">\'%1$s\' installed</string> <string name="msg_installed">\'%1$s\' installed</string>
<string name="msg_installed_n">Has been installed</string> <string name="msg_installed_n">Has been installed</string>