Update icons

This commit is contained in:
Victor Shcherb 2014-07-11 19:55:20 +02:00
parent 93a5b4cc5e
commit c60a4ff3c6
32 changed files with 11 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 662 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 868 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 746 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

@ -251,11 +251,12 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
final Drawable srcSignalSmall = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small); final Drawable srcSignalSmall = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small);
final Drawable srcBig = getResources().getDrawable(R.drawable.mon_osmo_conn_big); final Drawable srcBig = getResources().getDrawable(R.drawable.mon_osmo_conn_big);
final Drawable srcSignalBig = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big); final Drawable srcSignalBig = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big);
final Drawable srcinactive = getResources().getDrawable(R.drawable.monitoring_rec_inactive); // final Drawable srcinactive = getResources().getDrawable(R.drawable.mon_osmo_inactive);
Drawable small = srcinactive; final Drawable srcSignalinactive = getResources().getDrawable(R.drawable.mon_osmo_signal_inactive);
Drawable big = srcinactive;
OsMoService service = osMoPlugin.getService(); OsMoService service = osMoPlugin.getService();
OsMoTracker tracker = osMoPlugin.getTracker(); OsMoTracker tracker = osMoPlugin.getTracker();
Drawable small = srcSignalinactive; //tracker.isEnabledTracker() ? srcSignalinactive : srcinactive;
Drawable big = srcSignalinactive;// tracker.isEnabledTracker() ? srcSignalinactive : srcinactive;
long last = service.getLastCommandTime(); long last = service.getLastCommandTime();
if (service.isActive()) { if (service.isActive()) {
small = tracker.isEnabledTracker() ? srcSignalSmall : srcSmall; small = tracker.isEnabledTracker() ? srcSignalSmall : srcSmall;
@ -654,7 +655,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
final EditText et = new EditText(this); final EditText et = new EditText(this);
et.setVisibility(View.GONE); et.setVisibility(View.GONE);
ll.addView(et); ll.addView(et);
builder.setView(ll); ScrollView scrollView = new ScrollView(this);
scrollView.addView(ll);
builder.setView(scrollView);
wv.setFocusable(true); wv.setFocusable(true);
wv.setFocusableInTouchMode(true); wv.setFocusableInTouchMode(true);
wv.requestFocus(View.FOCUS_DOWN); wv.requestFocus(View.FOCUS_DOWN);

View file

@ -203,7 +203,8 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
final Drawable srcSignalSmall = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small); final Drawable srcSignalSmall = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small);
final Drawable srcBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_big); final Drawable srcBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_big);
final Drawable srcSignalBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big); final Drawable srcSignalBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big);
final Drawable srcinactive = map.getResources().getDrawable(R.drawable.monitoring_rec_inactive); // final Drawable srcinactive = map.getResources().getDrawable(R.drawable.mon_osmo_inactive);
final Drawable srcSignalinactive = map.getResources().getDrawable(R.drawable.mon_osmo_signal_inactive);
final TextInfoWidget osmoControl = new TextInfoWidget(map, 0, paintText, paintSubText) { final TextInfoWidget osmoControl = new TextInfoWidget(map, 0, paintText, paintSubText) {
long lastUpdateTime; long lastUpdateTime;
private Drawable blinkImg; private Drawable blinkImg;
@ -227,8 +228,8 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
} }
} }
} }
Drawable small = srcinactive; Drawable small = srcSignalinactive; //tracker.isEnabledTracker() ? srcSignalinactive : srcinactive;
Drawable big = srcinactive; Drawable big = srcSignalinactive; // tracker.isEnabledTracker() ? srcSignalinactive : srcinactive;
long last = service.getLastCommandTime(); long last = service.getLastCommandTime();
if (service.isActive()) { if (service.isActive()) {
small = tracker.isEnabledTracker() ? srcSignalSmall : srcSmall; small = tracker.isEnabledTracker() ? srcSignalSmall : srcSmall;