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

[android] Fixed review notes

Browse source
This commit is contained in:
Dmitry Donskoy 2018-06-28 13:29:12 +03:00 • committed by Aleksandr Zatsepin
parent 045b1525bb
commit 2f61dd9dc1
30 changed files with 247 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/res/drawable/bg_subway_light.xml Normal file
View file

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

4
android/res/drawable/subway_bg_night_selected.xml → android/res/drawable/bg_subway_light_default.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle"/>
<item
android:drawable="@drawable/bg_circle_night"
android:drawable="@drawable/ic_layers_light_on"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
<item android:drawable="@drawable/ic_subway_off_night"/>
</layer-list>

11
android/res/drawable/bg_subway_light_pressed.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle_pressed"/>
<item
android:drawable="@drawable/ic_layers_light_on"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

11
android/res/drawable/bg_subway_light_selected.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle"/>
<item
android:drawable="@drawable/ic_subway_off"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

6
android/res/drawable/bg_subway_night.xml Normal file
View file

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

0
android/res/drawable/subway_bg_night_default.xml → android/res/drawable/bg_subway_night_default.xml
View file

0
android/res/drawable/subway_bg_night_pressed.xml → android/res/drawable/bg_subway_night_pressed.xml
View file

12
android/res/drawable/bg_subway_night_selected.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/bg_circle_night"/>
<item
android:drawable="@drawable/ic_subway_off_night"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

5
android/res/drawable/bg_toggle_map_layer_btn.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" android:state_selected="true"/>
<item android:drawable="@drawable/bg_toggle_map_layer_btn_default"/>
</selector>

2
android/res/drawable/traffic_subway_bg_default.xml → 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="@color/subway_traffic_btn_bg_disabled"/>
<solid android:color="?attr/transitPedestrianBackground"/>
</shape>

0
android/res/drawable/traffic_subway_btn_bg_selected.xml → android/res/drawable/bg_toggle_map_layer_btn_selected.xml
View file

8
android/res/drawable/subway_bg_light.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UnusedAttribute">
<item android:drawable="@drawable/subway_bg_light_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/subway_bg_light_selected" android:state_selected="true"/>
<item android:drawable="@drawable/subway_bg_light_default"/>
</selector>

9
android/res/drawable/subway_bg_light_default.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle"/>
<item android:drawable="@drawable/ic_layers_light_on"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

10
android/res/drawable/subway_bg_light_pressed.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle_pressed"/>
<item android:drawable="@drawable/ic_layers_light_on"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

9
android/res/drawable/subway_bg_light_selected.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_circle"/>
<item android:drawable="@drawable/ic_subway_off"
android:left="@dimen/margin_base_plus_quarter"
android:right="@dimen/margin_base_plus_quarter"
android:top="@dimen/margin_base_plus_quarter"
android:bottom="@dimen/margin_base_plus_quarter"/>
</layer-list>

8
android/res/drawable/subway_bg_night.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UnusedAttribute">
<item android:drawable="@drawable/subway_bg_night_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/subway_bg_night_selected" android:state_selected="true"/>
<item android:drawable="@drawable/subway_bg_night_default"/>
</selector>

5
android/res/drawable/traffic_subway_btn_bg.xml
View file

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

10
android/res/layout/fragment_toggle_map_layer.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:layout_behavior="android.support.design.widget.BottomSheetBehavior"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:background="?attr/cardBackground"
android:paddingTop="@dimen/margin_quarter"
android:paddingBottom="@dimen/margin_quarter"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
@ -42,7 +42,7 @@
android:id="@+id/recycler"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:minHeight="@dimen/subway_traffic_frame_height"
android:minHeight="@dimen/toggle_map_layer_frame_height"
android:paddingLeft="@dimen/margin_base"
android:paddingStart="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
@ -52,7 +52,7 @@
<View
app:layout_constraintBottom_toTopOf="@id/recycler"
android:background="@color/bookmarks_list_item_bg"
android:background="?android:attr/listDivider"
android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"/>
</android.support.constraint.ConstraintLayout>

