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 2016-03-12 14:27:41 +01:00
commit 45ea4d46cc
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/res/layout/dialog_live_updates_item_settings.xml
View file

@ -33,8 +33,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="12sp"
@ -162,17 +162,18 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/updates_size"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:text="@string/updates_size"/>
android:textSize="16sp"/>
<TextView
android:id="@+id/sizeTextView"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:text="64NB"
android:gravity="center_vertical"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"/>
android:textSize="16sp"
tools:text="64NB"/>
</LinearLayout>

4
OsmAnd/res/values/styles.xml
View file

@ -147,8 +147,8 @@
</style>
<style name="OsmandLightTheme.Spinner" parent="Widget.AppCompat.Light.Spinner.DropDown.ActionBar">
<item name="android:background">?attr:selectableItemBackground</item>
<item name="android:dropDownSelector">?attr:selectableItemBackground</item>
<item name="android:background">?attr/selectableItemBackground</item>
<item name="android:dropDownSelector">?attr/selectableItemBackground</item>
<item name="android:divider">@null</item>
<item name="overlapAnchor">true</item>
<item name="android:textColorPrimary">@color/color_dialog_buttons_light</item>

8
OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
View file

@ -189,9 +189,11 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
} else if (command.equalsIgnoreCase("GROUP_DISCONNECT")) {
group = storage.getGroup(gid);
if (group != null) {
disconnectAllGroupUsers(group);
disableGroupTracks(group, group.groupTracks);
disableGroupTracks(group, Collections.singleton(group.name + " points.gpx"));
if (!obj.has("error")) {
disconnectAllGroupUsers(group);
disableGroupTracks(group, group.groupTracks);
disableGroupTracks(group, Collections.singleton(group.name + " points.gpx"));
}
}
processed = true;
} else if (command.equalsIgnoreCase("GROUP_CONNECT")) {

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

@ -1519,6 +1519,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
if (osMoPlugin.getService().isLoggedIn()) {
app.getSettings().OSMO_USER_NAME.set("");
app.getSettings().OSMO_USER_PWD.set("");
app.getSettings().OSMO_DEVICE_KEY.set("");
osMoPlugin.getService().reconnectToServer();
updateStatus();
osMoPlugin.getGroups().clearGroups();