Implement Zoom UI in Hamburger Menu

Unlike the general menu items with ImageView&TextView layout, a Zoom menu has ImageView&TextView&+/- ImageViews layout and only +/- ImageViews should handle hover and click events. This patch configures the zoom layout and add the relevant code. The +/- ImageViews are connected to the page zoom feature, and this Zoom UI appears only in chromium-backend.
Igalia · Feb 16, 2024 · b282282 · b282282
1 parent d9c38c9
commit b282282
Show file tree

Hide file tree

Showing 18 changed files with 248 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -130,6 +130,8 @@ android {
         buildConfigField "String[]", "SPEECH_SERVICES", "{ com.igalia.wolvic.speech.SpeechServices.MEETKAI }"
         buildConfigField "Boolean", "SUPPORTS_SYSTEM_NOTIFICATIONS", "false"
         buildConfigField "Float", "DEFAULT_DENSITY", "1.25f"
+        buildConfigField "Boolean", "ENABLE_PAGE_ZOOM", "false"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue 'string', 'app_name', 'Wolvic'
         resValue 'string', 'HOMEPAGE_URL', "https://wolvic.com/start"
@@ -360,6 +362,7 @@ android {
                     arguments "-DCHROMIUM=ON"
                 }
             }
+            buildConfigField "Boolean", "ENABLE_PAGE_ZOOM", "true"
         }
 
         webkit {

diff --git a/app/src/chromium/assets/content_shell.pak b/app/src/chromium/assets/content_shell.pak
diff --git a/app/src/chromium/assets/icudtl.dat b/app/src/chromium/assets/icudtl.dat
diff --git a/app/src/chromium/assets/snapshot_blob_64.bin b/app/src/chromium/assets/snapshot_blob_64.bin
diff --git a/app/src/common/chromium/com/igalia/wolvic/browser/api/impl/SessionImpl.java b/app/src/common/chromium/com/igalia/wolvic/browser/api/impl/SessionImpl.java
@@ -3,6 +3,7 @@
 import android.graphics.Matrix;
 import android.view.ViewGroup;
 
+import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -240,6 +241,24 @@ public WTextInput getTextInput() {
         return mTextInput;
     }
 
+    @AnyThread
+    @Override
+    public void pageZoomIn() {
+        mTab.pageZoomIn();
+    }
+
+    @AnyThread
+    @Override
+    public void pageZoomOut() {
+        mTab.pageZoomOut();
+    }
+
+    @AnyThread
+    @Override
+    public int getCurrentZoomLevel() {
+        return mTab.getCurrentZoomLevel();
+    }
+
     @NonNull
     @Override
     public WPanZoomController getPanZoomController() {

diff --git a/app/src/common/gecko/com/igalia/wolvic/browser/api/impl/SessionImpl.java b/app/src/common/gecko/com/igalia/wolvic/browser/api/impl/SessionImpl.java
@@ -221,6 +221,15 @@ public WTextInput getTextInput() {
         return mTextInput;
     }
 
+    @Override
+    public void pageZoomIn() {}
+
+    @Override
+    public void pageZoomOut() {}
+
+    @Override
+    public int getCurrentZoomLevel() { return 0; }
+
     @NonNull
     @Override
     public WPanZoomController getPanZoomController() {

diff --git a/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java b/app/src/common/shared/com/igalia/wolvic/VRBrowserActivity.java
@@ -1969,6 +1969,11 @@ public boolean isPassthroughSupported() {
                (DeviceType.isPicoXR() && Build.ID.compareTo(kPicoVersionPassthroughUpdate) >= 0);
     }
 
+    @Override
+    public boolean isPageZoomEnabled() {
+        return BuildConfig.ENABLE_PAGE_ZOOM;
+    }
+
     @Override
     public void setHeadLockEnabled(boolean isHeadLockEnabled) {
         queueRunnable(() -> {

diff --git a/app/src/common/shared/com/igalia/wolvic/browser/api/WSession.java b/app/src/common/shared/com/igalia/wolvic/browser/api/WSession.java
@@ -2769,6 +2769,15 @@ void dispatchLocation(double latitude, double longitude, double altitude, float
     WTextInput getTextInput();
 
 
+    @AnyThread
+    void pageZoomIn();
+
+    @AnyThread
+    void pageZoomOut();
+
+    @AnyThread
+    int getCurrentZoomLevel();
+
     /**
      * Get the PanZoomController instance for this session.
      *

diff --git a/app/src/common/shared/com/igalia/wolvic/browser/engine/Session.java b/app/src/common/shared/com/igalia/wolvic/browser/engine/Session.java
@@ -1049,6 +1049,25 @@ public void setParentSession(@NonNull Session parentSession) {
         mState.mParentId = parentSession.getId();
     }
 
+    public void pageZoomIn() {
+        if (mState.mSession != null) {
+            mState.mSession.pageZoomIn();
+        }
+    }
+
+    public void pageZoomOut() {
+        if (mState.mSession != null) {
+            mState.mSession.pageZoomOut();
+        }
+    }
+
+    public int getCurrentZoomLevel() {
+        if (mState.mSession != null) {
+            return mState.mSession.getCurrentZoomLevel();
+        }
+        return 0;
+    }
+
     // NavigationDelegate
 
     @Override

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/adapters/HamburgerMenuAdapter.java b/app/src/common/shared/com/igalia/wolvic/ui/adapters/HamburgerMenuAdapter.java
@@ -22,6 +22,7 @@
 import com.igalia.wolvic.databinding.HamburgerMenuAddonItemBinding;
 import com.igalia.wolvic.databinding.HamburgerMenuAddonsSettingsItemBinding;
 import com.igalia.wolvic.databinding.HamburgerMenuItemBinding;
+import com.igalia.wolvic.databinding.HamburgerMenuZoomItemBinding;
 import com.igalia.wolvic.utils.SystemUtils;
 import com.igalia.wolvic.utils.ViewUtils;
 
@@ -41,11 +42,12 @@ public class HamburgerMenuAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     public static class MenuItem {
 
-        @IntDef(value = { TYPE_DEFAULT, TYPE_ADDON, TYPE_ADDONS_SETTINGS })
+        @IntDef(value = { TYPE_DEFAULT, TYPE_ADDON, TYPE_ADDONS_SETTINGS, TYPE_ZOOM })
         public @interface MenuItemType {}
         public static final int TYPE_DEFAULT = 0;
         public static final int TYPE_ADDON = 1;
         public static final int TYPE_ADDONS_SETTINGS = 2;
+        public static final int TYPE_ZOOM = 3;
 
         @MenuItem.MenuItemType
         int mItemType;
@@ -56,6 +58,8 @@ public static class MenuItem {
         int mIcon;
         Function<MenuItem, Void> mCallback;
         Action mAction;
+        String mZoomLevel;
+        Function<Boolean, Void> mZoomCallback;
 
         public MenuItem(@NonNull Builder builder) {
             mItemType = builder.mItemType;
@@ -65,6 +69,8 @@ public MenuItem(@NonNull Builder builder) {
             mIcon = builder.mIcon;
             mCallback = builder.mCallback;
             mAction = builder.mAction;
+            mZoomLevel =  builder.mZoomLevel;
+            mZoomCallback = builder.mZoomCallback;;
         }
 
         public int getItemType() {
@@ -107,6 +113,13 @@ public void setIcon(@DrawableRes int icon) {
             mIcon = icon;
         }
 
+        public void setZoomLevel(String zoomLevel) {
+            mZoomLevel = zoomLevel;
+        }
+
+        public String getZoomLevel() { return mZoomLevel; }
+
+
         public static class Builder {
 
             @MenuItem.MenuItemType
@@ -118,6 +131,8 @@ public static class Builder {
             int mIcon;
             Function<MenuItem, Void> mCallback;
             Action mAction;
+            String mZoomLevel;
+            Function<Boolean, Void> mZoomCallback;
 
             public Builder(@MenuItem.MenuItemType int type, @Nullable Function<MenuItem, Void> callback) {
                 this.mItemType = type;
@@ -149,6 +164,12 @@ public MenuItem.Builder withAction(@Nullable Action action) {
                 return this;
             }
 
+            public MenuItem.Builder withZoom(@NonNull String zoomLevel, Function<Boolean, Void> callback) {
+                this.mZoomLevel = zoomLevel;
+                this.mZoomCallback = callback;
+                return this;
+            }
+
             public MenuItem build(){
                 return new MenuItem(this);
             }
@@ -226,6 +247,11 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                             parent, false);
 
             return new HamburgerMenuItemAddonsSettingsHolder(binding);
+        } else if (viewType == MenuItem.TYPE_ZOOM) {
+            HamburgerMenuZoomItemBinding binding = DataBindingUtil
+                    .inflate(LayoutInflater.from(parent.getContext()), R.layout.hamburger_menu_zoom_item,
+                            parent, false);
+            return new HamburgerMenuZoomItemHolder(binding);
         }
 
         throw new RuntimeException("there is no type that matches the type " + viewType + " + make sure your using types correctly");
@@ -286,6 +312,17 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             viewHolder.binding.container.setOnHoverListener(mHoverListener);
             ViewUtils.setStickyClickListener(viewHolder.binding.container, callback);
             setBackground(viewHolder.binding.container, item, position);
+        } else if (holder instanceof HamburgerMenuZoomItemHolder) {
+            HamburgerMenuZoomItemHolder viewHolder = (HamburgerMenuZoomItemHolder) holder;
+            viewHolder.binding.setItem(item);
+            viewHolder.binding.container.setTag(R.string.position_tag, position);
+            viewHolder.binding.container.findViewById(R.id.zoomOutImage).setOnClickListener(v -> {
+                item.mZoomCallback.apply(true);
+            });
+            viewHolder.binding.container.findViewById(R.id.zoomInImage).setOnClickListener(v -> {
+                item.mZoomCallback.apply(false);
+            });
+            setBackground(viewHolder.binding.container, item, position);
         }
     }
 
@@ -401,4 +438,13 @@ static class HamburgerMenuItemAddonsSettingsHolder extends RecyclerView.ViewHold
         }
     }
 
+    static class HamburgerMenuZoomItemHolder extends RecyclerView.ViewHolder {
+
+        final HamburgerMenuZoomItemBinding binding;
+
+        HamburgerMenuZoomItemHolder(@NonNull HamburgerMenuZoomItemBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+    }
 }
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
@@ -1396,6 +1396,21 @@ public void onSaveWebApp() {
 
                 showSaveWebAppDialog();
             }
+
+            @Override
+            public void onPageZoomIn() {
+                mAttachedWindow.getSession().pageZoomIn();
+            }
+
+            @Override
+            public void onPageZoomOut() {
+                mAttachedWindow.getSession().pageZoomOut();
+            }
+
+            @Override
+            public int getCurrentZoomLevel() {
+                return mAttachedWindow.getSession().getCurrentZoomLevel();
+            }
         });
         boolean isSendTabEnabled = false;
         if (URLUtil.isHttpUrl(mAttachedWindow.getSession().getCurrentUri()) ||

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WidgetManagerDelegate.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WidgetManagerDelegate.java
@@ -91,6 +91,7 @@ interface WebXRListener {
     void togglePassthrough();
     boolean isPassthroughEnabled();
     boolean isPassthroughSupported();
+    boolean isPageZoomEnabled();
     void setHeadLockEnabled(boolean isHeadLockEnabled);
     void recenterUIYaw(@YawTarget int target);
     void setCylinderDensity(float aDensity);

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/menus/HamburgerMenuWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/menus/HamburgerMenuWidget.java
@@ -51,6 +51,9 @@ public interface MenuDelegate {
         void onSaveWebApp();
         void onPassthrough();
         boolean isPassthroughEnabled();
+        void onPageZoomIn();
+        void onPageZoomOut();
+        int getCurrentZoomLevel();
     }
 
     public static final int SWITCH_ITEM_ID = 0;
@@ -313,6 +316,19 @@ private void updateItems() {
                     .build());
         }
 
+        if (mWidgetManager != null && mWidgetManager.isPageZoomEnabled() && mDelegate != null) {
+            mItems.add(new HamburgerMenuAdapter.MenuItem.Builder(
+                    HamburgerMenuAdapter.MenuItem.TYPE_ZOOM, null)
+                    .withZoom(Integer.toString(mDelegate.getCurrentZoomLevel()) + "%",
+                            (isZoomOut) -> {
+                        if (isZoomOut) mDelegate.onPageZoomOut();
+                        else mDelegate.onPageZoomIn();
+                        updateItems();
+                        return null;
+                    })
+                    .build());
+        }
+
         mAdapter.setItems(mItems);
         mAdapter.notifyDataSetChanged();
 

diff --git a/app/src/main/res/drawable/ic_icon_minus.xml b/app/src/main/res/drawable/ic_icon_minus.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,12C8,11.448 8.448,11 9,11H15C15.552,11 16,11.448 16,12C16,12.552 15.552,13 15,13H9C8.448,13 8,12.552 8,12ZM7.25,2.388C8.549,2.099 10.124,2 12,2C13.876,2 15.451,2.099 16.75,2.388C18.06,2.679 19.149,3.176 19.986,4.014C20.824,4.851 21.321,5.94 21.612,7.25C21.901,8.549 22,10.124 22,12C22,13.876 21.901,15.451 21.612,16.75C21.321,18.06 20.824,19.149 19.986,19.986C19.149,20.824 18.06,21.321 16.75,21.612C15.451,21.901 13.876,22 12,22C10.124,22 8.549,21.901 7.25,21.612C5.94,21.321 4.851,20.824 4.014,19.986C3.176,19.149 2.679,18.06 2.388,16.75C2.099,15.451 2,13.876 2,12C2,10.124 2.099,8.549 2.388,7.25C2.679,5.94 3.176,4.851 4.014,4.014C4.851,3.176 5.94,2.679 7.25,2.388Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_icon_plus.xml b/app/src/main/res/drawable/ic_icon_plus.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,9C13,8.448 12.552,8 12,8C11.448,8 11,8.448 11,9V11H9C8.448,11 8,11.448 8,12C8,12.552 8.448,13 9,13H11V15C11,15.552 11.448,16 12,16C12.552,16 13,15.552 13,15V13H15C15.552,13 16,12.552 16,12C16,11.448 15.552,11 15,11H13V9ZM7.25,2.388C8.549,2.099 10.124,2 12,2C13.876,2 15.451,2.099 16.75,2.388C18.06,2.679 19.149,3.176 19.986,4.014C20.824,4.851 21.321,5.94 21.612,7.25C21.901,8.549 22,10.124 22,12C22,13.876 21.901,15.451 21.612,16.75C21.321,18.06 20.824,19.149 19.986,19.986C19.149,20.824 18.06,21.321 16.75,21.612C15.451,21.901 13.876,22 12,22C10.124,22 8.549,21.901 7.25,21.612C5.94,21.321 4.851,20.824 4.014,19.986C3.176,19.149 2.679,18.06 2.388,16.75C2.099,15.451 2,13.876 2,12C2,10.124 2.099,8.549 2.388,7.25C2.679,5.94 3.176,4.851 4.014,4.014C4.851,3.176 5.94,2.679 7.25,2.388Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_icon_zoom.xml b/app/src/main/res/drawable/ic_icon_zoom.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="1920"
+    android:viewportWidth="1920" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path android:fillColor="#FFFFFF" android:fillType="evenOdd" android:pathData="m1920,1766.7 l-368.1,-368.2c114.3,-146.8 183,-330.8 183,-531C1734.9,389.2 1345.7,0 867.5,0 389.2,0 0,389.2 0,867.5c0,478.3 389.2,867.5 867.5,867.5 200.2,0 384.1,-68.9 531,-183L1766.7,1920 1920,1766.7ZM867.5,1518c-358.8,0 -650.6,-291.8 -650.6,-650.6s291.8,-650.6 650.6,-650.6 650.6,291.8 650.6,650.6 -291.8,650.6 -650.6,650.6ZM975.9,487.9H759v271.1h-271.1v216.9h271.1v271.1h216.9v-271.1h271.1V759h-271.1v-271.1Z"/>
+</vector>