android/source/src/java/org/libreoffice/LOKitTileProvider.java | 2 - android/source/src/java/org/libreoffice/ToolbarController.java | 19 ++-------- 2 files changed, 5 insertions(+), 16 deletions(-)
New commits: commit 082b22735abd682d8022820929c46e45a02bafdf Author: Michael Weghorn <[email protected]> AuthorDate: Fri Nov 7 10:28:17 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Nov 10 09:04:20 2025 +0100 android: Merge ToolBarController.{show,hide}Item Instead of having two methods doing almost the same, have a ToolBarController.setItemVisible that takes a boolean parameter and passes it to MenuItem.setVisible. Use it in one more place. Change-Id: Ia186910865c8d3903763fbbad999e06a1cc41946 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193573 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java b/android/source/src/java/org/libreoffice/LOKitTileProvider.java index bbdc9456cf4c..ac98d076d1d7 100644 --- a/android/source/src/java/org/libreoffice/LOKitTileProvider.java +++ b/android/source/src/java/org/libreoffice/LOKitTileProvider.java @@ -124,7 +124,7 @@ class LOKitTileProvider implements TileProvider { // Writer documents always have one part, so hide the navigation drawer. if (mDocument.getDocumentType() == Document.DOCTYPE_TEXT) { mContext.disableNavigationDrawer(); - mContext.getToolbarController().hideItem(R.id.action_parts); + mContext.getToolbarController().setItemVisible(R.id.action_parts, false); } // Enable headers for Calc documents diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java b/android/source/src/java/org/libreoffice/ToolbarController.java index 603d2258167e..b53333a92942 100644 --- a/android/source/src/java/org/libreoffice/ToolbarController.java +++ b/android/source/src/java/org/libreoffice/ToolbarController.java @@ -246,27 +246,16 @@ public class ToolbarController implements Toolbar.OnMenuItemClickListener { Toast.makeText(mContext, mContext.getString(R.string.readonly_file), Toast.LENGTH_LONG).show(); } } else { - hideItem(R.id.action_save); + setItemVisible(R.id.action_save, false); } - mMainMenu.findItem(R.id.action_parts).setVisible(mContext.isDrawerEnabled()); + setItemVisible(R.id.action_parts, mContext.isDrawerEnabled()); } - public void showItem(final int item){ + public void setItemVisible(final int item, boolean visible){ LOKitShell.getMainHandler().post(new Runnable() { @Override public void run() { - mMainMenu.findItem(item).setVisible(true); - - } - }); - } - - public void hideItem(final int item){ - LOKitShell.getMainHandler().post(new Runnable() { - @Override - public void run() { - mMainMenu.findItem(item).setVisible(false); - + mMainMenu.findItem(item).setVisible(visible); } }); }