5
android/res/layout/bootsheet_dialog_item.xml → android/res/layout/item_bottomsheet_dialog.xml
View file

@ -6,15 +6,16 @@
android:gravity="center"
android:layout_height="match_parent">
<ImageButton
android:id="@+id/item_btn"
android:id="@+id/btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/margin_double_plus"
android:minWidth="@dimen/margin_double_plus"
android:background="@drawable/traffic_subway_btn_bg"
android:background="@drawable/bg_toggle_map_layer_btn"
android:layout_gravity="center"/>
<TextView
android:id="@+id/name"
android:layout_marginTop="@dimen/margin_quarter"
android:textAppearance="@style/MwmTextAppearance.Body5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

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

@ -11,7 +11,7 @@
android:fontFamily="@string/robotoMedium"
android:text="@string/bookmarks"
tools:targetApi="jelly_bean"
android:background="@color/bookmarks_list_item_bg"
android:background="@color/black_12"
android:paddingEnd="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingStart="@dimen/margin_base"

3
android/res/values/colors.xml
View file

@ -225,7 +225,4 @@
<color name="rating_horrible">#E53935</color>
<color name="rating_none">#FF888A82</color>
<color name="rating_coming_soon">#FF1E96F0</color>
<color name="bookmarks_list_item_bg">#1E000000</color>
<color name="subway_traffic_btn_bg_disabled">#f5f5f5</color>
</resources>

2
android/res/values/dimens.xml
View file

@ -248,5 +248,5 @@
<dimen name="bookmark_hide_btn_padding_top">22dp</dimen>
<dimen name="bookmark_recycler_view_bottom_margin">80dp</dimen>
<dimen name="dp_0">0dp</dimen>
<dimen name="subway_traffic_frame_height">98dp</dimen>
<dimen name="toggle_map_layer_frame_height">98dp</dimen>
</resources>

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

@ -126,7 +126,7 @@
<item name="filterPropertyBackground">@drawable/button_with_border</item>
<item name="adChoicesIcon">@drawable/ic_ad_light</item>
<item name="saleIcon">@drawable/ic_deal_light</item>
<item name="nav_bg_subway">@drawable/subway_bg_light</item>
<item name="nav_bg_subway">@drawable/bg_subway_light</item>
</style>
<!-- Night theme -->
@ -256,6 +256,6 @@
<item name="filterPropertyBackground">@drawable/button_with_border_night</item>
<item name="adChoicesIcon">@drawable/ic_ad_dark</item>
<item name="saleIcon">@drawable/ic_deal_dark</item>
<item name="nav_bg_subway">@drawable/subway_bg_night</item>
<item name="nav_bg_subway">@drawable/bg_subway_night</item>
</style>
</resources>

89
android/src/com/mapswithme/maps/adapter/BottomSheetItem.java
View file

@ -1,21 +1,100 @@
package com.mapswithme.maps.adapter;
import android.content.Context;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.subway.Mode;
import com.mapswithme.util.ThemeUtils;
public interface BottomSheetItem
public abstract class BottomSheetItem
{
private final int mEnabledStateDrawableResId;
private final int mDisabledStateDrawableResId;
private final int mTitleResId;
@NonNull
private final Mode mMode;
protected BottomSheetItem(int enabledStateDrawableResId,
int disabledStateDrawableResId,
int titleResId,
@NonNull Mode mode)
{
mEnabledStateDrawableResId = enabledStateDrawableResId;
mDisabledStateDrawableResId = disabledStateDrawableResId;
mTitleResId = titleResId;
mMode = mode;
}
@NonNull
public Mode getMode()
{
return mMode;
}
/*
boolean isSelected(@NonNull Context context);
void onSelected(@NonNull MwmActivity activity);
*/
@DrawableRes
int getDrawableResId(@NonNull Context context);
public int getEnabledStateDrawable()
{
return mEnabledStateDrawableResId;
}
@DrawableRes
public int getDisabledStateDrawable()
{
return mDisabledStateDrawableResId;
}
@StringRes
int getTitleResId();
public int getTitle()
{
return mTitleResId;
}
public static class Subway extends BottomSheetItem
{
private Subway(int drawableResId, int disabledStateDrawableResId)
{
super(drawableResId, disabledStateDrawableResId, R.string.button_layer_subway, Mode.SUBWAY);
}
public static BottomSheetItem makeInstance()
{
int disabled = getDisabledStateFromTheme(R.drawable.ic_subway_menu_dark_off,
R.drawable.ic_subway_menu_light_off);
return new Subway(R.drawable.ic_subway_menu_on, disabled);
}
}
private static int getDisabledStateFromTheme(int light, int dark)
{
return ThemeUtils.isNightTheme()
? light
: dark;
}
public static class Traffic extends BottomSheetItem
{
private Traffic(int drawableResId, int disabledStateDrawableResId)
{
super(drawableResId, disabledStateDrawableResId, R.string.button_layer_traffic, Mode.TRAFFIC);
}
public static BottomSheetItem makeInstance()
{
int disabled = getDisabledStateFromTheme(R.drawable.ic_traffic_menu_dark_off,
R.drawable.ic_traffic_menu_light_off);
return new Traffic(R.drawable.ic_traffic_menu_on, disabled);
}
}
}

