AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

set routing buttons colour with xml, not programatically

Browse source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond 2024-12-29 17:51:33 +00:00
parent 881e86dd93
commit 3f4721bbd9
10 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
View file

@ -37,10 +37,8 @@ public class RoutingToolbarButton extends AppCompatRadioButton
private void initView()
{
setBackgroundResource(ThemeUtils.isNightTheme(getContext()) ? R.drawable.routing_toolbar_button_night
: R.drawable.routing_toolbar_button);
setButtonTintList(ThemeUtils.isNightTheme(getContext()) ? R.color.routing_toolbar_icon_tint_night
: R.color.routing_toolbar_icon_tint);
setBackgroundResource(R.drawable.routing_toolbar_button);
setButtonTintList(R.color.routing_toolbar_icon_tint);
}
public void progress()

2
android/app/src/main/res/color/routing_toolbar_icon_tint.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
android:color="@color/routing_button_activated_tint"/>
android:color="?routingToolbarButtonIconActive"/>
<item
android:state_pressed="true"
android:color="@color/routing_button_pressed_tint"/>

11
android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
android:color="@color/routing_button_activated_tint_night"/>
<item
android:state_pressed="true"
android:color="@color/routing_button_pressed_tint"/>
<item
android:color="@color/routing_button_tint"/>
</selector>

2
android/app/src/main/res/drawable/routing_toolbar_button_active.xml
View file

@ -3,5 +3,5 @@
android:shape="oval"
android:height="40dp"
android:width="40dp">
<solid android:color="@color/white_primary"/>
<solid android:color="?routingToolbarButtonActive"/>
</shape>

13
android/app/src/main/res/drawable/routing_toolbar_button_night.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal_night"/>
</selector>
</item>
</ripple>

2
android/app/src/main/res/drawable/routing_toolbar_button_normal.xml
View file

@ -3,5 +3,5 @@
android:shape="oval"
android:height="40dp"
android:width="40dp">
<solid android:color="@color/bg_primary_dark"/>
<solid android:color="?routingToolbarButton"/>
</shape>

7
android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"
android:height="40dp"
android:width="40dp">
<solid android:color="@color/bg_primary_dark_night"/>
</shape>

3
android/app/src/main/res/values-night/themes-base.xml
View file

@ -81,6 +81,9 @@
<item name="navigationTheme">@style/MwmTheme.Navigation</item>
<item name="routingButtonHint">@color/routing_button_tint</item>
<item name="routingToolbarButtonIconActive">@color/routing_button_activated_tint_night</item>
<item name="routingToolbarButtonActive">@color/routing_button_tint</item>
<item name="routingToolbarButton">@color/bg_primary_dark_night</item>
<item name="android:listDivider">@drawable/list_divider_night</item>

3
android/app/src/main/res/values/themes-attrs.xml
View file

@ -43,6 +43,9 @@
<attr name="downloaderTheme" format="reference" />
<attr name="navigationTheme" format="reference" />
<attr name="routingButtonHint" format="color" />
<attr name="routingToolbarButtonIconActive" format="color" />
<attr name="routingToolbarButtonActive" format="color" />
<attr name="routingToolbarButton" format="color" />
<attr name="drivingOptionsViewBg" format="color" />
<attr name="transitPedestrianBackground" format="color" />
<attr name="transitRulerBackground" format="color" />

4
android/app/src/main/res/values/themes-base.xml
View file

@ -79,6 +79,10 @@
<item name="navigationTheme">@style/MwmTheme.Navigation</item>
<item name="routingButtonHint">@color/routing_button_tint</item>
<item name="routingToolbarButtonIconActive">@color/routing_button_activated_tint</item>
<item name="routingToolbarButtonActive">@color/routing_button_tint</item>
<item name="routingToolbarButton">@color/bg_primary_dark</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>