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

Added app modes toolbar to route preparation dialog

Browse source
This commit is contained in:
crimean 2019-02-09 21:58:54 +03:00
parent 2f7c635fa7
commit 94b1819fc3
5 changed files with 354 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/res/drawable/route_info_trans_gradient_left_dark.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<gradient
android:angle="180"
android:startColor="#0517191a"
android:centerColor="@color/activity_background_dark"
android:endColor="@color/activity_background_dark"
android:centerX="0.2"
android:type="linear" />
<corners android:radius="4dp" />
</shape>
</item>
</selector>

15
OsmAnd/res/drawable/route_info_trans_gradient_left_light.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<gradient
android:angle="180"
android:startColor="#05ffffff"
android:centerColor="@color/card_and_list_background_light"
android:endColor="@color/card_and_list_background_light"
android:centerX="0.2"
android:type="linear" />
<corners android:radius="4dp" />
</shape>
</item>
</selector>

213
OsmAnd/res/layout/plan_route_info.xml
View file

@ -16,62 +16,69 @@
android:id="@+id/route_menu_top_shadow_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@drawable/route_info_menu_bg_light">
android:orientation="vertical">
<FrameLayout
android:id="@+id/ModesLayout"
android:id="@+id/modes_layout_list_container"
android:layout_width="match_parent"
android:layout_height="@dimen/route_info_modes_height"
android:orientation="horizontal">
android:layout_height="@dimen/route_info_modes_height">
<LinearLayout
android:id="@+id/app_modes"
<FrameLayout
android:id="@+id/modes_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/context_menu_buttons_padding_bottom"
android:layout_marginRight="@dimen/context_menu_buttons_padding_bottom"
android:orientation="horizontal"
android:paddingEnd="@dimen/route_info_app_modes_padding"
android:paddingRight="@dimen/route_info_app_modes_padding" />
tools:ignore="UselessParent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginStart="@dimen/list_content_padding"
android:orientation="horizontal"
android:visibility="gone">
<LinearLayout
android:id="@+id/app_modes"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/context_menu_buttons_padding_bottom"
android:layout_marginRight="@dimen/context_menu_buttons_padding_bottom"
android:orientation="horizontal"
android:paddingStart="40dp"
android:paddingLeft="40dp"
android:paddingEnd="@dimen/route_info_app_modes_padding"
android:paddingRight="@dimen/route_info_app_modes_padding" />
<ImageView
android:id="@+id/waypoints"
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:background="?attr/selectableItemBackground"
android:scaleType="center"
android:src="@drawable/map_action_waypoints" />
</LinearLayout>
<LinearLayout
android:id="@+id/app_modes_options_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
tools:background="@drawable/route_info_trans_gradient_light">
<ImageView
android:id="@+id/app_modes_options"
<LinearLayout
android:id="@+id/app_modes_fold_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/route_info_icon_padding_right"
android:paddingRight="@dimen/route_info_icon_padding_right"
android:src="@drawable/ic_overflow_menu_dark" />
android:layout_gravity="start"
android:orientation="horizontal">
</LinearLayout>
<android.support.v7.widget.AppCompatImageView
android:id="@+id/fold_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackgroundBorderless"
android:paddingLeft="@dimen/route_info_icon_padding_right"
android:paddingRight="@dimen/route_info_icon_padding_right"
android:src="@drawable/ic_action_arrow_down"
android:tint="?attr/primary_icon_color" />
</LinearLayout>
<LinearLayout
android:id="@+id/app_modes_options_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end">
<ImageView
android:id="@+id/app_modes_options"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackgroundBorderless"
android:paddingLeft="@dimen/route_info_icon_padding_right"
android:paddingRight="@dimen/route_info_icon_padding_right"
android:src="@drawable/ic_overflow_menu_dark" />
</LinearLayout>
</FrameLayout>
</FrameLayout>
@ -92,12 +99,12 @@
android:id="@+id/fromIcon"
android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="@dimen/list_header_text_left_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
android:src="@drawable/map_default_location" />
<LinearLayout
@ -110,9 +117,9 @@
android:id="@+id/fromTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="3dp"
android:layout_marginRight="@dimen/list_content_padding"
android:layout_marginTop="5dp"
android:layout_marginRight="@dimen/list_content_padding"
android:layout_marginBottom="3dp"
android:text="@string/route_from"
android:textSize="@dimen/default_sub_text_size" />
@ -130,10 +137,10 @@
android:id="@+id/from_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/route_info_buttons_height"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
android:layout_marginLeft="@dimen/context_menu_padding_margin_medium"
android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
tools:background="@drawable/btn_border_trans_rounded_dark">
<LinearLayout
@ -165,10 +172,10 @@
android:id="@+id/from_button_image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
android:layout_marginLeft="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
tools:src="@drawable/ic_action_test_light" />
</LinearLayout>
@ -181,10 +188,10 @@
android:id="@+id/dividerFromDropDown"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginEnd="@dimen/route_info_end_divider_margin"
android:layout_marginLeft="@dimen/route_info_start_divider_margin"
android:layout_marginRight="@dimen/route_info_end_divider_margin"
android:layout_marginStart="@dimen/route_info_start_divider_margin"
android:layout_marginLeft="@dimen/route_info_start_divider_margin"
android:layout_marginEnd="@dimen/route_info_end_divider_margin"
android:layout_marginRight="@dimen/route_info_end_divider_margin"
android:background="@color/dashboard_divider_dark"
android:focusable="false" />
@ -200,12 +207,12 @@
android:id="@+id/viaIcon"
android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="@dimen/list_header_text_left_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
android:src="@drawable/map_default_location" />
<LinearLayout
@ -218,8 +225,8 @@
android:id="@+id/ViaSubView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="3dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="3dp"
android:ellipsize="end"
android:gravity="left"
android:singleLine="true"
@ -242,10 +249,10 @@
android:id="@+id/via_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/route_info_buttons_height"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
android:layout_marginLeft="@dimen/context_menu_padding_margin_medium"
android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
tools:background="@drawable/btn_border_trans_rounded_dark">
<LinearLayout
@ -260,8 +267,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center"
@ -277,10 +284,10 @@
android:id="@+id/via_button_image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
android:layout_marginLeft="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
tools:src="@drawable/ic_action_edit_dark" />
</LinearLayout>
@ -293,10 +300,10 @@
android:id="@+id/viaLayoutDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginEnd="@dimen/route_info_end_divider_margin"
android:layout_marginLeft="@dimen/route_info_start_divider_margin"
android:layout_marginRight="@dimen/route_info_end_divider_margin"
android:layout_marginStart="@dimen/route_info_start_divider_margin"
android:layout_marginLeft="@dimen/route_info_start_divider_margin"
android:layout_marginEnd="@dimen/route_info_end_divider_margin"
android:layout_marginRight="@dimen/route_info_end_divider_margin"
android:background="@color/dashboard_divider_dark"
android:focusable="false" />
@ -312,12 +319,12 @@
android:id="@+id/toIcon"
android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="@dimen/list_header_text_left_margin"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
android:src="@drawable/map_default_location" />
<LinearLayout
@ -330,8 +337,8 @@
android:id="@+id/toTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="3dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="3dp"
android:text="@string/route_to"
android:textSize="@dimen/default_sub_text_size" />
@ -349,10 +356,10 @@
android:id="@+id/to_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/route_info_buttons_height"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
android:layout_marginLeft="@dimen/context_menu_padding_margin_medium"
android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/context_menu_padding_margin_medium"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
tools:background="@drawable/btn_border_trans_rounded_dark">
<LinearLayout
@ -367,8 +374,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center"
@ -384,10 +391,10 @@
android:id="@+id/to_button_image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
android:layout_marginLeft="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
tools:src="@drawable/ic_action_plus" />
</LinearLayout>
@ -416,8 +423,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:paddingBottom="@dimen/bottom_sheet_content_margin_small"
android:paddingTop="@dimen/bottom_sheet_content_margin_small">
android:paddingTop="@dimen/bottom_sheet_content_margin_small"
android:paddingBottom="@dimen/bottom_sheet_content_margin_small">
<LinearLayout
android:id="@+id/route_options_container"
@ -425,10 +432,10 @@
android:layout_height="match_parent"
android:gravity="start"
android:orientation="horizontal"
android:paddingEnd="70dp"
android:paddingStart="5dp"
android:paddingLeft="5dp"
android:paddingRight="70dp"
android:paddingStart="5dp">
android:paddingEnd="70dp"
android:paddingRight="70dp">
</LinearLayout>
@ -440,8 +447,8 @@
android:layout_height="match_parent"
android:layout_gravity="end"
android:orientation="horizontal"
android:paddingLeft="@dimen/route_info_buttons_padding_top_bottom"
android:paddingStart="@dimen/route_info_buttons_padding_top_bottom">
android:paddingStart="@dimen/route_info_buttons_padding_top_bottom"
android:paddingLeft="@dimen/route_info_buttons_padding_top_bottom">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/map_options_route_button_title"
@ -462,10 +469,10 @@
android:id="@+id/map_options_route_button_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
android:paddingLeft="@dimen/content_padding_small"
android:paddingRight="@dimen/route_info_buttons_padding_top_bottom"
android:paddingStart="@dimen/content_padding_small"
android:paddingLeft="@dimen/content_padding_small"
android:paddingEnd="@dimen/route_info_buttons_padding_top_bottom"
android:paddingRight="@dimen/route_info_buttons_padding_top_bottom"
tools:src="@drawable/ic_action_edit_dark"
tools:tint="@color/recording_color" />
@ -503,8 +510,8 @@
android:id="@+id/route_menu_cards_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="60dp"
android:orientation="vertical"
android:paddingBottom="60dp"
tools:background="?attr/ctx_menu_info_view_bg">
</LinearLayout>
@ -515,6 +522,28 @@
</net.osmand.plus.mapcontextmenu.InterceptorLinearLayout>
<LinearLayout
android:id="@+id/modes_layout_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:orientation="vertical"
android:visibility="gone">
<FrameLayout
android:id="@+id/modes_layout_toolbar_container"
android:layout_width="match_parent"
android:layout_height="@dimen/route_info_modes_height" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
android:src="@drawable/bg_shadow_list_bottom" />
</LinearLayout>
<LinearLayout
android:id="@+id/control_buttons"
android:layout_width="match_parent"

