Skip to content

Add updated new UI icons and mappings #7574

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 30, 2024
Merged

Add updated new UI icons and mappings #7574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f6158e
Add updated new UI icons and mappings
helin24 Jul 24, 2024
278a0ac
Update plugin_template
helin24 Jul 24, 2024
7408f06
Update with final icons
helin24 Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions flutter-idea/src/icons/FlutterIcons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,12 @@ private static Icon load(String path) {
return IconLoader.getIcon(path, FlutterIcons.class);
}

public static final Icon FlutterDefault = load("/icons/Flutter_DarkMode_C.2.svg");
public static final Icon DevToolsDeepLinks = load("/icons/DeepLinks_DarkMode_C.2.svg");
public static final Icon DevTools = load("/icons/DevTools_DarkMode_C.2.svg");
public static final Icon DevToolsExtensions = load("/icons/DevToolsExtensions_DarkMode_C.2.svg");
public static final Icon DevToolsInspector = load("/icons/Inspector_DarkMode_C.2.svg");

public static final Icon FlutterDefaultLight = load("/icons/Flutter_LtMode_C.2.svg");
public static final Icon DevToolsDeepLinksLight = load("/icons/DeepLinks_LtMode_C.2.svg");
public static final Icon DevToolsLight = load("/icons/DevTools_LtMode_C.2.svg");
public static final Icon DevToolsExtensionsLight = load("/icons/DevToolsExtensions_LtMode_C.2.svg");
public static final Icon DevToolsInspectorLight = load("/icons/Inspector_LtMode_C.2.svg");
public static final Icon FlutterDefault = load("/icons/expui/flutter.svg");
public static final Icon DevToolsDeepLinks = load("/icons/expui/deepLinks.svg");
public static final Icon DevTools = load("/icons/expui/devTools.svg");
public static final Icon DevToolsExtensions = load("/icons/expui/extensions.svg");
public static final Icon DevToolsInspector = load("icons/expui/inspector.svg");

public static final Icon Flutter_13_2x = load("/icons/[email protected]");
public static final Icon Flutter_64 = load("/icons/flutter_64.png");
public static final Icon Flutter_64_2x = load("/icons/[email protected]");
Expand Down
1 change: 0 additions & 1 deletion flutter-idea/src/io/flutter/FlutterInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ private void initializeToolWindows(@NotNull Project project) {
PreviewViewFactory.init(project);
RemainingDevToolsViewFactory.init(project);
DevToolsExtensionsViewFactory.init(project);
DeepLinksViewFactory.init(project);
toolWindowsInitialized = true;
}

Expand Down
7 changes: 0 additions & 7 deletions flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ public Object isApplicableAsync(@NotNull Project project, @NotNull Continuation<
return sdkVersion != null && sdkVersion.canUseDeepLinksTool();
}

public static void init(@NotNull Project project) {
final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID);
if (window != null) {
UIUtils.registerLightDarkIconsForWindow(window, FlutterIcons.DevToolsDeepLinksLight, FlutterIcons.DevToolsDeepLinks);
}
}

@Override
public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
final ContentManager contentManager = toolWindow.getContentManager();
Expand Down
6 changes: 0 additions & 6 deletions flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,10 @@
import java.util.Optional;

public class DevToolsExtensionsViewFactory implements ToolWindowFactory {
private static String TOOL_WINDOW_ID = "Flutter DevTools Extensions";
public static void init(Project project) {
project.getMessageBus().connect().subscribe(
FlutterViewMessages.FLUTTER_DEBUG_TOPIC, (FlutterViewMessages.FlutterDebugNotifier)event -> initView(project, event)
);

final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID);
if (window != null) {
UIUtils.registerLightDarkIconsForWindow(window, FlutterIcons.DevToolsExtensionsLight, FlutterIcons.DevToolsExtensions);
}
}

private static void initView(Project project, FlutterViewMessages.FlutterDebugEvent event) {
Expand Down
5 changes: 0 additions & 5 deletions flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ public static void init(Project project) {
project.getMessageBus().connect().subscribe(
FlutterViewMessages.FLUTTER_DEBUG_TOPIC, (FlutterViewMessages.FlutterDebugNotifier)event -> initView(project, event)
);

final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID);
if (window != null) {
UIUtils.registerLightDarkIconsForWindow(window, FlutterIcons.DevToolsLight, FlutterIcons.DevTools);
}
}