37
android/src/com/mapswithme/maps/subway/Mode.java
View file

@ -1,27 +1,28 @@
package com.mapswithme.maps.subway;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import com.mapswithme.maps.adapter.BottomSheetItem;
import com.mapswithme.maps.traffic.TrafficItem;
import com.mapswithme.maps.traffic.TrafficManager;
public enum Mode
{
TRAFFIC(new TrafficItem()),
SUBWAY(new SubwayItem());
TRAFFIC
{
@Override
public boolean isEnabled(@NonNull Context context)
{
return TrafficManager.INSTANCE.isEnabled();
}
},
SUBWAY
{
@Override
public boolean isEnabled(@NonNull Context context)
{
return SubwayManager.from(context).isEnabled();
}
};
@NonNull
private final BottomSheetItem mItem;
Mode(@NonNull BottomSheetItem item)
{
mItem = item;
}
@NonNull
public BottomSheetItem getItem()
{
return mItem;
}
public abstract boolean isEnabled(@NonNull Context context);
}

38
android/src/com/mapswithme/maps/subway/SubwayItem.java
View file

@ -1,38 +0,0 @@
package com.mapswithme.maps.subway;
import android.content.Context;
import android.support.annotation.NonNull;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.adapter.BottomSheetItem;
import com.mapswithme.maps.traffic.TrafficManager;
class SubwayItem implements BottomSheetItem
{
@Override
public void onSelected(@NonNull MwmActivity activity)
{
SubwayManager.from(activity).toggle();
TrafficManager.INSTANCE.setEnabled(false);
activity.onSubwayModeSelected();
}
@Override
public int getDrawableResId(@NonNull Context context)
{
return SubwayManager.from(context).getIconRes();
}
@Override
public int getTitleResId()
{
return R.string.button_layer_subway;
}
@Override
public boolean isSelected(@NonNull Context context)
{
return SubwayManager.from(context).isEnabled();
}
}

18
android/src/com/mapswithme/maps/subway/SubwayManager.java
View file

