diff --git a/js/quadrilateral/QuadrilateralScreen.ts b/js/quadrilateral/QuadrilateralScreen.ts index 09bf0ad..c5f29c9 100644 --- a/js/quadrilateral/QuadrilateralScreen.ts +++ b/js/quadrilateral/QuadrilateralScreen.ts @@ -6,13 +6,13 @@ */ import Screen, { ScreenOptions } from '../../../joist/js/Screen.js'; -import QuadrilateralColors from '../QuadrilateralColors.js'; +import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js'; import quadrilateral from '../quadrilateral.js'; +import QuadrilateralColors from '../QuadrilateralColors.js'; import QuadrilateralModel from './model/QuadrilateralModel.js'; -import QuadrilateralScreenView from './view/QuadrilateralScreenView.js'; import QuadrilateralOptionsModel from './model/QuadrilateralOptionsModel.js'; -import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js'; import QuadrilateralKeyboardHelpContent from './view/QuadrilateralKeyboardHelpContent.js'; +import QuadrilateralScreenView from './view/QuadrilateralScreenView.js'; export default class QuadrilateralScreen extends Screen { public constructor( optionsModel: QuadrilateralOptionsModel, providedOptions: ScreenOptions ) { diff --git a/js/quadrilateral/model/ParallelSideChecker.ts b/js/quadrilateral/model/ParallelSideChecker.ts index 8f8720e..bb24c36 100644 --- a/js/quadrilateral/model/ParallelSideChecker.ts +++ b/js/quadrilateral/model/ParallelSideChecker.ts @@ -8,14 +8,14 @@ */ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; -import { TReadOnlyEmitter } from '../../../../axon/js/TEmitter.js'; import Property from '../../../../axon/js/Property.js'; +import { TReadOnlyEmitter } from '../../../../axon/js/TEmitter.js'; import Utils from '../../../../dot/js/Utils.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import quadrilateral from '../../quadrilateral.js'; import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; -import QuadrilateralSidePair from './QuadrilateralSidePair.js'; import QuadrilateralShapeModel from './QuadrilateralShapeModel.js'; +import QuadrilateralSidePair from './QuadrilateralSidePair.js'; export default class ParallelSideChecker { diff --git a/js/quadrilateral/model/QuadrilateralModel.ts b/js/quadrilateral/model/QuadrilateralModel.ts index c7faf57..af2ddc9 100644 --- a/js/quadrilateral/model/QuadrilateralModel.ts +++ b/js/quadrilateral/model/QuadrilateralModel.ts @@ -9,21 +9,21 @@ */ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; -import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from './QuadrilateralShapeModel.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; -import Utils from '../../../../dot/js/Utils.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import QuadrilateralOptionsModel from './QuadrilateralOptionsModel.js'; -import TProperty from '../../../../axon/js/TProperty.js'; -import Emitter from '../../../../axon/js/Emitter.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import Emitter from '../../../../axon/js/Emitter.js'; +import TProperty from '../../../../axon/js/TProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Utils from '../../../../dot/js/Utils.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; +import TModel from '../../../../joist/js/TModel.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import quadrilateral from '../../quadrilateral.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; import TangibleConnectionModel from './prototype/TangibleConnectionModel.js'; +import QuadrilateralOptionsModel from './QuadrilateralOptionsModel.js'; +import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from './QuadrilateralShapeModel.js'; import QuadrilateralVisibilityModel from './QuadrilateralVisibilityModel.js'; -import TModel from '../../../../joist/js/TModel.js'; export default class QuadrilateralModel implements TModel { diff --git a/js/quadrilateral/model/QuadrilateralOptionsModel.ts b/js/quadrilateral/model/QuadrilateralOptionsModel.ts index 9500ff4..bb46c77 100644 --- a/js/quadrilateral/model/QuadrilateralOptionsModel.ts +++ b/js/quadrilateral/model/QuadrilateralOptionsModel.ts @@ -8,8 +8,8 @@ */ import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralSoundOptionsModel from './QuadrilateralSoundOptionsModel.js'; import QuadrilateralTangibleOptionsModel from './prototype/QuadrilateralTangibleOptionsModel.js'; +import QuadrilateralSoundOptionsModel from './QuadrilateralSoundOptionsModel.js'; export default class QuadrilateralOptionsModel { public readonly soundOptionsModel = new QuadrilateralSoundOptionsModel(); diff --git a/js/quadrilateral/model/QuadrilateralShapeDetector.ts b/js/quadrilateral/model/QuadrilateralShapeDetector.ts index 33b4934..a567f92 100644 --- a/js/quadrilateral/model/QuadrilateralShapeDetector.ts +++ b/js/quadrilateral/model/QuadrilateralShapeDetector.ts @@ -11,8 +11,8 @@ */ import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralShapeModel from './QuadrilateralShapeModel.js'; import NamedQuadrilateral from './NamedQuadrilateral.js'; +import QuadrilateralShapeModel from './QuadrilateralShapeModel.js'; // Set up the bits for each shape property. const CONCAVE_ANGLE = ( shapeModel: QuadrilateralShapeModel ) => _.some( shapeModel.vertices, vertex => vertex.angleProperty.value! > Math.PI ); diff --git a/js/quadrilateral/model/QuadrilateralShapeDetectorTests.ts b/js/quadrilateral/model/QuadrilateralShapeDetectorTests.ts index 8dce61b..bbcd1fd 100644 --- a/js/quadrilateral/model/QuadrilateralShapeDetectorTests.ts +++ b/js/quadrilateral/model/QuadrilateralShapeDetectorTests.ts @@ -8,10 +8,10 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; +import NamedQuadrilateral from './NamedQuadrilateral.js'; import QuadrilateralShapeDetector from './QuadrilateralShapeDetector.js'; import QuadrilateralShapeModel from './QuadrilateralShapeModel.js'; -import NamedQuadrilateral from './NamedQuadrilateral.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js'; QUnit.module( 'BooleanProperty' ); diff --git a/js/quadrilateral/model/QuadrilateralShapeModel.ts b/js/quadrilateral/model/QuadrilateralShapeModel.ts index d14d6a4..3c46a40 100644 --- a/js/quadrilateral/model/QuadrilateralShapeModel.ts +++ b/js/quadrilateral/model/QuadrilateralShapeModel.ts @@ -8,32 +8,32 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import Property from '../../../../axon/js/Property.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; -import quadrilateral from '../../quadrilateral.js'; -import NamedQuadrilateral from './NamedQuadrilateral.js'; -import QuadrilateralSide from './QuadrilateralSide.js'; -import QuadrilateralVertex from './QuadrilateralVertex.js'; -import Utils from '../../../../dot/js/Utils.js'; import Emitter from '../../../../axon/js/Emitter.js'; +import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; -import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; -import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js'; +import Property from '../../../../axon/js/Property.js'; +import TEmitter from '../../../../axon/js/TEmitter.js'; +import TProperty from '../../../../axon/js/TProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Utils from '../../../../dot/js/Utils.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; import optionize from '../../../../phet-core/js/optionize.js'; +import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import quadrilateral from '../../quadrilateral.js'; +import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; +import NamedQuadrilateral from './NamedQuadrilateral.js'; import ParallelSideChecker from './ParallelSideChecker.js'; -import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import TProperty from '../../../../axon/js/TProperty.js'; -import Multilink from '../../../../axon/js/Multilink.js'; -import TEmitter from '../../../../axon/js/TEmitter.js'; import QuadrilateralShapeDetector from './QuadrilateralShapeDetector.js'; +import QuadrilateralSide from './QuadrilateralSide.js'; +import QuadrilateralSideLabel from './QuadrilateralSideLabel.js'; import QuadrilateralSidePair from './QuadrilateralSidePair.js'; -import QuadrilateralVertexPair from './QuadrilateralVertexPair.js'; import QuadrilateralUtils from './QuadrilateralUtils.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import QuadrilateralSideLabel from './QuadrilateralSideLabel.js'; -import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js'; +import QuadrilateralVertex from './QuadrilateralVertex.js'; +import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js'; +import QuadrilateralVertexPair from './QuadrilateralVertexPair.js'; // Used when verifying that QuadrilateralVertex positions are valid before setting to the model. export type VertexLabelToProposedPositionMap = Map; diff --git a/js/quadrilateral/model/QuadrilateralShapeSnapshot.ts b/js/quadrilateral/model/QuadrilateralShapeSnapshot.ts index 8be61a1..3de8b1e 100644 --- a/js/quadrilateral/model/QuadrilateralShapeSnapshot.ts +++ b/js/quadrilateral/model/QuadrilateralShapeSnapshot.ts @@ -10,12 +10,12 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; import Vector2 from '../../../../dot/js/Vector2.js'; +import quadrilateral from '../../quadrilateral.js'; +import NamedQuadrilateral from './NamedQuadrilateral.js'; import QuadrilateralShapeModel from './QuadrilateralShapeModel.js'; import QuadrilateralSideLabel from './QuadrilateralSideLabel.js'; import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js'; -import NamedQuadrilateral from './NamedQuadrilateral.js'; export default class QuadrilateralShapeSnapshot { public readonly isParallelogram: boolean; diff --git a/js/quadrilateral/model/QuadrilateralSide.ts b/js/quadrilateral/model/QuadrilateralSide.ts index 0293f59..56c21b9 100644 --- a/js/quadrilateral/model/QuadrilateralSide.ts +++ b/js/quadrilateral/model/QuadrilateralSide.ts @@ -6,17 +6,17 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import Property from '../../../../axon/js/Property.js'; +import TProperty from '../../../../axon/js/TProperty.js'; import Vector2 from '../../../../dot/js/Vector2.js'; +import { Line as LineShape, Shape } from '../../../../kite/js/imports.js'; +import { Line } from '../../../../scenery/js/imports.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralVertex from './QuadrilateralVertex.js'; -import { Line } from '../../../../scenery/js/imports.js'; -import { Line as LineShape, Shape } from '../../../../kite/js/imports.js'; -import NumberProperty from '../../../../axon/js/NumberProperty.js'; -import QuadrilateralSideLabel from './QuadrilateralSideLabel.js'; import QuadrilateralMovable from './QuadrilateralMovable.js'; -import Property from '../../../../axon/js/Property.js'; -import TProperty from '../../../../axon/js/TProperty.js'; +import QuadrilateralSideLabel from './QuadrilateralSideLabel.js'; +import QuadrilateralVertex from './QuadrilateralVertex.js'; export default class QuadrilateralSide extends QuadrilateralMovable { diff --git a/js/quadrilateral/model/QuadrilateralSoundOptionsModel.ts b/js/quadrilateral/model/QuadrilateralSoundOptionsModel.ts index 9cc7133..f0e9ab5 100644 --- a/js/quadrilateral/model/QuadrilateralSoundOptionsModel.ts +++ b/js/quadrilateral/model/QuadrilateralSoundOptionsModel.ts @@ -7,11 +7,11 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import EnumerationValue from '../../../../phet-core/js/EnumerationValue.js'; import Enumeration from '../../../../phet-core/js/Enumeration.js'; +import EnumerationValue from '../../../../phet-core/js/EnumerationValue.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; // Enumeration for the different sound designs available to the user. diff --git a/js/quadrilateral/model/QuadrilateralVertex.ts b/js/quadrilateral/model/QuadrilateralVertex.ts index 48d94a5..628fa62 100644 --- a/js/quadrilateral/model/QuadrilateralVertex.ts +++ b/js/quadrilateral/model/QuadrilateralVertex.ts @@ -6,21 +6,21 @@ * @author Jesse Greenberg */ +import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import Property from '../../../../axon/js/Property.js'; -import Vector2Property from '../../../../dot/js/Vector2Property.js'; -import quadrilateral from '../../quadrilateral.js'; -import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; import Vector2 from '../../../../dot/js/Vector2.js'; +import Vector2Property from '../../../../dot/js/Vector2Property.js'; import { Shape } from '../../../../kite/js/imports.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import NullableIO from '../../../../tandem/js/types/NullableIO.js'; import NumberIO from '../../../../tandem/js/types/NumberIO.js'; -import QuadrilateralMovable from './QuadrilateralMovable.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralMovable from './QuadrilateralMovable.js'; +import QuadrilateralVertexLabel from './QuadrilateralVertexLabel.js'; const VERTEX_BOUNDS = new Bounds2( 0, 0, QuadrilateralConstants.VERTEX_WIDTH, QuadrilateralConstants.VERTEX_WIDTH ); const HALF_WIDTH = VERTEX_BOUNDS.width / 2; diff --git a/js/quadrilateral/model/prototype/QuadrilateralTangibleOptionsModel.ts b/js/quadrilateral/model/prototype/QuadrilateralTangibleOptionsModel.ts index 293bd0d..cce09bf 100644 --- a/js/quadrilateral/model/prototype/QuadrilateralTangibleOptionsModel.ts +++ b/js/quadrilateral/model/prototype/QuadrilateralTangibleOptionsModel.ts @@ -7,12 +7,12 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import BooleanProperty from '../../../../../axon/js/BooleanProperty.js'; import NumberProperty from '../../../../../axon/js/NumberProperty.js'; -import quadrilateral from '../../../quadrilateral.js'; import Range from '../../../../../dot/js/Range.js'; -import QuadrilateralQueryParameters from '../../QuadrilateralQueryParameters.js'; -import BooleanProperty from '../../../../../axon/js/BooleanProperty.js'; import MediaPipeQueryParameters from '../../../../../tangible/js/mediaPipe/MediaPipeQueryParameters.js'; +import quadrilateral from '../../../quadrilateral.js'; +import QuadrilateralQueryParameters from '../../QuadrilateralQueryParameters.js'; export default class QuadrilateralTangibleOptionsModel { diff --git a/js/quadrilateral/model/prototype/TangibleConnectionModel.ts b/js/quadrilateral/model/prototype/TangibleConnectionModel.ts index 6a86e66..3d815b2 100644 --- a/js/quadrilateral/model/prototype/TangibleConnectionModel.ts +++ b/js/quadrilateral/model/prototype/TangibleConnectionModel.ts @@ -27,9 +27,9 @@ import NullableIO from '../../../../../tandem/js/types/NullableIO.js'; import quadrilateral from '../../../quadrilateral.js'; import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from '../QuadrilateralShapeModel.js'; -import QuadrilateralTangibleOptionsModel from './QuadrilateralTangibleOptionsModel.js'; -import MarkerDetectionModel from './MarkerDetectionModel.js'; import QuadrilateralVertexLabel from '../QuadrilateralVertexLabel.js'; +import MarkerDetectionModel from './MarkerDetectionModel.js'; +import QuadrilateralTangibleOptionsModel from './QuadrilateralTangibleOptionsModel.js'; export default class TangibleConnectionModel { diff --git a/js/quadrilateral/view/CornerGuideNode.ts b/js/quadrilateral/view/CornerGuideNode.ts index 8e26ffe..202dd92 100644 --- a/js/quadrilateral/view/CornerGuideNode.ts +++ b/js/quadrilateral/view/CornerGuideNode.ts @@ -13,18 +13,18 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import { Node, Path } from '../../../../scenery/js/imports.js'; -import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; +import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import Utils from '../../../../dot/js/Utils.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; import { Line, Shape } from '../../../../kite/js/imports.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; +import { Node, Path } from '../../../../scenery/js/imports.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; -import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; -import Multilink from '../../../../axon/js/Multilink.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; +import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; // constants // The size of each wedge of the angle guide, in radians diff --git a/js/quadrilateral/view/MoveShapeHelpSection.ts b/js/quadrilateral/view/MoveShapeHelpSection.ts index 3fba7c3..4a7b810 100644 --- a/js/quadrilateral/view/MoveShapeHelpSection.ts +++ b/js/quadrilateral/view/MoveShapeHelpSection.ts @@ -9,9 +9,9 @@ import KeyboardHelpIconFactory from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpIconFactory.js'; import KeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSection.js'; import KeyboardHelpSectionRow from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSectionRow.js'; +import { Text } from '../../../../scenery/js/imports.js'; import quadrilateral from '../../quadrilateral.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; -import { Text } from '../../../../scenery/js/imports.js'; import QuadrilateralKeyboardHelpContent from './QuadrilateralKeyboardHelpContent.js'; // constants - Voicing strings not translatable diff --git a/js/quadrilateral/view/QuadrilateralAlerter.ts b/js/quadrilateral/view/QuadrilateralAlerter.ts index 50fdbff..b5e2b4d 100644 --- a/js/quadrilateral/view/QuadrilateralAlerter.ts +++ b/js/quadrilateral/view/QuadrilateralAlerter.ts @@ -11,25 +11,25 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralModel from '../model/QuadrilateralModel.js'; -import Utterance from '../../../../utterance-queue/js/Utterance.js'; +import Utils from '../../../../dot/js/Utils.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; +import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import Alerter from '../../../../scenery-phet/js/accessibility/describers/Alerter.js'; -import QuadrilateralScreenView from './QuadrilateralScreenView.js'; +import MovementAlerter from '../../../../scenery-phet/js/accessibility/describers/MovementAlerter.js'; import { Voicing } from '../../../../scenery/js/imports.js'; import ResponsePacket from '../../../../utterance-queue/js/ResponsePacket.js'; +import Utterance from '../../../../utterance-queue/js/Utterance.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; +import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; +import QuadrilateralModel from '../model/QuadrilateralModel.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import QuadrilateralShapeSnapshot from '../model/QuadrilateralShapeSnapshot.js'; import QuadrilateralSide from '../model/QuadrilateralSide.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; -import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; -import MovementAlerter from '../../../../scenery-phet/js/accessibility/describers/MovementAlerter.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; -import Utils from '../../../../dot/js/Utils.js'; -import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; import QuadrilateralDescriber, { NullableQuadrilateralStringType } from './QuadrilateralDescriber.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; +import QuadrilateralScreenView from './QuadrilateralScreenView.js'; import QuadrilateralVertexDescriber from './QuadrilateralVertexDescriber.js'; // constants - Voicing strings are not translatable so we just use the StringProperty initial value diff --git a/js/quadrilateral/view/QuadrilateralDebuggingPanel.ts b/js/quadrilateral/view/QuadrilateralDebuggingPanel.ts index ec02602..7fd5928 100644 --- a/js/quadrilateral/view/QuadrilateralDebuggingPanel.ts +++ b/js/quadrilateral/view/QuadrilateralDebuggingPanel.ts @@ -9,21 +9,21 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralModel from '../model/QuadrilateralModel.js'; -import { Node, NodeOptions, Rectangle, Text, VBox, VBoxOptions } from '../../../../scenery/js/imports.js'; -import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Utils from '../../../../dot/js/Utils.js'; -import Property from '../../../../axon/js/Property.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Dimension2 from '../../../../dot/js/Dimension2.js'; import Range from '../../../../dot/js/Range.js'; -import NumberControl from '../../../../scenery-phet/js/NumberControl.js'; -import Multilink from '../../../../axon/js/Multilink.js'; +import Utils from '../../../../dot/js/Utils.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import IntentionalAny from '../../../../phet-core/js/types/IntentionalAny.js'; -import Dimension2 from '../../../../dot/js/Dimension2.js'; +import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; +import NumberControl from '../../../../scenery-phet/js/NumberControl.js'; +import { Node, NodeOptions, Rectangle, Text, VBox, VBoxOptions } from '../../../../scenery/js/imports.js'; import Tandem from '../../../../tandem/js/Tandem.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; +import quadrilateral from '../../quadrilateral.js'; +import QuadrilateralModel from '../model/QuadrilateralModel.js'; // constants const TEXT_OPTIONS = { fontSize: 16 }; diff --git a/js/quadrilateral/view/QuadrilateralDescriber.ts b/js/quadrilateral/view/QuadrilateralDescriber.ts index 4394766..2b3beee 100644 --- a/js/quadrilateral/view/QuadrilateralDescriber.ts +++ b/js/quadrilateral/view/QuadrilateralDescriber.ts @@ -7,22 +7,22 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import { PDOMValueType } from '../../../../scenery/js/imports.js'; +import ResponsePacket from '../../../../utterance-queue/js/ResponsePacket.js'; import quadrilateral from '../../quadrilateral.js'; +import QuadrilateralConstants from '../../QuadrilateralConstants.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; -import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; -import QuadrilateralVertexLabel from '../model/QuadrilateralVertexLabel.js'; -import QuadrilateralVertexDescriber from './QuadrilateralVertexDescriber.js'; -import QuadrilateralSideDescriber from './QuadrilateralSideDescriber.js'; import QuadrilateralSideLabel from '../model/QuadrilateralSideLabel.js'; import QuadrilateralSidePair from '../model/QuadrilateralSidePair.js'; +import QuadrilateralVertexLabel from '../model/QuadrilateralVertexLabel.js'; import QuadrilateralVertexPair from '../model/QuadrilateralVertexPair.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import ResponsePacket from '../../../../utterance-queue/js/ResponsePacket.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import { PDOMValueType } from '../../../../scenery/js/imports.js'; +import QuadrilateralSideDescriber from './QuadrilateralSideDescriber.js'; +import QuadrilateralVertexDescriber from './QuadrilateralVertexDescriber.js'; // Alias for string types used in this sim - to support string Properties (dynamic locales), strings, and often // null values for functions. Even though Voicing and Interactive Description do not support dynamic locales, code diff --git a/js/quadrilateral/view/QuadrilateralDiagonalGuidesNode.ts b/js/quadrilateral/view/QuadrilateralDiagonalGuidesNode.ts index 864a0cd..279445e 100644 --- a/js/quadrilateral/view/QuadrilateralDiagonalGuidesNode.ts +++ b/js/quadrilateral/view/QuadrilateralDiagonalGuidesNode.ts @@ -7,19 +7,19 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import { Line, Node } from '../../../../scenery/js/imports.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import Multilink from '../../../../axon/js/Multilink.js'; import Ray2 from '../../../../dot/js/Ray2.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; import { Shape } from '../../../../kite/js/imports.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import { Line, Node } from '../../../../scenery/js/imports.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; -import QuadrilateralUtils from '../model/QuadrilateralUtils.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; +import QuadrilateralUtils from '../model/QuadrilateralUtils.js'; // constants const LINE_NODE_OPTIONS = { diff --git a/js/quadrilateral/view/QuadrilateralGridNode.ts b/js/quadrilateral/view/QuadrilateralGridNode.ts index 22aabc9..5a8ebd4 100644 --- a/js/quadrilateral/view/QuadrilateralGridNode.ts +++ b/js/quadrilateral/view/QuadrilateralGridNode.ts @@ -6,15 +6,15 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import { Node, Path, Rectangle } from '../../../../scenery/js/imports.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; +import { Shape } from '../../../../kite/js/imports.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import { Node, Path, Rectangle } from '../../../../scenery/js/imports.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import { Shape } from '../../../../kite/js/imports.js'; -import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; // constants const MAJOR_GRID_LINE_OPTIONS = { diff --git a/js/quadrilateral/view/QuadrilateralIconFactory.ts b/js/quadrilateral/view/QuadrilateralIconFactory.ts index b6f439d..6d8e49c 100644 --- a/js/quadrilateral/view/QuadrilateralIconFactory.ts +++ b/js/quadrilateral/view/QuadrilateralIconFactory.ts @@ -5,19 +5,19 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import { Circle, FlowBox, HBox, Line, Node, Path, PathOptions, Text, TextOptions } from '../../../../scenery/js/imports.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Matrix3 from '../../../../dot/js/Matrix3.js'; +import Ray2 from '../../../../dot/js/Ray2.js'; import Utils from '../../../../dot/js/Utils.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; +import { Line as ShapeLine, Shape } from '../../../../kite/js/imports.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import GridIcon from '../../../../scenery-phet/js/GridIcon.js'; +import { Circle, FlowBox, HBox, Line, Node, Path, PathOptions, Text, TextOptions } from '../../../../scenery/js/imports.js'; +import musicSolidShape from '../../../../sherpa/js/fontawesome-5/musicSolidShape.js'; import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralConstants from '../../QuadrilateralConstants.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; -import { Line as ShapeLine, Shape } from '../../../../kite/js/imports.js'; -import musicSolidShape from '../../../../sherpa/js/fontawesome-5/musicSolidShape.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; -import Ray2 from '../../../../dot/js/Ray2.js'; -import Matrix3 from '../../../../dot/js/Matrix3.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import QuadrilateralConstants from '../../QuadrilateralConstants.js'; class QuadrilateralIconFactory { diff --git a/js/quadrilateral/view/QuadrilateralInteractionCueNode.ts b/js/quadrilateral/view/QuadrilateralInteractionCueNode.ts index 8cec59f..6c4cc63 100644 --- a/js/quadrilateral/view/QuadrilateralInteractionCueNode.ts +++ b/js/quadrilateral/view/QuadrilateralInteractionCueNode.ts @@ -7,16 +7,16 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import { Path } from '../../../../scenery/js/imports.js'; +import Emitter from '../../../../axon/js/Emitter.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import { Line, Shape } from '../../../../kite/js/imports.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import { Path } from '../../../../scenery/js/imports.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import QuadrilateralSide from '../model/QuadrilateralSide.js'; -import { Line, Shape } from '../../../../kite/js/imports.js'; -import quadrilateral from '../../quadrilateral.js'; -import Emitter from '../../../../axon/js/Emitter.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; const PATH_OPTIONS = { stroke: QuadrilateralColors.interactionCueColorProperty, diff --git a/js/quadrilateral/view/QuadrilateralKeyboardHelpContent.ts b/js/quadrilateral/view/QuadrilateralKeyboardHelpContent.ts index 9fb4a5f..8cfedb4 100644 --- a/js/quadrilateral/view/QuadrilateralKeyboardHelpContent.ts +++ b/js/quadrilateral/view/QuadrilateralKeyboardHelpContent.ts @@ -6,10 +6,10 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; import BasicActionsKeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/BasicActionsKeyboardHelpSection.js'; -import TwoColumnKeyboardHelpContent from '../../../../scenery-phet/js/keyboard/help/TwoColumnKeyboardHelpContent.js'; import KeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSection.js'; +import TwoColumnKeyboardHelpContent from '../../../../scenery-phet/js/keyboard/help/TwoColumnKeyboardHelpContent.js'; +import quadrilateral from '../../quadrilateral.js'; import MoveShapeHelpSection from './MoveShapeHelpSection.js'; import ShapeShortcutsHelpSection from './ShapeShortcutsHelpSection.js'; diff --git a/js/quadrilateral/view/QuadrilateralModelViewTransform.ts b/js/quadrilateral/view/QuadrilateralModelViewTransform.ts index 66a787d..0a86544 100644 --- a/js/quadrilateral/view/QuadrilateralModelViewTransform.ts +++ b/js/quadrilateral/view/QuadrilateralModelViewTransform.ts @@ -8,11 +8,11 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import Bounds2 from '../../../../dot/js/Bounds2.js'; +import Dimension2 from '../../../../dot/js/Dimension2.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import quadrilateral from '../../quadrilateral.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import Dimension2 from '../../../../dot/js/Dimension2.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; // dimensions of the view space, relative to ScreenView layoutBounds const VIEW_DIMENSION = new Dimension2( 790, 530 ); diff --git a/js/quadrilateral/view/QuadrilateralMovableNode.ts b/js/quadrilateral/view/QuadrilateralMovableNode.ts index fca4323..61a92df 100644 --- a/js/quadrilateral/view/QuadrilateralMovableNode.ts +++ b/js/quadrilateral/view/QuadrilateralMovableNode.ts @@ -6,24 +6,24 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import { HotkeyData, KeyboardListener, Node, NodeOptions, PaintableNode, Voicing, VoicingOptions } from '../../../../scenery/js/imports.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import optionize from '../../../../phet-core/js/optionize.js'; -import QuadrilateralMovable from '../model/QuadrilateralMovable.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import { HotkeyData, KeyboardListener, Node, NodeOptions, PaintableNode, Voicing, VoicingOptions } from '../../../../scenery/js/imports.js'; import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js'; -import WrappedAudioBuffer from '../../../../tambo/js/WrappedAudioBuffer.js'; import soundManager from '../../../../tambo/js/soundManager.js'; +import WrappedAudioBuffer from '../../../../tambo/js/WrappedAudioBuffer.js'; +import Utterance from '../../../../utterance-queue/js/Utterance.js'; import quadShapeCollision_mp3 from '../../../sounds/quadShapeCollision_mp3.js'; +import quadrilateral from '../../quadrilateral.js'; +import QuadrilateralColors from '../../QuadrilateralColors.js'; +import QuadrilateralConstants from '../../QuadrilateralConstants.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; +import QuadrilateralMovable from '../model/QuadrilateralMovable.js'; import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; -import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import QuadrilateralColors from '../../QuadrilateralColors.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Utterance from '../../../../utterance-queue/js/Utterance.js'; -import Property from '../../../../axon/js/Property.js'; // constants const blockedByInnerShapeStringProperty = QuadrilateralStrings.a11y.voicing.blockedByInnerShapeStringProperty; diff --git a/js/quadrilateral/view/QuadrilateralNode.ts b/js/quadrilateral/view/QuadrilateralNode.ts index 4db40c8..b9579f1 100644 --- a/js/quadrilateral/view/QuadrilateralNode.ts +++ b/js/quadrilateral/view/QuadrilateralNode.ts @@ -6,26 +6,26 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import Multilink from '../../../../axon/js/Multilink.js'; +import Property from '../../../../axon/js/Property.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; +import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import TextKeyNode from '../../../../scenery-phet/js/keyboard/TextKeyNode.js'; import { HotkeyData, KeyboardListener, Node, NodeOptions, TPaint, Voicing, VoicingOptions } from '../../../../scenery/js/imports.js'; import quadrilateral from '../../quadrilateral.js'; +import QuadrilateralColors from '../../QuadrilateralColors.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; -import QuadrilateralSideNode from './QuadrilateralSideNode.js'; -import QuadrilateralVertexNode from './QuadrilateralVertexNode.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import QuadrilateralModel from '../model/QuadrilateralModel.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import CornerGuideNode from './CornerGuideNode.js'; -import QuadrilateralColors from '../../QuadrilateralColors.js'; -import RightAngleIndicatorNode from './RightAngleIndicatorNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import QuadrilateralDescriber from './QuadrilateralDescriber.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import Multilink from '../../../../axon/js/Multilink.js'; -import Property from '../../../../axon/js/Property.js'; -import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; -import TextKeyNode from '../../../../scenery-phet/js/keyboard/TextKeyNode.js'; +import QuadrilateralSideNode from './QuadrilateralSideNode.js'; +import QuadrilateralVertexNode from './QuadrilateralVertexNode.js'; +import RightAngleIndicatorNode from './RightAngleIndicatorNode.js'; // constants const cornerAStringProperty = QuadrilateralStrings.a11y.cornerAStringProperty; diff --git a/js/quadrilateral/view/QuadrilateralScreenView.ts b/js/quadrilateral/view/QuadrilateralScreenView.ts index 5457321..48b40df 100644 --- a/js/quadrilateral/view/QuadrilateralScreenView.ts +++ b/js/quadrilateral/view/QuadrilateralScreenView.ts @@ -11,37 +11,37 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import Vector2 from '../../../../dot/js/Vector2.js'; import ScreenView from '../../../../joist/js/ScreenView.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js'; +import { VBox } from '../../../../scenery/js/imports.js'; import Tandem from '../../../../tandem/js/Tandem.js'; -import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import MediaPipeQueryParameters from '../../../../tangible/js/mediaPipe/MediaPipeQueryParameters.js'; +import { SpeakableResolvedResponse } from '../../../../utterance-queue/js/ResponsePacket.js'; import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralModel from '../model/QuadrilateralModel.js'; -import { VBox } from '../../../../scenery/js/imports.js'; -import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; -import QuadrilateralNode from './QuadrilateralNode.js'; -import QuadrilateralSoundView from './sound/QuadrilateralSoundView.js'; +import QuadrilateralConstants from '../../QuadrilateralConstants.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; -import QuadrilateralDescriber from './QuadrilateralDescriber.js'; -import QuadrilateralDebuggingPanel from './QuadrilateralDebuggingPanel.js'; -import QuadrilateralVisibilityControls from './QuadrilateralVisibilityControls.js'; -import QuadrilateralGridNode from './QuadrilateralGridNode.js'; -import QuadrilateralAlerter from './QuadrilateralAlerter.js'; +import QuadrilateralModel from '../model/QuadrilateralModel.js'; import QuadrilateralOptionsModel from '../model/QuadrilateralOptionsModel.js'; +import QuadrilateralQueryParameters from '../QuadrilateralQueryParameters.js'; import QuadrilateralMediaPipe from './prototype/QuadrilateralMediaPipe.js'; +import QuadrilateralTangibleController from './prototype/QuadrilateralTangibleController.js'; +import QuadrilateralTangibleControls from './prototype/QuadrilateralTangibleControls.js'; +import QuadrilateralAlerter from './QuadrilateralAlerter.js'; +import QuadrilateralDebuggingPanel from './QuadrilateralDebuggingPanel.js'; +import QuadrilateralDescriber from './QuadrilateralDescriber.js'; import QuadrilateralDiagonalGuidesNode from './QuadrilateralDiagonalGuidesNode.js'; -import QuadrilateralShapeNameDisplay from './QuadrilateralShapeNameDisplay.js'; -import MediaPipeQueryParameters from '../../../../tangible/js/mediaPipe/MediaPipeQueryParameters.js'; +import QuadrilateralGridNode from './QuadrilateralGridNode.js'; import QuadrilateralInteractionCueNode from './QuadrilateralInteractionCueNode.js'; +import QuadrilateralModelViewTransform from './QuadrilateralModelViewTransform.js'; +import QuadrilateralNode from './QuadrilateralNode.js'; +import QuadrilateralShapeNameDisplay from './QuadrilateralShapeNameDisplay.js'; +import QuadrilateralVisibilityControls from './QuadrilateralVisibilityControls.js'; import ResetShapeButton from './ResetShapeButton.js'; import ShapeSoundsCheckbox from './ShapeSoundsCheckbox.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; import SmallStepsLockToggleButton from './SmallStepsLockToggleButton.js'; -import QuadrilateralTangibleControls from './prototype/QuadrilateralTangibleControls.js'; -import QuadrilateralModelViewTransform from './QuadrilateralModelViewTransform.js'; -import QuadrilateralTangibleController from './prototype/QuadrilateralTangibleController.js'; -import { SpeakableResolvedResponse } from '../../../../utterance-queue/js/ResponsePacket.js'; +import QuadrilateralSoundView from './sound/QuadrilateralSoundView.js'; export default class QuadrilateralScreenView extends ScreenView { private readonly model: QuadrilateralModel; diff --git a/js/quadrilateral/view/QuadrilateralShapeNameDisplay.ts b/js/quadrilateral/view/QuadrilateralShapeNameDisplay.ts index 72d792a..ee4f640 100644 --- a/js/quadrilateral/view/QuadrilateralShapeNameDisplay.ts +++ b/js/quadrilateral/view/QuadrilateralShapeNameDisplay.ts @@ -7,19 +7,19 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import { Node, Rectangle, VoicingText, VoicingTextOptions } from '../../../../scenery/js/imports.js'; import ExpandCollapseButton from '../../../../sun/js/ExpandCollapseButton.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import quadrilateral from '../../quadrilateral.js'; -import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; +import QuadrilateralColors from '../../QuadrilateralColors.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import Multilink from '../../../../axon/js/Multilink.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; -import QuadrilateralColors from '../../QuadrilateralColors.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; +import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; import QuadrilateralDescriber from './QuadrilateralDescriber.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; // constants const squareStringProperty = QuadrilateralStrings.shapeNames.squareStringProperty; diff --git a/js/quadrilateral/view/QuadrilateralSideDescriber.ts b/js/quadrilateral/view/QuadrilateralSideDescriber.ts index 483d8ab..d5798c5 100644 --- a/js/quadrilateral/view/QuadrilateralSideDescriber.ts +++ b/js/quadrilateral/view/QuadrilateralSideDescriber.ts @@ -6,15 +6,15 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralSide from '../model/QuadrilateralSide.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Range from '../../../../dot/js/Range.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; +import QuadrilateralSide from '../model/QuadrilateralSide.js'; import { NullableQuadrilateralStringType } from './QuadrilateralDescriber.js'; // constants diff --git a/js/quadrilateral/view/QuadrilateralSideNode.ts b/js/quadrilateral/view/QuadrilateralSideNode.ts index 001e5e9..eb9578d 100644 --- a/js/quadrilateral/view/QuadrilateralSideNode.ts +++ b/js/quadrilateral/view/QuadrilateralSideNode.ts @@ -6,22 +6,22 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import Multilink from '../../../../axon/js/Multilink.js'; +import Bounds2 from '../../../../dot/js/Bounds2.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; +import { Line, Shape } from '../../../../kite/js/imports.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import { Line as LineNode, Path, RichDragListener, SceneryEvent } from '../../../../scenery/js/imports.js'; +import release_mp3 from '../../../../tambo/sounds/release_mp3.js'; import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralSide from '../model/QuadrilateralSide.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; -import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from '../model/QuadrilateralShapeModel.js'; import QuadrilateralModel from '../model/QuadrilateralModel.js'; -import { Line, Shape } from '../../../../kite/js/imports.js'; +import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from '../model/QuadrilateralShapeModel.js'; +import QuadrilateralSide from '../model/QuadrilateralSide.js'; +import QuadrilateralMovableNode, { QuadrilateralMovableNodeOptions } from './QuadrilateralMovableNode.js'; import QuadrilateralSideDescriber from './QuadrilateralSideDescriber.js'; -import Multilink from '../../../../axon/js/Multilink.js'; -import release_mp3 from '../../../../tambo/sounds/release_mp3.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; import SideTicksNode from './SideTicksNode.js'; -import QuadrilateralMovableNode, { QuadrilateralMovableNodeOptions } from './QuadrilateralMovableNode.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; // The dilation around side shapes when drawing the focus highlight. const FOCUS_HIGHLIGHT_DILATION = 15; diff --git a/js/quadrilateral/view/QuadrilateralVertexDescriber.ts b/js/quadrilateral/view/QuadrilateralVertexDescriber.ts index b8f1386..e209e07 100644 --- a/js/quadrilateral/view/QuadrilateralVertexDescriber.ts +++ b/js/quadrilateral/view/QuadrilateralVertexDescriber.ts @@ -6,17 +6,17 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Range from '../../../../dot/js/Range.js'; import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; +import { PDOMValueType } from '../../../../scenery/js/imports.js'; import quadrilateral from '../../quadrilateral.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; +import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; import QuadrilateralVertexLabel from '../model/QuadrilateralVertexLabel.js'; -import Range from '../../../../dot/js/Range.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import CornerGuideNode from './CornerGuideNode.js'; -import NamedQuadrilateral from '../model/NamedQuadrilateral.js'; -import { PDOMValueType } from '../../../../scenery/js/imports.js'; // constants const cornerAStringProperty = QuadrilateralStrings.a11y.cornerAStringProperty; diff --git a/js/quadrilateral/view/QuadrilateralVertexNode.ts b/js/quadrilateral/view/QuadrilateralVertexNode.ts index 7cf2c83..9eee880 100644 --- a/js/quadrilateral/view/QuadrilateralVertexNode.ts +++ b/js/quadrilateral/view/QuadrilateralVertexNode.ts @@ -6,25 +6,25 @@ * @author Jesse Greenberg */ -import { Circle, DragListener, Path, RichDragListener, SceneryEvent, Text } from '../../../../scenery/js/imports.js'; -import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Vector2 from '../../../../dot/js/Vector2.js'; -import QuadrilateralModel from '../model/QuadrilateralModel.js'; -import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; -import QuadrilateralVertexDescriber from './QuadrilateralVertexDescriber.js'; import { Shape } from '../../../../kite/js/imports.js'; -import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; +import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; +import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; +import { Circle, DragListener, Path, RichDragListener, SceneryEvent, Text } from '../../../../scenery/js/imports.js'; import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js'; -import grabHighPitch_mp3 from '../../../sounds/grabHighPitch_mp3.js'; -import boundaryReached_mp3 from '../../../../tambo/sounds/boundaryReached_mp3.js'; import soundManager from '../../../../tambo/js/soundManager.js'; +import boundaryReached_mp3 from '../../../../tambo/sounds/boundaryReached_mp3.js'; +import grabHighPitch_mp3 from '../../../sounds/grabHighPitch_mp3.js'; import quadrilateral from '../../quadrilateral.js'; -import QuadrilateralMovableNode, { QuadrilateralMovableNodeOptions } from './QuadrilateralMovableNode.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralModel from '../model/QuadrilateralModel.js'; import { VertexLabelToProposedPositionMap } from '../model/QuadrilateralShapeModel.js'; +import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; +import QuadrilateralMovableNode, { QuadrilateralMovableNodeOptions } from './QuadrilateralMovableNode.js'; +import QuadrilateralVertexDescriber from './QuadrilateralVertexDescriber.js'; // constants const LABEL_TEXT_FONT = new PhetFont( { size: 16, weight: 'bold' } ); diff --git a/js/quadrilateral/view/QuadrilateralVisibilityControls.ts b/js/quadrilateral/view/QuadrilateralVisibilityControls.ts index d89b423..9bbf842 100644 --- a/js/quadrilateral/view/QuadrilateralVisibilityControls.ts +++ b/js/quadrilateral/view/QuadrilateralVisibilityControls.ts @@ -6,16 +6,16 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import { VBox, VBoxOptions } from '../../../../scenery/js/imports.js'; -import quadrilateral from '../../quadrilateral.js'; import Checkbox from '../../../../sun/js/Checkbox.js'; -import QuadrilateralStrings from '../../QuadrilateralStrings.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import QuadrilateralIconFactory from './QuadrilateralIconFactory.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; +import QuadrilateralStrings from '../../QuadrilateralStrings.js'; import QuadrilateralVisibilityModel from '../model/QuadrilateralVisibilityModel.js'; +import QuadrilateralIconFactory from './QuadrilateralIconFactory.js'; type SelfOptions = EmptySelfOptions; type QuadrilateralVisibilityControlsOptions = SelfOptions & StrictOmit & PickRequired; diff --git a/js/quadrilateral/view/ResetShapeButton.ts b/js/quadrilateral/view/ResetShapeButton.ts index 03213fe..1f6a391 100644 --- a/js/quadrilateral/view/ResetShapeButton.ts +++ b/js/quadrilateral/view/ResetShapeButton.ts @@ -8,9 +8,9 @@ import TextPushButton from '../../../../sun/js/buttons/TextPushButton.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import quadrilateral from '../../quadrilateral.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; import QuadrilateralDescriber from './QuadrilateralDescriber.js'; diff --git a/js/quadrilateral/view/RightAngleIndicatorNode.ts b/js/quadrilateral/view/RightAngleIndicatorNode.ts index 390fcfa..1e6e449 100644 --- a/js/quadrilateral/view/RightAngleIndicatorNode.ts +++ b/js/quadrilateral/view/RightAngleIndicatorNode.ts @@ -6,14 +6,14 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import { Path } from '../../../../scenery/js/imports.js'; -import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; -import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import { Line, Shape } from '../../../../kite/js/imports.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import QuadrilateralColors from '../../QuadrilateralColors.js'; +import { Path } from '../../../../scenery/js/imports.js'; import quadrilateral from '../../quadrilateral.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import QuadrilateralColors from '../../QuadrilateralColors.js'; +import QuadrilateralShapeModel from '../model/QuadrilateralShapeModel.js'; +import QuadrilateralVertex from '../model/QuadrilateralVertex.js'; // in model coordinates, length of a side of the indicator from the edge of a line between two vertices const SIDE_LENGTH = 0.12; diff --git a/js/quadrilateral/view/ShapeShortcutsHelpSection.ts b/js/quadrilateral/view/ShapeShortcutsHelpSection.ts index b70535e..50d67c1 100644 --- a/js/quadrilateral/view/ShapeShortcutsHelpSection.ts +++ b/js/quadrilateral/view/ShapeShortcutsHelpSection.ts @@ -7,13 +7,13 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import localeProperty from '../../../../joist/js/i18n/localeProperty.js'; import KeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSection.js'; import KeyboardHelpSectionRow from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSectionRow.js'; +import { voicingManager } from '../../../../scenery/js/imports.js'; import quadrilateral from '../../quadrilateral.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; import QuadrilateralKeyboardHelpContent from './QuadrilateralKeyboardHelpContent.js'; -import { voicingManager } from '../../../../scenery/js/imports.js'; -import localeProperty from '../../../../joist/js/i18n/localeProperty.js'; import QuadrilateralNode from './QuadrilateralNode.js'; export default class ShapeShortcutsHelpSection extends KeyboardHelpSection { diff --git a/js/quadrilateral/view/SideTicksNode.ts b/js/quadrilateral/view/SideTicksNode.ts index 63e5955..a99c52d 100644 --- a/js/quadrilateral/view/SideTicksNode.ts +++ b/js/quadrilateral/view/SideTicksNode.ts @@ -6,13 +6,13 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../quadrilateral.js'; -import { Path } from '../../../../scenery/js/imports.js'; -import QuadrilateralSide from '../model/QuadrilateralSide.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; import { Line, Shape } from '../../../../kite/js/imports.js'; -import QuadrilateralColors from '../../QuadrilateralColors.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; +import { Path } from '../../../../scenery/js/imports.js'; +import quadrilateral from '../../quadrilateral.js'; +import QuadrilateralColors from '../../QuadrilateralColors.js'; +import QuadrilateralSide from '../model/QuadrilateralSide.js'; const TICKS_PER_SEGMENT = 4; diff --git a/js/quadrilateral/view/SmallStepsLockToggleButton.ts b/js/quadrilateral/view/SmallStepsLockToggleButton.ts index 4338ef6..e6f0670 100644 --- a/js/quadrilateral/view/SmallStepsLockToggleButton.ts +++ b/js/quadrilateral/view/SmallStepsLockToggleButton.ts @@ -7,14 +7,14 @@ */ import Property from '../../../../axon/js/Property.js'; -import quadrilateral from '../../quadrilateral.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import LockNode from '../../../../scenery-phet/js/LockNode.js'; -import RectangularToggleButton, { RectangularToggleButtonOptions } from '../../../../sun/js/buttons/RectangularToggleButton.js'; import { Node, Text } from '../../../../scenery/js/imports.js'; +import RectangularToggleButton, { RectangularToggleButtonOptions } from '../../../../sun/js/buttons/RectangularToggleButton.js'; +import quadrilateral from '../../quadrilateral.js'; import QuadrilateralColors from '../../QuadrilateralColors.js'; import QuadrilateralConstants from '../../QuadrilateralConstants.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import QuadrilateralStrings from '../../QuadrilateralStrings.js'; // constants diff --git a/js/quadrilateral/view/prototype/QuadrilateralBluetoothConnectionButton.ts b/js/quadrilateral/view/prototype/QuadrilateralBluetoothConnectionButton.ts index 07ee307..59119b7 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralBluetoothConnectionButton.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralBluetoothConnectionButton.ts @@ -1,5 +1,10 @@ // Copyright 2022-2024, University of Colorado Boulder +import Emitter from '../../../../../axon/js/Emitter.js'; +import stepTimer from '../../../../../axon/js/stepTimer.js'; +import Utils from '../../../../../dot/js/Utils.js'; +import IntentionalAny from '../../../../../phet-core/js/types/IntentionalAny.js'; +import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js'; /** * To test connecting to a bluetooth device using web bluetooth. This code was written in collaboration with Scott * Lambert from SLU, who built the tangible hardware and bluetooth device. @@ -15,13 +20,8 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ import quadrilateral from '../../../quadrilateral.js'; -import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js'; -import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; -import Utils from '../../../../../dot/js/Utils.js'; -import Emitter from '../../../../../axon/js/Emitter.js'; -import stepTimer from '../../../../../axon/js/stepTimer.js'; -import IntentionalAny from '../../../../../phet-core/js/types/IntentionalAny.js'; import QuadrilateralColors from '../../../QuadrilateralColors.js'; +import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; import QuadrilateralTangibleController from './QuadrilateralTangibleController.js'; diff --git a/js/quadrilateral/view/prototype/QuadrilateralCalibrationContentNode.ts b/js/quadrilateral/view/prototype/QuadrilateralCalibrationContentNode.ts index 766fd5c..1a35bbd 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralCalibrationContentNode.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralCalibrationContentNode.ts @@ -11,9 +11,9 @@ import Bounds2 from '../../../../../dot/js/Bounds2.js'; import Utils from '../../../../../dot/js/Utils.js'; -import quadrilateral from '../../../quadrilateral.js'; -import { Circle, Line, Rectangle, Text, VBox, VBoxOptions } from '../../../../../scenery/js/imports.js'; import optionize, { EmptySelfOptions } from '../../../../../phet-core/js/optionize.js'; +import { Circle, Line, Rectangle, Text, VBox, VBoxOptions } from '../../../../../scenery/js/imports.js'; +import quadrilateral from '../../../quadrilateral.js'; import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; diff --git a/js/quadrilateral/view/prototype/QuadrilateralInputPreferencesNode.ts b/js/quadrilateral/view/prototype/QuadrilateralInputPreferencesNode.ts index 618f0d4..54c8760 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralInputPreferencesNode.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralInputPreferencesNode.ts @@ -6,19 +6,19 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../../quadrilateral.js'; -import NumberControl, { NumberControlOptions, NumberControlSliderOptions } from '../../../../../scenery-phet/js/NumberControl.js'; import NumberProperty from '../../../../../axon/js/NumberProperty.js'; +import JoistStrings from '../../../../../joist/js/JoistStrings.js'; +import PreferencesDialog from '../../../../../joist/js/preferences/PreferencesDialog.js'; import optionize, { combineOptions } from '../../../../../phet-core/js/optionize.js'; -import Tandem from '../../../../../tandem/js/Tandem.js'; +import StrictOmit from '../../../../../phet-core/js/types/StrictOmit.js'; +import StringUtils from '../../../../../phetcommon/js/util/StringUtils.js'; +import NumberControl, { NumberControlOptions, NumberControlSliderOptions } from '../../../../../scenery-phet/js/NumberControl.js'; +import PhetFont from '../../../../../scenery-phet/js/PhetFont.js'; import { Node, Text, TextOptions, VBox, VoicingRichText, VoicingRichTextOptions } from '../../../../../scenery/js/imports.js'; -import PreferencesDialog from '../../../../../joist/js/preferences/PreferencesDialog.js'; -import QuadrilateralTangibleOptionsModel from '../../model/prototype/QuadrilateralTangibleOptionsModel.js'; +import Tandem from '../../../../../tandem/js/Tandem.js'; import MediaPipe from '../../../../../tangible/js/mediaPipe/MediaPipe.js'; -import PhetFont from '../../../../../scenery-phet/js/PhetFont.js'; -import JoistStrings from '../../../../../joist/js/JoistStrings.js'; -import StringUtils from '../../../../../phetcommon/js/util/StringUtils.js'; -import StrictOmit from '../../../../../phet-core/js/types/StrictOmit.js'; +import quadrilateral from '../../../quadrilateral.js'; +import QuadrilateralTangibleOptionsModel from '../../model/prototype/QuadrilateralTangibleOptionsModel.js'; // Strings for the content - this is a prototype so it is not translatable yet. const mediaPipeFeatureDescriptionString = 'Use custom hand gestures and movements to control objects in the sim. Please see the Teacher Tips for specific gestures, movements, and object mappings.'; diff --git a/js/quadrilateral/view/prototype/QuadrilateralMediaPipe.ts b/js/quadrilateral/view/prototype/QuadrilateralMediaPipe.ts index 525cc47..378db81 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralMediaPipe.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralMediaPipe.ts @@ -17,14 +17,14 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../../quadrilateral.js'; +import Vector2 from '../../../../../dot/js/Vector2.js'; import MediaPipe, { HandLandmarks } from '../../../../../tangible/js/mediaPipe/MediaPipe.js'; +import MediaPipeQueryParameters from '../../../../../tangible/js/mediaPipe/MediaPipeQueryParameters.js'; +import quadrilateral from '../../../quadrilateral.js'; import QuadrilateralModel from '../../model/QuadrilateralModel.js'; -import Vector2 from '../../../../../dot/js/Vector2.js'; import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from '../../model/QuadrilateralShapeModel.js'; -import MediaPipeQueryParameters from '../../../../../tangible/js/mediaPipe/MediaPipeQueryParameters.js'; -import QuadrilateralTangibleController from './QuadrilateralTangibleController.js'; import QuadrilateralVertexLabel from '../../model/QuadrilateralVertexLabel.js'; +import QuadrilateralTangibleController from './QuadrilateralTangibleController.js'; // aspect ratio of the video stream to map camera coordinates to sim model coordinates const streamDimension2 = MediaPipe.videoStreamDimension2; diff --git a/js/quadrilateral/view/prototype/QuadrilateralSerialConnectionButton.ts b/js/quadrilateral/view/prototype/QuadrilateralSerialConnectionButton.ts index 0105875..3c4b421 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralSerialConnectionButton.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralSerialConnectionButton.ts @@ -10,9 +10,9 @@ */ import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js'; +import quadrilateral from '../../../quadrilateral.js'; import QuadrilateralColors from '../../../QuadrilateralColors.js'; import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; -import quadrilateral from '../../../quadrilateral.js'; import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; import QuadrilateralSerialMessageSender from './QuadrilateralSerialMessageSender.js'; diff --git a/js/quadrilateral/view/prototype/QuadrilateralSerialMessageSender.ts b/js/quadrilateral/view/prototype/QuadrilateralSerialMessageSender.ts index 6ae3a2d..913d33a 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralSerialMessageSender.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralSerialMessageSender.ts @@ -20,8 +20,8 @@ import Utils from '../../../../../dot/js/Utils.js'; import quadrilateral from '../../../quadrilateral.js'; -import QuadrilateralShapeModel from '../../model/QuadrilateralShapeModel.js'; import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; +import QuadrilateralShapeModel from '../../model/QuadrilateralShapeModel.js'; export default class QuadrilateralSerialMessageSender { private readonly shapeModel: QuadrilateralShapeModel; diff --git a/js/quadrilateral/view/prototype/QuadrilateralTangibleController.ts b/js/quadrilateral/view/prototype/QuadrilateralTangibleController.ts index bf0d79d..bb39a4b 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralTangibleController.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralTangibleController.ts @@ -6,14 +6,14 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import LinearFunction from '../../../../../dot/js/LinearFunction.js'; import Vector2 from '../../../../../dot/js/Vector2.js'; import quadrilateral from '../../../quadrilateral.js'; +import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; +import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; import QuadrilateralModel from '../../model/QuadrilateralModel.js'; import QuadrilateralShapeModel, { VertexLabelToProposedPositionMap } from '../../model/QuadrilateralShapeModel.js'; import QuadrilateralUtils from '../../model/QuadrilateralUtils.js'; -import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; -import LinearFunction from '../../../../../dot/js/LinearFunction.js'; -import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; export default class QuadrilateralTangibleController { private readonly quadrilateralModel: QuadrilateralModel; diff --git a/js/quadrilateral/view/prototype/QuadrilateralTangibleControls.ts b/js/quadrilateral/view/prototype/QuadrilateralTangibleControls.ts index 5b41061..635c7b2 100644 --- a/js/quadrilateral/view/prototype/QuadrilateralTangibleControls.ts +++ b/js/quadrilateral/view/prototype/QuadrilateralTangibleControls.ts @@ -11,17 +11,17 @@ */ import { Text, VBox } from '../../../../../scenery/js/imports.js'; +import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js'; +import Dialog from '../../../../../sun/js/Dialog.js'; +import Tandem from '../../../../../tandem/js/Tandem.js'; import quadrilateral from '../../../quadrilateral.js'; +import QuadrilateralColors from '../../../QuadrilateralColors.js'; import QuadrilateralConstants from '../../../QuadrilateralConstants.js'; import TangibleConnectionModel from '../../model/prototype/TangibleConnectionModel.js'; -import QuadrilateralCalibrationContentNode from './QuadrilateralCalibrationContentNode.js'; -import Dialog from '../../../../../sun/js/Dialog.js'; -import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js'; -import QuadrilateralColors from '../../../QuadrilateralColors.js'; import QuadrilateralQueryParameters from '../../QuadrilateralQueryParameters.js'; import QuadrilateralBluetoothConnectionButton from './QuadrilateralBluetoothConnectionButton.js'; +import QuadrilateralCalibrationContentNode from './QuadrilateralCalibrationContentNode.js'; import QuadrilateralSerialConnectionButton from './QuadrilateralSerialConnectionButton.js'; -import Tandem from '../../../../../tandem/js/Tandem.js'; import QuadrilateralTangibleController from './QuadrilateralTangibleController.js'; export default class QuadrilateralTangibleControls extends VBox { diff --git a/js/quadrilateral/view/sound/EmphasisTracksSoundView.ts b/js/quadrilateral/view/sound/EmphasisTracksSoundView.ts index 10e1ee2..4b499ac 100644 --- a/js/quadrilateral/view/sound/EmphasisTracksSoundView.ts +++ b/js/quadrilateral/view/sound/EmphasisTracksSoundView.ts @@ -10,22 +10,22 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../../quadrilateral.js'; -import TracksSoundView from './TracksSoundView.js'; +import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; import quadTrackBackgroundRhythmComplex_mp3 from '../../../../sounds/quadTrackBackgroundRhythmComplex_mp3.js'; -import quadTrackLowAscendingFourNotes_mp3 from '../../../../sounds/quadTrackLowAscendingFourNotes_mp3.js'; -import quadTrackHighTonesAmbient_mp3 from '../../../../sounds/quadTrackHighTonesAmbient_mp3.js'; -import quadTrackHighDescendingPingRepeats_mp3 from '../../../../sounds/quadTrackHighDescendingPingRepeats_mp3.js'; +import quadTrackBackgroundRhythmInverted_mp3 from '../../../../sounds/quadTrackBackgroundRhythmInverted_mp3.js'; import quadTrackHighBellsFallAndRise_mp3 from '../../../../sounds/quadTrackHighBellsFallAndRise_mp3.js'; -import quadTrackLowPunctualBoops_mp3 from '../../../../sounds/quadTrackLowPunctualBoops_mp3.js'; -import quadTrackLowDistortedTonalRhythm_mp3 from '../../../../sounds/quadTrackLowDistortedTonalRhythm_mp3.js'; +import quadTrackHighDescendingPingRepeats_mp3 from '../../../../sounds/quadTrackHighDescendingPingRepeats_mp3.js'; import quadTrackHighRepeatedMonotoneRinging_mp3 from '../../../../sounds/quadTrackHighRepeatedMonotoneRinging_mp3.js'; -import quadTrackBackgroundRhythmInverted_mp3 from '../../../../sounds/quadTrackBackgroundRhythmInverted_mp3.js'; +import quadTrackHighTonesAmbient_mp3 from '../../../../sounds/quadTrackHighTonesAmbient_mp3.js'; +import quadTrackLowAscendingFourNotes_mp3 from '../../../../sounds/quadTrackLowAscendingFourNotes_mp3.js'; +import quadTrackLowDistortedTonalRhythm_mp3 from '../../../../sounds/quadTrackLowDistortedTonalRhythm_mp3.js'; +import quadTrackLowPunctualBoops_mp3 from '../../../../sounds/quadTrackLowPunctualBoops_mp3.js'; import quadTrackLowPunctualBoopsSparse_mp3 from '../../../../sounds/quadTrackLowPunctualBoopsSparse_mp3.js'; -import QuadrilateralShapeModel from '../../model/QuadrilateralShapeModel.js'; -import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; +import quadrilateral from '../../../quadrilateral.js'; import NamedQuadrilateral from '../../model/NamedQuadrilateral.js'; +import QuadrilateralShapeModel from '../../model/QuadrilateralShapeModel.js'; import QuadrilateralSoundOptionsModel from '../../model/QuadrilateralSoundOptionsModel.js'; +import TracksSoundView from './TracksSoundView.js'; // default output level for sound clips that are playing in the background behind the louder emphasized sound const DEFAULT_BACKGROUND_OUTPUT_LEVEL = 0.15; diff --git a/js/quadrilateral/view/sound/LayersTracksSoundView.ts b/js/quadrilateral/view/sound/LayersTracksSoundView.ts index 822193d..8b182a2 100644 --- a/js/quadrilateral/view/sound/LayersTracksSoundView.ts +++ b/js/quadrilateral/view/sound/LayersTracksSoundView.ts @@ -12,21 +12,21 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ -import quadrilateral from '../../../quadrilateral.js'; -import TracksSoundView from './TracksSoundView.js'; -import quadTrackLowAscendingFourNotes_mp3 from '../../../../sounds/quadTrackLowAscendingFourNotes_mp3.js'; -import quadTrackHighDescendingPingRepeats_mp3 from '../../../../sounds/quadTrackHighDescendingPingRepeats_mp3.js'; -import quadTrackHighBellsFallAndRise_mp3 from '../../../../sounds/quadTrackHighBellsFallAndRise_mp3.js'; -import quadTrackLowPunctualBoops_mp3 from '../../../../sounds/quadTrackLowPunctualBoops_mp3.js'; -import quadTrackBackgroundRhythmSimple_mp3 from '../../../../sounds/quadTrackBackgroundRhythmSimple_mp3.js'; +import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; import quadTrackBackgroundRhythmInverted_mp3 from '../../../../sounds/quadTrackBackgroundRhythmInverted_mp3.js'; -import quadTrackLowDistortedTonalRhythm_mp3 from '../../../../sounds/quadTrackLowDistortedTonalRhythm_mp3.js'; +import quadTrackBackgroundRhythmSimple_mp3 from '../../../../sounds/quadTrackBackgroundRhythmSimple_mp3.js'; +import quadTrackHighBellsFallAndRise_mp3 from '../../../../sounds/quadTrackHighBellsFallAndRise_mp3.js'; import quadTrackHighBellsShortLoop_mp3 from '../../../../sounds/quadTrackHighBellsShortLoop_mp3.js'; -import QuadrilateralShapeModel from '../../model/QuadrilateralShapeModel.js'; -import TReadOnlyProperty from '../../../../../axon/js/TReadOnlyProperty.js'; +import quadTrackHighDescendingPingRepeats_mp3 from '../../../../sounds/quadTrackHighDescendingPingRepeats_mp3.js'; +import quadTrackLowAscendingFourNotes_mp3 from '../../../../sounds/quadTrackLowAscendingFourNotes_mp3.js'; +import quadTrackLowDistortedTonalRhythm_mp3 from '../../../../sounds/quadTrackLowDistortedTonalRhythm_mp3.js'; +import quadTrackLowPunctualBoops_mp3 from '../../../../sounds/quadTrackLowPunctualBoops_mp3.js'; +import quadrilateral from '../../../quadrilateral.js'; import NamedQuadrilateral from '../../model/NamedQuadrilateral.js'; +import QuadrilateralShapeModel from '../../model/QuadrilateralShapeModel.js'; import QuadrilateralSoundOptionsModel from '../../model/QuadrilateralSoundOptionsModel.js'; import QuadrilateralQueryParameters from '../../QuadrilateralQueryParameters.js'; +import TracksSoundView from './TracksSoundView.js'; // All the sounds played in this sound design. const LAYER_TRACKS = [ diff --git a/js/quadrilateral/view/sound/QuadrilateralSoundOptionsNode.ts b/js/quadrilateral/view/sound/QuadrilateralSoundOptionsNode.ts index 1860e88..64edfd7 100644 --- a/js/quadrilateral/view/sound/QuadrilateralSoundOptionsNode.ts +++ b/js/quadrilateral/view/sound/QuadrilateralSoundOptionsNode.ts @@ -6,21 +6,21 @@ * @author Jesse Greenberg (PhET Interactive Simulations) */ +import PatternStringProperty from '../../../../../axon/js/PatternStringProperty.js'; +import JoistStrings from '../../../../../joist/js/JoistStrings.js'; +import PreferencesControl from '../../../../../joist/js/preferences/PreferencesControl.js'; +import PreferencesDialog from '../../../../../joist/js/preferences/PreferencesDialog.js'; +import PreferencesDialogConstants from '../../../../../joist/js/preferences/PreferencesDialogConstants.js'; +import PreferencesPanelSection from '../../../../../joist/js/preferences/PreferencesPanelSection.js'; +import { combineOptions } from '../../../../../phet-core/js/optionize.js'; import { Node, Text, TextOptions, VoicingText, VoicingTextOptions } from '../../../../../scenery/js/imports.js'; +import AquaRadioButtonGroup from '../../../../../sun/js/AquaRadioButtonGroup.js'; +import ToggleSwitch, { ToggleSwitchOptions } from '../../../../../sun/js/ToggleSwitch.js'; +import soundManager from '../../../../../tambo/js/soundManager.js'; import Tandem from '../../../../../tandem/js/Tandem.js'; import quadrilateral from '../../../quadrilateral.js'; -import QuadrilateralSoundOptionsModel, { SoundDesign } from '../../model/QuadrilateralSoundOptionsModel.js'; -import PreferencesDialog from '../../../../../joist/js/preferences/PreferencesDialog.js'; -import AquaRadioButtonGroup from '../../../../../sun/js/AquaRadioButtonGroup.js'; -import PreferencesPanelSection from '../../../../../joist/js/preferences/PreferencesPanelSection.js'; import QuadrilateralStrings from '../../../QuadrilateralStrings.js'; -import soundManager from '../../../../../tambo/js/soundManager.js'; -import ToggleSwitch, { ToggleSwitchOptions } from '../../../../../sun/js/ToggleSwitch.js'; -import PreferencesDialogConstants from '../../../../../joist/js/preferences/PreferencesDialogConstants.js'; -import PreferencesControl from '../../../../../joist/js/preferences/PreferencesControl.js'; -import { combineOptions } from '../../../../../phet-core/js/optionize.js'; -import PatternStringProperty from '../../../../../axon/js/PatternStringProperty.js'; -import JoistStrings from '../../../../../joist/js/JoistStrings.js'; +import QuadrilateralSoundOptionsModel, { SoundDesign } from '../../model/QuadrilateralSoundOptionsModel.js'; // constants const shapeSoundsOptionsStringProperty = QuadrilateralStrings.preferencesDialog.shapeSoundOptionsStringProperty; diff --git a/js/quadrilateral/view/sound/QuadrilateralSoundView.ts b/js/quadrilateral/view/sound/QuadrilateralSoundView.ts index 7aa2964..213a2ad 100644 --- a/js/quadrilateral/view/sound/QuadrilateralSoundView.ts +++ b/js/quadrilateral/view/sound/QuadrilateralSoundView.ts @@ -10,9 +10,9 @@ import quadrilateral from '../../../quadrilateral.js'; import QuadrilateralModel from '../../model/QuadrilateralModel.js'; import QuadrilateralSoundOptionsModel, { SoundDesign } from '../../model/QuadrilateralSoundOptionsModel.js'; +import EmphasisTracksSoundView from './EmphasisTracksSoundView.js'; import LayersTracksSoundView from './LayersTracksSoundView.js'; import TracksSoundView from './TracksSoundView.js'; -import EmphasisTracksSoundView from './EmphasisTracksSoundView.js'; export default class QuadrilateralSoundView {