PrefCateg is an enum

mamciek · Dec 18, 2022 · ddce2f6 · ddce2f6
1 parent 9a4aae0
commit ddce2f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/app/views/account/layout.scala b/app/views/account/layout.scala
@@ -22,7 +22,7 @@ object layout:
       def activeCls(c: String) = cls := active.activeO(c)
       main(cls := "account page-menu")(
         ctx.me.exists(_.enabled) option st.nav(cls := "page-menu__menu subnav")(
-          lila.pref.PrefCateg.all.map { categ =>
+          lila.pref.PrefCateg.values.map { categ =>
             a(activeCls(categ.slug), href := routes.Pref.form(categ.slug))(
               bits.categName(categ)
             )

diff --git a/modules/pref/src/main/PrefCateg.scala b/modules/pref/src/main/PrefCateg.scala
@@ -1,15 +1,12 @@
 package lila.pref
 
-sealed abstract class PrefCateg(val slug: String)
+enum PrefCateg(val slug: String):
 
-object PrefCateg:
-
-  case object Display      extends PrefCateg("display")
-  case object ChessClock   extends PrefCateg("chess-clock")
-  case object GameBehavior extends PrefCateg("game-behavior")
-  case object Privacy      extends PrefCateg("privacy")
-  case object Notification extends PrefCateg("notification")
+  case Display      extends PrefCateg("display")
+  case ChessClock   extends PrefCateg("chess-clock")
+  case GameBehavior extends PrefCateg("game-behavior")
+  case Privacy      extends PrefCateg("privacy")
 
-  val all: List[PrefCateg] = List(Display, ChessClock, GameBehavior, Privacy, Notification)
+object PrefCateg:
 
-  def apply(slug: String) = all.find(_.slug == slug)
+  def apply(slug: String) = values.find(_.slug == slug)