Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for colors from json for discount banner

Browse source
This commit is contained in:
Alex Sytnyk 2018-10-18 17:39:02 +03:00
parent b256a6cafc
commit 484364a7cf
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/drawable/discount_bar_bg_land.xml
View file

@ -3,7 +3,7 @@
<item>
<nine-patch android:src="@drawable/bg_card_shadow" />
</item>
<item>
<item android:id="@+id/color_bg">
<shape android:shape="rectangle">
<solid android:color="@color/discount_bar_bg" />
<corners android:radius="@dimen/map_button_rect_rad" />

38
OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
View file

@ -2,9 +2,15 @@ package net.osmand.plus.helpers;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.LayerDrawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.provider.Settings.Secure;
import android.support.annotation.ColorInt;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.View;
@ -161,9 +167,20 @@ public class DiscountHelper {
private static void showDiscountBanner(final MapActivity mapActivity, final ControllerData data) {
int iconId = mapActivity.getResources().getIdentifier(data.iconId, "drawable", mapActivity.getMyApplication().getPackageName());
final DiscountBarController toolbarController = new DiscountBarController();
if (data.bgColor != -1) {
LayerDrawable bgLand = (LayerDrawable) ContextCompat.getDrawable(mapActivity, R.drawable.discount_bar_bg_land);
if (bgLand != null) {
((GradientDrawable) bgLand.findDrawableByLayerId(R.id.color_bg)).setColor(data.bgColor);
}
ColorDrawable bg = new ColorDrawable(data.bgColor);
toolbarController.setBgs(bg, bg, bgLand, bgLand);
}
toolbarController.setTitle(data.message);
toolbarController.setTitleTextClrs(data.titleColor, data.titleColor);
toolbarController.setDescription(data.description);
toolbarController.setDescrTextClrs(data.descrColor, data.descrColor);
toolbarController.setBackBtnIconIds(iconId, iconId);
toolbarController.setBackBtnIconClrs(data.iconColor, data.iconColor);
if (!Algorithms.isEmpty(data.url)) {
View.OnClickListener clickListener = new View.OnClickListener() {
@Override
@ -218,14 +235,35 @@ public class DiscountHelper {
String iconId;
String url;
@ColorInt
int iconColor = -1;
@ColorInt
int bgColor = -1;
@ColorInt
int titleColor = -1;
@ColorInt
int descrColor = -1;
static ControllerData parse(OsmandApplication app, JSONObject obj) throws JSONException {
ControllerData res = new ControllerData();
res.message = obj.getString("message");
res.description = obj.getString("description");
res.iconId = obj.getString("icon");
res.url = parseUrl(app, obj.getString("url"));
res.iconColor = parseColor("icon_color", obj);
res.bgColor = parseColor("bg_color", obj);
res.titleColor = parseColor("title_color", obj);
res.descrColor = parseColor("description_color", obj);
return res;
}
private static int parseColor(String key, JSONObject obj) {
String color = obj.optString(key);
if (!color.isEmpty()) {
return Color.parseColor(color);
}
return -1;
}
}
private static class DiscountBarController extends TopToolbarController {