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

Merge pull request #7628 from osmandapp/revert-7580-DownloadMap

Browse source 
Revert "Add "Download Map" Top Sheet card"
This commit is contained in:
max-klaus 2019-10-02 15:38:00 +03:00 committed by GitHub
commit f40bcadc21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 166 additions and 707 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
View file

@ -707,10 +707,6 @@ public class OsmandRegions {
public BinaryMapDataObject getSmallestBinaryMapDataObjectAt(LatLon latLon) throws IOException { public BinaryMapDataObject getSmallestBinaryMapDataObjectAt(LatLon latLon) throws IOException {
List<BinaryMapDataObject> mapDataObjects = getBinaryMapDataObjectsAt(latLon); List<BinaryMapDataObject> mapDataObjects = getBinaryMapDataObjectsAt(latLon);
return getSmallestBinaryMapDataObjectAt(mapDataObjects);
}
public BinaryMapDataObject getSmallestBinaryMapDataObjectAt(List<BinaryMapDataObject> mapDataObjects) throws IOException {
BinaryMapDataObject res = null; BinaryMapDataObject res = null;
double smallestArea = -1; double smallestArea = -1;
for (BinaryMapDataObject o : mapDataObjects) { for (BinaryMapDataObject o : mapDataObjects) {

7
OsmAnd/res/anim/slide_in_top.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromYDelta="-100%p" android:toYDelta="0"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set>

7
OsmAnd/res/anim/slide_out_top.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromYDelta="0" android:toYDelta="-100%p"
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set>

13
OsmAnd/res/drawable/bg_top_menu_dark.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_shadow_dialogtop_portrait" />
</item>
<item>
<shape>
<solid android:color="@color/list_background_color_dark" />
<corners android:bottomRightRadius="3dp"
android:bottomLeftRadius="3dp" />
</shape>
</item>
</layer-list>

13
OsmAnd/res/drawable/bg_top_menu_light.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_shadow_dialogtop_portrait" />
</item>
<item>
<shape>
<solid android:color="@color/list_background_color_light" />
<corners android:bottomRightRadius="3dp"
android:bottomLeftRadius="3dp" />
</shape>
</item>
</layer-list>

13
OsmAnd/res/drawable/bg_top_sheet_bottom_sides_landscape_dark.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_shadow_dialogtop_landscape"/>
</item>
<item>
<shape>
<solid android:color="@color/list_background_color_dark"/>
<corners android:bottomRightRadius="3dp"
android:bottomLeftRadius="3dp" />
</shape>
</item>
</layer-list>

13
OsmAnd/res/drawable/bg_top_sheet_bottom_sides_landscape_light.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_shadow_dialogtop_landscape"/>
</item>
<item>
<shape>
<solid android:color="@color/list_background_color_light"/>
<corners android:bottomRightRadius="3dp"
android:bottomLeftRadius="3dp" />
</shape>
</item>
</layer-list>

18
OsmAnd/res/layout/bottom_sheet_dialog.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:id="@+id/touch_outside"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<FrameLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"/>
</android.support.design.widget.CoordinatorLayout>

72
OsmAnd/res/layout/card_download_detailed_map.xml
View file

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:background="?attr/list_background_color"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/description"
android:layout_width="0dp"
android:layout_height="wrap_content"
osmand:typeface="@string/font_roboto_regular"
android:layout_marginTop="@dimen/list_content_padding"
android:layout_weight="1"
android:textSize="@dimen/default_list_text_size"
tools:text="@string/download_detaile_map" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/card_content_padding_large"
android:src="@drawable/img_download" />
</LinearLayout>
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/fileSize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
osmand:typeface="@string/font_roboto_medium"
android:textColor="?attr/active_color_basic"
android:textSize="@dimen/default_desc_text_size"
tools:text="139mb" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_padding_small"
android:layout_marginBottom="@dimen/content_padding_small">
<include
android:id="@+id/btnClose"
layout="@layout/bottom_sheet_dialog_button" />
<View
android:id="@+id/buttons_divider"
android:layout_width="@dimen/content_padding"
android:layout_height="match_parent" />
<include
android:id="@+id/btnDownload"
layout="@layout/bottom_sheet_dialog_button" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

2
OsmAnd/res/values-large/sizes.xml
View file

@ -13,8 +13,6 @@
<dimen name="map_route_planning_land_width">510dp</dimen> <dimen name="map_route_planning_land_width">510dp</dimen>
<dimen name="map_route_planning_land_width_minus_shadow">496dp</dimen> <dimen name="map_route_planning_land_width_minus_shadow">496dp</dimen>
<dimen name="card_content_padding_large">42dp</dimen>
<dimen name="map_address_height">60dp</dimen> <dimen name="map_address_height">60dp</dimen>
<dimen name="map_button_size">78dp</dimen> <dimen name="map_button_size">78dp</dimen>
<dimen name="map_small_button_size">66dp</dimen> <dimen name="map_small_button_size">66dp</dimen>

2
OsmAnd/res/values/sizes.xml
View file

@ -19,8 +19,6 @@
<dimen name="card_button_progress_size_small">24dp</dimen> <dimen name="card_button_progress_size_small">24dp</dimen>
<dimen name="card_padding">12dp</dimen> <dimen name="card_padding">12dp</dimen>
<dimen name="dlg_button_rect_rad">3dp</dimen> <dimen name="dlg_button_rect_rad">3dp</dimen>
<dimen name="card_content_padding_large">28dp</dimen>
<dimen name="widget_turn_lane_size">36dp</dimen> <dimen name="widget_turn_lane_size">36dp</dimen>
<dimen name="widget_turn_lane_border">6dp</dimen> <dimen name="widget_turn_lane_border">6dp</dimen>

1
OsmAnd/res/values/strings.xml
View file

@ -14,7 +14,6 @@
<string name="shared_string_by_default">By default</string> <string name="shared_string_by_default">By default</string>
<string name="plugins_settings">Plugin settings</string> <string name="plugins_settings">Plugin settings</string>
<string name="logcat_buffer">Logcat buffer</string> <string name="logcat_buffer">Logcat buffer</string>
<string name="download_detaile_map">Download detailed %s map, to view this area.</string>
<string name="application_profile_changed">Application profile changed to \"%s\"</string> <string name="application_profile_changed">Application profile changed to \"%s\"</string>
<string name="switch_profile">Switch profile</string> <string name="switch_profile">Switch profile</string>
<string name="configure_profile">Configure profile</string> <string name="configure_profile">Configure profile</string>

5
OsmAnd/res/values/styles.xml
View file

@ -647,11 +647,6 @@
<item name="android:windowExitAnimation">@anim/shrink_from_top</item> <item name="android:windowExitAnimation">@anim/shrink_from_top</item>
</style> </style>
<style name="Animations.PopUpMenu.Top">
<item name="android:windowEnterAnimation">@anim/slide_in_top</item>
<item name="android:windowExitAnimation">@anim/slide_out_top</item>
</style>
<style name="Animations.PopUpMenu.Bottom"> <style name="Animations.PopUpMenu.Bottom">
<item name="android:windowEnterAnimation">@anim/slide_in_bottom</item> <item name="android:windowEnterAnimation">@anim/slide_in_bottom</item>
<item name="android:windowExitAnimation">@anim/slide_out_bottom</item> <item name="android:windowExitAnimation">@anim/slide_out_bottom</item>

1
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -500,6 +500,7 @@ public class AppInitializer implements IProgress {
app.travelDbHelper = startupInit(app.travelDbHelper, TravelDbHelper.class); app.travelDbHelper = startupInit(app.travelDbHelper, TravelDbHelper.class);
app.lockHelper = startupInit(new LockHelper(app), LockHelper.class); app.lockHelper = startupInit(new LockHelper(app), LockHelper.class);
initOpeningHoursParser(); initOpeningHoursParser();
} }

2
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -133,7 +133,7 @@ public class MapActivityLayers {
mapVectorLayer = new MapVectorLayer(mapTileLayer, false); mapVectorLayer = new MapVectorLayer(mapTileLayer, false);
mapView.addLayer(mapVectorLayer, 0.5f); mapView.addLayer(mapVectorLayer, 0.5f);
downloadedRegionsLayer = new DownloadedRegionsLayer(activity); downloadedRegionsLayer = new DownloadedRegionsLayer();
mapView.addLayer(downloadedRegionsLayer, 0.5f); mapView.addLayer(downloadedRegionsLayer, 0.5f);
// 0.9 gpx layer // 0.9 gpx layer

75
OsmAnd/src/net/osmand/plus/base/OsmandSheetDialog.java → OsmAnd/src/net/osmand/plus/base/BottomSheetDialog.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.base; package net.osmand.plus.base;
import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
@ -8,39 +7,31 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams; import android.view.ViewGroup.LayoutParams;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import static net.osmand.plus.base.SheetDialogType.*; import net.osmand.plus.R;
public class OsmandSheetDialog extends Dialog { public class BottomSheetDialog extends Dialog {
public final static int CONTAINER_ID = 111111;
private boolean cancelable = true; private boolean cancelable = true;
private boolean canceledOnTouchOutside = true; private boolean canceledOnTouchOutside = true;
private boolean interactWithOutside = false;
private boolean canceledOnTouchOutsideSet; private boolean canceledOnTouchOutsideSet;
private SheetDialogType dialogType;
public OsmandSheetDialog(@NonNull Context context) { public BottomSheetDialog(@NonNull Context context) {
this(context, 0, BOTTOM); this(context, 0);
} }
public OsmandSheetDialog(@NonNull Context context, int themeResId, SheetDialogType dialogType) { public BottomSheetDialog(@NonNull Context context, int themeResId) {
super(context, themeResId); super(context, themeResId);
this.dialogType = dialogType;
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
} }
protected OsmandSheetDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) { protected BottomSheetDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
super(context, cancelable, cancelListener); super(context, cancelable, cancelListener);
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
this.cancelable = cancelable; this.cancelable = cancelable;
@ -89,23 +80,11 @@ public class OsmandSheetDialog extends Dialog {
canceledOnTouchOutside = cancel; canceledOnTouchOutside = cancel;
canceledOnTouchOutsideSet = true; canceledOnTouchOutsideSet = true;
} }
public void setInteractWithOutside(boolean interactWithOutside) {
this.interactWithOutside = interactWithOutside;
}
@NonNull @NonNull
private View wrapInContainer(int layoutResId, View view, LayoutParams params) { private View wrapInContainer(int layoutResId, View view, LayoutParams params) {
final FrameLayout res = new FrameLayout(getContext()); final View res = View.inflate(getContext(), R.layout.bottom_sheet_dialog, null);
final View touchOutside = new View(getContext()); final FrameLayout container = (FrameLayout) res.findViewById(R.id.content_container);
final FrameLayout container = getContainer(dialogType);
ViewGroup.LayoutParams fullScreenParams = new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
res.setLayoutParams(fullScreenParams);
touchOutside.setLayoutParams(fullScreenParams);
res.addView(touchOutside);
res.addView(container);
if (layoutResId != 0 && view == null) { if (layoutResId != 0 && view == null) {
view = getLayoutInflater().inflate(layoutResId, container, false); view = getLayoutInflater().inflate(layoutResId, container, false);
@ -116,7 +95,7 @@ public class OsmandSheetDialog extends Dialog {
container.addView(view, params); container.addView(view, params);
} }
touchOutside.setOnClickListener(new View.OnClickListener() { res.findViewById(R.id.touch_outside).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (cancelable && isShowing() && shouldWindowCloseOnTouchOutside()) { if (cancelable && isShowing() && shouldWindowCloseOnTouchOutside()) {
@ -124,19 +103,6 @@ public class OsmandSheetDialog extends Dialog {
} }
} }
}); });
touchOutside.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
if (interactWithOutside) {
Activity ownerActivity = getOwnerActivity();
if (ownerActivity != null) {
ownerActivity.dispatchTouchEvent(event);
}
}
return false;
}
});
container.setOnTouchListener(new View.OnTouchListener() { container.setOnTouchListener(new View.OnTouchListener() {
@Override @Override
@ -148,29 +114,6 @@ public class OsmandSheetDialog extends Dialog {
return res; return res;
} }
private FrameLayout getContainer(SheetDialogType dialogType) {
if (dialogType == null) {
return null;
}
int width = LayoutParams.MATCH_PARENT;
int height = LayoutParams.WRAP_CONTENT;
int gravity = 0;
switch (dialogType) {
case TOP:
gravity = Gravity.TOP | Gravity.CENTER_HORIZONTAL;
break;
case BOTTOM:
gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
break;
}
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(width, height);
params.gravity = gravity;
FrameLayout container = new FrameLayout(getContext());
container.setLayoutParams(params);
container.setId(CONTAINER_ID);
return container;
}
private boolean shouldWindowCloseOnTouchOutside() { private boolean shouldWindowCloseOnTouchOutside() {
if (!canceledOnTouchOutsideSet) { if (!canceledOnTouchOutsideSet) {

101
OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
View file

@ -1,9 +1,102 @@
package net.osmand.plus.base; package net.osmand.plus.base;
public abstract class BottomSheetDialogFragment extends OsmAndSheetDialogFragment { import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import net.osmand.plus.OnDialogFragmentResultListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
public abstract class BottomSheetDialogFragment extends DialogFragment {
private OnDialogFragmentResultListener dialogFragmentResultListener;
@NonNull
@Override @Override
protected SheetDialogType getSheetDialogType() { public Dialog onCreateDialog(Bundle savedInstanceState) {
return SheetDialogType.BOTTOM; Context context = requireContext();
OsmandApplication app = (OsmandApplication) context.getApplicationContext();
OsmandSettings settings = app.getSettings();
int themeId = settings.isLightContent() ? R.style.OsmandLightTheme_BottomSheet : R.style.OsmandDarkTheme_BottomSheet;
BottomSheetDialog dialog = new BottomSheetDialog(context, themeId);
dialog.setCanceledOnTouchOutside(true);
Window window = dialog.getWindow();
if (!settings.DO_NOT_USE_ANIMATIONS.get() && window != null) {
window.getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
}
return dialog;
}
@Nullable
@Override
public abstract View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (context instanceof OnDialogFragmentResultListener) {
dialogFragmentResultListener = (OnDialogFragmentResultListener) context;
}
}
@Override
public void onDetach() {
super.onDetach();
dialogFragmentResultListener = null;
}
@Nullable
public OnDialogFragmentResultListener getResultListener() {
return dialogFragmentResultListener;
}
@Nullable
protected OsmandApplication getMyApplication() {
Activity activity = getActivity();
if (activity != null) {
return (OsmandApplication) activity.getApplication();
} else {
return null;
}
}
@NonNull
protected OsmandApplication requiredMyApplication() {
return (OsmandApplication) requireActivity().getApplication();
}
@Nullable
protected Drawable getIcon(@DrawableRes int drawableRes, @ColorRes int color) {
OsmandApplication app = getMyApplication();
if (app != null) {
return app.getUIUtilities().getIcon(drawableRes, color);
} else {
return null;
}
}
@Nullable
protected Drawable getContentIcon(@DrawableRes int drawableRes) {
OsmandApplication app = getMyApplication();
if (app != null) {
return app.getUIUtilities().getThemedIcon(drawableRes);
} else {
return null;
}
} }
} }

39
OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
View file

@ -35,10 +35,14 @@ import java.util.List;
public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFragment { public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFragment {
private static final String USED_ON_MAP_KEY = "used_on_map";
private static final int DEFAULT_VALUE = -1; private static final int DEFAULT_VALUE = -1;
protected List<BaseBottomSheetItem> items = new ArrayList<>(); protected List<BaseBottomSheetItem> items = new ArrayList<>();
protected boolean usedOnMap = true;
protected boolean nightMode;
protected int themeRes; protected int themeRes;
protected View dismissButton; protected View dismissButton;
protected View rightButton; protected View rightButton;
@ -48,9 +52,17 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
@StringRes @StringRes
protected int dismissButtonStringRes = R.string.shared_string_cancel; protected int dismissButtonStringRes = R.string.shared_string_cancel;
public void setUsedOnMap(boolean usedOnMap) {
this.usedOnMap = usedOnMap;
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
usedOnMap = savedInstanceState.getBoolean(USED_ON_MAP_KEY);
}
nightMode = isNightMode(requiredMyApplication());
themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme; themeRes = nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme;
} }
@ -101,6 +113,26 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
return mainView; return mainView;
} }
@Override
public void onStart() {
super.onStart();
FragmentActivity activity = requireActivity();
if (!AndroidUiHelper.isOrientationPortrait(activity)) {
final Window window = getDialog().getWindow();
if (window != null) {
WindowManager.LayoutParams params = window.getAttributes();
params.width = activity.getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
window.setAttributes(params);
}
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(USED_ON_MAP_KEY, usedOnMap);
}
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
@ -278,4 +310,11 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
protected int getLandscapeSidesBgResId() { protected int getLandscapeSidesBgResId() {
return nightMode ? R.drawable.bg_bottom_sheet_sides_landscape_dark : R.drawable.bg_bottom_sheet_sides_landscape_light; return nightMode ? R.drawable.bg_bottom_sheet_sides_landscape_dark : R.drawable.bg_bottom_sheet_sides_landscape_light;
} }
private boolean isNightMode(@NonNull OsmandApplication app) {
if (usedOnMap) {
return app.getDaynightHelper().isNightModeForMapControls();
}
return !app.getSettings().isLightContent();
}
} }

166
OsmAnd/src/net/osmand/plus/base/OsmAndSheetDialogFragment.java
View file

@ -1,166 +0,0 @@
package net.osmand.plus.base;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import net.osmand.plus.OnDialogFragmentResultListener;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.helpers.AndroidUiHelper;
public abstract class OsmAndSheetDialogFragment extends DialogFragment {
private static final String USED_ON_MAP_KEY = "used_on_map";
private OnDialogFragmentResultListener dialogFragmentResultListener;
private int dialogWidth;
protected boolean usedOnMap = true;
protected boolean nightMode;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
usedOnMap = savedInstanceState.getBoolean(USED_ON_MAP_KEY);
}
dialogWidth = requireActivity().getResources().getDimensionPixelSize(R.dimen.landscape_bottom_sheet_dialog_fragment_width);
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Context context = requireContext();
OsmandApplication app = (OsmandApplication) context.getApplicationContext();
OsmandSettings settings = app.getSettings();
int themeId = settings.isLightContent() ? R.style.OsmandLightTheme_BottomSheet : R.style.OsmandDarkTheme_BottomSheet;
nightMode = isNightMode(app);
OsmandSheetDialog dialog = new OsmandSheetDialog(context, themeId, getSheetDialogType());
dialog.setCanceledOnTouchOutside(getCancelOnTouchOutside());
dialog.setInteractWithOutside(getInteractWithOutside());
Window window = dialog.getWindow();
if (window != null && !settings.DO_NOT_USE_ANIMATIONS.get()) {
window.getAttributes().windowAnimations = getSheetDialogType().getAnimationStyleResId();
}
return dialog;
}
@Nullable
@Override
public abstract View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (context instanceof OnDialogFragmentResultListener) {
dialogFragmentResultListener = (OnDialogFragmentResultListener) context;
}
}
@Override
public void onDetach() {
super.onDetach();
dialogFragmentResultListener = null;
}
@Override
public void onStart() {
super.onStart();
final Window window = getDialog().getWindow();
FragmentActivity activity = requireActivity();
if (window != null) {
window.setDimAmount(getBackgroundDimAmount());
if (!AndroidUiHelper.isOrientationPortrait(activity)) {
View container = window.findViewById(OsmandSheetDialog.CONTAINER_ID);
if (container != null) {
container.getLayoutParams().width = dialogWidth;
}
}
}
}
@Nullable
public OnDialogFragmentResultListener getResultListener() {
return dialogFragmentResultListener;
}
@Nullable
protected OsmandApplication getMyApplication() {
Activity activity = getActivity();
if (activity != null) {
return (OsmandApplication) activity.getApplication();
} else {
return null;
}
}
@NonNull
protected OsmandApplication requiredMyApplication() {
return (OsmandApplication) requireActivity().getApplication();
}
@Nullable
protected Drawable getIcon(@DrawableRes int drawableRes, @ColorRes int color) {
OsmandApplication app = getMyApplication();
if (app != null) {
return app.getUIUtilities().getIcon(drawableRes, color);
} else {
return null;
}
}
@Nullable
protected Drawable getContentIcon(@DrawableRes int drawableRes) {
OsmandApplication app = getMyApplication();
if (app != null) {
return app.getUIUtilities().getThemedIcon(drawableRes);
} else {
return null;
}
}
public void setUsedOnMap(boolean usedOnMap) {
this.usedOnMap = usedOnMap;
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(USED_ON_MAP_KEY, usedOnMap);
}
private boolean isNightMode(@NonNull OsmandApplication app) {
if (usedOnMap) {
return app.getDaynightHelper().isNightModeForMapControls();
}
return !app.getSettings().isLightContent();
}
protected abstract SheetDialogType getSheetDialogType();
protected boolean getCancelOnTouchOutside() {
return true;
}
protected boolean getInteractWithOutside() {
return false;
}
protected float getBackgroundDimAmount() {
return 0.3f;
}
}

19
OsmAnd/src/net/osmand/plus/base/SheetDialogType.java
View file

@ -1,19 +0,0 @@
package net.osmand.plus.base;
import net.osmand.plus.R;
public enum SheetDialogType {
TOP(R.style.Animations_PopUpMenu_Top),
BOTTOM(R.style.Animations_PopUpMenu_Bottom);
SheetDialogType(int animationStyleResId) {
this.animationStyleResId = animationStyleResId;
}
private int animationStyleResId;
public int getAnimationStyleResId() {
return animationStyleResId;
}
}

9
OsmAnd/src/net/osmand/plus/base/TopSheetDialogFragment.java
View file

@ -1,9 +0,0 @@
package net.osmand.plus.base;
public abstract class TopSheetDialogFragment extends OsmAndSheetDialogFragment {
@Override
protected SheetDialogType getSheetDialogType() {
return SheetDialogType.TOP;
}
}

178
OsmAnd/src/net/osmand/plus/download/ui/DownloadMapDialogFragment.java
View file

@ -1,178 +0,0 @@
package net.osmand.plus.download.ui;
import android.graphics.Typeface;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentManager;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.base.SheetDialogType;
import net.osmand.plus.base.TopSheetDialogFragment;
import net.osmand.plus.download.DownloadValidationManager;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.widgets.style.CustomTypefaceSpan;
public class DownloadMapDialogFragment extends TopSheetDialogFragment {
public static final String TAG = "DownloadMapDialogFragment";
private final static String REGION_NAME = "REGION_NAME";
protected DownloadValidationManager downloadValidationManager;
private View btnClose;
private View btnDownload;
private TextView tvDescription;
private TextView tvSize;
private IndexItem currentIndexItem;
private String currentRegionName;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
readBundle(getArguments());
View mainView = View.inflate(new ContextThemeWrapper(getContext(), nightMode ? R.style.OsmandDarkTheme : R.style.OsmandLightTheme), R.layout.card_download_detailed_map, null);
if (!AndroidUiHelper.isOrientationPortrait(requireActivity())) {
mainView.setBackgroundResource(getLandscapeBottomSidesBgResId());
} else {
mainView.setBackgroundResource(getPortraitBgResId());
}
downloadValidationManager = new DownloadValidationManager(getMyApplication());
tvDescription = mainView.findViewById(R.id.description);
tvSize = mainView.findViewById(R.id.fileSize);
btnClose = mainView.findViewById(R.id.btnClose);
btnDownload = mainView.findViewById(R.id.btnDownload);
UiUtilities.setupDialogButton(nightMode, btnClose, UiUtilities.DialogButtonType.SECONDARY, getString(R.string.shared_string_close));
UiUtilities.setupDialogButton(nightMode, btnDownload, UiUtilities.DialogButtonType.PRIMARY, getString(R.string.shared_string_download));
refreshView();
return mainView;
}
public void refreshData(final String newRegionName, final IndexItem newIndexItem) {
getMyApplication().runInUIThread(new Runnable() {
@Override
public void run() {
currentRegionName = newRegionName;
currentIndexItem = newIndexItem;
refreshView();
}
});
}
private void refreshView() {
if (currentRegionName != null) {
String descriptionText = String.format(getString(R.string.download_detaile_map), currentRegionName);
int startIndex = descriptionText.indexOf(currentRegionName);
int endIndex = startIndex + currentRegionName.length();
SpannableStringBuilder description = new SpannableStringBuilder(descriptionText);
Typeface typeface = FontCache.getRobotoMedium(getMyApplication());
description.setSpan(new CustomTypefaceSpan(typeface), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
tvDescription.setText(description);
}
if (currentIndexItem != null) {
String size = currentIndexItem.getSizeDescription(getMyApplication()).toLowerCase();
tvSize.setText(size);
btnDownload.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
downloadValidationManager.startDownload(getActivity(), currentIndexItem);
dismiss();
}
});
}
btnClose.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dismiss();
}
});
}
protected void readBundle(Bundle bundle) {
if (bundle != null) {
currentRegionName = bundle.getString(REGION_NAME);
}
}
public static DownloadMapDialogFragment newInstance(FragmentManager fragmentManager, IndexItem indexItem, String name, boolean usedOnMap) {
Bundle bundle = new Bundle();
bundle.putString(REGION_NAME, name);
DownloadMapDialogFragment fragment = new DownloadMapDialogFragment();
fragment.setArguments(bundle);
fragment.setCurrentIndexItem(indexItem);
fragment.setUsedOnMap(usedOnMap);
return fragment;
}
public static void showInstance(FragmentManager fragmentManager, IndexItem indexItem, String name, boolean usedOnMap) {
DownloadMapDialogFragment fragment = newInstance(fragmentManager, indexItem, name, usedOnMap);
fragmentManager.beginTransaction()
.add(fragment, TAG).commitAllowingStateLoss();
}
public static void hideInstance(FragmentManager fragmentManager) {
DownloadMapDialogFragment fragment = (DownloadMapDialogFragment) fragmentManager.findFragmentByTag(TAG);
if (fragment != null) {
fragment.dismiss();
}
}
@Override
protected SheetDialogType getSheetDialogType() {
return SheetDialogType.TOP;
}
public void setCurrentIndexItem(IndexItem currentIndexItem) {
this.currentIndexItem = currentIndexItem;
}
@DrawableRes
protected int getPortraitBgResId() {
return nightMode ? R.drawable.bg_top_menu_dark : R.drawable.bg_top_menu_light;
}
@DrawableRes
protected int getLandscapeBottomSidesBgResId() {
return nightMode ? R.drawable.bg_top_sheet_bottom_sides_landscape_dark : R.drawable.bg_top_sheet_bottom_sides_landscape_light;
}
@Override
protected boolean getCancelOnTouchOutside() {
return false;
}
@Override
protected boolean getInteractWithOutside() {
return true;
}
@Override
protected float getBackgroundDimAmount() {
return 0;
}
}

