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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-03-25 19:06:12 +01:00
commit c4b91b2333
1 changed files with 55 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
OsmAnd/src/net/osmand/plus/osmo/DashOsMoFragment.java
View file

@ -1,18 +1,5 @@
package net.osmand.plus.osmo; package net.osmand.plus.osmo;
import java.util.ArrayList;
import java.util.List;
import net.osmand.Location;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.IconsCache;
import net.osmand.plus.NavigationService;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashLocationFragment;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@ -28,6 +15,20 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.Location;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.plus.IconsCache;
import net.osmand.plus.NavigationService;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashLocationFragment;
import java.util.ArrayList;
import java.util.List;
/** /**
* Created by Denis * Created by Denis
* on 20.01.2015. * on 20.01.2015.
@ -140,12 +141,15 @@ public class DashOsMoFragment extends DashLocationFragment implements OsMoGroups
View cardContent = header.findViewById(R.id.card_content); View cardContent = header.findViewById(R.id.card_content);
View enableOsmo = header.findViewById(R.id.header_layout).findViewById(R.id.check_item); View enableOsmo = header.findViewById(R.id.header_layout).findViewById(R.id.check_item);
View manage = header.findViewById(R.id.manage);
if (plugin.getService().isEnabled()) { if (plugin.getService().isEnabled()) {
cardContent.setVisibility(View.VISIBLE); cardContent.setVisibility(View.VISIBLE);
enableOsmo.setVisibility(View.GONE); enableOsmo.setVisibility(View.GONE);
manage.setVisibility(View.VISIBLE);
} else { } else {
cardContent.setVisibility(View.GONE); cardContent.setVisibility(View.GONE);
enableOsmo.setVisibility(View.VISIBLE); enableOsmo.setVisibility(View.VISIBLE);
manage.setVisibility(View.GONE);
getClearContentList(header); getClearContentList(header);
return; return;
} }
@ -160,8 +164,18 @@ public class DashOsMoFragment extends DashLocationFragment implements OsMoGroups
private void updateConnectedDevices(View mainView) { private void updateConnectedDevices(View mainView) {
OsMoGroups grps = plugin.getGroups(); OsMoGroups grps = plugin.getGroups();
OsMoGroupsStorage.OsMoGroup mainGroup = null;
LinearLayout contentList = getClearContentList(mainView);
ArrayList<OsMoGroupsStorage.OsMoGroup> groups = new ArrayList<>(grps.getGroups()); ArrayList<OsMoGroupsStorage.OsMoGroup> groups = new ArrayList<>(grps.getGroups());
List<OsMoGroupsStorage.OsMoDevice> devices = getOsMoDevices(groups);
setupDeviceViews(contentList, devices);
}
private List<OsMoGroupsStorage.OsMoDevice> getOsMoDevices(ArrayList<OsMoGroupsStorage.OsMoGroup> groups) {
OsMoGroupsStorage.OsMoGroup mainGroup = null;
for (OsMoGroupsStorage.OsMoGroup grp : groups) { for (OsMoGroupsStorage.OsMoGroup grp : groups) {
if (grp.getGroupId() == null) { if (grp.getGroupId() == null) {
mainGroup = grp; mainGroup = grp;
@ -169,34 +183,45 @@ public class DashOsMoFragment extends DashLocationFragment implements OsMoGroups
break; break;
} }
} }
LinearLayout contentList = getClearContentList(mainView);
if (mainGroup == null) {
return;
}
if (mainGroup == null) {
return new ArrayList<>();
}
String trackerId = plugin.getService().getMyGroupTrackerId(); String trackerId = plugin.getService().getMyGroupTrackerId();
List<OsMoGroupsStorage.OsMoDevice> devices = List<OsMoGroupsStorage.OsMoDevice> devices =
new ArrayList<>(mainGroup.getVisibleGroupUsers(trackerId)); new ArrayList<>(mainGroup.getVisibleGroupUsers(trackerId));
if (groups.size() > 0) {
for (OsMoGroupsStorage.OsMoGroup grp : groups) {
for (OsMoGroupsStorage.OsMoDevice device : grp.getVisibleGroupUsers(trackerId)) {
devices.add(device);
}
}
}
//remove all inactive devices
for (OsMoGroupsStorage.OsMoDevice device : devices) {
if (!device.isActive() && !device.isEnabled() && devices.size() > 2) {
devices.remove(device);
}
if (devices.size() < 4) {
break;
}
}
sortDevices(devices);
if (devices.size() > 3) { if (devices.size() > 3) {
while (devices.size() > 3) { while (devices.size() > 3) {
devices.remove(devices.size() - 1); devices.remove(devices.size() - 1);
} }
} else {
if (groups.size() > 0){
for (OsMoGroupsStorage.OsMoGroup grp : groups) {
if (grp.getVisibleGroupUsers(trackerId).size() > 0) {
}
}
}
} }
return devices;
}
setupDeviceViews(contentList, devices); private void sortDevices(List<OsMoGroupsStorage.OsMoDevice> devices) {
// if (devices.size() < 3 && groups.size() > 0) { //TODO implement sorting somehow
// setupGroupsViews(3 - devices.size(), groups, contentList);
// }
} }
private LinearLayout getClearContentList(View mainView) { private LinearLayout getClearContentList(View mainView) {
@ -205,36 +230,6 @@ public class DashOsMoFragment extends DashLocationFragment implements OsMoGroups
return contentList; return contentList;
} }
private void setupGroupsViews(int toAddCount, ArrayList<OsMoGroupsStorage.OsMoGroup> groups, LinearLayout contentList) {
int counter = 1;
LayoutInflater inflater = getActivity().getLayoutInflater();
for (final OsMoGroupsStorage.OsMoGroup group : groups) {
View v = inflater.inflate(R.layout.dash_osmo_item, null, false);
v.findViewById(R.id.direction_icon).setVisibility(View.GONE);
v.findViewById(R.id.distance).setVisibility(View.GONE);
v.findViewById(R.id.show_on_map).setVisibility(View.GONE);
v.findViewById(R.id.check_item).setVisibility(View.GONE);
final String name = group.getVisibleName(getActivity());
//TODO show group users
TextView peopleCount = (TextView) v.findViewById(R.id.people_count);
peopleCount.setText(String.valueOf(group.getGroupUsers(null).size()));
ImageView icon = (ImageView) v.findViewById(R.id.icon);
icon.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_group));
((TextView) v.findViewById(R.id.name)).setText(name);
v.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
launchOsMoGroupsActivity();
}
});
contentList.addView(v);
if (counter == toAddCount) {
return;
}
counter++;
}
}
private void setupDeviceViews(LinearLayout contentList, List<OsMoGroupsStorage.OsMoDevice> devices) { private void setupDeviceViews(LinearLayout contentList, List<OsMoGroupsStorage.OsMoDevice> devices) {
Drawable markerIcon = getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_marker_dark); Drawable markerIcon = getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_marker_dark);
LayoutInflater inflater = getActivity().getLayoutInflater(); LayoutInflater inflater = getActivity().getLayoutInflater();