1 files changed, 49 insertions, 34 deletions

diff --git a/src/Views.elm b/src/Views.elm
index b56a945..b54fc93 100644
--- a/src/Views.elm
+++ b/src/Views.elm
@@ -5,10 +5,11 @@ import Base exposing (..)
 import Css exposing (..)
 import Html
 import Html.Styled exposing (..)
+import Html.Styled.Attributes exposing (css)
 import Html.Styled.Events exposing (onClick)
-import Styles exposing (styledListItem, styledUnorderedList)
+import Styles exposing (styledButton, styledListItem, styledUnorderedList)
 import Time exposing (Posix, toHour, toMinute, toSecond, utc)
-import Utils exposing (diffDuration, wordCountWith)
+import Utils exposing (diffDuration, isNothing, wordCountWith)
 
 
 viewTime : Posix -> String
@@ -26,7 +27,7 @@ viewTime t =
     String.join ":" (List.map String.fromInt [ hh, mm, ss ])
 
 
-viewWpm : Model -> String
+viewWpm : Model -> Maybe String
 viewWpm model =
     let
         t1 =
@@ -40,11 +41,8 @@ viewWpm model =
 
         correctWords =
             wordCountWith model.words ((==) Correct)
-
-        wpm =
-            Maybe.map (String.fromInt << truncate << (*) 60 << (/) (toFloat correctWords)) duration
     in
-    Maybe.withDefault "XX" wpm
+    Maybe.map (String.fromInt << truncate << (*) 60 << (/) (toFloat correctWords)) duration
 
 
 viewProgress : Model -> String
@@ -59,28 +57,30 @@ viewProgress model =
     String.fromInt soFar ++ ":" ++ String.fromInt total
 
 
-viewAccuracy : Array Word -> String
-viewAccuracy words =
-    let
-        wordsAttempted =
-            toFloat <| wordCountWith words ((/=) Todo)
+viewAccuracy : Model -> Maybe String
+viewAccuracy model =
+    if isNothing model.end then
+        Nothing
 
-        correctCount =
-            toFloat <| wordCountWith words ((==) Correct)
+    else
+        let
+            words =
+                model.words
 
-        accuracy =
-            if wordsAttempted == 0.0 then
-                Nothing
+            wordsAttempted =
+                toFloat <| wordCountWith words ((/=) Todo)
 
-            else
-                Just <| correctCount / wordsAttempted * 100
-    in
-    case accuracy of
-        Nothing ->
-            "XX"
+            correctCount =
+                toFloat <| wordCountWith words ((==) Correct)
+
+            accuracy =
+                if wordsAttempted == 0.0 then
+                    Nothing
 
-        Just a ->
-            String.fromInt <| truncate a
+                else
+                    Just <| String.fromInt <| truncate <| correctCount / wordsAttempted * 100
+        in
+        accuracy
 
 
 viewWordLengthOptions : Html Msg
@@ -89,12 +89,20 @@ viewWordLengthOptions =
         wl =
             [ 10, 25, 50, 100 ]
     in
-    styledUnorderedList []
+    ul
+        [ css
+            [ margin zero
+            , listStyle Css.none
+            , display inlineBlock
+            , paddingLeft (px 0)
+            ]
+        ]
         (List.map
             (\len ->
-                styledListItem
-                    [ onClick (Base.WordLengthChanged len) ]
-                    [ text <| String.fromInt len ]
+                li [ css [ display inline ] ]
+                    [ styledButton [ onClick (Base.WordLengthChanged len) ]
+                        [ text <| String.fromInt len ]
+                    ]
             )
             wl
         )
@@ -102,8 +110,15 @@ viewWordLengthOptions =
 
 viewStats : Model -> Html Msg
 viewStats model =
-    styledUnorderedList []
-        [ styledListItem [] [ text ("WPM " ++ viewWpm model) ]
-        , styledListItem [] [ text ("ACC " ++ viewAccuracy model.words) ]
-        , styledListItem [] [ text ("POS " ++ viewProgress model) ]
-        ]
+    let
+        wpm =
+            viewWpm model
+
+        acc =
+            viewAccuracy model
+
+        stats =
+            Maybe.map2 (\w a -> w ++ " words per minute · " ++ a ++ "% accuracy") wpm acc
+    in
+    p []
+        [ text (Maybe.withDefault "" stats) ]