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

Added cache vars to aidl widget

Browse source
This commit is contained in:
max-klaus 2020-02-09 19:16:47 +03:00
parent a0e380b5ce
commit 3217aae9a3
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/aidl/ConnectedApp.java
View file

@ -184,6 +184,13 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
TextInfoWidget createWidgetControl(final MapActivity mapActivity, final String widgetId) {
TextInfoWidget control = new TextInfoWidget(mapActivity) {
private boolean init = true;
private String cachedTxt;
private String cachedSubtext;
private Boolean cachedNight;
private Integer cachedIcon;
@Override
public boolean updateInfo(OsmandMapLayer.DrawSettings drawSettings) {
AidlMapWidgetWrapper widget = widgets.get(widgetId);
@ -192,6 +199,14 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
String subtext = widget.getDescription();
boolean night = drawSettings != null && drawSettings.isNightMode();
int icon = AndroidUtils.getDrawableId(mapActivity.getMyApplication(), night ? widget.getDarkIconName() : widget.getLightIconName());
if (init || !Algorithms.objectEquals(txt, cachedTxt) || !Algorithms.objectEquals(subtext, cachedSubtext)
|| !Algorithms.objectEquals(night, cachedNight) || !Algorithms.objectEquals(icon, cachedIcon)) {
init = false;
cachedTxt = txt;
cachedSubtext = subtext;
cachedNight = night;
cachedIcon = icon;
setText(txt, subtext);
if (icon != 0) {
setImageDrawable(icon);
@ -201,6 +216,11 @@ public class ConnectedApp implements Comparable<ConnectedApp> {
return true;
}
return false;
} else {
setText(null, null);
setImageDrawable(null);
return true;
}
}
};
control.updateInfo(null);