organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android-auto] Layout change fix

Browse source 
Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
This commit is contained in:
Andrew Shkrob 2023-02-14 19:09:40 +01:00
parent 0f3c87652f
commit 797c1b6469
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
android/src/app/organicmaps/car/SurfaceRenderer.java
View file

@ -3,7 +3,6 @@ package app.organicmaps.car;
import android.graphics.Rect;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.AppManager;
import androidx.car.app.CarContext;
import androidx.car.app.CarToast;
@ -26,10 +25,10 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
private final CarContext mCarContext;
private final Map mMap = new Map(MapType.AndroidAuto);
@Nullable
private Rect mVisibleArea;
@Nullable
private Rect mStableArea;
@NonNull
private Rect mVisibleArea = new Rect();
@NonNull
private Rect mStableArea = new Rect();
public SurfaceRenderer(@NonNull CarContext carContext, @NonNull Lifecycle lifecycle)
{
@ -62,7 +61,11 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
{
Logger.d(TAG, "Stable area changed. stableArea: " + stableArea);
mStableArea = stableArea;
Framework.nativeSetVisibleRect(mStableArea.left, mStableArea.top, mStableArea.right, mStableArea.bottom);
if (!mStableArea.isEmpty())
Framework.nativeSetVisibleRect(mStableArea.left, mStableArea.top, mStableArea.right, mStableArea.bottom);
else if (!mVisibleArea.isEmpty())
Framework.nativeSetVisibleRect(mVisibleArea.left, mVisibleArea.top, mVisibleArea.right, mVisibleArea.bottom);
}
@Override
@ -143,14 +146,13 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
float x = focusX;
float y = focusY;
Rect visibleArea = mVisibleArea;
if (visibleArea != null)
if (!mVisibleArea.isEmpty())
{
// If a focal point value is negative, use the center point of the visible area.
if (x < 0)
x = visibleArea.centerX();
x = mVisibleArea.centerX();
if (y < 0)
y = visibleArea.centerY();
y = mVisibleArea.centerY();
}
final boolean animated = Float.compare(scaleFactor, 2f) == 0;

2
android/src/app/organicmaps/car/UiHelpers.java
View file

@ -48,7 +48,7 @@ public final class UiHelpers
private static Action createLocationButton(@NonNull CarContext context)
{
final Action.Builder builder = new Action.Builder();
final int locationMode = LocationHelper.INSTANCE.getMyPositionMode();
final int locationMode = LocationState.nativeGetMode();
CarColor tintColor = CarColor.DEFAULT;
@DrawableRes int drawableRes;

2
android/src/app/organicmaps/car/screens/settings/HelpScreen.java
View file

@ -68,7 +68,7 @@ public class HelpScreen extends MapScreen
{
return new Row.Builder()
.setTitle(getCarContext().getString(R.string.data_version, ""))
.addText(DateUtils.getLocalDate(Framework.nativeGetDataVersion()))
.addText(DateUtils.getShortDateFormatter().format(Framework.getDataVersion()))
.build();
}
}