53
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -14,6 +14,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.AppCompatImageView;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
@ -321,6 +322,20 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
}
}
public void openMenuFullScreen() {
WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
if (fragmentRef != null && fragmentRef.get().isVisible()) {
fragmentRef.get().openMenuFullScreen();
}
}
public void openMenuHeaderOnly() {
WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
if (fragmentRef != null && fragmentRef.get().isVisible()) {
fragmentRef.get().openMenuHeaderOnly();
}
}
public void updateMenu() {
WeakReference<MapRouteInfoMenuFragment> fragmentRef = findMenuFragment();
if (fragmentRef != null)
@ -346,7 +361,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
updateViaView(main);
updateFromSpinner(main);
updateToSpinner(main);
updateApplicationModes(main);
updateApplicationModes(mainView);
updateApplicationModesOptions(main);
updateOptionsButtons(main);
@ -385,7 +400,21 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
return routingHelper.getFinalLocation() != null && routingHelper.isRouteCalculated();
}
public void updateApplicationModesOptions() {
updateApplicationModesOptions(mainView);
}
private void updateApplicationModesOptions(final View parentView) {
AppCompatImageView foldButtonView = (AppCompatImageView) parentView.findViewById(R.id.fold_button);
foldButtonView.setImageResource(currentMenuState == MenuState.HEADER_ONLY ?
R.drawable.ic_action_arrow_up : R.drawable.ic_action_arrow_down);
foldButtonView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
expandCollapse();
}
});
parentView.findViewById(R.id.app_modes_options).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -394,6 +423,15 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
});
}
private void expandCollapse() {
if (currentMenuState == MenuState.HEADER_ONLY) {
openMenuFullScreen();
} else {
openMenuHeaderOnly();
}
updateApplicationModesOptions(mainView);
}
private void availableProfileDialog() {
AlertDialog.Builder b = new AlertDialog.Builder(mapActivity);
final OsmandSettings settings = mapActivity.getMyApplication().getSettings();
@ -475,16 +513,25 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
scrollView.setVerticalScrollBarEnabled(false);
scrollView.setHorizontalScrollBarEnabled(false);
int leftTogglePadding = AndroidUtils.dpToPx(mapActivity, 8f);
int rightTogglePadding = mapActivity.getResources().getDimensionPixelSize(R.dimen.content_padding);
final View[] buttons = new View[values.size()];
int k = 0;
Iterator<ApplicationMode> iterator = values.iterator();
boolean firstMode = true;
while (iterator.hasNext()) {
ApplicationMode mode = iterator.next();
View toggle = AppModeDialog.createToggle(mapActivity.getLayoutInflater(), (OsmandApplication) mapActivity.getApplication(), R.layout.mode_view_route_preparation, (LinearLayout) ll.findViewById(R.id.app_modes_content), mode, true);
View toggle = AppModeDialog.createToggle(mapActivity.getLayoutInflater(), (OsmandApplication) mapActivity.getApplication(),
R.layout.mode_view_route_preparation, (LinearLayout) ll.findViewById(R.id.app_modes_content), mode, true);
if (firstMode && toggle.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
firstMode = false;
ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) toggle.getLayoutParams();
p.setMargins(p.leftMargin + leftTogglePadding, p.topMargin, p.rightMargin, p.bottomMargin);
}
if (!iterator.hasNext() && toggle.getLayoutParams() instanceof ViewGroup.MarginLayoutParams) {
ViewGroup.MarginLayoutParams p = (ViewGroup.MarginLayoutParams) toggle.getLayoutParams();
p.setMargins(p.leftMargin, p.topMargin, p.rightMargin + mapActivity.getResources().getDimensionPixelSize(R.dimen.content_padding), p.bottomMargin);
p.setMargins(p.leftMargin, p.topMargin, p.rightMargin + rightTogglePadding, p.bottomMargin);
}
buttons[k++] = toggle;

197
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenuFragment.java
View file

@ -6,6 +6,7 @@ import android.annotation.TargetApi;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat;
@ -44,7 +45,6 @@ import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.controls.HorizontalSwipeConfirm;
import net.osmand.plus.widgets.ImageViewExProgress;
import net.osmand.plus.widgets.TextViewExProgress;
import net.osmand.router.TransportRoutePlanner;
import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
@ -58,6 +58,10 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
private MapRouteInfoMenu menu;
private InterceptorLinearLayout mainView;
private View modesLayoutToolbar;
private View modesLayoutToolbarContainer;
private View modesLayoutListContainer;
private View modesLayout;
private View view;
private LinearLayout cardsContainer;
private View.OnLayoutChangeListener containerLayoutListener;
@ -79,18 +83,35 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
private int shadowHeight;
private int screenHeight;
private int viewHeight;
private int topShadowMargin;
@Nullable
private MapActivity getMapActivity() {
return (MapActivity) getActivity();
FragmentActivity activity = getActivity();
if (activity instanceof MapActivity) {
return (MapActivity) activity;
} else {
return null;
}
}
@NonNull
private MapActivity requireMapActivity() {
FragmentActivity activity = getActivity();
if (!(activity instanceof MapActivity)) {
throw new IllegalStateException("Fragment " + this + " not attached to an activity.");
}
return (MapActivity) activity;
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
MapActivity mapActivity = getMapActivity();
MapActivity mapActivity = requireMapActivity();
processScreenHeight(container);
portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
topShadowMargin = AndroidUtils.dpToPx(mapActivity, 9f);
menu = mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu();
shadowHeight = AndroidUtils.dpToPx(mapActivity, SHADOW_HEIGHT_TOP_DP);
@ -104,6 +125,10 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
AndroidUtils.addStatusBarPadding21v(getActivity(), view);
mainView = view.findViewById(R.id.main_view);
modesLayoutToolbar = view.findViewById(R.id.modes_layout_toolbar);
modesLayoutToolbarContainer = view.findViewById(R.id.modes_layout_toolbar_container);
modesLayoutListContainer = view.findViewById(R.id.modes_layout_list_container);
modesLayout = view.findViewById(R.id.modes_layout);
nightMode = mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
view.setOnClickListener(new View.OnClickListener() {
@ -130,11 +155,11 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
if (!portrait) {
final TypedValue typedValueAttr = new TypedValue();
getMapActivity().getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
mapActivity.getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
mainView.setBackgroundResource(typedValueAttr.resourceId);
mainView.setLayoutParams(new FrameLayout.LayoutParams(getResources().getDimensionPixelSize(R.dimen.dashboard_land_width), ViewGroup.LayoutParams.MATCH_PARENT));
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AndroidUtils.dpToPx(getMyApplication(), 345f), ViewGroup.LayoutParams.WRAP_CONTENT);
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(AndroidUtils.dpToPx(mapActivity, 345f), ViewGroup.LayoutParams.WRAP_CONTENT);
params.gravity = Gravity.BOTTOM;
view.findViewById(R.id.control_buttons).setLayoutParams(params);
@ -214,6 +239,8 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
initVelocityTrackerIfNotExists();
velocityTracker.addMovement(ev);
updateToolbar();
}
break;
@ -313,10 +340,13 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
if (parent != null && containerLayoutListener != null) {
((View) parent).addOnLayoutChangeListener(containerLayoutListener);
}
getMapActivity().getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
wasDrawerDisabled = getMapActivity().isDrawerDisabled();
if (!wasDrawerDisabled) {
getMapActivity().disableDrawer();
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
mapActivity.getMapLayers().getMapControlsLayer().showMapControlsIfHidden();
wasDrawerDisabled = mapActivity.isDrawerDisabled();
if (!wasDrawerDisabled) {
mapActivity.disableDrawer();
}
}
}
@ -329,8 +359,9 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
((View) parent).removeOnLayoutChangeListener(containerLayoutListener);
}
}
if (!wasDrawerDisabled) {
getMapActivity().enableDrawer();
MapActivity mapActivity = getMapActivity();
if (!wasDrawerDisabled && mapActivity != null) {
mapActivity.enableDrawer();
}
}
@ -344,8 +375,17 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
@Override
public int getStatusBarColorId() {
if (menu != null && (menu.getCurrentMenuState() == MapRouteInfoMenu.MenuState.FULL_SCREEN || !portrait)) {
return nightMode ? R.color.status_bar_dark : R.color.status_bar_route_light;
if (view != null) {
if (menu != null && (getViewY() <= topShadowMargin || !portrait)) {
if (Build.VERSION.SDK_INT >= 23) {
view.setSystemUiVisibility(view.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
return nightMode ? R.color.dialog_divider_dark : R.color.dialog_divider_light;
} else {
if (Build.VERSION.SDK_INT >= 23) {
view.setSystemUiVisibility(view.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
}
}
return -1;
}
@ -364,25 +404,64 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
mainView.setY(y);
}
private void updateToolbar() {
MapActivity mapActivity = getMapActivity();
if (menu == null || mapActivity == null) {
return;
}
int y = getViewY();
if (y < topShadowMargin || !portrait) {
ViewGroup parent = (ViewGroup) modesLayout.getParent();
if (parent != null && parent != modesLayoutToolbarContainer) {
parent.removeView(modesLayout);
((ViewGroup) modesLayoutToolbarContainer).addView(modesLayout);
}
modesLayoutToolbar.setVisibility(View.VISIBLE);
} else {
ViewGroup parent = (ViewGroup) modesLayout.getParent();
if (parent != null && parent != modesLayoutListContainer) {
parent.removeView(modesLayout);
((ViewGroup) modesLayoutListContainer).addView(modesLayout);
}
modesLayoutToolbar.setVisibility(View.GONE);
}
mapActivity.updateStatusBarColor();
menu.updateApplicationModesOptions();
}
private void processScreenHeight(ViewParent parent) {
View container = (View) parent;
screenHeight = container.getHeight() + AndroidUtils.getStatusBarHeight(getMapActivity());
viewHeight = screenHeight - AndroidUtils.getStatusBarHeight(getMapActivity());
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
screenHeight = container.getHeight() + AndroidUtils.getStatusBarHeight(mapActivity);
viewHeight = screenHeight - AndroidUtils.getStatusBarHeight(mapActivity);
}
}
private int getFullScreenTopPosY() {
return -menuTitleHeight + AndroidUtils.getStatusBarHeight(getMyApplication());
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
return topShadowMargin;
} else {
return 0;
}
}
private int addStatusBarHeightIfNeeded(int res) {
if (Build.VERSION.SDK_INT >= 21) {
return res + AndroidUtils.getStatusBarHeight(getMyApplication());
MapActivity mapActivity = getMapActivity();
if (Build.VERSION.SDK_INT >= 21 && mapActivity != null) {
return res + AndroidUtils.getStatusBarHeight(mapActivity);
}
return res;
}
private int getHeaderOnlyTopY() {
return viewHeight - menuTitleHeight - AndroidUtils.dpToPx(getMyApplication(), 48f);
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
return viewHeight - menuTitleHeight - AndroidUtils.dpToPx(mapActivity, 48f);
} else {
return 0;
}
}
public void openMenuFullScreen() {
@ -482,6 +561,10 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
if (needCloseMenu) {
return screenHeight;
}
MapActivity mapActivity = getMapActivity();
if (mapActivity == null) {
return 0;
}
int destinationState;
destinationState = menu.getCurrentMenuState();
@ -516,19 +599,22 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
break;
}
if (portrait) {
getMapActivity().updateStatusBarColor();
mapActivity.updateStatusBarColor();
}
return posY;
}
private void updateMainViewLayout(int posY) {
if (view != null) {
MapActivity mapActivity = getMapActivity();
if (view != null && mapActivity != null) {
menuFullHeight = view.getHeight() - posY;
menuTopShadowAllHeight = menuTitleHeight;
ViewGroup.LayoutParams lp = mainView.getLayoutParams();
lp.height = Math.max(menuFullHeight, menuTitleHeight);
mainView.setLayoutParams(lp);
mainView.requestLayout();
updateToolbar();
}
}
@ -628,9 +714,10 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
}
public int getHeight() {
if (menu != null) {
MapActivity mapActivity = getMapActivity();
if (menu != null && mapActivity != null) {
int height = getMenuStatePosY(menu.getCurrentMenuState());
return viewHeight - height - AndroidUtils.getStatusBarHeight(getMyApplication());
return viewHeight - height - AndroidUtils.getStatusBarHeight(mapActivity);
} else {
return 0;
}
@ -638,12 +725,13 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
private void adjustMapPosition(int y) {
OsmandApplication app = getMyApplication();
if (menu.isSelectFromMapTouch() || app == null) {
MapActivity mapActivity = getMapActivity();
if (menu.isSelectFromMapTouch() || app == null || mapActivity == null) {
return;
}
RoutingHelper rh = app.getRoutingHelper();
if (rh.isRoutePlanningMode() && getMapActivity().getMapView() != null) {
if (rh.isRoutePlanningMode() && mapActivity.getMapView() != null) {
Location lt = rh.getLastProjection();
if (lt == null) {
lt = app.getTargetPointsHelper().getPointToStartLocation();
@ -679,7 +767,7 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
bottom = Math.min(bottom, l.getLatitude());
}
RotatedTileBox tb = getMapActivity().getMapView().getCurrentRotatedTileBox().copy();
RotatedTileBox tb = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
int tileBoxWidthPx = 0;
int tileBoxHeightPx = 0;
@ -689,7 +777,7 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
int fHeight = viewHeight - y - AndroidUtils.getStatusBarHeight(app);
tileBoxHeightPx = tb.getPixHeight() - fHeight;
}
getMapActivity().getMapView().fitRectToMap(left, right, top, bottom, tileBoxWidthPx, tileBoxHeightPx, 0);
mapActivity.getMapView().fitRectToMap(left, right, top, bottom, tileBoxWidthPx, tileBoxHeightPx, 0);
}
}
}
@ -717,6 +805,11 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
}
public void updateRouteCalculationProgress(int progress) {
MapActivity mapActivity = getMapActivity();
if (mapActivity == null) {
return;
}
ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.progress_bar);
if (progressBar != null) {
if (progressBar.getVisibility() != View.VISIBLE) {
@ -734,17 +827,22 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
textViewExProgress.percent = progress / 100f;
int color = nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light;
textViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), color);
textViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
textViewExProgress.color1 = ContextCompat.getColor(mapActivity, color);
textViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.description_font_and_bottom_sheet_icons);
textViewExProgress.invalidate();
ImageViewExProgress imageViewExProgress = (ImageViewExProgress) view.findViewById(R.id.start_icon);
imageViewExProgress.percent = progress / 100f;
imageViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), color);
imageViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
imageViewExProgress.color1 = ContextCompat.getColor(mapActivity, color);
imageViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.description_font_and_bottom_sheet_icons);
imageViewExProgress.invalidate();
}
public void hideRouteCalculationProgressBar() {
MapActivity mapActivity = getMapActivity();
if (mapActivity == null) {
return;
}
View progressBar = mainView.findViewById(R.id.progress_bar);
if (progressBar != null) {
progressBar.setVisibility(View.GONE);
@ -754,19 +852,20 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
progressBarButton.setVisibility(View.GONE);
}
int color = nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light;
((TextView) view.findViewById(R.id.start_button_descr)).setTextColor(ContextCompat.getColor(getMapActivity(), color));
((TextView) view.findViewById(R.id.start_button_descr)).setTextColor(ContextCompat.getColor(mapActivity, color));
}
public void updateControlButtons() {
OsmandApplication app = getMyApplication();
if (app != null) {
MapActivity mapActivity = getMapActivity();
if (app != null && mapActivity != null) {
TextViewExProgress textViewExProgress = (TextViewExProgress) view.findViewById(R.id.start_button_descr);
textViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light);
textViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
textViewExProgress.color1 = ContextCompat.getColor(mapActivity, nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light);
textViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.description_font_and_bottom_sheet_icons);
ImageViewExProgress imageViewExProgress = (ImageViewExProgress) view.findViewById(R.id.start_icon);
imageViewExProgress.color1 = ContextCompat.getColor(getMapActivity(), nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light);
imageViewExProgress.color2 = ContextCompat.getColor(getMapActivity(), R.color.description_font_and_bottom_sheet_icons);
imageViewExProgress.color1 = ContextCompat.getColor(mapActivity, nightMode ? R.color.main_font_dark : R.color.card_and_list_background_light);
imageViewExProgress.color2 = ContextCompat.getColor(mapActivity, R.color.description_font_and_bottom_sheet_icons);
((ImageView) view.findViewById(R.id.start_icon)).setImageResource(R.drawable.ic_action_start_navigation);
if (menu.isRouteCalculated()) {
AndroidUtils.setBackground(app, view.findViewById(R.id.start_button), nightMode, R.color.active_buttons_and_links_light, R.color.active_buttons_and_links_dark);
@ -805,6 +904,10 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
public void applyDayNightMode() {
MapActivity ctx = getMapActivity();
if (ctx == null) {
return;
}
boolean portraitMode = AndroidUiHelper.isOrientationPortrait(ctx);
boolean landscapeLayout = !portraitMode;
boolean nightMode = ctx.getMyApplication().getDaynightHelper().isNightModeForMapControls();
@ -813,18 +916,22 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
} else {
AndroidUtils.setBackground(ctx, mainView, nightMode, R.drawable.route_info_menu_bg_left_light, R.drawable.route_info_menu_bg_left_dark);
}
AndroidUtils.setBackground(ctx, view.findViewById(R.id.modes_layout_toolbar_container), nightMode,
R.color.route_info_bg_light, R.color.route_info_bg_dark);
AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerFromDropDown), nightMode,
R.color.divider_light, R.color.divider_dark);
AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.viaLayoutDivider), nightMode,
R.color.divider_light, R.color.divider_dark);
AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.dividerButtons), nightMode,
R.color.divider_light, R.color.divider_dark);
AndroidUtils.setBackground(ctx, mainView.findViewById(R.id.app_modes_options_container), nightMode,
AndroidUtils.setBackground(ctx, view.findViewById(R.id.app_modes_options_container), nightMode,
R.drawable.route_info_trans_gradient_light, R.drawable.route_info_trans_gradient_dark);
AndroidUtils.setBackground(ctx, view.findViewById(R.id.app_modes_fold_container), nightMode,
R.drawable.route_info_trans_gradient_left_light, R.drawable.route_info_trans_gradient_left_dark);
AndroidUtils.setBackground(ctx, view.findViewById(R.id.dividerControlButtons), nightMode,
R.color.divider_light, R.color.divider_dark);
int color = ContextCompat.getColor(getMapActivity(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
int color = ContextCompat.getColor(ctx, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
((TextView) mainView.findViewById(R.id.from_button_description)).setTextColor(color);
((TextView) mainView.findViewById(R.id.via_button_description)).setTextColor(color);
@ -832,7 +939,7 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
((TextView) mainView.findViewById(R.id.map_options_route_button_title)).setTextColor(color);
((TextView) view.findViewById(R.id.cancel_button_descr)).setTextColor(
ContextCompat.getColor(getMapActivity(), nightMode ? R.color.active_buttons_and_links_dark : R.color.route_info_cancel_button_color_light));
ContextCompat.getColor(ctx, nightMode ? R.color.active_buttons_and_links_dark : R.color.route_info_cancel_button_color_light));
AndroidUtils.setTextPrimaryColor(ctx, (TextView) mainView.findViewById(R.id.ViaView), nightMode);
AndroidUtils.setTextSecondaryColor(ctx, (TextView) mainView.findViewById(R.id.ViaSubView), nightMode);
@ -885,9 +992,11 @@ public class MapRouteInfoMenuFragment extends BaseOsmAndFragment {
}
public void setupRouteCalculationButtonProgressBar(@NonNull ProgressBar pb) {
int bgColor = ContextCompat.getColor(getMyApplication(), nightMode ? R.color.route_info_cancel_button_color_dark : R.color.activity_background_light);
int progressColor = ContextCompat.getColor(getMyApplication(), nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, progressColor));
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
int bgColor = ContextCompat.getColor(mapActivity, nightMode ? R.color.route_info_cancel_button_color_dark : R.color.activity_background_light);
int progressColor = ContextCompat.getColor(mapActivity, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
pb.setProgressDrawable(AndroidUtils.createProgressDrawable(bgColor, progressColor));
}
}
}