16632 show items on group selection #17404

Corwin-Kh · 2023-06-12T11:16:38Z

No description provided.

…n android auto

Chumva · 2023-06-13T08:12:08Z

OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java

@@ -324,10 +325,17 @@ public void fileVisibilityChanged() {
 		this.fileVisibilityChanged = true;
 	}

+	public void setAndroidAutoPoints(@Nullable Set<PoiUIFilter> points){


setAndroidAutoPoiFilters ?

Chumva · 2023-06-13T08:12:52Z

OsmAnd/src/net/osmand/plus/auto/FavoriteGroupsScreen.kt

+        }
+        val favoriteGroupsSize = favoriteGroups.size
+        val limitedFavoriteGroups =
+            favoriteGroups.subList(0, favoriteGroupsSize.coerceAtMost(contentLimit - 2))


Why -2 if other screens -1?

Chumva · 2023-06-13T08:13:54Z

OsmAnd/src/net/osmand/plus/auto/FavoritesScreen.java

+			public void onDestroy(@NonNull LifecycleOwner owner) {
+				DefaultLifecycleObserver.super.onDestroy(owner);
+				getApp().getOsmandMap().getMapLayers().getFavouritesLayer().setAndroidAutoFavouritePoints(null);
+				getApp().getOsmandMap().refreshMap();


Probably we should move this two rows in separate methods in each screen, also add getOsmandMap in base screen class

Chumva · 2023-06-13T08:15:33Z

OsmAnd/src/net/osmand/plus/auto/TracksScreen.kt

+            override fun onCreate(owner: LifecycleOwner) {
+                super.onCreate(owner)
+                isLoading = true
+                loadGpxFilesThread = Thread {


AsyncTask is easier to support than thread, use it and replace isLoading flag with method to check asyncTask

Chumva · 2023-06-13T08:19:55Z

OsmAnd/src/net/osmand/plus/views/layers/MapMarkersLayer.java

-								NativeUtilities.clipLineInVisibleRect(mapRenderer, tileBox, center31, marker31);
-						if (line == null) {
-							continue;
+		if (!getMapView().isCarView()) {


use local variable isCarView from above

Chumva · 2023-06-13T08:21:29Z

OsmAnd/src/net/osmand/plus/views/layers/MapMarkersLayer.java

@@ -370,7 +384,8 @@ public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings nightMode
 		OsmandApplication app = getApplication();
 		OsmandSettings settings = app.getSettings();

-		if (tileBox.getZoom() < 3 || !settings.SHOW_MAP_MARKERS.get()) {
+		boolean isCarView = getMapView().isCarView();
+		if ((tileBox.getZoom() < 3 || !settings.SHOW_MAP_MARKERS.get()) && !isCarView || isCarView && Algorithms.isEmpty(androidAutoMarkers)) {


Markers in AA do not depend on zoom level?

Chumva · 2023-06-13T08:25:16Z

OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java

@@ -130,7 +140,20 @@ public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSett
 		boolean favoritesChanged = this.favoritesChangedTime != favoritesChangedTime;
 		this.favoritesChangedTime = favoritesChangedTime;

-		if (hasMapRenderer()) {
+		if (androidAutoFavouritePoints != null) {


AA check isn`t necessary as in other places? Also no zoom check?

Chumva · 2023-06-13T08:25:47Z

OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java

@@ -337,7 +338,16 @@ private void drawMovableWpt(@NonNull Canvas canvas, @NonNull RotatedTileBox tile
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
 		super.onPrepareBufferImage(canvas, tileBox, settings);
-		List<SelectedGpxFile> visibleGPXFiles = new ArrayList<>(selectedGpxHelper.getSelectedGPXFiles());
+		List<SelectedGpxFile> visibleGPXFiles;
+		if (getMapView().isCarView()) {


Probably getMapView().isCarView() we could move to method in base class

alex-osm · 2023-06-13T10:28:55Z

OsmAnd/src/net/osmand/plus/views/layers/MapMarkersLayer.java

 public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvider,
 		IContextMenuProviderSelection, ContextMenuLayer.IMoveObjectProvider {

+	private static final Log LOG = PlatformUtil.getLog(FavouritesLayer.class);


It's not FavouritesLayer

alex-osm · 2023-06-13T10:30:56Z

OsmAnd/src/net/osmand/plus/auto/BaseOsmAndAndroidAutoScreen.kt

@@ -58,6 +58,6 @@ abstract class BaseOsmAndAndroidAutoScreen(carContext: CarContext) : Screen(carC
    }

    companion object {
-        private const val DEFAULT_CONTENT_LIMIT = 12
+        private const val DEFAULT_CONTENT_LIMIT = 100


Why 100? Possible crash

We use system value from ConstraintManager. This value limits that value to reduce probability of crash

alex-osm · 2023-06-13T10:34:01Z

OsmAnd/src/net/osmand/plus/auto/FavoriteGroupsScreen.kt

-            if (collectionSize == contentLimit) {
-                break
-            }
+        if (contentLimit < 2) {


Is it possible?

Technically yes. If ConstraintManager gives such value

alex-osm · 2023-06-13T10:44:17Z

OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java

@@ -111,6 +117,10 @@ public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings)
 		}
 	}

+	public void setAndroidAutoFavouritePoints(@Nullable List<FavouritePoint> points) {


Bad approach. Do not inject AA specific code in layers. For example you may introduce some custom data iterator and assign it to layer(s).

…ndapp/OsmAnd into 16632-show_items_on_group_selection

…items_on_group_selection

OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java

alex-osm · 2023-06-23T15:51:50Z

OsmAnd/src/net/osmand/plus/auto/TracksScreen.kt

@@ -25,9 +34,35 @@ class TracksScreen(
    private val trackTab: TrackTab
 ) : BaseOsmAndAndroidAutoScreen(carContext) {
    val gpxDbHelper: GpxDbHelper = app.gpxDbHelper
+    var loadGpxFilesThread: Thread? = null


nullable property must be initialized

alex-osm · 2023-06-23T15:54:23Z

OsmAnd/src/net/osmand/plus/auto/TracksScreen.kt

@@ -48,14 +86,20 @@ class TracksScreen(
    }

    private fun prepareTrackItems() {
+        loadedGpxFiles.clear()


Possible concurrency

alex-osm · 2023-06-23T15:54:50Z

OsmAnd/src/net/osmand/plus/auto/TracksScreen.kt

            }
        }
+        invalidate()


Is it legal to call it in non-ui thread?

OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java

OsmAnd/src/net/osmand/plus/views/layers/MapMarkersLayer.java

OsmAnd/src/net/osmand/plus/views/layers/base/OsmandMapLayer.java

Corwin-Kh added 2 commits June 5, 2023 01:14

16632: fixed crash; show items on group selection

7db580a

#16632: Implelemted displaying objects on map while selecting group i…

aa1ccfa

…n android auto

Corwin-Kh linked an issue Jun 12, 2023 that may be closed by this pull request

Landing screen allow to choose data by type – Android Auto #16632

Closed

Enabled tests

906f221

Chumva reviewed Jun 13, 2023

View reviewed changes

alex-osm reviewed Jun 13, 2023

View reviewed changes

Chumva and others added 3 commits June 13, 2023 16:06

Merge branch 'master' into 16632-show_items_on_group_selection

0ca1afa

#16632: Fixes after review

6d8001a

Merge branch '16632-show_items_on_group_selection' of github.com:osma…

e60c26e

…ndapp/OsmAnd into 16632-show_items_on_group_selection

Chumva requested a review from alex-osm June 19, 2023 15:25

Corwin-Kh added 4 commits June 21, 2023 17:21

Merge branch 'master' of github.com:osmandapp/OsmAnd into 16632-show_…

d9a71e2

…items_on_group_selection

#16632: Fixes after review

2c267e6

#16632: Implemented map pisitioning to show all selected items

2cf37c9

Restored tests

be40bed

alex-osm reviewed Jun 23, 2023

View reviewed changes

Corwin-Kh added 2 commits June 25, 2023 08:42

#16632: Fixes after review

2c9b03d

Fixed formatting

025fb41

Chumva merged commit b35c1c9 into master Jun 27, 2023
3 checks passed

Chumva deleted the 16632-show_items_on_group_selection branch June 27, 2023 08:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

16632 show items on group selection #17404

16632 show items on group selection #17404

Corwin-Kh commented Jun 12, 2023

Chumva Jun 13, 2023

Chumva Jun 13, 2023

Chumva Jun 13, 2023

Chumva Jun 13, 2023

Chumva Jun 13, 2023

Chumva Jun 13, 2023

Chumva Jun 13, 2023 •

edited

Loading

Chumva Jun 13, 2023

alex-osm Jun 13, 2023

alex-osm Jun 13, 2023

Corwin-Kh Jun 16, 2023

alex-osm Jun 13, 2023

Corwin-Kh Jun 16, 2023

alex-osm Jun 13, 2023

alex-osm Jun 23, 2023

Corwin-Kh Jun 26, 2023

alex-osm Jun 23, 2023

alex-osm Jun 23, 2023

16632 show items on group selection #17404

16632 show items on group selection #17404

Conversation

Corwin-Kh commented Jun 12, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chumva Jun 13, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chumva Jun 13, 2023 •

edited

Loading