map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #752 from trashkalmar/mm-2110-suggest-reroute-title-master

Browse source 
[android] fix: Custom title for reroute suggest dialog.
This commit is contained in:
Dmitry Yunitsky 2015-11-27 18:22:21 +03:00
commit f0249748dd
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/res/layout/dialog_suggest_reroute_title.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingTop="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus"
android:textAppearance="@android:style/TextAppearance.DialogWindowTitle"
android:fontFamily="@string/robotoMedium"
tools:text="Title"/>

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

@ -9,6 +9,7 @@ import android.support.v4.app.FragmentActivity;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import java.util.Calendar;
@ -348,11 +349,14 @@ public class RoutingController
private void suggestRebuildRoute()
{
final AlertDialog.Builder builder = new AlertDialog.Builder(mContainer.getActivity())
.setCancelable(false)
.setNegativeButton(R.string.cancel, null);
.setMessage(R.string.p2p_reroute_from_current)
.setCancelable(false)
.setNegativeButton(R.string.cancel, null);
TextView titleView = (TextView)View.inflate(mContainer.getActivity(), R.layout.dialog_suggest_reroute_title, null);
titleView.setText(R.string.p2p_only_from_current);
builder.setCustomTitle(titleView);
builder.setTitle(R.string.p2p_only_from_current)
.setMessage(R.string.p2p_reroute_from_current);
if (mEndPoint instanceof MapObject.MyPosition)
{
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()