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

[android] Fix for new banner colors

Browse source
This commit is contained in:
Александр Зацепин 2020-05-27 20:03:41 +03:00 • committed by rmrfsudols
parent 7745787a17
commit 780c8110d6
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/place_page_banner_content.xml
View file

@ -120,7 +120,6 @@
android:singleLine="true"
tools:visibility="visible"
android:fontFamily="@string/robotoMedium"
tools:targetApi="jelly_bean"
tools:ignore="SpUsage"/>
<TextView
android:id="@+id/tv__action_large"
@ -144,7 +143,6 @@
tools:text="Заказать"
tools:visibility="visible"
android:fontFamily="@string/robotoMedium"
tools:targetApi="jelly_bean"
tools:ignore="SpUsage"/>
</LinearLayout>
<ImageButton

8
android/src/com/mapswithme/maps/widget/placepage/BannerController.java
View file

@ -392,10 +392,10 @@ final class BannerController implements PlacePageStateObserver
{
Context context = mBannerView.getContext();
Resources res = context.getResources();
int colorFrom = ThemeUtils.isNightTheme() ? res.getColor(R.color.white_12)
: res.getColor(R.color.black_12);
int colorTo = ThemeUtils.isNightTheme() ? res.getColor(R.color.white_24)
: res.getColor(R.color.black_24);
int colorFrom = ThemeUtils.isNightTheme() ? res.getColor(R.color.bg_banner_action_button_night)
: res.getColor(R.color.bg_banner_action_button);
int colorTo = ThemeUtils.isNightTheme() ? res.getColor(R.color.bg_banner_action_button_pressed_night)
: res.getColor(R.color.bg_banner_action_button_pressed);
animator = ObjectAnimator.ofObject(mActionLarge, "backgroundColor", new ArgbEvaluator(),
colorFrom, colorTo, colorFrom);
}