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:
Victor Shcherb 2018-03-12 09:32:06 +01:00
commit cfca2cb0be
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
}); });
((TextView) mainView.findViewById(R.id.close_row_text)).setText(getCloseRowTextId()); ((TextView) mainView.findViewById(R.id.close_row_text)).setText(getCloseRowTextId());
setupHeightAndBackground(mainView, R.id.scroll_view); setupHeightAndBackground(mainView);
return mainView; return mainView;
} }
@ -123,7 +123,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
return getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance); return getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
} }
protected void setupHeightAndBackground(final View mainView, final int scrollViewId) { protected void setupHeightAndBackground(final View mainView) {
final Activity activity = getActivity(); final Activity activity = getActivity();
final int screenHeight = AndroidUtils.getScreenHeight(activity); final int screenHeight = AndroidUtils.getScreenHeight(activity);
final int statusBarHeight = AndroidUtils.getStatusBarHeight(activity); final int statusBarHeight = AndroidUtils.getStatusBarHeight(activity);
@ -132,7 +132,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { mainView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override @Override
public void onGlobalLayout() { public void onGlobalLayout() {
final View scrollView = mainView.findViewById(scrollViewId); final View scrollView = mainView.findViewById(R.id.scroll_view);
int scrollViewHeight = scrollView.getHeight(); int scrollViewHeight = scrollView.getHeight();
int dividerHeight = AndroidUtils.dpToPx(getContext(), 1); int dividerHeight = AndroidUtils.dpToPx(getContext(), 1);
int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height); int cancelButtonHeight = getContext().getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height);

1
OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
View file

@ -152,6 +152,7 @@ public class AddTracksGroupBottomSheetDialogFragment extends AddGroupBottomSheet
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
lookingForTracksText.setVisibility(View.GONE); lookingForTracksText.setVisibility(View.GONE);
recyclerView.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.VISIBLE);
setupHeightAndBackground(getView());
} }
} }
} }