Fix: Makes service alert scrollable and fix text color (#1456)

fixes #1454

Makes service alert scrollable and fix text color

Author: HossamSaberr

onebusaway-android/src/main/java/org/onebusaway/android/ui/SituationDialogFragment.java

@@ -19,12 +19,16 @@
 import android.content.ContentValues;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.style.ClickableSpan;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
@@ -53,6 +57,8 @@ public class SituationDialogFragment extends DialogFragment {
 
     public static final String URL = ".Url";
 
+    private static final float MAX_DIALOG_HEIGHT_RATIO = 0.65f;
+
     interface Listener {
 
         /**
@@ -137,7 +143,7 @@ public void onClick(View v) {
 
                     // Show the snackbar
                     Snackbar.make(getActivity().findViewById(R.id.fragment_arrivals_list),
-                                    R.string.all_alert_hidden_snackbar_text, Snackbar.LENGTH_SHORT)
+                            R.string.all_alert_hidden_snackbar_text, Snackbar.LENGTH_SHORT)
                             .show();
 
                     dialog.dismiss();
@@ -158,40 +164,93 @@ public void onClick(DialogInterface dialog, int which) {
         final AlertDialog dialog = builder.create();
         dialog.show();
 
-        // Set the title, description, and URL (if provided)
-        TextView title = (TextView) dialog.findViewById(R.id.alert_title);
-        title.setText(args.getString(TITLE));
+        // Ensure the alert ScrollView has a max height so it becomes scrollable
+        // when there is lots of content instead of expanding the dialog infinitely.
+        ScrollView scrollView = (ScrollView) dialog.findViewById(R.id.alert_scrollview);
+        if (scrollView != null) {
+            // Capture screen height before posting to avoid accessing resources after
+            // detachment.
+            final int screenHeight = getResources().getDisplayMetrics().heightPixels;
+            // Post to ensure views are measured before checking/setting height.
+            scrollView.post(() -> {
+                if (!isAdded())
+                    return;
+                // Use ~65% of the screen height as a reasonable max dialog height.
+                final int maxHeightPx = (int) (MAX_DIALOG_HEIGHT_RATIO * screenHeight);
+                if (scrollView.getHeight() > maxHeightPx) {
+                    ViewGroup.LayoutParams lp = scrollView.getLayoutParams();
+                    lp.height = maxHeightPx;
+                    scrollView.setLayoutParams(lp);
+                }
+            });
+        }
 
-        TextView descTxtView = (TextView) dialog.findViewById(R.id.alert_description);
+        // --- START MANUAL DARK MODE CHECK ---
+
+        // 1. Get the current UI mode from the dialog's context
+        int currentNightMode = dialog.getContext().getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_NIGHT_MASK;
+
+        // 2. Define the colors based on the mode
+        int textColor;
+        int linkColor;
+
+        if (currentNightMode == Configuration.UI_MODE_NIGHT_YES) {
+            // Dark Mode: Use light colors
+            textColor = Color.WHITE;
+            linkColor = Color.CYAN; // A light blue for links
+        } else {
+            // Light Mode: Use dark colors
+            textColor = Color.BLACK;
+            linkColor = Color.BLUE; // Standard dark blue for links
+        }
+        // --- END MANUAL DARK MODE CHECK ---
 
-        String desc = args.getString(DESCRIPTION);
+        // 3. Apply the colors
+        TextView title = (TextView) dialog.findViewById(R.id.alert_title);
+        if (title != null) {
+            title.setText(args.getString(TITLE));
+            // The title's background (@color/theme_primary) is dark, so title text should
+            // always be light.
+            title.setTextColor(Color.WHITE);
+        }
 
+        TextView descTxtView = (TextView) dialog.findViewById(R.id.alert_description);
         if (descTxtView != null) {
+            descTxtView.setTextColor(textColor);
+            descTxtView.setLinkTextColor(linkColor);
+
+            String desc = args.getString(DESCRIPTION);
             if (!TextUtils.isEmpty(desc)) {
                 String htmlDescription = desc.replaceAll("\\r\\n|\\r|\\n", "<br>");
                 descTxtView.setText(Html.fromHtml(htmlDescription));
             } else {
                 descTxtView.setText(R.string.no_description_available);
             }
         }
+
         TextView urlView = (TextView) dialog.findViewById(R.id.alert_url);
+        if (urlView != null) {
+            urlView.setTextColor(linkColor);
+            urlView.setLinkTextColor(linkColor);
 
-        // Remove any previous clickable spans just to be safe
-        UIUtils.removeAllClickableSpans(urlView);
+            // Remove any previous clickable spans just to be safe
+            UIUtils.removeAllClickableSpans(urlView);
 
-        final String url = args.getString(URL);
-        if (!TextUtils.isEmpty(url)) {
-            urlView.setVisibility(View.VISIBLE);
+            final String url = args.getString(URL);
+            if (!TextUtils.isEmpty(url)) {
+                urlView.setVisibility(View.VISIBLE);
 
-            ClickableSpan urlClick = new ClickableSpan() {
-                public void onClick(View v) {
-                    getActivity().startActivity(
-                            new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
-                }
-            };
-            UIUtils.setClickableSpan(urlView, urlClick);
-        } else {
-            urlView.setVisibility(View.GONE);
+                ClickableSpan urlClick = new ClickableSpan() {
+                    public void onClick(View v) {
+                        getActivity().startActivity(
+                                new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+                    }
+                };
+                UIUtils.setClickableSpan(urlView, urlClick);
+            } else {
+                urlView.setVisibility(View.GONE);
+            }
         }
 
         // Update the database to indicate that this alert has been read

onebusaway-android/src/main/res/layout/situation.xml

@@ -19,7 +19,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/listview_background">
+        android:background="?android:attr/colorBackground">
 
     <LinearLayout
             android:id="@+id/situation_header"
@@ -42,7 +42,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/situation_header"
-            android:background="@color/listview_background">
+            android:background="?android:attr/colorBackground">
+
         <LinearLayout
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:orientation="vertical"