Refactor: Moved most ui files to ui module

app/src/main/scala/tripaint/view/gui/MainStage.scala

@@ -1,19 +1,12 @@
 package tripaint.view.gui
 
-import tripaint.Color
+import tripaint.{Color, TriPaintModel}
 import tripaint.ScalaFxExt.{*, given}
-import tripaint.TriPaintModel
 import tripaint.effects.{BlurEffect, MotionBlurEffect, RandomNoiseEffect}
 import tripaint.grid.GridCell
 import tripaint.image.{ImagePool, ImageStorage}
 import tripaint.image.format.{RecursiveStorageFormat, SimpleStorageFormat}
-import tripaint.view.{
-  EditMode,
-  FileOpenSettings,
-  FileSaveSettings,
-  TriPaintView,
-  TriPaintViewListener
-}
+import tripaint.view.*
 import tripaint.view.image.ImageGridPane
 
 import scalafx.application.JFXApp3.PrimaryStage
@@ -175,7 +168,7 @@ class MainStage(controls: TriPaintViewListener, model: TriPaintModel)
     val selectedImagesCoords = model.imageGrid.selectedImages.map(_.coords)
     val loColorPicker = new ColorPicker(FXColor.Black)
     val hiColorPicker = new ColorPicker(FXColor.White)
-    import DialogUtils._
+    import DialogUtils.*
 
     val (previewPane, updatePreview) = DialogUtils.makeImagePreviewList(images, model.imagePool)
 
@@ -250,7 +243,7 @@ class MainStage(controls: TriPaintViewListener, model: TriPaintModel)
         RecursiveStorageFormat -> "Recursive format"
       ),
       0,
-      model.fileSystem
+      model.fileSystem.readImage
     )
   }
 

app/src/main/scala/tripaint/view/gui/AskForFileOpenSettingsDialog.scala → ui/src/main/scala/tripaint/view/gui/AskForFileOpenSettingsDialog.scala

@@ -3,9 +3,8 @@ package tripaint.view.gui
 import tripaint.Color
 import tripaint.coords.{GridCoords, StorageCoords}
 import tripaint.grid.{GridCell, ImageGrid}
-import tripaint.image.ImageStorage
+import tripaint.image.{ImageStorage, RegularImage}
 import tripaint.image.format.StorageFormat
-import tripaint.infrastructure.FileSystem
 import tripaint.view.FileOpenSettings
 import tripaint.view.gui.DialogUtils.{getValueFromCustomDialog, makeGridPane}
 import tripaint.view.image.TriImageForPreview
@@ -26,7 +25,7 @@ object AskForFileOpenSettingsDialog {
       imagePreview: (File, Int, Int, Int),
       formats: Seq[(StorageFormat, String)],
       initiallySelectedFormat: Int,
-      fileSystem: FileSystem
+      readImage: File => Option[RegularImage]
   ): Option[FileOpenSettings] = {
     val (previewFile, imageSize, xCount, yCount) = imagePreview
     val (previewWidth, previewHeight) = (xCount * imageSize, yCount * imageSize)
@@ -77,7 +76,7 @@ object AskForFileOpenSettingsDialog {
       p
     }
 
-    val underlyingImage = fileSystem.readImage(previewFile).get
+    val underlyingImage = readImage(previewFile).get
 
     val wholeImage = new ImageView(SwingFXUtils.toFXImage(underlyingImage.toBufferedImage, null))