@ -52,24 +52,6 @@ public class SubwayManager
nativeRemoveListener(listener);
}
@DrawableRes
public int getIconRes()
{
return isEnabled() ? getEnabledStateIcon() : getDisabledStateIcon();
}
private int getEnabledStateIcon()
{
return R.drawable.ic_subway_menu_on;
}
private int getDisabledStateIcon()
{
return ThemeUtils.isNightTheme()
? R.drawable.ic_subway_menu_dark_off
: R.drawable.ic_subway_menu_light_off;
}
@NonNull
public static SubwayManager from(@NonNull Context context)
{

109
android/src/com/mapswithme/maps/subway/ToggleMapLayerDialog.java
View file

@ -12,22 +12,24 @@ import android.support.v4.app.FragmentManager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.TextView;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.adapter.BottomSheetItem;
import com.mapswithme.maps.adapter.SpanningLinearLayoutManager;
import com.mapswithme.maps.bookmarks.OnItemClickListener;
import com.mapswithme.maps.traffic.widget.OnTrafficModeSelectListener;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
public class ToggleMapLayerDialog extends DialogFragment implements OnItemClickListener<Mode>
public class ToggleMapLayerDialog extends DialogFragment
{
@NonNull
@SuppressWarnings("NullableProblems")
@ -68,16 +70,22 @@ public class ToggleMapLayerDialog extends DialogFragment implements OnItemClickL
LinearLayoutManager.HORIZONTAL,
false);
recycler.setLayoutManager(layoutManager);
mAdapter = new ModeAdapter(Arrays.asList(Mode.values()), this);
mAdapter = new ModeAdapter(createItems());
recycler.setAdapter(mAdapter);
}
@Override
public void onItemClick(@NonNull View v, @NonNull Mode item)
@NonNull
private List<Pair<BottomSheetItem, OnItemClickListener<BottomSheetItem>>> createItems()
{
MwmActivity activity = (MwmActivity) getActivity();
item.getItem().onSelected(activity);
mAdapter.notifyDataSetChanged();
SubwayItemClickListener subwayListener = new SubwayItemClickListener();
Pair<BottomSheetItem, OnItemClickListener<BottomSheetItem>> subway
= new Pair<>(BottomSheetItem.Subway.makeInstance(), subwayListener);
TrafficItemClickListener trafficListener = new TrafficItemClickListener();
Pair<BottomSheetItem, OnItemClickListener<BottomSheetItem>> traffic
= new Pair<>(BottomSheetItem.Traffic.makeInstance(), trafficListener);
return Arrays.asList(subway, traffic);
}
public static void show(@NonNull AppCompatActivity activity)
@ -97,40 +105,42 @@ public class ToggleMapLayerDialog extends DialogFragment implements OnItemClickL
private static class ModeAdapter extends RecyclerView.Adapter<ModeHolder>
{
@NonNull
private final List<Mode> mModes;
@NonNull
private final OnItemClickListener<Mode> mListener;
private final List<Pair<BottomSheetItem, OnItemClickListener<BottomSheetItem>>> mItems;
private ModeAdapter(@NonNull List<Mode> modes,
@NonNull OnItemClickListener<Mode> listener)
private ModeAdapter(@NonNull List<Pair<BottomSheetItem, OnItemClickListener<BottomSheetItem>>> modes)
{
mModes = modes;
mListener = listener;
mItems = modes;
}
@Override
public ModeHolder onCreateViewHolder(ViewGroup parent, int viewType)
{
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
View root = inflater.inflate(R.layout.bootsheet_dialog_item, parent, false);
return new ModeHolder(root, mListener);
View root = inflater.inflate(R.layout.item_bottomsheet_dialog, parent, false);
return new ModeHolder(root);
}
@Override
public void onBindViewHolder(ModeHolder holder, int position)
{
Context context = holder.itemView.getContext();
Mode mode = mModes.get(position);
holder.mItem = mode;
holder.mButton.setSelected(mode.getItem().isSelected(context));
holder.mButton.setImageResource(mode.getItem().getDrawableResId(context));
holder.mTitle.setText(mode.getItem().getTitleResId());
Pair<BottomSheetItem, OnItemClickListener<BottomSheetItem>> pair = mItems.get(position);
BottomSheetItem item = pair.first;
holder.mItem = item;
boolean isEnabled = item.getMode().isEnabled(context);
holder.mButton.setSelected(isEnabled);
holder.mTitle.setText(item.getTitle());
holder.mButton.setImageResource(isEnabled ? item.getEnabledStateDrawable()
: item.getDisabledStateDrawable());
holder.mListener = pair.second;
}
@Override
public int getItemCount()
{
return mModes.size();
return mItems.size();
}
}
private static class ModeHolder extends RecyclerView.ViewHolder
@ -138,30 +148,67 @@ public class ToggleMapLayerDialog extends DialogFragment implements OnItemClickL
@NonNull
private final ImageButton mButton;
@NonNull
private final OnItemClickListener<Mode> mListener;
@NonNull
private final TextView mTitle;
@Nullable
private Mode mItem;
private BottomSheetItem mItem;
@Nullable
private OnItemClickListener<BottomSheetItem> mListener;
ModeHolder(@NonNull View root, @NonNull OnItemClickListener<Mode> listener)
ModeHolder(@NonNull View root)
{
super(root);
mButton = root.findViewById(R.id.item_btn);
mButton = root.findViewById(R.id.btn);
mTitle = root.findViewById(R.id.name);
mListener = listener;
mButton.setOnClickListener(this::onItemClicked);
}
@NonNull
public Mode getItem()
public BottomSheetItem getItem()
{
return Objects.requireNonNull(mItem);
}
@NonNull
public OnItemClickListener<BottomSheetItem> getListener()
{
return Objects.requireNonNull(mListener);
}
private void onItemClicked(@NonNull View v)
{
mListener.onItemClick(v, getItem());
getListener().onItemClick(v, getItem());
}
}
private abstract class DefaultClickListener implements OnItemClickListener<BottomSheetItem>
{
@Override
public final void onItemClick(@NonNull View v, @NonNull BottomSheetItem item)
{
onItemClickInternal(v, item);
mAdapter.notifyDataSetChanged();
}
abstract void onItemClickInternal(@NonNull View v, @NonNull BottomSheetItem item);
}
private class SubwayItemClickListener extends DefaultClickListener
{
@Override
void onItemClickInternal(@NonNull View v, @NonNull BottomSheetItem item)
{
OnSubwayModeSelectListener listener = (OnSubwayModeSelectListener) getActivity();
listener.onSubwayModeSelected();
}
}
private class TrafficItemClickListener extends DefaultClickListener
{
@Override
void onItemClickInternal(@NonNull View v, @NonNull BottomSheetItem item)
{
OnTrafficModeSelectListener listener = (OnTrafficModeSelectListener) getActivity();
listener.onTrafficModeSelected();
}
}
}

