-
Notifications
You must be signed in to change notification settings - Fork 168
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add material theme support to Flow. #4322
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>com.vaadin</groupId> | ||
<artifactId>flow-theme-integrations</artifactId> | ||
<version>1.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<artifactId>vaadin-material-theme</artifactId> | ||
<name>Material theme for Flow</name> | ||
<description>Package with Material dependencies and setting for use with Flow | ||
</description> | ||
<packaging>jar</packaging> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>org.webjars.bowergithub.vaadin</groupId> | ||
<artifactId>vaadin-material-styles</artifactId> | ||
<version>0.4.0</version> | ||
</dependency> | ||
</dependencies> | ||
</project> |
69 changes: 69 additions & 0 deletions
69
flow-theme-integrations/material/src/main/java/com/vaadin/flow/theme/material/Material.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* Copyright 2000-2017 Vaadin Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package com.vaadin.flow.theme.material; | ||
|
||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
import org.slf4j.LoggerFactory; | ||
|
||
import com.vaadin.flow.component.dependency.HtmlImport; | ||
import com.vaadin.flow.theme.AbstractTheme; | ||
|
||
/** | ||
* Material component theme class implementation. | ||
*/ | ||
@HtmlImport("frontend://bower_components/vaadin-material-styles/color.html") | ||
@HtmlImport("frontend://bower_components/vaadin-material-styles/typography.html") | ||
public class Material implements AbstractTheme { | ||
public static final String LIGHT = "light"; | ||
public static final String DARK = "dark"; | ||
|
||
@Override | ||
public String getBaseUrl() { | ||
return "src/"; | ||
} | ||
|
||
@Override | ||
public String getThemeUrl() { | ||
return "theme/material/"; | ||
} | ||
|
||
@Override | ||
public List<String> getHeaderInlineContents() { | ||
return Collections.singletonList("<custom-style>\n" | ||
+ " <style include=\"material-color-light material-typography\"></style>\n" | ||
+ "</custom-style>"); | ||
} | ||
|
||
@Override | ||
public Map<String, String> getBodyAttributes(String variant) { | ||
switch (variant) { | ||
case LIGHT: | ||
return Collections.singletonMap("theme", LIGHT); | ||
case DARK: | ||
return Collections.singletonMap("theme", DARK); | ||
default: | ||
if (!variant.isEmpty()) { | ||
LoggerFactory.getLogger(getClass().getName()).warn( | ||
"Material theme variant not recognized: '{0}'. Using no variant.", | ||
variant); | ||
} | ||
return Collections.emptyMap(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ | |
|
||
<modules> | ||
<module>lumo</module> | ||
<module>material</module> | ||
</modules> | ||
|
||
<dependencies> | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reduce this switch case number of lines from 6 to at most 5, for example by extracting code into methods.