private static void initView(Project project, FlutterViewMessages.FlutterDebugEvent event) {
Expand Down
1 change: 0 additions & 1 deletion flutter-idea/src/io/flutter/performance/FlutterPerformanceViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public static void init(@NotNull Project project) {
final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(FlutterPerformanceView.TOOL_WINDOW_ID);
if (window != null) {
window.setAvailable(true);
UIUtils.registerLightDarkIconsForWindow(window, FlutterIcons.FlutterDefaultLight, FlutterIcons.FlutterDefault);

if (PropertiesComponent.getInstance(project).getBoolean(TOOL_WINDOW_VISIBLE_PROPERTY, false)) {
window.activate(null, false);
Expand Down
1 change: 0 additions & 1 deletion flutter-idea/src/io/flutter/preview/PreviewViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public static void init(@NotNull Project project) {
final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(PreviewView.TOOL_WINDOW_ID);
if (window != null) {
window.setAvailable(true);
UIUtils.registerLightDarkIconsForWindow(window, FlutterIcons.FlutterDefaultLight, FlutterIcons.FlutterDefault);

if (PropertiesComponent.getInstance(project).getBoolean(TOOL_WINDOW_VISIBLE_PROPERTY, false)) {
window.activate(null, false);
Expand Down
15 changes: 0 additions & 15 deletions flutter-idea/src/io/flutter/utils/UIUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,4 @@ public static Project findVisibleProject() {
}
return null;
}

public static void registerLightDarkIconsForWindow(@NotNull ToolWindow window, @NotNull Icon lightIcon, @NotNull Icon darkIcon) {
window.setIcon(Boolean.TRUE.equals(new DevToolsUtils().getIsBackgroundBright())
? lightIcon
: darkIcon);

final Application application = ApplicationManager.getApplication();
if (application == null) return;
application.getMessageBus().connect()
.subscribe(EditorColorsManager.TOPIC, (EditorColorsListener)scheme -> {
window.setIcon(Boolean.TRUE.equals(new DevToolsUtils().getIsBackgroundBright())
? lightIcon
: darkIcon);
});
}
}
1 change: 0 additions & 1 deletion flutter-idea/src/io/flutter/view/FlutterViewFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public static void init(@NotNull Project project) {
final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(FlutterView.TOOL_WINDOW_ID);
if (window != null) {
window.setAvailable(true);
UIUtils.registerLightDarkIconsForWindow(window, FlutterIcons.DevToolsInspectorLight, FlutterIcons.DevToolsInspector);

if (PropertiesComponent.getInstance(project).getBoolean(TOOL_WINDOW_VISIBLE_PROPERTY, false)) {
window.activate(null, false);
Expand Down
11 changes: 11 additions & 0 deletions resources/FlutterIconMappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"icons": {
"expui": {
"deepLinks.svg": "icons/deepLinks.svg",
"devTools.svg": "icons/devTools.svg",
"extensions.svg": "icons/extensions.svg",
"flutter.svg": "icons/flutter.svg",
"inspector.svg": "icons/inspector.svg"
}
}
}
1 change: 1 addition & 0 deletions resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@
</extensions>

<extensions defaultExtensionNs="com.intellij">
<iconMapper mappingFile="FlutterIconMappings.json"/>
<postStartupActivity implementation="io.flutter.ProjectOpenActivity"/>
<postStartupActivity implementation="io.flutter.FlutterInitializer"/>
<projectService serviceInterface="io.flutter.run.daemon.DeviceService"
Expand Down
1 change: 1 addition & 0 deletions resources/META-INF/plugin_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
</extensions>

<extensions defaultExtensionNs="com.intellij">
<iconMapper mappingFile="FlutterIconMappings.json"/>
<postStartupActivity implementation="io.flutter.ProjectOpenActivity"/>
<postStartupActivity implementation="io.flutter.FlutterInitializer"/>
<projectService serviceInterface="io.flutter.run.daemon.DeviceService"
Expand Down
89 changes: 0 additions & 89 deletions resources/icons/DeepLinks_DarkMode_C.2.svg
View file
Open in desktop

This file was deleted.

Loading