Merge branch 'master' into feature/fixed

Author: mlopezFC

src/main/java/com/flowingcode/addons/applayout/AppDrawer.java

@@ -72,11 +72,13 @@ private Component[] createComponents(List<MenuItem> menuItems) {
     		} else {
     			if (menuItem.getIcon()==null) {
     				PaperItem pi = new PaperItem(menuItem.getLabel(),menuItem.getCommand(), this);
+    				pi.setEnabled(menuItem.isEnabled());
     				components.add(pi);
     				menuItem.setRefreshCallback(()->pi.setText(menuItem.getLabel()));
     			} else {
     				PaperIconItem pi = new PaperIconItem(menuItem.getLabel(), menuItem.getIcon(),menuItem.getCommand(), this);
     				components.add(pi);
+    				pi.setEnabled(menuItem.isEnabled());
     				menuItem.setRefreshCallback(()->{
     					pi.setTitle(menuItem.getLabel());
     					pi.setIcon(menuItem.getIcon());
@@ -90,7 +92,9 @@ private Component[] createComponents(List<MenuItem> menuItems) {
 	private CollapseButton collectMenus(MenuItem topMenuItem) {
 		List<MenuItem> menuItems = topMenuItem.getSubMenuItems();
     	Component[] components = createComponents(menuItems);
-		return new CollapseButton(topMenuItem.getLabel(), topMenuItem.getIcon(), components);
+    	CollapseButton collapseButton = new CollapseButton(topMenuItem.getLabel(), topMenuItem.getIcon(), components);
+    	collapseButton.setEnabled(topMenuItem.isEnabled());
+    	return collapseButton;
 	}
 
 }

src/main/java/com/flowingcode/addons/applayout/AppHeader.java

@@ -77,4 +77,9 @@ public void setFixed(boolean fixed) {
 	public void setReveals(boolean reveals) {
 		this.getElement().setAttribute("reveals", reveals);
 	}
+
+  void setHeight(String height) {
+		appToolbar.getElement().getStyle().set("height", height);
+	}
+
 }

src/main/java/com/flowingcode/addons/applayout/AppLayout.java

@@ -72,6 +72,12 @@ private void configureAppLayout(String title, Image logo) {
         setHeight("64px");
 	}
 
+	@Override
+	public void setHeight(String height) {
+		super.setHeight(height);
+		header.setHeight(height);
+	}
+
 	public void setMenuItems(MenuItem... menuitems) {
 		drawer.setMenuItems(Arrays.asList(menuitems));
 	}
@@ -93,6 +99,11 @@ public boolean isMenuVisible() {
 		return drawer.isVisible();
 	}
 
+	/**Set the toolbar title*/
+	public void setCaption(String caption) {
+		header.getAppToolbar().setTitle(caption);
+	}
+
 	@Override
 	public void configurePage(InitialPageSettings settings) {
         settings.addMetaTag("viewport", "width=device-width, initial-scale=1.0");

src/main/java/com/flowingcode/addons/applayout/AppToolbar.java

@@ -58,12 +58,14 @@ public AppToolbar(Image logo, String title, AppDrawer drawer) {
     		ctitle = logo;
     		this.add(ctitle);
     	}
-    	if (title!=null) {
-        	divTitle = new Div();
-        	divTitle.setText(title);
-        	divTitle.getElement().setAttribute("main-title", true);
-    		this.add(divTitle);
-    	}
+    	divTitle = new Div();
+    	divTitle.getElement().setAttribute("main-title", true);
+    	this.add(divTitle);
+    	setTitle(title);
+    }
+
+    public void setTitle(String title) {
+    	divTitle.setText(title);
     }
 
 	public void setToolbarIconButtons(MenuItem[] menuItems) {
@@ -79,6 +81,7 @@ private List<PaperIconButton> createToolbarIconButtons(MenuItem[] menuItems) {
         List<PaperIconButton> result = new ArrayList<>();
         for (MenuItem menuItem : menuItems) {
                 PaperIconButton paperIconButton = new PaperIconButton(menuItem.getIcon(),menuItem.getCommand());
+               	paperIconButton.setEnabled(menuItem.isEnabled());
                 menuItem.setRefreshCallback(() -> paperIconButton.setIcon(menuItem.getIcon()));
                 result.add(paperIconButton);
         }

src/main/java/com/flowingcode/addons/applayout/PaperIconButton.java

@@ -21,6 +21,7 @@
  */
 
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.HasEnabled;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.HtmlImport;
 import com.vaadin.flow.server.Command;
@@ -34,8 +35,8 @@
 @SuppressWarnings("serial")
 @Tag("paper-icon-button")
 @HtmlImport("bower_components/paper-icon-button/paper-icon-button.html")
-public class PaperIconButton extends Component  {
-	
+public class PaperIconButton extends Component implements HasEnabled {
+
     public PaperIconButton(String icon) {
     	this.setIcon(icon);
     }

src/main/java/com/flowingcode/addons/applayout/PaperItem.java

@@ -21,6 +21,7 @@
  */
 
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.HasEnabled;
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.HasText;
 import com.vaadin.flow.component.Tag;
@@ -37,8 +38,8 @@
 @SuppressWarnings("serial")
 @HtmlImport("bower_components/paper-item/paper-item.html")
 @Tag("paper-item")
-public class PaperItem extends Component implements HasText, HasSize {
-	
+public class PaperItem extends Component implements HasEnabled, HasText, HasSize {
+
 	public PaperItem(String title) {
 		this(title, null,null);
 	}

src/main/java/com/flowingcode/addons/applayout/menu/MenuItem.java

@@ -39,6 +39,7 @@ public class MenuItem {
 	private Command command;
 	private List<MenuItem> subMenuItems = new ArrayList<>();
 	private Runnable refreshCallback;
+	private boolean enabled = true;
 
 	public MenuItem(String label, MenuItem... subMenuItems) {
 		this.label = label;
@@ -68,7 +69,9 @@ public String getLabel() {
 
 	public void setLabel(String label) {
 		this.label = label;
-		this.refreshCallback.run();
+		if (refreshCallback!=null) {
+			this.refreshCallback.run();
+		}
 	}
 
 	public Command getCommand() {
@@ -82,10 +85,12 @@ public void setCommand(Command command) {
 	public String getIcon() {
 		return icon;
 	}
-	
+
 	public void setIcon(String icon) {
 		this.icon = icon;
-		this.refreshCallback.run();
+		if (refreshCallback!=null) {
+			this.refreshCallback.run();
+		}
 	}
 
 	public List<MenuItem> getSubMenuItems() {
@@ -111,5 +116,12 @@ public void setRefreshCallback(Runnable refreshCallback) {
 		this.refreshCallback = refreshCallback;
 	}
 
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
 
 }

src/main/resources/META-INF/resources/frontend/styles/applayout-styles.html

@@ -33,6 +33,10 @@
 		  margin-left: 24px;
 		}
 
+		paper-icon-button {
+			--paper-icon-button-disabled-text: var(--lumo-disabled-text-color);
+		}
+		
 		paper-progress {
 		  display: block;
 		      width: 100%;