From e161de67f0b95f8c77f7904c3730fba01e7b35d8 Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Tue, 3 Nov 2020 14:27:19 +0300 Subject: [PATCH] [ads][android] additional ads into download on map dialog are added --- android/res/drawable/ic_logo_arsenal.xml | 14 +++ android/res/values/colors.xml | 1 + .../maps/downloader/DownloaderBannerType.java | 102 +++++++++++++++++- .../downloader/DownloaderPromoBanner.java | 5 + .../util/statistics/Statistics.java | 5 + 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 android/res/drawable/ic_logo_arsenal.xml diff --git a/android/res/drawable/ic_logo_arsenal.xml b/android/res/drawable/ic_logo_arsenal.xml new file mode 100644 index 0000000000..0f6059e603 --- /dev/null +++ b/android/res/drawable/ic_logo_arsenal.xml @@ -0,0 +1,14 @@ + + + + diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 7a6b1f9c7f..12e0bb1782 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -236,6 +236,7 @@ #E30611 #4287DF #009A37 + #93C950 #9B24B2 #9867FC #93BF39 diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java b/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java index f2f77d507a..5c6c27d494 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java @@ -136,7 +136,107 @@ enum DownloaderBannerType implements StatisticValueConverter { return R.layout.onmap_downloader_banner_big_logo; } - }; + }, + ARSENAL_MEDIC(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_arsenal, + R.string.arsenal_telemed_map_downloader_title, + R.string.arsenal_cta_button, + R.color.white_primary, + R.color.arsenal_button)) + { + @NonNull + @Override + public String toStatisticValue() + { + return Statistics.ParamValue.ARSENAL_MEDIC; + } + + @LayoutRes + @Override + int getLayoutId() + { + return R.layout.onmap_downloader_banner; + } + }, + ARSENAL_FLAT(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_arsenal, + R.string.arsenal_flat_map_downloader_title, + R.string.arsenal_cta_button, + R.color.white_primary, + R.color.arsenal_button)) + { + @NonNull + @Override + public String toStatisticValue() + { + return Statistics.ParamValue.ARSENAL_FLAT; + } + + @LayoutRes + @Override + int getLayoutId() + { + return R.layout.onmap_downloader_banner; + } + }, + ARSENAL_INSURANCE_CRIMEA(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_arsenal, + R.string.arsenal_crimea_map_downloader_title, + R.string.arsenal_cta_button, + R.color.white_primary, + R.color.arsenal_button)) + { + @NonNull + @Override + public String toStatisticValue() + { + return Statistics.ParamValue.ARSENAL_INSURANCE_CRIMEA; + } + + @LayoutRes + @Override + int getLayoutId() + { + return R.layout.onmap_downloader_banner; + } + }, + ARSENAL_INSURANCE_RUSSIA(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_arsenal, + R.string.arsenal_russia_map_downloader_title, + R.string.arsenal_cta_button, + R.color.white_primary, + R.color.arsenal_button)) + { + @NonNull + @Override + public String toStatisticValue() + { + return Statistics.ParamValue.ARSENAL_INSURANCE_RUSSIA; + } + + @LayoutRes + @Override + int getLayoutId() + { + return R.layout.onmap_downloader_banner; + } + }, + ARSENAL_INSURANCE_WORLD(new DownloaderBannerConfigStrategyPartner(R.drawable.ic_logo_arsenal, + R.string.arsenal_abroad_map_downloader_title, + R.string.arsenal_cta_button, + R.color.white_primary, + R.color.arsenal_button)) + { + @NonNull + @Override + public String toStatisticValue() + { + return Statistics.ParamValue.ARSENAL_INSURANCE_WORLD; + } + + @LayoutRes + @Override + int getLayoutId() + { + return R.layout.onmap_downloader_banner; + } + }; @NonNull private final DownloaderBannerConfigStrategy mViewConfigStrategy; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java b/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java index afd8aa2e53..bd8c882da6 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java @@ -35,6 +35,11 @@ public final class DownloaderPromoBanner case 7: return DownloaderBannerType.SKYENG; case 8: return DownloaderBannerType.BOOKMARK_CATALOG; case 9: return DownloaderBannerType.MASTERCARD_SBERBANK; + case 11: return DownloaderBannerType.ARSENAL_MEDIC; + case 12: return DownloaderBannerType.ARSENAL_FLAT; + case 13: return DownloaderBannerType.ARSENAL_INSURANCE_CRIMEA; + case 14: return DownloaderBannerType.ARSENAL_INSURANCE_RUSSIA; + case 15: return DownloaderBannerType.ARSENAL_INSURANCE_WORLD; default: throw new AssertionError("Incorrect core banner type: " + coreValue); } } diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index 13c1f38254..c77be96a43 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -817,6 +817,11 @@ public enum Statistics public static final String SKYENG = "Skyeng"; public static final String MTS = "MTS"; public static final String MASTERCARD_SBERBANK = "MastercardSberbank"; + public static final String ARSENAL_MEDIC = "Arsenal_telemed"; + public static final String ARSENAL_FLAT = "Arsenal_flat"; + public static final String ARSENAL_INSURANCE_CRIMEA = "Arsenal_crimea"; + public static final String ARSENAL_INSURANCE_RUSSIA = "Arsenal_russia"; + public static final String ARSENAL_INSURANCE_WORLD = "Arsenal_abroad"; public static final String WIKIPEDIA = "wikipedia"; public static final String PREVIEW = "preview"; public static final String FULL = "full";