Skip to content

Commit 4ce64c3

Browse files
authored
material: Move the source code to ui-libraries/material/src
That way we can create an archive with just the `src` that doesn't contains the docs and example that can be moved in that folder
1 parent cf51367 commit 4ce64c3

File tree

89 files changed

+15
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+15
-42
lines changed

.github/workflows/material.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
with:
8989
version: 10.14.0
9090
- name: Take screenshots
91-
run: cargo run -p slint-docsnapper -- docs
91+
run: cargo run -p slint-docsnapper -- -I$PWD/src docs
9292
working-directory: ui-libraries/material
9393
- name: Install dependencies
9494
run: pnpm install --frozen-lockfile

REUSE.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ SPDX-License-Identifier = "MIT"
218218
[[annotations]]
219219
path = [
220220
"internal/compiler/widgets/material/_**.svg",
221-
"component-sets/material/ui/icons/**.svg",
221+
"component-sets/material/src/ui/icons/**.svg",
222222
"component-sets/material/examples/gallery/ui/icons/**.svg",
223223
"examples/carousel/icons/**.svg",
224224
"internal/compiler/widgets/cupertino/_**.svg",
@@ -274,7 +274,7 @@ SPDX-FileCopyrightText = "Copyright (c) 2020-2024 Paweł Kuna <https://github.co
274274
SPDX-License-Identifier = "MIT"
275275

276276
[[annotations]]
277-
path = ["ui-libraries/material/ui/icons/**.svg", "ui-libraries/material/examples/gallery/ui/icons/**.svg"]
277+
path = ["ui-libraries/material/src/ui/icons/**.svg", "ui-libraries/material/examples/gallery/ui/icons/**.svg"]
278278
precedence = "aggregate"
279279
SPDX-FileCopyrightText = "Material Icons <https://github.com/material-icons/material-icons/blob/master/LICENSE>"
280280
SPDX-License-Identifier = "Apache-2.0"

tests/doctests/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ fn do_test(snippet: &str, path: &str) -> Result<(), Box<dyn std::error::Error>>
2020
};
2121

2222
let mut compiler = slint_interpreter::Compiler::default();
23-
compiler.set_include_paths(vec![
24-
std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../ui-libraries/material/")
25-
]);
23+
compiler
24+
.set_include_paths(vec![std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
25+
.join("../../ui-libraries/material/src/")]);
2626
let result = spin_on::spin_on(compiler.build_from_source(code, path.into()));
2727

2828
let diagnostics = result

ui-libraries/material/CONTRIBUTING.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

ui-libraries/material/examples/gallery/ui/components/component_card.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
OutlinedCard,
77
MaterialTypography,
88
MaterialStyleMetrics
9-
} from "../../../../material.slint";
9+
} from "../../../../src/material.slint";
1010

1111
export component ComponentCard {
1212
in property <string> title;

ui-libraries/material/examples/gallery/ui/components/group.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
MaterialText,
66
MaterialPalette,
77
MaterialTypography
8-
} from "../../../../material.slint";
8+
} from "../../../../src/material.slint";
99

1010
export component Group {
1111
in property <string> title;

ui-libraries/material/examples/gallery/ui/components/text_icon_button.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import {
55
IconButton,
66
MaterialText
7-
} from "../../../../material.slint";
7+
} from "../../../../src/material.slint";
88

99
export component TextIconButton {
1010
in property <image> icon <=> button.icon;

ui-libraries/material/examples/gallery/ui/main.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
MaterialScheme,
1010
MaterialPalette,
1111
DatePickerAdapter,
12-
} from "../../../material.slint";
12+
} from "../../../src/material.slint";
1313
import { MainView, MainViewAdapter } from "./views/main_view.slint";
1414
import { MainWindowAdapter } from "./main_window_adapter.slint";
1515
export { NavigationViewAdapter } from "./views/navigation_view.slint";

ui-libraries/material/examples/gallery/ui/main_window_adapter.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright © SixtyFPS GmbH <[email protected]>
22
// SPDX-License-Identifier: MIT
33

4-
import { MaterialPalette } from "../../../material.slint";
4+
import { MaterialPalette } from "../../../src/material.slint";
55

66
export global MainWindowAdapter {
77
in property <length> width;

ui-libraries/material/examples/gallery/ui/views/actions_view.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import {
3434
HorizontalDivider,
3535
Dialog,
3636
FullscreenDialog
37-
} from "../../../../material.slint";
37+
} from "../../../../src/material.slint";
3838

3939
import { Group } from "../components/group.slint";
4040
import { ComponentCard } from "../components/component_card.slint";

0 commit comments

Comments
 (0)