From 778083a9b710999a7814062f0d95df84584229c1 Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Mon, 2 Jul 2018 19:51:18 +0300 Subject: [PATCH] [android] Fixed crash and review notes --- .../res/drawable/bg_toggle_map_layer_btn_dark.xml | 5 +++++ .../res/drawable/bg_toggle_map_layer_btn_default.xml | 2 +- .../bg_toggle_map_layer_btn_default_dark.xml | 8 ++++++++ .../drawable/bg_toggle_map_layer_btn_selected.xml | 2 +- .../bg_toggle_map_layer_btn_selected_dark.xml | 8 ++++++++ android/res/layout/item_bottomsheet_dialog.xml | 2 +- android/res/values/themes-attrs.xml | 1 + android/res/values/themes-base.xml | 2 ++ .../maps/maplayer/ToggleMapLayerDialog.java | 12 ++++++------ .../mapswithme/maps/routing/RoutingController.java | 4 +--- .../com/mapswithme/maps/search/SearchFragment.java | 2 +- 11 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 android/res/drawable/bg_toggle_map_layer_btn_dark.xml create mode 100644 android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml create mode 100644 android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml diff --git a/android/res/drawable/bg_toggle_map_layer_btn_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_dark.xml new file mode 100644 index 0000000000..e3cedfb43b --- /dev/null +++ b/android/res/drawable/bg_toggle_map_layer_btn_dark.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/res/drawable/bg_toggle_map_layer_btn_default.xml b/android/res/drawable/bg_toggle_map_layer_btn_default.xml index aff70729be..954aa5b196 100644 --- a/android/res/drawable/bg_toggle_map_layer_btn_default.xml +++ b/android/res/drawable/bg_toggle_map_layer_btn_default.xml @@ -4,5 +4,5 @@ android:shape="oval" android:height="@dimen/margin_double_plus" android:width="@dimen/margin_double_plus"> - + diff --git a/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml new file mode 100644 index 0000000000..3f46ad91d3 --- /dev/null +++ b/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml @@ -0,0 +1,8 @@ + + + + diff --git a/android/res/drawable/bg_toggle_map_layer_btn_selected.xml b/android/res/drawable/bg_toggle_map_layer_btn_selected.xml index 8196902175..76a2654af6 100644 --- a/android/res/drawable/bg_toggle_map_layer_btn_selected.xml +++ b/android/res/drawable/bg_toggle_map_layer_btn_selected.xml @@ -4,5 +4,5 @@ android:shape="oval" android:height="@dimen/margin_double_plus" android:width="@dimen/margin_double_plus"> - + diff --git a/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml new file mode 100644 index 0000000000..dd60485f91 --- /dev/null +++ b/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml @@ -0,0 +1,8 @@ + + + + diff --git a/android/res/layout/item_bottomsheet_dialog.xml b/android/res/layout/item_bottomsheet_dialog.xml index 3091824aee..a9309b48e1 100644 --- a/android/res/layout/item_bottomsheet_dialog.xml +++ b/android/res/layout/item_bottomsheet_dialog.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:minHeight="@dimen/margin_double_plus" android:minWidth="@dimen/margin_double_plus" - android:background="@drawable/bg_toggle_map_layer_btn" + android:background="?attr/toggleMapLayerBtnBg" android:layout_gravity="center"/> + diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index 9ae05466ad..bc7402d619 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -129,6 +129,7 @@ @drawable/bg_subway_light @drawable/ic_traffic_menu_light_off @drawable/ic_subway_menu_light_off + @drawable/bg_toggle_map_layer_btn @@ -261,5 +262,6 @@ @drawable/bg_subway_night @drawable/ic_traffic_menu_dark_off @drawable/ic_subway_menu_dark_off + @drawable/bg_toggle_map_layer_btn_dark diff --git a/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java b/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java index e316b67b80..71277cbaee 100644 --- a/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java +++ b/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java @@ -18,14 +18,14 @@ import android.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.TextView; import com.mapswithme.maps.R; -import com.mapswithme.maps.maplayer.subway.OnSubwayLayerToggleListener; -import com.mapswithme.maps.widget.recycler.SpanningLinearLayoutManager; import com.mapswithme.maps.bookmarks.OnItemClickListener; +import com.mapswithme.maps.maplayer.subway.OnSubwayLayerToggleListener; import com.mapswithme.maps.maplayer.traffic.OnTrafficLayerToggleListener; +import com.mapswithme.maps.widget.recycler.SpanningLinearLayoutManager; import java.util.Arrays; import java.util.List; @@ -54,8 +54,8 @@ public class ToggleMapLayerDialog extends DialogFragment { BottomSheetDialog dialog = (BottomSheetDialog) dialogInterface; View bottomSheet = dialog.findViewById(android.support.design.R.id.design_bottom_sheet); - BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet); - bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED); + BottomSheetBehavior behavior = BottomSheetBehavior.from(Objects.requireNonNull(bottomSheet)); + behavior.setState(BottomSheetBehavior.STATE_EXPANDED); } private void initChildren(@NonNull View root) @@ -152,7 +152,7 @@ public class ToggleMapLayerDialog extends DialogFragment private static class ModeHolder extends RecyclerView.ViewHolder { @NonNull - private final ImageButton mButton; + private final ImageView mButton; @NonNull private final TextView mTitle; @Nullable diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index 8cd6df1427..ba411b4ee2 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -23,7 +23,6 @@ import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.downloader.MapManager; import com.mapswithme.maps.location.LocationHelper; -import com.mapswithme.maps.maplayer.subway.SubwayManager; import com.mapswithme.maps.taxi.TaxiInfo; import com.mapswithme.maps.taxi.TaxiInfoError; import com.mapswithme.maps.taxi.TaxiManager; @@ -435,8 +434,7 @@ public class RoutingController implements TaxiManager.TaxiListener private boolean isSubwayEnabled() { - FragmentActivity activity = mContainer == null ? null : mContainer.getActivity(); - return activity != null && mContainer.isSubwayEnabled(); + return mContainer != null && mContainer.isSubwayEnabled(); } public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint, diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index ba96e51528..6b0eb9620c 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -90,7 +90,7 @@ public class SearchFragment extends BaseMwmFragment { public ToolbarController(View root) { - super(root, SearchFragment.this.getActivity()); + super(root, getActivity()); } @Override