Skip to content

Commit 0113331

Browse files
xnkevinnguyenxnkevinnguyen
committed
Remove non-generic sliders
1 parent 1b3ada1 commit 0113331

9 files changed

Lines changed: 278 additions & 472 deletions

File tree

src/view/components/toolbar/motion/Gesture.tsx renamed to src/view/components/toolbar/Gesture.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
2-
import { CONSTANTS } from "../../../constants";
3-
import { Dropdown } from "../../Dropdown";
4-
import SensorButton from "../SensorButton";
2+
import { CONSTANTS } from "../../constants";
3+
import { Dropdown } from "../Dropdown";
4+
import SensorButton from "./SensorButton";
55

66
const GESTURE_BUTTON_MESSAGE = "Send Gesture";
77
interface IProps {

‎src/view/components/toolbar/LightSensorBar.tsx‎

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

‎src/view/components/toolbar/SensorModalUtils.tsx‎

Lines changed: 13 additions & 192 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
import * as React from "react";
44
import { SENSOR_LIST } from "../../constants";
55
import { ARROW_RIGHT_SVG } from "../../svgs/arrow_right_svg";
6-
import { TAG_INPUT_SVG } from "../../svgs/tag_input_svg";
7-
import { TAG_OUTPUT_SVG } from "../../svgs/tag_output_svg";
6+
import * as CPX_MODAL from "./cpx/CpxModalContent"
87
import * as CLUE_MODAL from "./clue/ClueModalContent";
9-
import LightSensorBar from "./LightSensorBar";
108
import * as MICROBIT_MODAL from "./microbit/MicrobitModalContent";
11-
import MotionSensorBar from "./motion/MotionSensorBar";
12-
import TemperatureSensorBar from "./TemperatureSensorBar";
9+
1310

1411
export const TRY_IT_MAKE_CODE = (
1512
<div className="link-parent">
@@ -115,196 +112,20 @@ export const DEFAULT_MODAL_CONTENT: IModalContent = {
115112
id: "none",
116113
};
117114

118-
export const GPIO_MODAL_CONTENT = (
119-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
120-
sensorValues: { [key: string]: number }
121-
): IModalContent => {
122-
return {
123-
descriptionTitle: "toolbar-gpio.title",
124-
tagInput: TAG_INPUT_SVG,
125-
tagOutput: TAG_OUTPUT_SVG,
126-
descriptionText: "toolbar-gpio.description",
127-
tryItDescription: "toolbar-gpio.tryItDescription",
128-
components: undefined,
129-
id: "GPIO",
130-
};
131-
};
132115

133-
export const IR_MODAL_CONTENT = (
134-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
135-
sensorValues: { [key: string]: number }
136-
): IModalContent => {
137-
return {
138-
descriptionTitle: "toolbar-ir-sensor.title",
139-
tagInput: TAG_INPUT_SVG,
140-
tagOutput: TAG_OUTPUT_SVG,
141-
descriptionText: "toolbar-ir-sensor.description",
142-
tryItDescription: "toolbar-ir-sensor.tryItDescription",
143-
components: [TRY_IT_MAKE_CODE, FEATURE_REQUEST_ON_GITHUB],
144-
id: "IR",
145-
};
146-
};
147-
export const LIGHT_MODAL_CONTENT = (
148-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
149-
sensorValues: { [key: string]: number }
150-
): IModalContent => {
151-
return {
152-
descriptionTitle: "toolbar-light-sensor.title",
153-
tagInput: TAG_INPUT_SVG,
154-
tagOutput: undefined,
155-
descriptionText: "toolbar-light-sensor.description",
156-
tryItDescription: "toolbar-light-sensor.tryItDescription",
157-
components: [
158-
<LightSensorBar
159-
onUpdateValue={onUpdateValue}
160-
value={sensorValues[SENSOR_LIST.LIGHT]}
161-
/>,
162-
],
163-
id: "light_sensor",
164-
};
165-
};
166-
export const MOTION_MODAL_CONTENT = (
167-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
168-
sensorValues: { [key: string]: number }
169-
): IModalContent => {
170-
const motionSensorValues = {
171-
X: sensorValues[SENSOR_LIST.MOTION_X],
172-
Y: sensorValues[SENSOR_LIST.MOTION_Y],
173-
Z: sensorValues[SENSOR_LIST.MOTION_Z],
174-
};
175-
return {
176-
descriptionTitle: "toolbar-motion-sensor.title",
177-
tagInput: TAG_INPUT_SVG,
178-
tagOutput: undefined,
179-
descriptionText: "toolbar-motion-sensor.description",
180-
tryItDescription: "toolbar-motion-sensor.tryItDescription",
181-
components: [
182-
<MotionSensorBar
183-
onUpdateValue={onUpdateValue}
184-
axisValues={motionSensorValues}
185-
/>,
186-
TRY_IT_MAKE_CODE,
187-
FEATURE_REQUEST_ON_GITHUB,
188-
],
189-
id: "motion_sensor",
190-
};
191-
};
192-
export const NEOP_MODAL_CONTENT = (
193-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
194-
sensorValues: { [key: string]: number }
195-
): IModalContent => {
196-
return {
197-
descriptionTitle: "toolbar-neo-pixels.title",
198-
tagInput: undefined,
199-
tagOutput: TAG_OUTPUT_SVG,
200-
descriptionText: "toolbar-neo-pixels.description",
201-
tryItDescription: "toolbar-neo-pixels.tryItDescription",
202-
components: undefined,
203-
id: "neon_pixel",
204-
};
205-
};
206-
export const PUSHB_MODAL_CONTENT = (
207-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
208-
sensorValues: { [key: string]: number }
209-
): IModalContent => {
210-
return {
211-
descriptionTitle: "toolbar-a-b-push.title",
212-
tagInput: TAG_INPUT_SVG,
213-
tagOutput: undefined,
214-
descriptionText: "toolbar-a-b-push.description",
215-
tryItDescription: "toolbar-a-b-push.tryItDescription",
216-
components: undefined,
217-
id: "push_btn",
218-
};
219-
};
220-
export const RED_LED_MODAL_CONTENT = (
221-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
222-
sensorValues: { [key: string]: number }
223-
): IModalContent => {
224-
return {
225-
descriptionTitle: "toolbar-red-led.title",
226-
tagInput: undefined,
227-
tagOutput: TAG_OUTPUT_SVG,
228-
descriptionText: "toolbar-red-led.description",
229-
tryItDescription: "toolbar-red-led.tryItDescription",
230-
components: undefined,
231-
id: "red_LED",
232-
};
233-
};
234-
export const SOUND_MODAL_CONTENT = (
235-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
236-
sensorValues: { [key: string]: number }
237-
): IModalContent => {
238-
return {
239-
descriptionTitle: "toolbar-sound-sensor.title",
240-
tagInput: TAG_INPUT_SVG,
241-
tagOutput: undefined,
242-
descriptionText: "toolbar-sound-sensor.description",
243-
tryItDescription: "toolbar-sound-sensor.tryItDescription",
244-
components: [TRY_IT_MAKE_CODE, FEATURE_REQUEST_ON_GITHUB],
245-
id: "sound_sensor",
246-
};
247-
};
248-
export const SWITCH_MODAL_CONTENT = (
249-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
250-
sensorValues: { [key: string]: number }
251-
): IModalContent => {
252-
return {
253-
descriptionTitle: "toolbar-slider-switch.title",
254-
tagInput: TAG_INPUT_SVG,
255-
tagOutput: undefined,
256-
descriptionText: "toolbar-slider-switch.description",
257-
tryItDescription: "toolbar-slider-switch.tryItDescription",
258-
components: undefined,
259-
id: "slider_switch",
260-
};
261-
};
262-
export const SPEAKER_MODAL_CONTENT = (
263-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
264-
sensorValues: { [key: string]: number }
265-
): IModalContent => {
266-
return {
267-
descriptionTitle: "toolbar-speaker.title",
268-
tagInput: undefined,
269-
tagOutput: TAG_OUTPUT_SVG,
270-
descriptionText: "toolbar-speaker.description",
271-
tryItDescription: "toolbar-speaker.tryItDescription",
272-
components: [FEATURE_REQUEST_ON_GITHUB],
273-
id: "speaker",
274-
};
275-
};
276-
export const TEMPERATURE_MODAL_CONTENT = (
277-
onUpdateValue: (sensor: SENSOR_LIST, value: number) => void,
278-
sensorValues: { [key: string]: number }
279-
): IModalContent => {
280-
return {
281-
components: [
282-
<TemperatureSensorBar
283-
onUpdateSensor={onUpdateValue}
284-
value={sensorValues[SENSOR_LIST.TEMPERATURE]}
285-
/>,
286-
],
287-
descriptionText: "toolbar-temperature-sensor.description",
288-
descriptionTitle: "toolbar-temperature-sensor.title",
289-
id: "temperature",
290-
tagInput: TAG_INPUT_SVG,
291-
tagOutput: undefined,
292-
tryItDescription: "toolbar-temperature-sensor.tryItDescription",
293-
};
294-
};
295116

296117
export const LABEL_TO_MODAL_CONTENT_CONSTRUCTOR = new Map([
297-
[CPX_TOOLBAR_ICON_ID.GPIO, GPIO_MODAL_CONTENT],
298-
[CPX_TOOLBAR_ICON_ID.IR, IR_MODAL_CONTENT],
299-
[CPX_TOOLBAR_ICON_ID.LIGHT, LIGHT_MODAL_CONTENT],
300-
[CPX_TOOLBAR_ICON_ID.MOTION, MOTION_MODAL_CONTENT],
301-
[CPX_TOOLBAR_ICON_ID.NEO_PIXEL, NEOP_MODAL_CONTENT],
302-
[CPX_TOOLBAR_ICON_ID.PUSH_BUTTON, PUSHB_MODAL_CONTENT],
303-
[CPX_TOOLBAR_ICON_ID.RED_LED, RED_LED_MODAL_CONTENT],
304-
[CPX_TOOLBAR_ICON_ID.SOUND, SOUND_MODAL_CONTENT],
305-
[CPX_TOOLBAR_ICON_ID.SPEAKER, SPEAKER_MODAL_CONTENT],
306-
[CPX_TOOLBAR_ICON_ID.SWITCH, SWITCH_MODAL_CONTENT],
307-
[CPX_TOOLBAR_ICON_ID.TEMPERATURE, TEMPERATURE_MODAL_CONTENT],
118+
[CPX_TOOLBAR_ICON_ID.GPIO, CPX_MODAL.GPIO_CONTENT],
119+
[CPX_TOOLBAR_ICON_ID.IR, CPX_MODAL.IR_CONTENT],
120+
[CPX_TOOLBAR_ICON_ID.LIGHT, CPX_MODAL.LIGHT_CONTENT],
121+
[CPX_TOOLBAR_ICON_ID.MOTION, CPX_MODAL.MOTION_CONTENT],
122+
[CPX_TOOLBAR_ICON_ID.NEO_PIXEL, CPX_MODAL.NEOP_CONTENT],
123+
[CPX_TOOLBAR_ICON_ID.PUSH_BUTTON, CPX_MODAL.PUSHB_CONTENT],
124+
[CPX_TOOLBAR_ICON_ID.RED_LED, CPX_MODAL.RED_LED_CONTENT],
125+
[CPX_TOOLBAR_ICON_ID.SOUND, CPX_MODAL.SOUND_CONTENT],
126+
[CPX_TOOLBAR_ICON_ID.SPEAKER, CPX_MODAL.SPEAKER_CONTENT],
127+
[CPX_TOOLBAR_ICON_ID.SWITCH, CPX_MODAL.SWITCH_CONTENT],
128+
[CPX_TOOLBAR_ICON_ID.TEMPERATURE, CPX_MODAL.TEMPERATURE_CONTENT],
308129
[
309130
MICROBIT_TOOLBAR_ICON_ID.ACCELEROMETER,
310131
MICROBIT_MODAL.ACCELEROMETER_CONTENT,

‎src/view/components/toolbar/TemperatureSensorBar.tsx‎

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

‎src/view/components/toolbar/clue/ClueModalContent.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { GESTURES_CLUE, SENSOR_LIST } from "../../../constants";
33
import { TAG_INPUT_SVG } from "../../../svgs/tag_input_svg";
44
import { TAG_OUTPUT_SVG } from "../../../svgs/tag_output_svg";
55
import { GenericSliderComponent } from "../GenericSliderComponent";
6-
import { Gesture } from "../motion/Gesture";
6+
import { Gesture } from "../Gesture";
77
import { FEATURE_REQUEST_ON_GITHUB, IModalContent } from "../SensorModalUtils";
8-
import TemperatureSensorBar from "../TemperatureSensorBar";
98
import * as SENSOR_PROPERTIES from "./ClueSensorProperties";
109

1110
export const TEMPERATURE_CONTENT = (

0 commit comments

Comments
 (0)