Closes #10: Added support for placing a logo in the header of the application

Author: mlopezFC

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

@@ -25,6 +25,7 @@
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.HtmlImport;
+import com.vaadin.flow.component.html.Image;
 
 /**
  * Component that renders the app header
@@ -40,10 +41,14 @@ public class AppHeader extends Component implements HasComponents {
 	private AppToolbar appToolbar;
 
     public AppHeader(String title, AppDrawer drawer) {
+    	this(null,title,drawer);
+    }
+
+    public AppHeader(Image logo, String title, AppDrawer drawer) {
     	this.getElement().setAttribute("reveals", true);
     	this.getElement().setAttribute("condenses", true);
     	this.getElement().setAttribute("effects", true);
-    	appToolbar = new AppToolbar(title, drawer);
+    	appToolbar = new AppToolbar(logo, title, drawer);
     	this.add(appToolbar);
     }
 

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

@@ -28,6 +28,7 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.dependency.HtmlImport;
 import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Image;
 import com.vaadin.flow.server.InitialPageSettings;
 import com.vaadin.flow.server.PageConfigurator;
 
@@ -50,16 +51,21 @@ public class AppLayout extends Div implements PageConfigurator {
 
 	public AppLayout(String title) {
 		drawer = new AppDrawer(title);
-		configureAppLayout(title);
+		configureAppLayout(title, null);
 	}
 
-	public AppLayout(Component header, String title) {
-		drawer = new AppDrawer(header);
-		configureAppLayout(title);
+	public AppLayout(Component menuHeader, String title) {
+		drawer = new AppDrawer(menuHeader);
+		configureAppLayout(title, null);
 	}
 
-	private void configureAppLayout(String title) {
-		header = new AppHeader(title, drawer);
+	public AppLayout(Image logo, Component menuHeader, String title) {
+		drawer = new AppDrawer(menuHeader);
+		configureAppLayout(title, logo);
+	}
+
+	private void configureAppLayout(String title, Image logo) {
+		header = new AppHeader(logo, title, drawer);
         add(header);
         add(drawer);
         setWidth("100%");

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

@@ -29,6 +29,7 @@
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.HtmlImport;
 import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Image;
 
 /**
  * Component that renders the app toolbar
@@ -41,22 +42,36 @@
 @HtmlImport("bower_components/app-layout/app-toolbar/app-toolbar.html")
 public class AppToolbar extends Component implements HasComponents {
 
-	PaperIconButton menu;
-	Div divTitle;
+	private PaperIconButton menu;
+	private Component ctitle;
+	private Div divTitle;
 
     public AppToolbar(String title, AppDrawer drawer) {
+    	this(null,title, drawer);
+    }
+
+    public AppToolbar(Image logo, String title, AppDrawer drawer) {
     	menu = new PaperIconButton("menu");
     	menu.getElement().setAttribute("onclick", "" + drawer.getId().get() + ".toggle()");
-    	divTitle = new Div();
-    	divTitle.setText(title);
-    	divTitle.getElement().setAttribute("main-title", true);
-    	this.add(menu,divTitle);
+    	this.add(menu);
+    	if (logo!=null) {
+    		ctitle = logo;
+    		this.add(ctitle);
+    	}
+    	if (title!=null) {
+        	divTitle = new Div();
+        	divTitle.setText(title);
+        	divTitle.getElement().setAttribute("main-title", true);
+    		this.add(divTitle);
+    	}
     }
 
 	public void setToolbarIconButtons(MenuItem[] menuItems) {
 		List<PaperIconButton> toolbarIconButtons = createToolbarIconButtons(menuItems);
 		this.removeAll();
-		this.add(menu,divTitle);
+		this.add(menu);
+		if (ctitle!=null) this.add(ctitle);
+		if (divTitle!=null) this.add(divTitle);
 		toolbarIconButtons.forEach(tib->this.add(tib));
 	}
 

src/test/java/com/flowingcode/addons/applayout/DemoView.java

@@ -35,7 +35,7 @@
 public class DemoView extends VerticalLayout {
 
 	private VerticalLayout container = new VerticalLayout();
-	private final AppLayout app = new AppLayout(createAvatarComponent(), "AppLayout Addon for Vaadin 10 Demo");
+	private final AppLayout app = new AppLayout(new Image("/frontend/images/applogo.png","avatar"), createAvatarComponent(), "AppLayout Vaadin 10 Demo");
 
 	public DemoView() {
 		container.setDefaultHorizontalComponentAlignment(Alignment.CENTER);