Skip to content

Commit 5987dae

Browse files
committed
Revert "chore: change the name from christmass to festive (#1820)"
This reverts commit fa86790.
1 parent b367ed1 commit 5987dae

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

packages/vscode-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
"default": true,
411411
"description": "Shows device frame in the IDE panel."
412412
},
413-
"RadonIDE.userInterface.festiveMode": {
413+
"RadonIDE.userInterface.christmasMode": {
414414
"type": "boolean",
415415
"scope": "window",
416416
"default": false,

packages/vscode-extension/src/common/State.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export type RadonAISettings = {
9797
export type UserInterfaceSettings = {
9898
panelLocation: PanelLocation;
9999
showDeviceFrame: boolean;
100-
festiveMode?: boolean;
100+
christmasMode?: boolean;
101101
};
102102

103103
export type DeviceControlSettings = {
@@ -628,7 +628,7 @@ export const initialState: State = {
628628
userInterface: {
629629
panelLocation: "tab",
630630
showDeviceFrame: true,
631-
festiveMode: false,
631+
christmasMode: false,
632632
},
633633
deviceSettings: {
634634
deviceRotation: DeviceRotation.Portrait,

packages/vscode-extension/src/utilities/workspaceConfiguration.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const WorkspaceConfigurationKeyMap = {
2323
userInterface: {
2424
panelLocation: "userInterface.panelLocation",
2525
showDeviceFrame: "userInterface.showDeviceFrame",
26-
festiveMode: "userInterface.festiveMode",
26+
christmasMode: "userInterface.christmasMode",
2727
},
2828
deviceSettings: {
2929
deviceRotation: "deviceSettings.deviceRotation",
@@ -65,8 +65,8 @@ export function getCurrentWorkspaceConfiguration(config: WorkspaceConfiguration)
6565
"tab",
6666
showDeviceFrame:
6767
config.get<boolean>(WorkspaceConfigurationKeyMap.userInterface.showDeviceFrame) ?? true,
68-
festiveMode:
69-
config.get<boolean>(WorkspaceConfigurationKeyMap.userInterface.festiveMode) ?? false,
68+
christmasMode:
69+
config.get<boolean>(WorkspaceConfigurationKeyMap.userInterface.christmasMode) ?? false,
7070
},
7171
deviceControl: {
7272
startDeviceOnLaunch:

packages/vscode-extension/src/webview/components/PreviewLoader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
} from "../../common/State";
2020
import { useSelectedDeviceSessionState } from "../hooks/selectedSession";
2121

22-
import AsciiChristmasTree from "./festive/AsciiChristmasTree";
22+
import AsciiChristmasTree from "./christmas/AsciiChristmasTree";
2323

2424
const startupStageWeightSum = StartupStageWeight.map((item) => item.weight).reduce(
2525
(acc, cur) => acc + cur,
@@ -113,11 +113,11 @@ function PreviewLoader({ onRequestShowPreview }: { onRequestShowPreview: () => v
113113
}
114114
}
115115

116-
const festiveMode = use$(store$.workspaceConfiguration.userInterface.festiveMode);
116+
const christmasMode = use$(store$.workspaceConfiguration.userInterface.christmasMode);
117117

118118
return (
119119
<div className={`preview-loader-wrapper ${isLandscape ? "landscape" : "portrait"}`}>
120-
{festiveMode && <AsciiChristmasTree />}
120+
{christmasMode && <AsciiChristmasTree />}
121121
<div className="preview-loader-load-info">
122122
<button className="preview-loader-container" onClick={handleLoaderClick}>
123123
<div className="preview-loader-button-group">

packages/vscode-extension/src/webview/components/SettingsDropdown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { ActivateLicenseView } from "../views/ActivateLicenseView";
1616
import { LicenseStatus } from "../../common/License";
1717
import ExportLogsView from "../views/ExportLogsView";
1818

19-
import { FestiveModeToggle } from "./festive/FestiveModeToggle";
19+
import { ChristmasModeToggle } from "./christmas/ChristmasModeToggle";
2020

2121
interface SettingsDropdownProps {
2222
children: React.ReactNode;
@@ -168,7 +168,7 @@ function SettingsDropdown({ project, isDeviceRunning, children, disabled }: Sett
168168
</DropdownMenu.Item>
169169
{telemetryEnabled && <SendFeedbackItem />}
170170
{shouldShowActivateLicenseItem && <ActivateLicenseItem />}
171-
<FestiveModeToggle />
171+
<ChristmasModeToggle />
172172
<div className="dropdown-menu-item device-settings-version-text">
173173
Radon IDE version: {extensionVersion}
174174
</div>

packages/vscode-extension/src/webview/components/festive/AsciiChristmasTree.css renamed to packages/vscode-extension/src/webview/components/christmas/AsciiChristmasTree.css

File renamed without changes.

packages/vscode-extension/src/webview/components/festive/AsciiChristmasTree.tsx renamed to packages/vscode-extension/src/webview/components/christmas/AsciiChristmasTree.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function AsciiChristmasTree({ width = 46, height = 19 }: { width?: number; heigh
3636
}, []);
3737

3838
const treeImage = useMemo(() => {
39-
return generateFestiveScene(width, height, baubleColors);
39+
return generateChristmasScene(width, height, baubleColors);
4040
}, [width, height, baubleColors]);
4141

4242
return (
@@ -60,7 +60,7 @@ function AsciiChristmasTree({ width = 46, height = 19 }: { width?: number; heigh
6060
);
6161
}
6262

63-
function generateFestiveScene(width: number, _height: number, baubleColors: string[]): Pixel[][] {
63+
function generateChristmasScene(width: number, _height: number, baubleColors: string[]): Pixel[][] {
6464
// Generate single centered tree with fixed size
6565
const treeWidth = 21;
6666
const tree = generateTree(treeWidth, baubleColors, 0);

packages/vscode-extension/src/webview/components/festive/FestiveModeToggle.tsx renamed to packages/vscode-extension/src/webview/components/christmas/ChristmasModeToggle.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import * as Switch from "@radix-ui/react-switch";
22
import { use$ } from "@legendapp/state/react";
33
import { useStore } from "../../providers/storeProvider";
4-
export function FestiveModeToggle() {
4+
export function ChristmasModeToggle() {
55
const store$ = useStore();
6-
const festiveMode = use$(store$.workspaceConfiguration.userInterface.festiveMode);
6+
const christmasMode = use$(store$.workspaceConfiguration.userInterface.christmasMode);
77
return (
88
<div className="dropdown-menu-item">
99
<span className="codicon codicon-sparkle" />
10-
Festive Mode
10+
Christmas Mode
1111
<Switch.Root
1212
className="switch-root small-switch"
13-
id="festive-mode"
14-
data-testid="settings-dropdown-festive-mode-switch"
13+
id="christmas-mode"
14+
data-testid="settings-dropdown-christmas-mode-switch"
1515
onCheckedChange={(checked) =>
16-
store$.workspaceConfiguration.userInterface.festiveMode.set(checked)
16+
store$.workspaceConfiguration.userInterface.christmasMode.set(checked)
1717
}
18-
defaultChecked={festiveMode}
18+
defaultChecked={christmasMode}
1919
style={{ marginLeft: "auto" }}>
2020
<Switch.Thumb className="switch-thumb" />
2121
</Switch.Root>

packages/vscode-extension/src/webview/components/festive/FestiveSnow.tsx renamed to packages/vscode-extension/src/webview/components/christmas/FestiveSnow.tsx

File renamed without changes.

packages/vscode-extension/src/webview/views/PreviewView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { usePaywalledCallback } from "../hooks/usePaywalledCallback";
3636
import { useDevices } from "../hooks/useDevices";
3737
import { useIsFeatureAdminDisabled } from "../hooks/useIsFeatureAdminDisabled";
3838

39-
import FestiveSnow from "../components/festive/FestiveSnow";
39+
import FestiveSnow from "../components/christmas/FestiveSnow";
4040

4141
const INSPECTOR_AVAILABILITY_MESSAGES = {
4242
[InspectorAvailabilityStatus.Available]: "Select an element to inspect it",
@@ -160,7 +160,7 @@ function PreviewView() {
160160
const radonConnectEnabled = projectState.connectState.enabled;
161161
const rotation = use$(store$.workspaceConfiguration.deviceSettings.deviceRotation);
162162
const zoomLevel = use$(store$.projectState.previewZoom);
163-
const festiveMode = use$(store$.workspaceConfiguration.userInterface.festiveMode);
163+
const christmasMode = use$(store$.workspaceConfiguration.userInterface.christmasMode);
164164
const onZoomChanged = useCallback(
165165
(zoom: ZoomLevelType) => {
166166
store$.projectState.previewZoom.set(zoom);
@@ -363,7 +363,7 @@ function PreviewView() {
363363

364364
return (
365365
<div className="panel-view" data-testid="radon-panel-view">
366-
{festiveMode && <FestiveSnow />}
366+
{christmasMode && <FestiveSnow />}
367367
<div className="button-group-top">
368368
<div className="button-group-top-left">
369369
<UrlBar disabled={!selectedProjectDevice} />

0 commit comments

Comments
 (0)