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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-05-26 01:20:53 +02:00
commit 754010bc94
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd/res/layout/osmo_group_item.xml
View file

@ -7,6 +7,16 @@
android:paddingLeft="3dp"
android:paddingRight="4dp"
android:paddingTop="5dp">
<CheckBox
android:id="@+id/settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_gravity="center_vertical"
android:focusable="false"/>
<ImageView
android:id="@+id/explist_indicator"
@ -31,14 +41,6 @@
<include layout="@layout/check_item_rel"/>
<ImageView
android:id="@+id/settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginRight="1dp"
android:focusable="false"/>
</LinearLayout>

13
OsmAnd/res/layout/osmo_groups_list_header.xml
View file

@ -5,22 +5,20 @@
android:layout_height="wrap_content"
android:background="?attr/osmo_header_background"
android:orientation="vertical"
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/list_header_height"
android:minHeight="@dimen/list_item_height"
android:orientation="horizontal" >
<ImageView
android:id="@+id/osmo_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:scaleType="centerInside"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:src="@drawable/mon_osmo_conn_small" />
<include
@ -47,8 +45,6 @@
android:layout_height="@dimen/list_item_height"
android:layout_gravity="center_vertical"
android:background="?attr/dashboard_button"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:scaleType="centerInside"
android:src="@drawable/ic_action_gshare_dark" />
@ -68,6 +64,7 @@
android:id="@+id/motd"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:autoLink="web"
android:gravity="center"
android:textColor="@color/color_white"

10
OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
View file

@ -320,8 +320,11 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
final Drawable srcSignalBig = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big);
// final Drawable srcinactive = getResources().getDrawable(R.drawable.mon_osmo_inactive);
final Drawable srcSignalinactive = getResources().getDrawable(R.drawable.mon_osmo_signal_inactive);
// final Drawable srcSignalinactive = app.getIconsCache().getPaintedContentIcon(R.drawable.mon_osmo_signal_inactive,
// Color.LTGRAY);
OsMoService service = osMoPlugin.getService();
OsMoTracker tracker = osMoPlugin.getTracker();
Drawable small = srcSignalinactive; //tracker.isEnabledTracker() ? srcSignalinactive : srcinactive;
Drawable big = srcSignalinactive;// tracker.isEnabledTracker() ? srcSignalinactive : srcinactive;
long last = service.getLastCommandTime();
@ -1302,12 +1305,15 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
} else {
label.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
}
ImageView v = (ImageView) row.findViewById(R.id.settings);
View v = (View) row.findViewById(R.id.settings);
if(model.isMainGroup()) {
v.setVisibility(View.GONE);
} else {
v.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_settings));
// (ImageView) v.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_settings));
if((selectedObject == model) != ((CheckBox) v).isChecked()) {
((CheckBox) v).setChecked(selectedObject == model);
}
v.setVisibility(View.VISIBLE);
v.setOnClickListener(new View.OnClickListener() {