AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed crash and review notes

Browse source
This commit is contained in:
Dmitry Donskoy 2018-07-02 19:51:18 +03:00 • committed by Aleksandr Zatsepin
parent a6c7bcc83f
commit 778083a9b7
11 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/res/drawable/bg_toggle_map_layer_btn_dark.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_toggle_map_layer_btn_selected_dark" android:state_selected="true"/>
<item android:drawable="@drawable/bg_toggle_map_layer_btn_default_dark"/>
</selector>

2
android/res/drawable/bg_toggle_map_layer_btn_default.xml
View file

@ -4,5 +4,5 @@
android:shape="oval"
android:height="@dimen/margin_double_plus"
android:width="@dimen/margin_double_plus">
<solid android:color="?attr/transitPedestrianBackground"/>
<solid android:color="@color/black_4"/>
</shape>

8
android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"
android:height="@dimen/margin_double_plus"
android:width="@dimen/margin_double_plus">
<solid android:color="@color/white_4"/>
</shape>

2
android/res/drawable/bg_toggle_map_layer_btn_selected.xml
View file

@ -4,5 +4,5 @@
android:shape="oval"
android:height="@dimen/margin_double_plus"
android:width="@dimen/margin_double_plus">
<solid android:color="?attr/colorAccent"/>
<solid android:color="@color/base_accent"/>
</shape>

8
android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"
android:height="@dimen/margin_double_plus"
android:width="@dimen/margin_double_plus">
<solid android:color="@color/base_accent_night"/>
</shape>

2
android/res/layout/item_bottomsheet_dialog.xml
View file

@ -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"/>
<TextView
android:id="@+id/name"

1
android/res/values/themes-attrs.xml
View file

@ -101,6 +101,7 @@
<attr name="filterPropertyBackground" format="reference"/>
<attr name="adChoicesIcon" format="reference"/>
<attr name="saleIcon" format="reference"/>
<attr name="toggleMapLayerBtnBg" format="reference"/>
</declare-styleable>
<declare-styleable name="ThemeAttrs.NavButtons">

2
android/res/values/themes-base.xml
View file

@ -129,6 +129,7 @@
<item name="nav_bg_subway">@drawable/bg_subway_light</item>
<item name="trafficMenuDisabled">@drawable/ic_traffic_menu_light_off</item>
<item name="subwayMenuDisabled">@drawable/ic_subway_menu_light_off</item>
<item name="toggleMapLayerBtnBg">@drawable/bg_toggle_map_layer_btn</item>
</style>
<!-- Night theme -->
@ -261,5 +262,6 @@
<item name="nav_bg_subway">@drawable/bg_subway_night</item>
<item name="trafficMenuDisabled">@drawable/ic_traffic_menu_dark_off</item>
<item name="subwayMenuDisabled">@drawable/ic_subway_menu_dark_off</item>
<item name="toggleMapLayerBtnBg">@drawable/bg_toggle_map_layer_btn_dark</item>
</style>
</resources>

12
android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java
View file

@ -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

4
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -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,

2
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -90,7 +90,7 @@ public class SearchFragment extends BaseMwmFragment
{
public ToolbarController(View root)
{
super(root, SearchFragment.this.getActivity());
super(root, getActivity());
}
@Override