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

[android] search category ad colors are changed.

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-11-11 17:13:11 +03:00 • committed by Alexander Boriskov
parent 3a7b0b459d
commit d56a7e833e
6 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
android/res/drawable/bg_search_category_ad_action_night.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/placepage_banner_small_action_corner" />
<solid android:color="@color/white_12" />
<padding android:bottom="@dimen/placepage_banner_button_margin_top" android:left="@dimen/margin_half" android:right="@dimen/margin_half" android:top="@dimen/placepage_banner_button_margin_top" />
</shape>
</item>
<item android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="@dimen/placepage_banner_small_action_corner" />
<solid android:color="@color/white_54" />
<padding android:bottom="@dimen/placepage_banner_button_margin_top" android:left="@dimen/margin_half" android:right="@dimen/margin_half" android:top="@dimen/placepage_banner_button_margin_top" />
</shape>
</item>
</selector>

7
android/res/drawable/bg_search_category_banner_night.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bg_search_category_banner_color_night"/>
<corners android:radius="@dimen/cardview_default_radius"/>
</shape>

4
android/res/layout/item_search_promo_category.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/search_item_height"
android:background="?bannerBackground">
android:background="?searchCategorybannerBackground">
<ImageView
android:id="@+id/ad_choices_label"
android:layout_width="wrap_content"
@ -47,7 +47,7 @@
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:textSize="@dimen/text_size_body_4"
android:textColor="?android:textColorSecondary"
android:textColor="?searchCategoryAdsActionTextColor"
android:textAllCaps="true"
android:background="?searchCategoryAdsActionBackground"
android:foreground="?clickableBackground"

2
android/res/values/colors.xml
View file

@ -184,10 +184,12 @@
<!-- Banner colors -->
<color name="bg_banner_color">#F2F5D4</color>
<color name="bg_banner_color_night">#A5A6A8</color>
<color name="bg_search_category_banner_color_night">#525252</color>
<color name="text_banner_color">#28000000</color>
<color name="text_banner_color_night">#28FFFFFF</color>
<color name="text_ads_color">#FFFFFBF2</color>
<color name="text_ads_color_night">#FFFFFBF2</color>
<color name="text_search_category_ad_color_night">#383C40</color>
<color name="megafon_button">@color/bg_brand_partner19</color>
<color name="megafon_button_pressed">@color/bg_brand_partner19_pressed</color>
<color name="red_cross_background">#FFE53935</color>

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

@ -56,12 +56,14 @@
<attr name="routingButtonActivatedHint" format="color" />
<attr name="bannerText" format="color" />
<attr name="bannerBackground" format="reference" />
<attr name="searchCategorybannerBackground" format="reference" />
<attr name="bannerButtonBackground" format="reference" />
<attr name="bannerButtonBackgroundColor" format="color" />
<attr name="adsBackground" format="reference" />
<attr name="adsText" format="color" />
<attr name="adsActionBackground" format="reference" />
<attr name="searchCategoryAdsActionBackground" format="reference" />
<attr name="searchCategoryAdsActionTextColor" format="reference" />
<attr name="textBannerTitle" format="color" />
<attr name="steadyIconTint" format="color" />
<attr name="steadyIconBackground" format="reference" />

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

@ -95,12 +95,14 @@
<item name="bannerText">@color/text_banner_color</item>
<item name="bannerBackground">@drawable/bg_pp_banner</item>
<item name="searchCategorybannerBackground">@drawable/bg_pp_banner</item>
<item name="bannerButtonBackground">@drawable/bg_pp_banner_large_button</item>
<item name="bannerButtonBackgroundColor">@color/black_12</item>
<item name="adsBackground">@drawable/bg_ads</item>
<item name="adsText">@color/text_ads_color</item>
<item name="adsActionBackground">@drawable/bg_ads_action</item>
<item name="searchCategoryAdsActionBackground">@drawable/bg_search_category_ad_action</item>
<item name="searchCategoryAdsActionTextColor">@color/black_50</item>
<item name="textBannerTitle">@color/black_secondary</item>
<item name="steadyIconTint">@color/black_secondary</item>
@ -308,12 +310,14 @@
<item name="bannerText">@color/text_banner_color_night</item>
<item name="bannerBackground">@drawable/bg_pp_banner_night</item>
<item name="searchCategorybannerBackground">@drawable/bg_search_category_banner_night</item>
<item name="bannerButtonBackground">@drawable/bg_pp_banner_large_button_night</item>
<item name="bannerButtonBackgroundColor">@color/white_12</item>
<item name="adsBackground">@drawable/bg_ads_night</item>
<item name="adsText">@color/text_ads_color_night</item>
<item name="adsActionBackground">@drawable/bg_ads_action_night</item>
<item name="searchCategoryAdsActionBackground">@drawable/bg_ads_action_night</item>
<item name="searchCategoryAdsActionBackground">@drawable/bg_search_category_ad_action_night</item>
<item name="searchCategoryAdsActionTextColor">@color/text_search_category_ad_color_night</item>
<item name="textBannerTitle">@color/bg_primary_night</item>
<item name="steadyIconTint">@color/white_secondary</item>