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-10-27 17:30:55 +01:00
commit 6fb7c2fc7e
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,6 +222,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
initSettingsFirstMap(downloadItem); initSettingsFirstMap(downloadItem);
} }
showGoToMap(downloadItem); showGoToMap(downloadItem);
downloadItem = null;
} }
for (WeakReference<Fragment> ref : fragSet) { for (WeakReference<Fragment> ref : fragSet) {
Fragment f = ref.get(); Fragment f = ref.get();

23
OsmAnd/src/net/osmand/plus/download/ui/GoToMapFragment.java
View file

@ -14,6 +14,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@ -42,6 +43,8 @@ public class GoToMapFragment extends DialogFragment {
: R.style.OsmandDarkTheme_BottomSheet; : R.style.OsmandDarkTheme_BottomSheet;
final Dialog dialog = new Dialog(getActivity(), themeId); final Dialog dialog = new Dialog(getActivity(), themeId);
dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
dialog.getWindow().setDimAmount(0.3f);
dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom; dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
return dialog; return dialog;
} }
@ -66,13 +69,14 @@ public class GoToMapFragment extends DialogFragment {
((TextView) view.findViewById(R.id.descriptionTextView)) ((TextView) view.findViewById(R.id.descriptionTextView))
.setText(getActivity().getString(R.string.map_downloaded_descr, regionName)); .setText(getActivity().getString(R.string.map_downloaded_descr, regionName));
view.findViewById(R.id.closeImageButton) final ImageButton closeImageButton = (ImageButton) view.findViewById(R.id.closeImageButton);
.setOnClickListener(new View.OnClickListener() { closeImageButton.setImageDrawable(getContentIcon(R.drawable.ic_action_remove_dark));
@Override closeImageButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { @Override
dismiss(); public void onClick(View v) {
} dismiss();
}); }
});
view.findViewById(R.id.actionButton) view.findViewById(R.id.actionButton)
.setOnClickListener(new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@ -80,6 +84,7 @@ public class GoToMapFragment extends DialogFragment {
public void onClick(View v) { public void onClick(View v) {
OsmandApplication app = (OsmandApplication) getActivity().getApplication(); OsmandApplication app = (OsmandApplication) getActivity().getApplication();
app.getSettings().setMapLocationToShow(regionCenter.getLatitude(), regionCenter.getLongitude(), 5, null); app.getSettings().setMapLocationToShow(regionCenter.getLatitude(), regionCenter.getLongitude(), 5, null);
dismiss();
MapActivity.launchMapActivityMoveToTop(getActivity()); MapActivity.launchMapActivityMoveToTop(getActivity());
} }
}); });
@ -113,6 +118,10 @@ public class GoToMapFragment extends DialogFragment {
return getMyApplication().getIconsCache().getIcon(drawableRes, color); return getMyApplication().getIconsCache().getIcon(drawableRes, color);
} }
private Drawable getContentIcon(@DrawableRes int drawableRes) {
return getMyApplication().getIconsCache().getContentIcon(drawableRes);
}
public static void showInstance(WorldRegion region, DownloadActivity activity) { public static void showInstance(WorldRegion region, DownloadActivity activity) {
GoToMapFragment fragment = new GoToMapFragment(); GoToMapFragment fragment = new GoToMapFragment();
fragment.regionCenter = region.getRegionCenter(); fragment.regionCenter = region.getRegionCenter();