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

[android] Added bookmark button on map. Move search and bookmark buttons to P2P mode.

Browse source
This commit is contained in:
Roman Romanov 2017-06-13 10:31:38 +04:00
parent 2c7d7354d9
commit 4c2b078053
4 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/res/layout-land/layout_nav_search.xml
View file

@ -69,4 +69,19 @@
android:background="?nav_background"
android:src="@drawable/ic_menu_search"
android:tint="@null"/>
<ImageButton
android:id="@+id/btn_bookmarks"
style="@style/MwmWidget.SearchNavigationButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="@dimen/margin_eighth"
android:layout_marginLeft="@dimen/margin_eighth"
android:layout_above="@id/btn_search"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:background="?nav_background"
android:src="@drawable/ic_menu_bookmarks"
android:tint="@null"/>
</RelativeLayout>

14
android/res/layout/layout_nav_search.xml
View file

@ -21,6 +21,20 @@
android:layout_height="match_parent"
android:visibility="gone"/>
<ImageButton
android:id="@+id/btn_bookmarks"
style="@style/MwmWidget.SearchNavigationButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="@dimen/margin_eighth"
android:layout_marginLeft="@dimen/margin_eighth"
android:layout_above="@id/anchor_center"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:background="?nav_background"
android:src="@drawable/ic_menu_bookmarks"
android:tint="@null"/>
<RelativeLayout
android:id="@+id/search_frame"
android:layout_width="200dp"

6
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -1564,6 +1564,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void run()
{
if (mNavigationController != null)
{
mNavigationController.showSearchButtons(RoutingController.get().isPlanning()
|| RoutingController.get().isBuilt());
}
if (RoutingController.get().isNavigating())
{
if (mNavigationController != null)

27
android/src/com/mapswithme/maps/routing/NavigationController.java
View file

@ -1,6 +1,7 @@
package com.mapswithme.maps.routing;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.location.Location;
import android.os.Build;
@ -16,6 +17,7 @@ import android.widget.TextView;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity;
import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.settings.SettingsActivity;
@ -23,6 +25,7 @@ import com.mapswithme.maps.sound.TtsPlayer;
import com.mapswithme.maps.traffic.TrafficManager;
import com.mapswithme.maps.widget.FlatProgressView;
import com.mapswithme.maps.widget.menu.NavMenu;
import com.mapswithme.util.Graphics;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
@ -35,7 +38,7 @@ import java.util.Calendar;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
public class NavigationController implements TrafficManager.TrafficCallback
public class NavigationController implements TrafficManager.TrafficCallback, View.OnClickListener
{
private static final String STATE_SHOW_TIME_LEFT = "ShowTimeLeft";
@ -121,6 +124,11 @@ public class NavigationController implements TrafficManager.TrafficCallback
mSearchButtonFrame = activity.findViewById(R.id.search_button_frame);
mSearchWheel = new SearchWheel(mSearchButtonFrame);
ImageView bookmarkButton = (ImageView) mSearchButtonFrame.findViewById(R.id.btn_bookmarks);
bookmarkButton.setImageDrawable(Graphics.tint(bookmarkButton.getContext(),
R.drawable.ic_menu_bookmarks));
bookmarkButton.setOnClickListener(this);
}
public void onResume()
@ -297,6 +305,11 @@ public class NavigationController implements TrafficManager.TrafficCallback
update(Framework.nativeGetRouteFollowingInfo());
}
public void showSearchButtons(boolean show)
{
UiUtils.showIf(show, mSearchButtonFrame);
}
public void show(boolean show)
{
UiUtils.showIf(show, mFrame);
@ -368,4 +381,16 @@ public class NavigationController implements TrafficManager.TrafficCallback
{
// no op
}
@Override
public void onClick(View v)
{
switch (v.getId())
{
case R.id.btn_bookmarks:
Context context = mFrame.getContext();
context.startActivity(new Intent(context, BookmarkCategoriesActivity.class));
break;
}
}
}