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

[android] Adjust navigation search frame margin on the tablet devices.

Browse source
This commit is contained in:
Roman Romanov 2017-06-19 13:02:47 +04:00
parent a1f2adc6e6
commit 0bee68fd1b
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1746,7 +1746,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
replaceFragment(RoutingPlanFragment.class, null, completionListener);
showAddStartOrFinishFrame(RoutingController.get(), false);
adjustTraffic(UiUtils.dimen(R.dimen.panel_width), UiUtils.getStatusBarHeight(getApplicationContext()));
int width = UiUtils.dimen(R.dimen.panel_width);
adjustTraffic(width, UiUtils.getStatusBarHeight(getApplicationContext()));
if (mNavigationController != null)
mNavigationController.adjustSearchButtons(width);
}
else
{
@ -1765,9 +1768,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
else
{
if (mIsFragmentContainer)
{
adjustTraffic(0, UiUtils.getStatusBarHeight(getApplicationContext()));
if (mNavigationController != null)
mNavigationController.adjustSearchButtons(0);
}
else
{
mRoutingPlanInplaceController.show(false);
}
closeAllFloatingPanels();

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

@ -11,6 +11,7 @@ import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Pair;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
@ -310,6 +311,13 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie
UiUtils.showIf(show, mSearchButtonFrame);
}
public void adjustSearchButtons(int width)
{
ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mSearchButtonFrame.getLayoutParams();
params.setMargins(width, params.topMargin, params.rightMargin, params.bottomMargin);
mSearchButtonFrame.requestLayout();
}
public void show(boolean show)
{
UiUtils.showIf(show, mFrame);