35
OsmAnd/src/net/osmand/plus/download/ui/DownloadMapDialogManager.java
View file

@ -1,35 +0,0 @@
package net.osmand.plus.download.ui;
import android.support.v4.app.FragmentManager;
import android.support.v7.app.AppCompatActivity;
import net.osmand.plus.download.IndexItem;
import net.osmand.plus.download.ui.DownloadMapDialogFragment;
public class DownloadMapDialogManager {
private IndexItem currentIndexItem;
public void showDialog(AppCompatActivity activity, IndexItem newIndexItem, String newRegionName, boolean usedOnMap) {
if (newIndexItem != null) {
if (!newIndexItem.equals(this.currentIndexItem)) {
currentIndexItem = newIndexItem;
FragmentManager fragmentManager = activity.getSupportFragmentManager();
DownloadMapDialogFragment dialogFragment =
(DownloadMapDialogFragment) fragmentManager.findFragmentByTag(DownloadMapDialogFragment.TAG);
if (dialogFragment != null) {
//refresh dialog data
dialogFragment.refreshData(newRegionName, newIndexItem);
} else {
//create a new dialog
DownloadMapDialogFragment.showInstance(activity.getSupportFragmentManager(), newIndexItem, newRegionName, usedOnMap);
}
}
}
}
public void hideDialog(AppCompatActivity activity) {
currentIndexItem = null;
DownloadMapDialogFragment.hideInstance(activity.getSupportFragmentManager());
}
}

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/AdditionalActionsBottomSheetDialogFragment.java
View file

