kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Replace icons for adding and removing place from bookmarks

Browse source 
Signed-off-by: Daniil Popov <int02h@gmail.com>
This commit is contained in:
Daniil Popov 2021-06-28 13:20:32 +03:00 • committed by Alexander Borsuk
parent 45fa4c32fd
commit ed10e841df
5 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/res/drawable/ic_bookmarks_off.xml
View file

@ -3,13 +3,8 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group
android:pivotX="12"
android:pivotY="12"
android:scaleX="1"
android:scaleY="1">
<path
android:fillColor="#FFF"
android:pathData="M16.9994,2.998c1.105,0 2,0.896 2,2v15.9999l-7,-3 -7,3 0.011,-15.9999c0,-1.104 0.885,-2 1.989,-2h10ZM11,7v2h-2v2h2v2h2v-2h2v-2h-2v-2h-2Z" />
</group>
<path
android:pathData="M22,2V0.5C22,0.225 21.775,0 21.5,0H20.5C20.225,0 20,0.225 20,0.5V2H18.5C18.225,2 18,2.225 18,2.5V3.5C18,3.775 18.225,4 18.5,4H20V5.5C20,5.775 20.225,6 20.5,6H21.5C21.775,6 22,5.775 22,5.5V4H23.5C23.775,4 24,3.775 24,3.5V2.5C24,2.225 23.775,2 23.5,2H22ZM21.341,9.8465L14.8565,9.4425L12.451,3.3705C12.384,3.1475 12.185,2.9815 11.941,2.9815C11.697,2.9815 11.498,3.1475 11.4305,3.3705L9.025,9.4425L2.541,9.8465C2.2425,9.8465 2,10.089 2,10.387C2,10.5545 2.081,10.699 2.201,10.798L2.199,10.8035L7.2225,14.9885L5.6105,21.274L5.6205,21.2825C5.601,21.3385 5.585,21.3965 5.585,21.459C5.585,21.7575 5.8275,22 6.126,22C6.22,22 6.3045,21.969 6.382,21.9265L6.392,21.9355L11.941,18.4165L17.49,21.9355L17.5,21.9265C17.5775,21.969 17.662,22 17.756,22C18.054,22 18.297,21.7575 18.297,21.459C18.297,21.3965 18.281,21.3385 18.2615,21.2825L18.2715,21.274L16.659,14.9885L21.6825,10.8035L21.6805,10.798C21.801,10.699 21.882,10.5545 21.882,10.387C21.882,10.089 21.639,9.8465 21.341,9.8465Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>

13
android/res/drawable/ic_bookmarks_on.xml
View file

@ -3,13 +3,8 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group
android:pivotX="12"
android:pivotY="12"
android:scaleX="1"
android:scaleY="1">
<path
android:fillColor="#FFF"
android:pathData="M16.9994,2.998c1.105,0 2,0.896 2,2v15.9999l-7,-3 -7,3 0.011,-15.9999c0,-1.104 0.885,-2 1.989,-2h10ZM8.171,8.5838l2.4142,2.4142 -2.4142,2.4142 1.4142,1.4142 2.4142,-2.4142 2.4142,2.4142 1.4142,-1.4142 -2.4142,-2.4143 2.4142,-2.4142 -1.4142,-1.4142 -2.4142,2.4142 -2.4142,-2.4142 -1.4142,1.4142Z" />
</group>
<path
android:pathData="M18.5,2C18.225,2 18,2.225 18,2.5V3.5C18,3.775 18.225,4 18.5,4H23.5C23.775,4 24,3.775 24,3.5V2.5C24,2.225 23.775,2 23.5,2H18.5ZM14.8565,9.4425L12.451,3.3705C12.384,3.1475 12.185,2.9815 11.941,2.9815C11.697,2.9815 11.498,3.1475 11.4305,3.3705L9.025,9.4425L2.541,9.8465C2.2425,9.8465 2,10.089 2,10.387C2,10.5545 2.081,10.699 2.201,10.798L7.2225,14.9885L5.6105,21.274C5.601,21.3385 5.585,21.3965 5.585,21.459C5.585,21.7575 5.8275,22 6.126,22C6.22,22 6.3045,21.969 6.382,21.9265L11.941,18.4165L17.49,21.9355C17.5775,21.969 17.662,22 17.756,22C18.054,22 18.297,21.7575 18.297,21.459C18.297,21.3965 18.281,21.3385 18.2615,21.2825L16.659,14.9885L21.6825,10.8035C21.801,10.699 21.882,10.5545 21.882,10.387C21.882,10.089 21.639,9.8465 21.341,9.8465L14.8565,9.4425Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>

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

@ -12,6 +12,7 @@
<attr name="sidePanel" format="color" />
<attr name="iconTint" format="color" />
<attr name="iconTintDisabled" format="color" />
<attr name="iconTintActive" format="color" />
<attr name="iconTintLight" format="color" />
<attr name="zoomPlus" format="reference" />
<attr name="zoomMinus" format="reference" />

2
android/res/values/themes-base.xml
View file

@ -33,6 +33,7 @@
<item name="sidePanel">@color/bg_side_panel</item>
<item name="iconTint">@color/black_54</item>
<item name="iconTintDisabled">@color/black_12</item>
<item name="iconTintActive">@color/yellow</item>
<item name="iconTintLight">@color/icon_tint_light</item>
<item name="secondary">@color/text_dark_hint</item>
@ -209,6 +210,7 @@
<item name="sidePanel">@color/bg_side_panel_night</item>
<item name="iconTint">@color/white_secondary</item>
<item name="iconTintDisabled">@color/white_12</item>
<item name="iconTintActive">@color/yellow</item>
<item name="iconTintLight">@color/icon_tint_light_night</item>
<item name="secondary">@color/text_light_hint</item>

2
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -877,7 +877,7 @@ public class PlacePageView extends NestedScrollViewClickFixed
return;
if (mBookmarkSet)
mBookmarkButtonIcon.setImageDrawable(Graphics.tint(getContext(), R.drawable.ic_bookmarks_on, R.attr.iconTint));
mBookmarkButtonIcon.setImageDrawable(Graphics.tint(getContext(), R.drawable.ic_bookmarks_on, R.attr.iconTintActive));
else
mBookmarkButtonIcon.setImageDrawable(Graphics.tint(getContext(), R.drawable.ic_bookmarks_off, R.attr.iconTint));