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

set help icon tint with xml, not programatically

Browse source 
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
Harry Bond 2024-12-29 16:30:39 +00:00
parent 8a4468ac1d
commit 881e86dd93
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
View file

@ -106,9 +106,6 @@ public class MapButtonsController extends Fragment
helpButton.setImageResource(R.drawable.ic_christmas_tree);
else
helpButton.setImageResource(R.drawable.logo);
// Keep this button colorful in normal theme.
if (!ThemeUtils.isNightTheme(requireContext()))
helpButton.getDrawable().setTintList(null);
}
final View zoomFrame = mFrame.findViewById(R.id.zoom_buttons_container);

3
android/app/src/main/res/layout/map_buttons_help.xml
View file

@ -6,4 +6,5 @@
style="@style/MwmWidget.MapButton.Square"
android:contentDescription="@string/help"
app:shapeAppearanceOverlay="@style/MwmWidget.MapButton.Square"
app:srcCompat="@drawable/ic_question_mark" />
app:srcCompat="@drawable/logo"
android:tint="?helpIconTint"/>

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

@ -38,6 +38,7 @@
<item name="iconTintDisabled">@color/white_12</item>
<item name="iconTintActive">@color/yellow</item>
<item name="iconTintLight">@color/icon_tint_light_night</item>
<item name="helpIconTint">@color/white_secondary</item>
<item name="secondary">@color/text_light_hint</item>
<item name="dividerHorizontal">@color/divider_night</item>

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

@ -15,6 +15,7 @@
<attr name="iconTintDisabled" format="color" />
<attr name="iconTintActive" format="color" />
<attr name="iconTintLight" format="color" />
<attr name="helpIconTint" format="color" />
<attr name="ppBackground" format="color" />
<attr name="ppButtonsBackground" format="color" />
<attr name="navNextTurnFrame" format="reference" />

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

@ -36,6 +36,7 @@
<item name="iconTintDisabled">@color/black_12</item>
<item name="iconTintActive">@color/yellow</item>
<item name="iconTintLight">@color/icon_tint_light</item>
<item name="helpIconTint">@android:color/transparent</item>
<item name="secondary">@color/text_dark_hint</item>
<item name="dividerHorizontal">@color/divider</item>