adds quit menu

neurodynamic · neurodynamic · commit 794f771bb254 · 2021-06-23T08:29:24.000-06:00
diff --git a/elm/Main.elm b/elm/Main.elm
@@ -10,10 +10,11 @@ import Main.Update
 import Main.View
 import Stages.Debugging.Model exposing (HelpTab(..), Page(..))
 import Utils.Constants as Constants
+import Utils.DevModeStartState as DevModeStartState
 import Utils.Types.AppMode exposing (AppMode(..))
 import Utils.Types.BreakType exposing (BreakType(..))
 import Utils.Types.Error as Error
-import Utils.DevModeStartState as DevModeStartState
+
 
 init : Value -> ( Model, Cmd Msg )
 init flags =
@@ -52,13 +53,13 @@ init flags =
 
                 Development ->
                     DevModeStartState.get numbers
+      , showExitMenu = False
       , maybeError = startingError
       }
     , Cmd.none
     )
 
 
-
 main : Program Value Model Msg
 main =
     Browser.document
diff --git a/elm/Main/Definitions.elm b/elm/Main/Definitions.elm
@@ -43,6 +43,11 @@ writeFile =
         ]
 
 
+exit : TsEncode.Encoder ()
+exit =
+    TsEncode.null
+
+
 writeFileAndExit : TsEncode.Encoder File
 writeFileAndExit =
     TsEncode.object
@@ -65,3 +70,8 @@ gotFileChoice =
 fileChangeWasSaved : Decoder ()
 fileChangeWasSaved =
     TsDecode.null ()
+
+
+exitShortcutWasPressed : Decoder ()
+exitShortcutWasPressed =
+    TsDecode.succeed ()
diff --git a/elm/Main/Interop.elm b/elm/Main/Interop.elm
@@ -2,6 +2,7 @@ port module Main.Interop exposing
     ( ToElm(..)
     , toElm
     , decodeFlags
+    , exit
     , writeFile
     , writeFileAndExit
     , chooseFile
@@ -23,6 +24,12 @@ decodeFlags flags =
 
 
 
+exit argument____ =
+    argument____
+      |> encodeProVariant "exit" Main.Definitions.exit
+      |> interopFromElm
+
+
 writeFile argument____ =
     argument____
       |> encodeProVariant "writeFile" Main.Definitions.writeFile
@@ -43,7 +50,8 @@ chooseFile argument____ =
 
 
 type ToElm
-    = GotFileChoice Stages.ChooseFile.Model.File
+    = ExitShortcutWasPressed ()
+    | GotFileChoice Stages.ChooseFile.Model.File
     | FileChangeWasSaved ()
 
 
@@ -57,7 +65,8 @@ toElm =
 toElmDecoder____ : TsDecode.Decoder ToElm
 toElmDecoder____ =
     TsDecode.oneOf
-        [ toElmVariant "gotFileChoice" GotFileChoice Main.Definitions.gotFileChoice
+        [ toElmVariant "exitShortcutWasPressed" ExitShortcutWasPressed Main.Definitions.exitShortcutWasPressed
+    , toElmVariant "gotFileChoice" GotFileChoice Main.Definitions.gotFileChoice
     , toElmVariant "fileChangeWasSaved" FileChangeWasSaved Main.Definitions.fileChangeWasSaved
         ]
 
diff --git a/elm/Main/Model.elm b/elm/Main/Model.elm
@@ -14,6 +14,7 @@ type alias Model =
     , logo : String
     , randomNumbers : List Int
     , stage : Stage
+    , showExitMenu : Bool
     , maybeError : Maybe Report
     }
 
diff --git a/elm/Main/Msg.elm b/elm/Main/Msg.elm
@@ -1,9 +1,11 @@
 module Main.Msg exposing (Msg(..))
 
 import Json.Decode
+import Main.Interop exposing (ToElm(..))
 import Stages.ChooseFile.Msg
 import Stages.Debugging.Msg
 import Stages.Finished.Msg
+import Utils.Types.BrokenFile exposing (BrokenFile)
 
 
 type Msg
@@ -13,4 +15,8 @@ type Msg
     | DebuggingInterface Stages.Debugging.Msg.Msg
     | FinishedInterface Stages.Finished.Msg.Msg
     | GotNewRandomNumbers (List Int)
+    | ExitShortcutWasPressed
+    | Quit
+    | QuitAndResetFile BrokenFile
+    | CancelQuitRequest
     | InteropError Json.Decode.Error
diff --git a/elm/Main/Subscriptions.elm b/elm/Main/Subscriptions.elm
@@ -19,6 +19,9 @@ subscriptions model =
                     Ok (Interop.FileChangeWasSaved ()) ->
                         FileWasBroken
 
+                    Ok (Interop.ExitShortcutWasPressed ()) ->
+                        ExitShortcutWasPressed
+
                     Err error ->
                         InteropError error
             )
