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-07-04 17:11:48 +02:00
commit 885e37d25e
11 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/audionotes/DashAudioVideoNotesFragment.java
View file

@ -9,7 +9,6 @@ import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashBaseFragment; import net.osmand.plus.dashboard.DashBaseFragment;
import net.osmand.plus.myplaces.FavoritesActivity;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@ -39,6 +38,7 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startFavoritesActivity(AudioVideoNotesPlugin.NOTES_TAB); startFavoritesActivity(AudioVideoNotesPlugin.NOTES_TAB);
closeDashboard();
} }
}); });
return view; return view;

4
OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
View file

@ -43,6 +43,10 @@ public abstract class DashBaseFragment extends Fragment {
onCloseDash(); onCloseDash();
} }
public void closeDashboard() {
dashboard.hideDashboard(false);
}
@Override @Override
public final void onResume() { public final void onResume() {
// use on open update // use on open update

1
OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
View file

@ -40,6 +40,7 @@ public class DashFavoritesFragment extends DashLocationFragment {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startFavoritesActivity(FavoritesActivity.FAV_TAB); startFavoritesActivity(FavoritesActivity.FAV_TAB);
closeDashboard();
} }
}); });
return view; return view;

3
OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
View file

@ -37,6 +37,7 @@ public class DashPluginsFragment extends DashBaseFragment {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL()))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));
closeDashboard();
} }
}; };
} }
@ -48,6 +49,7 @@ public class DashPluginsFragment extends DashBaseFragment {
Intent intent = new Intent(getActivity(), PluginActivity.class); Intent intent = new Intent(getActivity(), PluginActivity.class);
intent.putExtra(PluginActivity.EXTRA_PLUGIN_ID, plugin.getId()); intent.putExtra(PluginActivity.EXTRA_PLUGIN_ID, plugin.getId());
startActivity(intent); startActivity(intent);
closeDashboard();
} }
}; };
} }
@ -61,6 +63,7 @@ public class DashPluginsFragment extends DashBaseFragment {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startActivity(new Intent(getActivity(), getMyApplication().getAppCustomization().getPluginsActivity())); startActivity(new Intent(getActivity(), getMyApplication().getAppCustomization().getPluginsActivity()));
closeDashboard();
} }
}); });
initPlugins(); initPlugins();

1
OsmAnd/src/net/osmand/plus/dashboard/DashRecentsFragment.java
View file

@ -52,6 +52,7 @@ public class DashRecentsFragment extends DashLocationFragment {
search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.HISTORY_TAB_INDEX); getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.HISTORY_TAB_INDEX);
activity.startActivity(search); activity.startActivity(search);
closeDashboard();
} }
}); });
return view; return view;

8
OsmAnd/src/net/osmand/plus/dashboard/DashSearchFragment.java
View file

@ -56,7 +56,7 @@ public class DashSearchFragment extends DashBaseFragment {
btn.setOnClickListener(new View.OnClickListener() { btn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
dashboard.hideDashboard(false); closeDashboard();
searchActivity(activity, appCustomization, SearchActivity.POI_TAB_INDEX); searchActivity(activity, appCustomization, SearchActivity.POI_TAB_INDEX);
} }
}); });
@ -67,7 +67,7 @@ public class DashSearchFragment extends DashBaseFragment {
btn.setOnClickListener(new View.OnClickListener() { btn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
dashboard.hideDashboard(false); closeDashboard();
searchActivity(activity, appCustomization, SearchActivity.ADDRESS_TAB_INDEX); searchActivity(activity, appCustomization, SearchActivity.ADDRESS_TAB_INDEX);
} }
}); });
@ -78,7 +78,7 @@ public class DashSearchFragment extends DashBaseFragment {
btn.setOnClickListener(new View.OnClickListener() { btn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
dashboard.hideDashboard(false); closeDashboard();
searchActivity(activity, appCustomization, SearchActivity.LOCATION_TAB_INDEX); searchActivity(activity, appCustomization, SearchActivity.LOCATION_TAB_INDEX);
} }
}); });
@ -88,7 +88,7 @@ public class DashSearchFragment extends DashBaseFragment {
(view.findViewById(R.id.recents)).setOnClickListener(new View.OnClickListener() { (view.findViewById(R.id.recents)).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
dashboard.hideDashboard(false); closeDashboard();
searchActivity(activity, appCustomization, SearchActivity.HISTORY_TAB_INDEX); searchActivity(activity, appCustomization, SearchActivity.HISTORY_TAB_INDEX);
} }
}); });

1
OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java
View file

@ -56,6 +56,7 @@ public class DashUpdatesFragment extends DashBaseFragment {
intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.UPDATES_TAB); intent.putExtra(DownloadActivity.TAB_TO_OPEN, DownloadActivity.UPDATES_TAB);
// intent.putExtra(DownloadActivity.SINGLE_TAB, true); // intent.putExtra(DownloadActivity.SINGLE_TAB, true);
getActivity().startActivity(intent); getActivity().startActivity(intent);
closeDashboard();
} }
}); });
return view; return view;

1
OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
View file

@ -60,6 +60,7 @@ public class DashTrackFragment extends DashBaseFragment {
getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.GPX_TAB); getMyApplication().getSettings().FAVORITES_TAB.set(FavoritesActivity.GPX_TAB);
favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); favorites.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
activity.startActivity(favorites); activity.startActivity(favorites);
closeDashboard();
} }
}); });
return view; return view;

1
OsmAnd/src/net/osmand/plus/osmedit/DashOsmEditsFragment.java
View file

@ -46,6 +46,7 @@ public class DashOsmEditsFragment extends DashBaseFragment implements OsmEditsUp
@Override @Override
public void onClick(View view) { public void onClick(View view) {
startFavoritesActivity(R.string.osm_edits); startFavoritesActivity(R.string.osm_edits);
closeDashboard();
} }
}); });

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

@ -362,6 +362,7 @@ public class DashOsMoFragment extends DashLocationFragment implements OsMoGroups
private void launchOsMoGroupsActivity() { private void launchOsMoGroupsActivity() {
Intent intent = new Intent(getActivity(), OsMoGroupsActivity.class); Intent intent = new Intent(getActivity(), OsMoGroupsActivity.class);
getActivity().startActivity(intent); getActivity().startActivity(intent);
closeDashboard();
} }
@Override @Override

28
OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
View file

@ -1,17 +1,7 @@
package net.osmand.plus.parkingpoint; package net.osmand.plus.parkingpoint;
import android.app.AlertDialog; import java.util.Calendar;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.PointDescription; import net.osmand.data.PointDescription;
import net.osmand.plus.OsmandPlugin; import net.osmand.plus.OsmandPlugin;
@ -19,9 +9,17 @@ import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.dashboard.DashLocationFragment; import net.osmand.plus.dashboard.DashLocationFragment;
import net.osmand.plus.helpers.FontCache; import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.views.DirectionDrawable; import android.app.AlertDialog;
import android.content.DialogInterface;
import java.util.Calendar; import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
/** /**
* Created by Denis on * Created by Denis on