diff options
| author | cyBerta <cyberta@riseup.net> | 2021-11-28 21:09:02 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2021-11-28 21:09:02 +0100 |
| commit | 3228b17f43b232116c192728438954c4c1412ec3 (patch) | |
| tree | 24fc23c58a7b511522d7071bfe8f119b7b19355a /app/src/main/res | |
| parent | 0ae22b0017c4796d0f27482b83ed282c1dbe7fea (diff) | |
make location button icon tint color configurable, use white tint for riseupvpn
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 |
3 files changed, 11 insertions, 1 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> |