@ -22,12 +22,11 @@ import net.osmand.AndroidUtils;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.ContextMenuItem; import net.osmand.plus.ContextMenuItem;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.base.BottomSheetDialogFragment;
import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.widgets.tools.ExtendedBottomSheetBehavior; import net.osmand.plus.widgets.tools.ExtendedBottomSheetBehavior;
import net.osmand.plus.widgets.tools.ExtendedBottomSheetBehavior.BottomSheetCallback; import net.osmand.plus.widgets.tools.ExtendedBottomSheetBehavior.BottomSheetCallback;
public class AdditionalActionsBottomSheetDialogFragment extends BottomSheetDialogFragment { public class AdditionalActionsBottomSheetDialogFragment extends net.osmand.plus.base.BottomSheetDialogFragment {
public static final String TAG = "AdditionalActionsBottomSheetDialogFragment"; public static final String TAG = "AdditionalActionsBottomSheetDialogFragment";

75
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -8,7 +8,6 @@ import android.graphics.Paint.Join;
import android.graphics.Paint.Style; import android.graphics.Paint.Style;
import android.graphics.Path; import android.graphics.Path;
import android.graphics.PointF; import android.graphics.PointF;
import android.support.v7.app.AppCompatActivity;
import android.text.TextPaint; import android.text.TextPaint;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.WindowManager; import android.view.WindowManager;
@ -27,8 +26,6 @@ import net.osmand.plus.activities.LocalIndexHelper;
import net.osmand.plus.activities.LocalIndexInfo; import net.osmand.plus.activities.LocalIndexInfo;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivityType; import net.osmand.plus.download.DownloadActivityType;
import net.osmand.plus.download.ui.DownloadMapDialogManager;
import net.osmand.plus.download.DownloadIndexesThread;
import net.osmand.plus.download.IndexItem; import net.osmand.plus.download.IndexItem;
import net.osmand.plus.mapcontextmenu.MapContextMenu; import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu; import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
@ -54,8 +51,6 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
private OsmandApplication app; private OsmandApplication app;
private OsmandMapTileView view; private OsmandMapTileView view;
private MapActivity mapActivity;
private DownloadMapDialogManager downloadDialogManager;
private Paint paintDownloaded; private Paint paintDownloaded;
private Path pathDownloaded; private Path pathDownloaded;
private Paint paintSelected; private Paint paintSelected;
@ -78,13 +73,6 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
private static int ZOOM_TO_SHOW_BORDERS = 7; private static int ZOOM_TO_SHOW_BORDERS = 7;
private static int ZOOM_TO_SHOW_SELECTION_ST = 3; private static int ZOOM_TO_SHOW_SELECTION_ST = 3;
private static int ZOOM_TO_SHOW_SELECTION = 8; private static int ZOOM_TO_SHOW_SELECTION = 8;
private static int ZOOM_MIN_TO_SHOW_DOWNLOAD_DIALOG = 9;
private static int ZOOM_MAX_TO_SHOW_DOWNLOAD_DIALOG = 11;
public DownloadedRegionsLayer(MapActivity activity) {
this.mapActivity = activity;
this.downloadDialogManager = new DownloadMapDialogManager();
}
public static class DownloadMapObject { public static class DownloadMapObject {
private BinaryMapDataObject dataObject; private BinaryMapDataObject dataObject;
@ -192,10 +180,6 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
if(zoom < ZOOM_TO_SHOW_SELECTION_ST) { if(zoom < ZOOM_TO_SHOW_SELECTION_ST) {
return; return;
} }
//make sure no maps are loaded for the location
checkMapToDownload(zoom, data.results);
// draw objects // draw objects
if (osmandRegions.isInitialized() && zoom >= ZOOM_TO_SHOW_SELECTION_ST && zoom < ZOOM_TO_SHOW_SELECTION) { if (osmandRegions.isInitialized() && zoom >= ZOOM_TO_SHOW_SELECTION_ST && zoom < ZOOM_TO_SHOW_SELECTION) {
final List<BinaryMapDataObject> currentObjects = new LinkedList<>(); final List<BinaryMapDataObject> currentObjects = new LinkedList<>();
@ -348,61 +332,6 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
return empty; return empty;
} }
private void checkMapToDownload(int zoom, List<BinaryMapDataObject> currentObjects) {
boolean found = false;
if (zoom >= ZOOM_MIN_TO_SHOW_DOWNLOAD_DIALOG && zoom <= ZOOM_MAX_TO_SHOW_DOWNLOAD_DIALOG
&& currentObjects != null) {
IndexItem indexItem = null;
String name = null;
WorldRegion regionData = null;
int cx = view.getCurrentRotatedTileBox().getCenter31X();
int cy = view.getCurrentRotatedTileBox().getCenter31Y();
for (int i = 0; i < currentObjects.size(); i++) {
final BinaryMapDataObject o = currentObjects.get(i);
if (!osmandRegions.contain(o, cx, cy)) {
continue;
}
String fullName = osmandRegions.getFullName(o);
regionData = osmandRegions.getRegionData(fullName);
if (regionData != null && regionData.isRegionMapDownload()) {
String regionDownloadName = regionData.getRegionDownloadName();
if (regionDownloadName != null && checkIfObjectDownloaded(regionDownloadName)) {
downloadDialogManager.hideDialog(getActivity());
return;
}
}
}
BinaryMapDataObject smallestRegion = null;
try {
smallestRegion = app.getRegions().getSmallestBinaryMapDataObjectAt(currentObjects);
} catch (IOException e) {
downloadDialogManager.hideDialog(mapActivity);
}
String fullName = osmandRegions.getFullName(smallestRegion);
regionData = osmandRegions.getRegionData(fullName);
DownloadIndexesThread downloadThread = app.getDownloadThread();
List<IndexItem> indexItems = downloadThread.getIndexes().getIndexItems(regionData);
for (IndexItem item : indexItems) {
if (item.getType() == DownloadActivityType.NORMAL_FILE
&& !(item.isDownloaded() || downloadThread.isDownloading(item))) {
found = true;
indexItem = item;
name = regionData.getLocaleName();
break;
}
}
if (found) {
downloadDialogManager.showDialog(getActivity(), indexItem, name, true);
} else {
downloadDialogManager.hideDialog(getActivity());
}
} else {
downloadDialogManager.hideDialog(getActivity());
}
}
@Override @Override
public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) { public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode) {
if(view.getMainLayer() instanceof MapTileLayer) { if(view.getMainLayer() instanceof MapTileLayer) {
@ -627,9 +556,5 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
public void clearSelectedObject() { public void clearSelectedObject() {
selectedObjects = new LinkedList<>(); selectedObjects = new LinkedList<>();
} }
protected MapActivity getActivity() {
return mapActivity;
}
} }