38
android/src/com/mapswithme/maps/traffic/TrafficItem.java
View file

@ -1,38 +0,0 @@
package com.mapswithme.maps.traffic;
import android.content.Context;
import android.support.annotation.NonNull;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.adapter.BottomSheetItem;
import com.mapswithme.maps.subway.SubwayManager;
public class TrafficItem implements BottomSheetItem
{
@Override
public boolean isSelected(@NonNull Context context) {
return !SubwayManager.from(context).isEnabled()
&& TrafficManager.INSTANCE.isEnabled();
}
@Override
public void onSelected(@NonNull MwmActivity activity)
{
TrafficManager.INSTANCE.toggle();
SubwayManager.from(activity).setEnabled(false);
activity.onTrafficModeSelected();
}
@Override
public int getDrawableResId(@NonNull Context context)
{
return TrafficManager.INSTANCE.getIconRes();
}
@Override
public int getTitleResId()
{
return R.string.button_layer_traffic;
}
}

21
android/src/com/mapswithme/maps/traffic/TrafficManager.java
View file

@ -1,11 +1,8 @@
package com.mapswithme.maps.traffic;
import android.support.annotation.DrawableRes;
import android.support.annotation.MainThread;
import android.support.annotation.NonNull;
import com.mapswithme.maps.R;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
@ -108,24 +105,6 @@ public enum TrafficManager
throw new AssertionError("Traffic manager is not initialized!");
}
@DrawableRes
public int getIconRes()
{
return isEnabled() ? getEnabledStateIcon() : getDisabledStateIcon();
}
private int getEnabledStateIcon()
{
return R.drawable.ic_traffic_menu_on;
}
private int getDisabledStateIcon()
{
return ThemeUtils.isNightTheme()
? R.drawable.ic_traffic_menu_dark_off
: R.drawable.ic_traffic_menu_light_off;
}
public void setEnabled(boolean enabled)
{
if (isEnabled() == enabled)