diff --git a/elm/Main/Update.elm b/elm/Main/Update.elm
@@ -155,6 +155,42 @@ update msg model =
                 _ ->
                     ( model, Cmd.none )
 
+        ExitShortcutWasPressed ->
+            case model.stage of
+                Intro ->
+                    ( model, Interop.exit () )
+
+                ChooseFile _ ->
+                    ( model, Interop.exit () )
+
+                Debugging _ ->
+                    if model.showExitMenu then
+                        ( model, Interop.exit () )
+
+                    else
+                        ( { model | showExitMenu = True }, Cmd.none )
+
+                Finished _ ->
+                    if model.showExitMenu then
+                        ( model, Interop.exit () )
+
+                    else
+                        ( { model | showExitMenu = True }, Cmd.none )
+
+        Quit ->
+            ( model, Interop.exit () )
+
+        QuitAndResetFile brokenFile ->
+            ( model
+            , Interop.writeFileAndExit
+                { path = brokenFile.path
+                , content = brokenFile.originalContent
+                }
+            )
+
+        CancelQuitRequest ->
+            ( { model | showExitMenu = False }, Cmd.none )
+
         InteropError error ->
             ( { model
                 | maybeError =
diff --git a/elm/Main/View.elm b/elm/Main/View.elm
@@ -2,6 +2,7 @@ module Main.View exposing (render)
 
 import Element exposing (..)
 import Element.Background as Background
+import Element.Border as Border
 import Element.Font as Font
 import Html exposing (Html)
 import Main.Model exposing (Model, Stage(..))
@@ -13,10 +14,12 @@ import Stages.Finished.View
 import Stages.Intro.View
 import Utils.Colors as Colors
 import Utils.Constants as Constants
+import Utils.Types.BrokenFile exposing (BrokenFile)
+import Utils.UI.Buttons as Buttons
 
 
 render : Model -> { title : String, body : List (Html Msg) }
-render { requestedBugCount, stage, maybeError, logo } =
+render ({ maybeError } as model) =
     { title = Constants.appName
     , body =
         [ layout
@@ -41,32 +44,94 @@ render { requestedBugCount, stage, maybeError, logo } =
                         none
                 )
             ]
-          <|
-            case stage of
-                Intro ->
-                    Stages.Intro.View.render logo
+            (renderViewByStage model)
+        ]
+    }
+
 
-                ChooseFile { startType, status } ->
-                    Element.map ChooseFileInterface <|
-                        Stages.ChooseFile.View.render
-                            { requestedBugCount = requestedBugCount
-                            , startType = startType
-                            , status = status
-                            }
+exitMenu : BrokenFile -> Element Msg
+exitMenu brokenFile =
+    column
+        [ centerX
+        , centerY
+        , spacing 40
+        , paddingXY 40 0
+        , Font.center
+        ]
+        [ paragraph [ Font.size 30 ] [ text "Quit Menu" ]
+        , paragraph []
+            [ text "You pressed the \"quit\" shortcut before resetting the broken file. "
+            , redText
+                ("If you quit without resetting the file, "
+                    ++ Constants.appName
+                    ++ " will not be able to remove any bugs that are still in the file. What do you want to do?"
+                )
+            ]
+        , column [ spacing 15, centerX ]
+            [ Buttons.button [ centerX, width (px 320), Background.color Colors.green ]
+                { name = "quit and reset the file"
+                , msg = QuitAndResetFile brokenFile
+                }
+            , Buttons.button [ centerX, width (px 320), Background.color Colors.red ]
+                { name = "quit without resetting the file"
+                , msg = Quit
+                }
+            , Buttons.button [ centerX, width (px 320) ]
+                { name = "go back"
+                , msg = CancelQuitRequest
+                }
+            ]
+        , paragraph [ Font.center, centerX, width (px 450) ]
+            [ text "You can also "
+            , redText "press the \"quit\" shortcut one more time to quit without resetting the file."
+            ]
+        ]
 
