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

[android] Disabled the discovery button #103

Browse source 
Signed-off-by: Altynaika <altynaika.toktomuratovaa@gmail.com>
This commit is contained in:
Altynaika 2021-02-05 17:11:26 +06:00 • committed by Roman Tsisyk
parent 3c480a68f1
commit b4d61b9e51
4 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/res/layout/menu_buttons_line.xml
View file

@ -32,16 +32,16 @@
android:layout_height="match_parent"
android:layout_weight="1"/>
<ImageView
android:id="@+id/discovery"
style="@style/MwmTheme.Menu.Line.Button"
android:src="@drawable/ic_menu_discovery"
android:tag="@string/tag_menu_collapse"/>
<!-- <ImageView-->
<!-- android:id="@+id/discovery"-->
<!-- style="@style/MwmTheme.Menu.Line.Button"-->
<!-- android:src="@drawable/ic_menu_discovery"-->
<!-- android:tag="@string/tag_menu_collapse"/>-->
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
<!-- <Space-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_weight="1"/>-->
<ImageView
android:id="@+id/bookmarks"

36
android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java
View file

@ -24,11 +24,11 @@ class ClickInterceptorFactory
return new ActivateSubwayLayer();
}
@NonNull
static ClickInterceptor createOpenDiscoveryScreenListener()
{
return new OpenDiscoveryScreen();
}
// @NonNull
// static ClickInterceptor createOpenDiscoveryScreenListener()
// {
// return new OpenDiscoveryScreen();
// }
@NonNull
static ClickInterceptor createSearchHotelsListener()
@ -104,17 +104,17 @@ class ClickInterceptorFactory
}
}
static class OpenDiscoveryScreen extends AbstractClickInterceptor
{
OpenDiscoveryScreen()
{
super(Tutorial.DISCOVERY);
}
@Override
public void onInterceptClickInternal(@NonNull MwmActivity activity)
{
activity.showDiscovery();
}
}
// static class OpenDiscoveryScreen extends AbstractClickInterceptor
// {
// OpenDiscoveryScreen()
// {
// super(Tutorial.DISCOVERY);
// }
//
// @Override
// public void onInterceptClickInternal(@NonNull MwmActivity activity)
// {
// activity.showDiscovery();
// }
// }
}

22
android/src/com/mapswithme/maps/tips/Tutorial.java
View file

@ -49,17 +49,17 @@ public enum Tutorial
}
},
DISCOVERY(R.string.tips_discover_button_title,
R.string.tips_discover_button_message,
R.id.discovery, MainMenu.Item.DISCOVERY, MwmActivity.class)
{
@NonNull
@Override
public ClickInterceptor createClickInterceptor()
{
return ClickInterceptorFactory.createOpenDiscoveryScreenListener();
}
},
// DISCOVERY(R.string.tips_discover_button_title,
// R.string.tips_discover_button_message,
// R.id.discovery, MainMenu.Item.DISCOVERY, MwmActivity.class)
// {
// @NonNull
// @Override
// public ClickInterceptor createClickInterceptor()
// {
// return ClickInterceptorFactory.createOpenDiscoveryScreenListener();
// }
// },
SUBWAY(R.string.tips_map_layers_title,
R.string.tips_map_layers_message,

22
android/src/com/mapswithme/maps/widget/menu/MainMenu.java
View file

@ -103,16 +103,16 @@ public class MainMenu extends BaseMenu
return new MwmActivity.PointToPointDelegate(activity, item);
}
},
DISCOVERY(R.id.discovery)
{
@NonNull
@Override
public ClickMenuDelegate createClickDelegate(@NonNull MwmActivity activity,
@NonNull Item item)
{
return new MwmActivity.DiscoveryDelegate(activity, item);
}
},
// DISCOVERY(R.id.discovery)
// {
// @NonNull
// @Override
// public ClickMenuDelegate createClickDelegate(@NonNull MwmActivity activity,
// @NonNull Item item)
// {
// return new MwmActivity.DiscoveryDelegate(activity, item);
// }
// },
BOOKMARKS(R.id.bookmarks)
{
@NonNull
@ -270,7 +270,7 @@ public class MainMenu extends BaseMenu
mapItem(Item.DOWNLOAD_GUIDES);
mapItem(Item.SEARCH);
mapItem(Item.POINT_TO_POINT);
mapItem(Item.DISCOVERY);
// mapItem(Item.DISCOVERY);
mapItem(Item.BOOKMARKS);
mapItem(Item.SHARE_MY_LOCATION);
mapItem(Item.DOWNLOAD_MAPS);