diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/v_location_button.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 7 |
4 files changed, 15 insertions, 4 deletions
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 3779a964..7f16a6b1 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -18,6 +18,7 @@ android:scaleType="fitCenter" android:src="@drawable/ic_web" android:layout_gravity="center" + app:tint="@color/colorLocationButtonTint" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/recommended_icn" @@ -31,6 +32,8 @@ android:layout_toEndOf="@id/world_icn" android:layout_toRightOf="@id/world_icn" android:src="@drawable/ic_lightning_bolt" + app:tint="@color/colorLocationButtonTint" + android:visibility="gone" tools:visibility="visible" /> @@ -77,6 +80,7 @@ android:src="@drawable/ic_bridge_36" android:visibility="gone" tools:visibility="visible" + app:tint="@color/colorLocationButtonTint" /> <se.leap.bitmaskclient.base.views.LocationIndicator @@ -91,6 +95,7 @@ android:paddingBottom="@dimen/stdpadding" android:visibility="visible" android:layout_gravity="center_vertical" + app:tint="@color/colorLocationButtonTintTransparent" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 5631e3f3..2bf4d8ce 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -9,6 +9,7 @@ <attr name="icon" format="reference"/> <attr name="subtitle" format="string|reference"/> <attr name="singleLine" format="boolean"/> + <attr name="tint" format="reference|color" /> <declare-styleable name="IconSwitchEntry"> <attr name="text"/> <attr name="subtitle" /> @@ -22,4 +23,7 @@ <attr name="icon"/> <attr name="singleLine"/> </declare-styleable> + <declare-styleable name="LocationIndicator"> + <attr name="tint"/> + </declare-styleable> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c1039f70..792db1ee 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -41,7 +41,8 @@ <color name="colorEipFragmentFont">@color/black800</color> <color name="colorFontBtn">@color/black800</color> <color name="colorFontBtnEnabled">@color/white</color> - + <color name="colorLocationButtonTint">@color/black800</color> + <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color> <color name="colorWarning">#B33A3A</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c32e0d3c..c5f021f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -128,7 +128,7 @@ <string name="donate_button_donate">Donate</string> <string name="obfuscated_connection">Using an obfuscated connection.</string> <string name="obfuscated_connection_try">Trying an obfuscated connection.</string> - <string name="nav_drawer_obfuscated_connection">Using Bridges</string> + <string name="nav_drawer_obfuscated_connection">Use Bridges</string> <string name="nav_drawer_subtitle_obfuscated_connection">Circumvent VPN filtering</string> <string name="warning_exclude_apps_message">Be careful of excluding apps from VPN. This will reveal your identity and compromise your security.</string> <plurals name="subtitle_exclude_apps"> @@ -152,7 +152,7 @@ <string name="version_update_error">Update failed.</string> <string name="version_update_error_permissions">No permissions to install app.</string> <string name="gateway_selection_title">Select location</string> - <string name="gateway_selection_recommended_location">Use recommended location</string> + <string name="gateway_selection_recommended_location">Recommended location</string> <string name="gateway_selection_recommended">Recommended</string> <string name="gateway_selection_manually">Manually select</string> <string name="gateway_selection_automatic_location">Automatically use best connection.</string> @@ -185,7 +185,7 @@ <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string> <string name="censorship_circumvention">Censorship circumvention</string> <string name="use_snowflake">Use Snowflake</string> - <string name="snowflake_description">Circumvent blocking of the provider\'s configuration server.</string> + <string name="snowflake_description">Protect configuration process against censorship.</string> <string name="vpn_settings">VPN settings</string> <string name="prefer_udp">Use UDP if available</string> <string name="prefer_udp_subtitle">UDP can be faster and better for streaming, but does not work for all networks.</string> @@ -196,4 +196,5 @@ <string name="connection_not_connected" >You may be leaking information to your internet provider or local network.</string> <string name="eip_state_no_network">You have no working Internet connection. Once you get it back, you will be automatically connected to</string> <string name="eip_state_blocking">%1$s is blocking all internet traffic.</string> + <string name="disabled_while_udp_on">Disabled while UDP is on.</string> </resources> |