Small edit

OsmAnd/res/layout/dialog_read_gpx_description.xml

@@ -4,10 +4,11 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/root"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
-    android:background="?attr/activity_background_basic">
+	android:background="?attr/list_background_color">
 
 	<com.google.android.material.appbar.AppBarLayout
 		android:layout_width="match_parent"
@@ -52,10 +53,12 @@
 				android:background="@color/color_transparent" />
 
 			<View
-                        android:id="@+id/divider1"
+				android:id="@+id/divider"
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
-                        android:background="?attr/divider_color" />
+				android:background="?attr/divider_color"
+				android:visibility="gone"
+				tools:visibility="visible"/>
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/btn_edit"
@@ -73,20 +76,27 @@
 				osmand:drawableLeftCompat="@drawable/ic_action_edit_dark"
 				osmand:drawableStartCompat="@drawable/ic_action_edit_dark"
 				osmand:drawableTint="?attr/active_color_basic"
+				android:visibility="gone"
 				android:text="@string/shared_string_edit"
 				android:textColor="?attr/active_color_basic"
 				android:textSize="@dimen/default_list_text_size"
-                        osmand:typeface="@string/font_roboto_medium" />
+				osmand:typeface="@string/font_roboto_medium"
+				tools:visibility="visible" />
 
-                    <View
+			<FrameLayout
-                        android:layout_width="match_parent"
+				android:id="@+id/bottom_empty_space"
-                        android:layout_height="1dp"
-                        android:background="?attr/divider_color" />
-
-                    <View
 				android:layout_width="match_parent"
 				android:layout_height="@dimen/card_row_min_height"
+				android:foreground="@drawable/bg_contextmenu_shadow"
+				android:foregroundGravity="top|fill_horizontal"
+				android:visibility="gone"
+				tools:visibility="visible">
+
+				<View
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
 					android:background="?attr/activity_background_basic" />
+			</FrameLayout>
 
 		</LinearLayout>
 

OsmAnd/res/layout/gpx_description_preview_card.xml

@@ -106,4 +106,19 @@
 			osmand:typeface="@string/font_roboto_medium" />
 
 	</FrameLayout>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:minHeight="@dimen/card_row_min_height"
+		android:layout_weight="1"
+		android:foreground="@drawable/bg_contextmenu_shadow"
+		android:foregroundGravity="top|fill_horizontal">
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/activity_background_basic" />
+	</FrameLayout>
+
 </LinearLayout>

OsmAnd/src/net/osmand/FileUtils.java

@@ -196,8 +196,4 @@ public class FileUtils {
 	public interface RenameCallback {
 		void renamedTo(File file);
 	}
-
-	public interface GpxEditedCallback {
-		void onGpxChanged();
-	}
 }

OsmAnd/src/net/osmand/plus/track/DescriptionCard.java

@@ -37,6 +37,11 @@ public class DescriptionCard extends BaseCard {
 
 	@Override
 	protected void updateContent() {
+		if (gpxFile == null || gpxFile.metadata == null || gpxFile.metadata.getDescription() == null) {
+			AndroidUiHelper.updateVisibility(view, false);
+			return;
+		}
+
 		final String title = gpxFile.metadata.getArticleTitle();
 		final String imageUrl = getMetadataImageLink(gpxFile.metadata);
 		final String descriptionHtml = gpxFile.metadata.getDescription();

OsmAnd/src/net/osmand/plus/track/GpxEditDescriptionDialogFragment.java

@@ -94,7 +94,7 @@ public class GpxEditDescriptionDialogFragment extends BaseOsmAndDialogFragment {
                     log.error(errorMessage);
                 }
 
-                trackMenuFragment.onGpxChanged();
+                trackMenuFragment.updateContent();
                 if (readGpxFragment != null) {
                     Bundle args = readGpxFragment.getArguments();
                     if (args != null) {

OsmAnd/src/net/osmand/plus/track/GpxReadDescriptionDialogFragment.java

@@ -13,6 +13,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
@@ -25,6 +26,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BaseOsmAndDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.widgets.TextViewEx;
 import net.osmand.plus.widgets.WebViewEx;
 import net.osmand.plus.wikivoyage.WikivoyageUtils;
 
@@ -59,13 +61,6 @@ public class GpxReadDescriptionDialogFragment extends BaseOsmAndDialogFragment {
 		setupImage(view);
 		setupWebView(view);
 
-		view.findViewById(R.id.btn_edit).setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				GpxEditDescriptionDialogFragment.showInstance(getMyActivity(), getArgument(CONTENT_KEY));
-			}
-		});
-
 		return view;
 	}
 
@@ -153,7 +148,7 @@ public class GpxReadDescriptionDialogFragment extends BaseOsmAndDialogFragment {
 		});
 	}
 
