feat: add reset session button (#204)

Author: vjousse

main.css

@@ -227,8 +227,17 @@ input:focus {
   text-align: center;
 }
 .round-wrapper .total-rounds {
+  text-align: left;
+}
+
+.round-wrapper .reset-rounds {
   color: var(--color-foreground-darker);
   font-size: 0.7rem;
+  letter-spacing: 0.05rem;
+}
+
+.round-wrapper .reset-rounds p {
+  display: inline;
 }
 
 .icon--mute path {

src-elm/Main.elm

@@ -19,6 +19,7 @@ import Types
         , Msg(..)
         , Notification
         , RGB(..)
+        , ResetType(..)
         , Seconds
         , SessionStatus(..)
         , SessionType(..)
@@ -418,7 +419,7 @@ update msg ({ config } as model) =
             , sendMessageFromElm (elmMessageBuilder "update_config" newConfig configEncoder)
             )
 
-        Reset ->
+        Reset resetType ->
             let
                 currentState =
                     { color =
@@ -436,7 +437,18 @@ update msg ({ config } as model) =
             ( model
             , Cmd.batch
                 [ sendMessageFromElm (elmMessageBuilder "update_current_state" currentState currentStateEncoder)
-                , sendMessageFromElm (elmMessageEncoder { name = "reset", value = Nothing })
+                , sendMessageFromElm
+                    (elmMessageEncoder
+                        { name =
+                            case resetType of
+                                CurrentRound ->
+                                    "reset_round"
+
+                                EntireSession ->
+                                    "reset_session"
+                        , value = Nothing
+                        }
+                    )
                 ]
             )
 

src-elm/Types.elm

@@ -11,6 +11,7 @@ module Types exposing
     , PomodoroSession
     , PomodoroState
     , RGB(..)
+    , ResetType(..)
     , Seconds
     , SessionStatus(..)
     , SessionType(..)
@@ -59,7 +60,7 @@ type Msg
     | ProcessExternalMessage ExternalMessage
     | MinimizeWindow
     | NoOp
-    | Reset
+    | Reset ResetType
     | ResetSettings
     | ResetAudioFile SessionType
     | SkipCurrentRound
@@ -71,6 +72,11 @@ type Msg
     | UpdateVolume String
 
 
+type ResetType
+    = CurrentRound
+    | EntireSession
+
+
 type alias Seconds =
     Int
 

src-elm/View/Timer.elm

@@ -8,7 +8,7 @@ import Svg exposing (path, svg)
 import Svg.Attributes as SvgAttr
 import Themes exposing (Theme)
 import TimeHelper exposing (getCurrentMaxTime)
-import Types exposing (Model, Msg(..), RGB(..), Seconds, SessionStatus(..), SessionType(..))
+import Types exposing (Model, Msg(..), RGB(..), ResetType(..), Seconds, SessionStatus(..), SessionType(..))
 
 
 dialView : SessionType -> Seconds -> Seconds -> Float -> Theme -> String -> String -> String -> Html Msg
@@ -189,8 +189,12 @@ footerView : Model -> Html Msg
 footerView model =
     section [ class "container", class "footer" ]
         [ div [ class "round-wrapper" ]
-            [ p [] [ text <| String.fromInt (model.pomodoroState |> Maybe.map (\state -> state.currentWorkRoundNumber) |> Maybe.withDefault 1) ++ "/" ++ String.fromInt model.config.maxRoundNumber ]
-            , p [ class "text-button", title "Reset current round", onClick Reset ] [ text "Reset" ]
+            [ p [ class "total-rounds" ] [ text <| String.fromInt (model.pomodoroState |> Maybe.map (\state -> state.currentWorkRoundNumber) |> Maybe.withDefault 1) ++ "/" ++ String.fromInt model.config.maxRoundNumber ]
+            , div [ class "reset-rounds" ]
+                [ p [ class "text-button", title "Reset current round", onClick <| Reset CurrentRound ] [ text "Reset round" ]
+                , text " or "
+                , p [ class "text-button", title "Reset the whole session", onClick <| Reset EntireSession ] [ text "session" ]
+                ]
             ]
         , div [ class "icon-group", style "position" "absolute", style "right" "0px" ]
             [ div [ class "icon-wrapper", class "icon-wrapper--double--left", title "Skip the current round", onClick SkipCurrentRound ]

src-tauri/src/gui.rs

@@ -792,9 +792,14 @@ async fn handle_external_message<R: tauri::Runtime>(
         "quit" => {
             app.exit(0);
         }
-        "reset" => {
+        "reset_round" => {
             app_state_guard.pomodoro = pomodoro::reset(&app_state_guard.pomodoro);
         }
+        "reset_session" => {
+            app_state_guard.pomodoro = pomodoro::reset(&app_state_guard.pomodoro);
+            app_state_guard.pomodoro.current_work_round_number = 1;
+        }
+
         "skip" => {
             app_state_guard.pomodoro = pomodoro::next(&app_state_guard.pomodoro);
         }