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

[android] Fixed review notes

Browse source
This commit is contained in:
Dmitry Donskoy 2020-03-20 13:53:57 +03:00 • committed by Aleksandr Zatsepin
parent 28da40e30f
commit 89b4261fa1
4 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -188,7 +188,7 @@ void PrepareClassRefs(JNIEnv * env)
"(Ljava/lang/String;Ljava/lang/String;Z"
"[Lcom/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption;)V");
g_onElevationCurrentPositionChangedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onElevationCurPositionChanged", "()V");
jni::GetMethodID(env, bookmarkManagerInstance, "onElevationCurrentPositionChanged", "()V");
g_onElevationActivePointChangedMethod =
jni::GetMethodID(env, bookmarkManagerInstance, "onElevationActivePointChanged", "()V");
}
@ -1417,16 +1417,16 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetElevationCurPos
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetElevationCurPositionChangedListener(
JNIEnv * env, jclass clazz)
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener(
JNIEnv * env, jclass clazz)
{
frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(
std::bind(&OnElevationCurPositionChanged, env));
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRemoveElevationCurPositionChangedListener(
JNIEnv * env, jclass)
Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener(
JNIEnv * env, jclass)
{
frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(nullptr);
}

35
android/src/com/mapswithme/maps/ChartController.java
View file

@ -8,6 +8,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.components.Legend;
import com.github.mikephil.charting.components.MarkerView;
@ -28,8 +29,6 @@ import com.mapswithme.maps.widget.placepage.FloatingMarkerView;
import com.mapswithme.util.StringUtils;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
@ -38,7 +37,8 @@ import java.util.List;
import java.util.Objects;
public class ChartController implements OnChartValueSelectedListener, Initializable<View>,
BookmarkManager.OnElevationActivePointChangedListener
BookmarkManager.OnElevationActivePointChangedListener,
BookmarkManager.OnElevationCurrentPositionChangedListener
{
private static final int CHART_Y_LABEL_COUNT = 3;
private static final int CHART_X_LABEL_COUNT = 6;
@ -47,9 +47,6 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
private static final float CUBIC_INTENSITY = 0.2f;
private static final int CURRENT_POSITION_OUT_OF_TRACK = -1;
private static final String TAG = ChartController.class.getName();
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.LOCATION);
@SuppressWarnings("NullableProblems")
@NonNull
private LineChart mChart;
@ -80,6 +77,7 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
{
Objects.requireNonNull(view);
BookmarkManager.INSTANCE.setElevationActivePointChangedListener(this);
BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(this);
final Resources resources = mContext.getResources();
mChart = view.findViewById(R.id.elevation_profile_chart);
@ -108,14 +106,13 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
Legend l = mChart.getLegend();
l.setEnabled(false);
initAxises();
BookmarkManager.INSTANCE.setElevationCurPositionChangedListener(this::onCurrentPositionChanged);
}
@Override
public void destroy()
{
BookmarkManager.INSTANCE.setElevationActivePointChangedListener(null);
BookmarkManager.INSTANCE.setElevationCurPositionChangedListener(null);
BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(null);
}
private void highlightChartCurrentLocation()
@ -192,16 +189,11 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
mFloatingMarkerView.updateOffsets(e, h);
Highlight curPos = getCurrentPosHighlight();
mChart.highlightValues(
mCurrentPositionOutOfTrack
? Collections.singletonList(h)
: Arrays.asList(curPos, h),
mCurrentPositionOutOfTrack
? Collections.singletonList(mFloatingMarkerView)
: Arrays.asList(mCurrentLocationMarkerView, mFloatingMarkerView));
if (mCurrentPositionOutOfTrack)
mChart.highlightValues(Collections.singletonList(h), Collections.singletonList(mFloatingMarkerView));
else
mChart.highlightValues(Arrays.asList(curPos, h), Arrays.asList(mCurrentLocationMarkerView,
mFloatingMarkerView));
if (mTrackId == Utils.INVALID_ID)
return;
@ -224,7 +216,8 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
highlightChartCurrentLocation();
}
private void onCurrentPositionChanged()
@Override
public void onCurrentPositionChanged()
{
if (mTrackId == Utils.INVALID_ID)
return;
@ -232,7 +225,6 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
double distance = BookmarkManager.INSTANCE.getElevationCurPositionDistance(mTrackId);
mCurrentPositionOutOfTrack = distance == CURRENT_POSITION_OUT_OF_TRACK;
highlightActivePointManually();
if (mCurrentPositionOutOfTrack) LOGGER.d(TAG, "mCurrentPositionOutOfTrack = true");
}
@Override
@ -251,7 +243,8 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
}
@NonNull
private Highlight getActivePoint() {
private Highlight getActivePoint()
{
double activeX = BookmarkManager.INSTANCE.getElevationActivePointDistance(mTrackId);
return new Highlight((float) activeX, 0f, 0);
}

17
android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
View file

@ -440,18 +440,18 @@ public enum BookmarkManager
// Called from JNI.
@SuppressWarnings("unused")
@MainThread
public void onElevationCurPositionChanged()
public void onElevationCurrentPositionChanged()
{
if (mOnElevationCurrentPositionChangedListener != null)
mOnElevationCurrentPositionChangedListener.onCurrentPositionChanged();
}
public void setElevationCurPositionChangedListener(@Nullable OnElevationCurrentPositionChangedListener listener)
public void setElevationCurrentPositionChangedListener(@Nullable OnElevationCurrentPositionChangedListener listener)
{
if (listener != null)
nativeSetElevationCurPositionChangedListener();
nativeSetElevationCurrentPositionChangedListener();
else
nativeRemoveElevationCurPositionChangedListener();
nativeRemoveElevationCurrentPositionChangedListener();
mOnElevationCurrentPositionChangedListener = listener;
}
@ -1190,9 +1190,9 @@ public enum BookmarkManager
private static native double nativeGetElevationCurPositionDistance(long trackId);
private static native void nativeSetElevationCurPositionChangedListener();
private static native void nativeSetElevationCurrentPositionChangedListener();
public static native void nativeRemoveElevationCurPositionChangedListener();
public static native void nativeRemoveElevationCurrentPositionChangedListener();
private static native void nativeSetElevationActivePoint(long trackId, double distanceInMeters);
@ -1377,6 +1377,11 @@ public enum BookmarkManager
void onElevationActivePointChanged();
}
public interface OnElevationCurrentPositionChangedListener
{
void onCurrentPositionChanged();
}
public enum UploadResult
{
UPLOAD_RESULT_SUCCESS,

6
android/src/com/mapswithme/maps/bookmarks/data/OnElevationCurrentPositionChangedListener.java
View file

@ -1,6 +0,0 @@
package com.mapswithme.maps.bookmarks.data;
public interface OnElevationCurrentPositionChangedListener
{
void onCurrentPositionChanged();
}