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

Fix custommization

Browse source
This commit is contained in:
Victor Shcherb 2014-09-08 22:38:12 +02:00
parent c9b78dafb6
commit f9b9b6d21f
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
View file

@ -13,11 +13,12 @@ import java.util.Set;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.access.AccessibleToast;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.*;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R;
import net.osmand.plus.activities.LocalIndexHelper.LocalIndexType;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.helpers.FileNameTranslationHelper;
import net.osmand.util.Algorithms;
import android.app.Activity;

24
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -10,26 +10,24 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import android.os.Environment;
import android.widget.Toast;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.Location;
import net.osmand.data.LatLon;
import net.osmand.data.LocationPoint;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.GPXUtilities.WptPt;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmAndAppCustomization;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.Version;
import net.osmand.plus.activities.DownloadIndexActivity;
import net.osmand.plus.activities.MapActivity;
@ -53,14 +51,15 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.view.Window;
import android.widget.TextView;
import android.widget.Toast;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockActivity;
import com.actionbarsherlock.app.SherlockFragmentActivity;
public class SherpafyCustomization extends OsmAndAppCustomization {
@ -275,6 +274,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
}
public StageInformation selectNextAvailableStage(final TourInformation tourInformation) {
if(selectedStagePref == null) {
return selectedStage;
}
Integer it = selectedStagePref.get();
while(it >= 0 && isStageVisited(it) ){
it++;
@ -286,6 +288,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
}
public StageInformation getNextAvailableStage(final TourInformation tourInformation) {
if(selectedStagePref == null){
return null;
}
int it = selectedStagePref.get();
while(it >= 0 && isStageVisited(it) ){
it++;
@ -297,11 +302,17 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
}
public boolean isStageVisited(int stageOrder) {
if(visitedStagesPref == null) {
return false;
}
Integer gi = visitedStagesPref.get();
return (gi & (1 << stageOrder)) > 0;
}
public void markStageAsCompleted(StageInformation si) {
if(visitedStagesPref == null) {
return;
}
Integer gi = visitedStagesPref.get();
gi |= (1 << si.getOrder());
visitedStagesPref.set(gi);
@ -309,6 +320,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
}
public void markStageAsNotCompleted(StageInformation si) {
if(visitedStagesPref == null) {
return;
}
Integer gi = visitedStagesPref.get();
if((gi & (1 << si.getOrder())) > 0) {
gi = gi - (1 << si.getOrder());

1
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStageFragment.java
View file

@ -3,7 +3,6 @@ package net.osmand.plus.sherpafy;
import java.lang.reflect.Field;
import java.util.ArrayList;
import android.widget.Toast;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.sherpafy.TourInformation.StageFavoriteGroup;