Merge pull request #155 from appdevforall/feat/ADFA-4593-help-mechanism-fixes

ADFA-4593: help mechanism fixes (LOHS wiring + smart tooltip placement)

Author: luisguzman-adfa

controller/app/src/main/java/org/iiab/controller/help/TooltipManager.java

@@ -24,6 +24,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -270,7 +271,7 @@ public void onClick(View v) {
                 linksBox.setVisibility(View.GONE);
             }
 
-            popup.showAsDropDown(anchor);
+            showPopupSmart(popup, anchor);
         } catch (Exception e) {
             Log.e(TAG, "showPopup failed: " + e.getMessage());
         }
@@ -284,6 +285,26 @@ private static boolean isDebuggable(Context context) {
         }
     }
 
+    // Show the popup below the anchor, or above it when the anchor sits low on
+    // screen (e.g. a bottom navigation/close button) so it isn't clipped off the
+    // bottom. Anchor-position based, so it works even while the WebView content
+    // is still laying out.
+    private static void showPopupSmart(PopupWindow popup, View anchor) {
+        try {
+            int screenH = anchor.getResources().getDisplayMetrics().heightPixels;
+            int[] loc = new int[2];
+            anchor.getLocationOnScreen(loc);
+            int anchorTop = loc[1];
+            if (anchorTop > screenH * 0.55f) {
+                popup.showAtLocation(anchor, Gravity.BOTTOM | Gravity.START, loc[0], screenH - anchorTop);
+            } else {
+                popup.showAsDropDown(anchor);
+            }
+        } catch (Exception e) {
+            try { popup.showAsDropDown(anchor); } catch (Exception ignored) {}
+        }
+    }
+
     public static void dismissActive() {
         try {
             if (activePopup != null) {

controller/app/src/main/java/org/iiab/controller/help/TooltipTag.java

@@ -104,6 +104,8 @@ private TooltipTag() {}
     public static final String USAGE_CLEAR_LOG = "usage.clear_log";
     public static final String USAGE_COPY_LOG = "usage.copy_log";
     public static final String USAGE_SERVER_CONTROL = "usage.server_control";
+    public static final String USAGE_LOHS_TOGGLE = "usage.lohs_toggle";
+    public static final String USAGE_LOHS_SHOW_QR = "usage.lohs_show_qr";
 
     // main
     public static final String MAIN_SHARE_QR = "main.share_qr";

controller/app/src/main/java/org/iiab/controller/help/TooltipWiring.java

@@ -105,6 +105,8 @@ private TooltipWiring() {}
         MAP.put(R.id.btn_clear_log, TooltipTag.USAGE_CLEAR_LOG);
         MAP.put(R.id.btn_copy_log, TooltipTag.USAGE_COPY_LOG);
         MAP.put(R.id.btn_server_control, TooltipTag.USAGE_SERVER_CONTROL);
+        MAP.put(R.id.lohs_toggle, TooltipTag.USAGE_LOHS_TOGGLE);
+        MAP.put(R.id.lohs_show_qr, TooltipTag.USAGE_LOHS_SHOW_QR);
         // main
         MAP.put(R.id.btn_share_qr, TooltipTag.MAIN_SHARE_QR);
         MAP.put(R.id.btn_settings, TooltipTag.MAIN_SETTINGS);