Fix Transport Lines fragment after UI Review

jj10133 · May 4, 2022 · 9cf1053 · 9cf1053
1 parent 8a49628
commit 9cf1053
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml b/OsmAnd/res/layout/bottom_sheet_item_with_switch_56dp.xml
@@ -36,6 +36,7 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical|end"
 		android:background="@null"
+		android:saveEnabled="false"
 		android:clickable="false"
 		android:focusable="false"
 		android:focusableInTouchMode="false"/>

diff --git a/OsmAnd/res/layout/fragment_transport_lines.xml b/OsmAnd/res/layout/fragment_transport_lines.xml
@@ -112,6 +112,10 @@
 
 			<include layout="@layout/card_bottom_divider" />
 
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/card_row_min_height" />
+
 		</LinearLayout>
 
 	</LinearLayout>

diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
@@ -13,7 +13,7 @@
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.backend.preferences.CommonPreference;
 import net.osmand.plus.utils.AndroidUtils;
-import net.osmand.plus.views.MapLayers;
+import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.render.RenderingRuleProperty;
 import net.osmand.util.Algorithms;
 
@@ -55,8 +55,8 @@ public void toggleTransportType(@NonNull MapActivity mapActivity, @NonNull Strin
 				idsToSave.add(p.getId());
 			}
 		}
-		settings.DISPLAYED_TRANSPORT_SETTINGS.setModeValues(
-				appMode, !Algorithms.isEmpty(idsToSave) ? idsToSave : null);
+		idsToSave = !Algorithms.isEmpty(idsToSave) ? idsToSave : null;
+		settings.DISPLAYED_TRANSPORT_SETTINGS.setModeValues(appMode, idsToSave);
 		refreshMap(mapActivity);
 	}
 
@@ -117,9 +117,9 @@ private void hideAllTransport(@NonNull MapActivity mapActivity) {
 	}
 
 	private void refreshMap(@NonNull MapActivity mapActivity) {
-		mapActivity.refreshMapComplete();
-		MapLayers mapLayers = mapActivity.getMapLayers();
-		mapLayers.updateLayers(mapActivity);
+		OsmandMapTileView mapView = mapActivity.getMapView();
+		mapView.refreshMap(true);
+		mapActivity.updateLayers();
 	}
 
 	private ApplicationMode getAppMode() {