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

Added region name in Updates tab in DownloadActivity

Browse source
This commit is contained in:
Denis 2014-11-19 13:28:11 +02:00
parent e62041ed67
commit a1e77212a7
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -18,6 +18,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Window; import com.actionbarsherlock.view.Window;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.access.AccessibleAlertBuilder; import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.*; import net.osmand.plus.*;
import net.osmand.plus.activities.FavouritesActivity; import net.osmand.plus.activities.FavouritesActivity;
import net.osmand.plus.activities.LocalIndexInfo; import net.osmand.plus.activities.LocalIndexInfo;
@ -596,4 +597,20 @@ public class DownloadActivity extends SherlockFragmentActivity {
} }
} }
public static String getFullName(IndexItem e, OsmandApplication app, OsmandRegions osmandRegions) {
String eName;
List<IndexItem> forCat = new ArrayList<IndexItem>();
forCat.add(e);
List<IndexItemCategory> category = IndexItemCategory.categorizeIndexItems(app, forCat);
if (category.size() != 0){
eName = e.getVisibleDescription(app) + "\n"
+ category.get(0).name + " "
+ e.getVisibleName(app, osmandRegions);
} else {
eName = e.getVisibleDescription(app) + "\n"
+ e.getVisibleName(app, osmandRegions);
}
return eName;
}
} }

5
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -961,8 +961,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
private String getNameToDisplay(LocalIndexInfo child) { private String getNameToDisplay(LocalIndexInfo child) {
String mapDescr = getMapDescription(child.getFileName()); String mapDescr = getMapDescription(child.getFileName());
String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName()); String mapName = FileNameTranslationHelper.getFileName(ctx,
((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(),
child.getFileName());
if (mapDescr.length() > 0){ if (mapDescr.length() > 0){
return mapDescr + " - " + mapName; return mapDescr + " - " + mapName;
} else { } else {

3
OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
View file

@ -202,7 +202,8 @@ public class UpdatesIndexFragment extends SherlockListFragment {
TextView name = (TextView) v.findViewById(R.id.download_item); TextView name = (TextView) v.findViewById(R.id.download_item);
TextView description = (TextView) v.findViewById(R.id.download_descr); TextView description = (TextView) v.findViewById(R.id.download_descr);
IndexItem e = items.get(position); IndexItem e = items.get(position);
String eName = e.getVisibleDescription(getMyApplication()) + "\n" + e.getVisibleName(getMyApplication(), osmandRegions); String eName = DownloadActivity.getFullName(e, getMyApplication(), osmandRegions);
name.setText(eName.trim()); //$NON-NLS-1$ name.setText(eName.trim()); //$NON-NLS-1$
String d = e.getDate(format) + "\n" + e.getSizeDescription(getMyApplication()); String d = e.getDate(format) + "\n" + e.getSizeDescription(getMyApplication());
description.setText(d); description.setText(d);