-	private void setupWebView(View view) {
+	private void setupWebView(final View view) {
 		webView = view.findViewById(R.id.content);
 		webView.setScrollbarFadingEnabled(true);
 		webView.setVerticalScrollBarEnabled(false);
@@ -163,6 +158,13 @@ public class GpxReadDescriptionDialogFragment extends BaseOsmAndDialogFragment {
 		webView.getSettings().setDomStorageEnabled(true);
 		webView.getSettings().setLoadWithOverviewMode(true);
 		webView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH);
+		webView.setWebViewClient(new WebViewClient() {
+			@Override
+			public void onPageCommitVisible(WebView webView, String url) {
+				super.onPageCommitVisible(webView, url);
+				setupDependentViews(view);
+			}
+		});
 		loadWebviewData();
 	}
 
@@ -175,6 +177,21 @@ public class GpxReadDescriptionDialogFragment extends BaseOsmAndDialogFragment {
 		}
 	}
 
+	private void setupDependentViews(final View view) {
+		TextViewEx readBtn = view.findViewById(R.id.btn_edit);
+		readBtn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				GpxEditDescriptionDialogFragment.showInstance(getMyActivity(), getArgument(CONTENT_KEY));
+			}
+		});
+		AndroidUiHelper.setVisibility(View.VISIBLE,
+				readBtn, view.findViewById(R.id.divider), view.findViewById(R.id.bottom_empty_space));
+		int backgroundColor = isNightMode(false) ?
+				R.color.activity_background_color_dark : R.color.activity_background_color_light;
+		view.findViewById(R.id.root).setBackgroundResource(backgroundColor);
+	}
+
 	private String getColoredContent(String content) {
 		return "<body style=\"color:white;\">\n" +
 				content +

OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java

@@ -20,7 +20,6 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import net.osmand.AndroidUtils;
 import net.osmand.FileUtils;
-import net.osmand.FileUtils.GpxEditedCallback;
 import net.osmand.FileUtils.RenameCallback;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.Track;
@@ -97,7 +96,7 @@ import static net.osmand.plus.track.OptionsCard.SHOW_ON_MAP_BUTTON_INDEX;
 import static net.osmand.plus.track.OptionsCard.UPLOAD_OSM_BUTTON_INDEX;
 
 public class TrackMenuFragment extends ContextMenuScrollFragment implements CardListener,
-		SegmentActionsListener, RenameCallback, OnTrackFileMoveListener, GpxEditedCallback {
+		SegmentActionsListener, RenameCallback, OnTrackFileMoveListener {
 
 	public static final String TAG = TrackMenuFragment.class.getName();
 	private static final Log log = PlatformUtil.getLog(TrackMenuFragment.class);
@@ -222,10 +221,6 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 	}
 
 	private void updateHeader() {
-		ViewGroup headerContainer = (ViewGroup) routeMenuTopShadowAll;
-		if (descriptionCard != null && descriptionCard.getView() != null) {
-			headerContainer.removeView(descriptionCard.getView());
-		}
 		if (menuType == TrackMenuType.OPTIONS) {
 			headerTitle.setText(menuType.titleId);
 			AndroidUiHelper.updateVisibility(headerIcon, false);
@@ -233,18 +228,8 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 			String fileName = Algorithms.getFileWithoutDirs(getGpx().path);
 			headerTitle.setText(GpxUiHelper.getGpxTitle(fileName));
 			AndroidUiHelper.updateVisibility(headerIcon, true);
-			if (menuType == TrackMenuType.OVERVIEW) {
-				fillOverviewTab(headerContainer);
 		}
 	}
-		runLayoutListener();
-		headerContainer.post(new Runnable() {
-			@Override
-			public void run() {
-				openMenuScreen(menuType == TrackMenuType.OVERVIEW ? MenuState.HEADER_ONLY : MenuState.HALF_SCREEN, false);
-			}
-		});
-	}
 
 	private void setupCards() {
 		MapActivity mapActivity = getMapActivity();
@@ -275,20 +260,18 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 					optionsCard.setListener(this);
 					cardsContainer.addView(optionsCard.build(mapActivity));
 				}
-			}
+			} else if (menuType == TrackMenuType.OVERVIEW) {
-		}
-	}
-
-	private void fillOverviewTab(ViewGroup headerContainer) {
 				if (descriptionCard != null && descriptionCard.getView() != null) {
 					ViewGroup parent = ((ViewGroup) descriptionCard.getView().getParent());
 					if (parent != null) {
-				parent.removeView(descriptionCard.getView());
+						cardsContainer.removeView(descriptionCard.getView());
 					}
-			headerContainer.addView(descriptionCard.getView());
+					cardsContainer.addView(descriptionCard.getView());
 				} else {
 					descriptionCard = new DescriptionCard(getMapActivity(), displayHelper.getGpx());
-			headerContainer.addView(descriptionCard.build(getMapActivity()));
+					cardsContainer.addView(descriptionCard.build(mapActivity));
+				}
+			}
 		}
 	}
 
@@ -623,6 +606,9 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 		if (optionsCard != null) {
 			optionsCard.updateContent();
 		}
+		if (descriptionCard != null) {
+			descriptionCard.updateContent();
+		}
 		setupCards();
 	}
 
@@ -814,13 +800,6 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
 		}
 	}
 
-	@Override
-	public void onGpxChanged() {
-		if (descriptionCard != null) {
-			descriptionCard.update();
-		}
-	}
-
 	public static boolean showInstance(@NonNull MapActivity mapActivity, String path, boolean showCurrentTrack) {
 		try {
 			Bundle args = new Bundle();