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

[ads][android] additional ads into download on map dialog are added

Browse source
This commit is contained in:
Arsentiy Milchakov 2020-11-03 14:27:19 +03:00 • committed by Alexander Boriskov
parent bb482f60d5
commit e161de67f0
5 changed files with 126 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/res/drawable/ic_logo_arsenal.xml Normal file
View file

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M9.0696,12.9265H4.2042L6.6367,17.174L9.0696,12.9265ZM11.7519,7.9541L9.3186,3.7062L6.8861,7.9541H11.7519ZM1.3579,17.6086C1.1128,18.0667 1,18.5492 1,19.0204C1,19.5512 1.1427,20.0675 1.3986,20.5158C1.6549,20.9645 2.0261,21.3471 2.4828,21.6116L2.4824,21.6123C2.8847,21.8452 3.3547,21.9855 3.873,21.9993L6.388,17.6086H1.3579ZM14.5156,3.4181L11.9998,7.8099L11.302,6.5913L9.4848,3.4188C9.7558,2.9752 10.1144,2.6355 10.5196,2.3997C10.9751,2.1344 11.4895,2.0007 12.0034,2C12.5177,1.9993 13.0321,2.1319 13.4877,2.3986C13.8892,2.6333 14.2456,2.9726 14.5156,3.4181ZM14.6818,3.7062L12.2489,7.9541H17.115L14.6818,3.7062ZM17.1146,17.6086H12.2489L14.6818,21.8561L17.1146,17.6086ZM17.3637,17.7528L19.7962,22H14.9308L17.3637,17.7528ZM17.6124,17.6086L20.1274,21.9993C20.6461,21.9855 21.1161,21.8452 21.5179,21.6123V21.6116C21.9746,21.3471 22.3458,20.9645 22.6017,20.5158C22.858,20.0675 23,19.5512 23,19.0204C23,18.5492 22.8875,18.0667 22.6424,17.6086H17.6124ZM17.3637,17.174L19.7962,12.9265H14.9308L17.3637,17.174ZM22.4785,17.3183H17.6124L20.0452,13.0703L22.4785,17.3183ZM14.6818,12.4919L17.1146,8.244H12.2489L14.6818,12.4919ZM19.7965,12.6366H14.9308L17.3637,8.3883L19.7965,12.6366ZM9.3186,12.4923L11.7519,8.244H6.8861L9.3186,12.4923ZM9.0696,12.6366H4.2042L6.6367,8.3886L9.0696,12.6366ZM11.7519,17.3183H6.8861L9.319,13.0703L11.7519,17.3183ZM6.388,17.3183H1.5226L3.9555,13.0707L6.388,17.3183Z"
android:fillColor="#7F7F7F"
android:fillType="evenOdd"/>
<path
android:pathData="M9.319,13.0703L11.7518,17.3182H6.8861L9.319,13.0703Z"
android:fillColor="#8CC751"
android:fillType="evenOdd"/>
</vector>

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

@ -236,6 +236,7 @@
<color name="mts_button">#E30611</color>
<color name="skyeng_button">#4287DF</color>
<color name="mastercard_sberbank_button">#009A37</color>
<color name="arsenal_button">#93C950</color>
<color name="city_color">#9B24B2</color>
<color name="city_color_night">#9867FC</color>
<color name="outdoor_color_night">#93BF39</color>

102
android/src/com/mapswithme/maps/downloader/DownloaderBannerType.java
View file

@ -136,7 +136,107 @@ enum DownloaderBannerType implements StatisticValueConverter<String>
{
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;

5
android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java
View file

@ -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);
}
}

5
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -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";