-                Debugging { brokenFile, currentPage, currentHelpTab, encouragements, currentDebuggingTip } ->
-                    Element.map DebuggingInterface <|
-                        Stages.Debugging.View.render
-                            { requestedBugCount = requestedBugCount
-                            , encouragements = encouragements
-                            , brokenFile = brokenFile
-                            , currentPage = currentPage
-                            , currentHelpTab = currentHelpTab
-                            , currentDebuggingTip = currentDebuggingTip
-                            }
 
-                Finished finishModel ->
-                    Element.map FinishedInterface <|
-                        Stages.Finished.View.render finishModel
+redText : String -> Element msg
+redText content =
+    el
+        [ Background.color Colors.red
+        , Font.color Colors.white
+        , paddingXY 7 3
+        , Border.rounded 4
         ]
-    }
+        (text content)
+
+
+renderViewByStage : Model -> Element Msg
+renderViewByStage { requestedBugCount, stage, showExitMenu, logo } =
+    case stage of
+        Intro ->
+            Stages.Intro.View.render logo
+
+        ChooseFile { startType, status } ->
+            Element.map ChooseFileInterface <|
+                Stages.ChooseFile.View.render
+                    { requestedBugCount = requestedBugCount
+                    , startType = startType
+                    , status = status
+                    }
+
+        Debugging { brokenFile, currentPage, currentHelpTab, encouragements, currentDebuggingTip } ->
+            if showExitMenu then
+                exitMenu brokenFile
+
+            else
+                Element.map DebuggingInterface <|
+                    Stages.Debugging.View.render
+                        { requestedBugCount = requestedBugCount
+                        , encouragements = encouragements
+                        , brokenFile = brokenFile
+                        , currentPage = currentPage
+                        , currentHelpTab = currentHelpTab
+                        , currentDebuggingTip = currentDebuggingTip
+                        }
+
+        Finished ({ brokenFile } as finishModel) ->
+            if showExitMenu then
+                exitMenu brokenFile
+
+            else
+                Element.map FinishedInterface <|
+                    Stages.Finished.View.render finishModel
diff --git a/elm/Main/index.d.ts b/elm/Main/index.d.ts
@@ -22,11 +22,13 @@ export interface ElmApp {
 }
 
 export type FromElm =
+  | { data: null; tag: "exit" }
   | { data: { content: string; path: string }; tag: "writeFile" }
   | { data: { content: string; path: string }; tag: "writeFileAndExit" }
   | { data: null; tag: "chooseFile" }
 
 export type ToElm =
+  | { data: JsonValue; tag: "exitShortcutWasPressed" }
   | { data: { content: string; path: string }; tag: "gotFileChoice" }
   | { data: null; tag: "fileChangeWasSaved" }
 
diff --git a/js/app.ts b/js/app.ts
@@ -6,7 +6,10 @@ import { register } from '@tauri-apps/api/globalShortcut'
 import logo from './assets/logo.png'
 
 register("CmdOrControl+Q", () => {
-  exit()
+  app.ports.interopToElm.send({
+    tag: "exitShortcutWasPressed",
+    data: null
+  })
 })
 
 const app = Elm.Main.init({
@@ -49,6 +52,12 @@ app.ports.interopFromElm.subscribe((fromElm) => {
         path: fromElm.data.path,
         contents: fromElm.data.content
       }).then(() => exit())
+      break
+    case "exit":
+      exit()
+      break
+    default:
+      throw new UnreachableCaseError(fromElm)
   }
 })
 
@@ -58,4 +67,12 @@ function getRandomInts(max: number, count: number): number[] {
 
 function getRandomInt(max: number): number {
   return Math.floor(Math.random() * Math.floor(max))
-}
+}
+
+
+export class UnreachableCaseError extends Error {
+  // IF THIS ERROR IS THROWN, A SWITCH STATEMENT IS MISSING SOME CASES
+  constructor(value: never) {
+    super(`Unreachable case: ${value}`)
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ type alias Model =`
`14`	`14`	`, logo : String`
`15`	`15`	`, randomNumbers : List Int`
`16`	`16`	`, stage : Stage`
	`17`	`+ , showExitMenu : Bool`
`17`	`18`	`, maybeError : Maybe Report`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ subscriptions model =`
`19`	`19`	`Ok (Interop.FileChangeWasSaved ()) ->`
`20`	`20`	`FileWasBroken`
`21`	`21`
	`22`	`+ Ok (Interop.ExitShortcutWasPressed ()) ->`
	`23`	`+ ExitShortcutWasPressed`
	`24`	`+`
`22`	`25`	`Err error ->`
`23`	`26`	`InteropError error`
`24`	`27`	`)`