From 62c3639a9eca669f1f6dd190c74a4b6701ca8a0e Mon Sep 17 00:00:00 2001
From: "Andres Gomez, Thomas (ITDV RL)" <thandresgomez-ext@airfrance.fr>
Date: Wed, 3 Sep 2025 18:50:40 +0200
Subject: [PATCH] Add event add and edit

---
 .idea/deploymentTargetSelector.xml            |   3 +
 .idea/misc.xml                                |   1 -
 app/build.gradle.kts                          |   7 +-
 app/release/baselineProfiles/0/app-release.dm | Bin 4222 -> 4559 bytes
 app/release/baselineProfiles/1/app-release.dm | Bin 4177 -> 4525 bytes
 .../headache/repository/event/Event.kt        |  75 +-----
 .../headache/repository/event/EventFactory.kt | 158 ------------
 .../repository/event/EventRepository.kt       | 161 +++++++++---
 .../repository/event/factory/EventFactory.kt  |  42 +++
 .../repository/event/factory/PillFactory.kt   | 158 ++++++++++++
 .../headache/ui/common/error/ErrorMessage.kt  |  42 +++
 .../headache/ui/navigation/MainNavDisplay.kt  |   3 +
 .../destination/EventDestination.kt           |   4 +-
 .../pixelized/headache/ui/page/MainPage.kt    |  54 +++-
 .../page/event/edit/EventEditBottomSheet.kt   | 243 ++++++++++++++++++
 .../edit/EventEditBottomSheetViewModel.kt     | 126 +++++++++
 .../ui/page/event/edit/EventEditFactory.kt    | 100 +++++++
 .../ui/page/event/edit/EventPillEdit.kt       | 159 ++++++++++++
 .../ui/page/event/{ => list}/EventItem.kt     |  15 +-
 .../page/event/{ => list}/EventItemFactory.kt |   5 +-
 .../ui/page/event/{ => list}/EventPage.kt     | 127 ++++++++-
 .../page/event/{ => list}/EventViewModel.kt   |  62 ++---
 .../ui/page/event/{ => list}/PillUio.kt       |  25 +-
 .../ui/page/summary/MonthSummaryPage.kt       | 213 +++++++++++----
 .../ui/page/summary/MonthSummaryPillItem.kt   |  88 +++++++
 .../ui/page/summary/MonthSummaryViewModel.kt  |  28 +-
 .../summary/{ => item}/MonthSummaryBox.kt     |  11 +-
 .../ui/page/summary/item/MonthSummaryCell.kt  |   9 +
 .../summary/{ => item}/MonthSummaryFactory.kt |  69 +++--
 .../summary/{ => item}/MonthSummaryItem.kt    |  46 ++--
 .../ui/page/summary/item/MonthSummaryTitle.kt |  71 +++++
 .../com/pixelized/headache/ui/theme/Color.kt  |  11 -
 .../com/pixelized/headache/ui/theme/Theme.kt  |  57 ++--
 .../ui/theme/color/HeadacheColorPalette.kt    |  60 +++++
 .../headache/ui/theme/color/HeadacheColors.kt |  58 +++++
 .../{CalendarEx.kt => CalendarEx+event.kt}    |   0
 ...ntDateEx.kt => EventDateEx+isSameMonth.kt} |   0
 .../extention/ModifierEx+isElementVisible.kt  |  24 ++
 .../utils/extention/ModifierEx+thenIf.kt      |  10 +
 .../utils/extention/StringEx+capitalize.kt    |  14 +
 .../headache/utils/rememberKeyboardActions.kt |  13 +
 app/src/main/res/values-fr/strings.xml        |   7 +-
 app/src/main/res/values/strings.xml           |   5 +
 ...ventFactoryText.kt => EventFactoryTest.kt} |   6 +-
 44 files changed, 1897 insertions(+), 473 deletions(-)
 delete mode 100644 app/src/main/java/com/pixelized/headache/repository/event/EventFactory.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/repository/event/factory/EventFactory.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/repository/event/factory/PillFactory.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/common/error/ErrorMessage.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheet.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheetViewModel.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditFactory.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventPillEdit.kt
 rename app/src/main/java/com/pixelized/headache/ui/page/event/{ => list}/EventItem.kt (89%)
 rename app/src/main/java/com/pixelized/headache/ui/page/event/{ => list}/EventItemFactory.kt (90%)
 rename app/src/main/java/com/pixelized/headache/ui/page/event/{ => list}/EventPage.kt (52%)
 rename app/src/main/java/com/pixelized/headache/ui/page/event/{ => list}/EventViewModel.kt (53%)
 rename app/src/main/java/com/pixelized/headache/ui/page/event/{ => list}/PillUio.kt (74%)
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPillItem.kt
 rename app/src/main/java/com/pixelized/headache/ui/page/summary/{ => item}/MonthSummaryBox.kt (95%)
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryCell.kt
 rename app/src/main/java/com/pixelized/headache/ui/page/summary/{ => item}/MonthSummaryFactory.kt (54%)
 rename app/src/main/java/com/pixelized/headache/ui/page/summary/{ => item}/MonthSummaryItem.kt (71%)
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryTitle.kt
 delete mode 100644 app/src/main/java/com/pixelized/headache/ui/theme/Color.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColorPalette.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColors.kt
 rename app/src/main/java/com/pixelized/headache/utils/extention/{CalendarEx.kt => CalendarEx+event.kt} (100%)
 rename app/src/main/java/com/pixelized/headache/utils/extention/{EventDateEx.kt => EventDateEx+isSameMonth.kt} (100%)
 create mode 100644 app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+isElementVisible.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+thenIf.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/utils/extention/StringEx+capitalize.kt
 create mode 100644 app/src/main/java/com/pixelized/headache/utils/rememberKeyboardActions.kt
 rename app/src/test/java/com/pixelized/headache/{EventFactoryText.kt => EventFactoryTest.kt} (94%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index f09be69..ee099a0 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -14,6 +14,9 @@
       <SelectionState runConfigName="text2Pills_3()">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="EventEditPreview">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f4211b3..0a0c0e1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DeviceStreaming">
     <option name="deviceSelectionList">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 28b4b57..ebdf24d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -51,7 +51,7 @@ android {
             isMinifyEnabled = true
             signingConfig = signingConfigs.getByName("pixelized")
             defaultConfig {
-                versionCode = 1 // getGitBuildNumber()
+                versionCode = getGitBuildNumber()
             }
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -65,6 +65,7 @@ android {
     }
     kotlinOptions {
         jvmTarget = "11"
+        freeCompilerArgs = listOf("-XXLanguage:+PropertyParamAnnotationDefaultTargetMode")
     }
     buildFeatures {
         compose = true
@@ -116,7 +117,7 @@ private fun getGitBuildNumber(
             standardOutput = stdout
         }
         stdout.toString(charset).trim().toInt()
-    } catch (e: Exception) {
-        0
+    } catch (_: Exception) {
+        1
     }
 }
\ No newline at end of file
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index 00bf25fc095b24f7db8fc0d74c166ac7e6dbe05d..e37820002f5a00ca5684535cf82bd811a059759d 100644
GIT binary patch
delta 4448
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
TmjN04=9?TTAkXF^2oeMUlGC-W

delta 4109
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

diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index 8ebb62a881ef8c3a7f9fc61ebdca25730f6cfc69..5882dbe50ade67915720340d0cefc56b4c172629 100644
GIT binary patch
literal 4525
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
ZtR*+Vo0SbD&BVaOP|Co-pd<+50RXD}?fU=#

literal 4177
zcmWIWW@Zs#;Nak3IPR?&&42`W7#J7|iZXK(iz@XBit^JKi+FoK6%^$&7#JEbFy`kn
zFeLIaFjO$Ujjis936-=jPcJXqm0Nx*D24I%-7p8;6|7Um49<Nr_`p8#7nek%-ls0k
ziIYC9;5u`GSEMsZc=3W6C7tyiJ)9kePx;UCWn?rrIxTW&+7+#}a>>Ei1DB@Go%{Iv
z?(hG~_E}cHzk4&i{M4MYbKlQ-U-SO++~a%8m&NAf<^249y{9ts>~!w!^Ha}kHILm~
z`uc0MedXP+w|hkV*Ig4>Bv-yw<;&5JJANz+U{m}Rm>zxo<mr7o%sv(h{8<^0FXOxS
z!B+``u(OY5%h{X9eOY@=B4g*1M!pk?(q#<GOLc?)E>PwFx}3G$>Z!25%<bc?CJWkq
zF6d9wRu<1>(DZ-2EP8qTgLb_wiubpE?QUZ3{T97ly!EdH|JmJ2M|OX6<j;60{q-W-
zDTV%PE0Y&~4BT?Wm-SV}1pn6$Z@68YXvg*HPw%V#LxJHT@wyg$p1NBuFTD6o_2s3H
zm#ZFqnAKLgwtL6Q1IDW74cIQ6+!&!*dg4a_$7aPfq3g~up7Z?GvhCc}lPTL;cOCSX
zd=M%7$khHzmQ*ae?5(Knx7VjG^#5M&HM{Ua#aZFd<^S{KQ(oAe$(1#qzVG6?xYw^O
z<-9}k67vt+Wb+r^$X5HTn|ZF@W{R`q@+%7cTQ)N;E~==^IDC?GTgJX6rp0DCb9~$`
z{kc{wR^-s_eVc!exB1L-Rj=LovS;^~-`bUL_iF2z**`ZdmMbl|zx-|9KlQcdPiE%6
zIJaEm=eoH|E>@h1j7qNCwQ+%u!#vl3<$NdHWk1Va=oS4HJ7=0_<do;%j&60d50yKn
z<oC?!`1Rd?-Ie$K+G8ClckHJ5^uqG*CqpM)FDyGFI`3bp4C~$Er<Y5f8i~b3Gu$<u
zSbO>E#3Sa@H%<Ox_Ul>Qy~4kVeGlh}7v7g}x+h<woMSBRaK4)3iPDEV`3Kiu-*NKT
zL?h4RU)ik+_}y$2&hL0|v6vw@=8OC14Su#$_-+1PEA3^j)7lqsJ>)^m>G@r{fm^K3
zy|GvAF~8MYTvys><o1;-Th{-a`k|FSPFtGE-dj;Krz`K0)Anrkw->V|U&eYwiT9V?
znbWtqcCK;1-_)`xcV<3%_Il=lnwK*(ZKVDbPfq7HTxTQwqEbFR{f<rV;`!P(_w&z8
z{j*rnJhQ%2O1d`g^{l0(A4?`q-co0*XOq9lR@UNfOxLdW$3E*F>-g!jB3HTZ_w0AG
zPyaf8=;KP&ZMXO?JYIBHuSGt1>dL3*-DMy5be~sw$gFpR&*t6Qj%2?J`oGvXWX|y)
zS?K$_v6;u=gaYrprAhNX*z(?w4YGeR;q(;Ns9O$|2Qv3w@T^@EEPrcCt5s^I%)P~q
zX2oJAZ`x({>HphR;&4o}h_NnUUAOpx^)m9dY%<Zk(Hvg`4VlUmre|zF=l@0VKf_Ib
znHMopmuez@Z8?9V`KEhq!>>nsnEAF$I9uCY#c^_Zs*pJQ$?8=np4O=9&Y#%OW@OmE
zQ7z%!&M#A3|FNx+^EQ{W5*M(J(~~`Z_o(@;lON~y{xCS6ee!MoDT#f0*K=O{U2y7w
zr2Fr9?>Dhh+c>w{T-kW<=+~WFxOevc=6%P`ee+!MO|xf$-#xZH+`LZywBd^K`;+F$
z9@t)5lqtX6BKPj}kp8IqlU_*IUM*aIz2d>{>ow~opF3YEmb{nVkluXCvR3b+$>y#1
z<_NsHlzzox_u~(jx3a!|A-V9Mg=FCmjcAA2F7vO5tLpQWFM9D%PQabnX1@P~w&%ak
z1}XaW=TGvvYkqUL;63kiN8;}sKIFFV{PDjJHvZ6=`S?P^)Hyjv9=$l8q*naB*{&|;
z|1%@LDqFux&9$Q0>g!ajzJ2^2IpO?X##$@+9pUz&i+xVj`CW95o5Ft}JNC&{vkmhF
zYCCr3WmnB<uPDo$)17^qS@yfzUct>(ry74o)W6o0<BgX7ynS8~!~L7bc7Lzhv@<a~
zd5@Ikg%gc#d?rN+dc_UjckG!z*E^Q?=J7ne`L`|Nd*|z0E}!u}Z+3<FHLvHNbeDW{
z`r+q3hqpuj{(pru&+`WA)$8R%i~HmgMR*H-S*pIC{PD=itOxyfO-mJf-m*U2^>5FC
z*@vy>wHxL${`@2N&8WZ8SyntFB3*jRfyak_r~m3Qdp(6+uD5%2GvDWHQy*T+mfrGK
zFE%9l_M+O7%&ojn6j^j%?OIzXb>3>>YWCc<-rt$|_wD#9@P7Z-o&Kj8`EUI=XYz5v
z(x;65Uqf!Q$=rU@y{YrQrXuhC#SZ#8ho(;RKmR|QEAhf77v}7%2CCa8Ep}bu(QfrY
z^5oSk7Gc3vpK=?*=I{2jTPSYuW66}P*v<E|zUQ7kQGVs}zO5JTy}5nS=w6%d+kLTx
zziuBnzU9xv<+IkE{oeO!_3u^Dx@oQ}u69oh^^IS@_RNmy?#G+cDzAH-eLHF48vm9P
zZJjq>CT=qI>^iq_WyYExW}<r2%O3IMcyHM6nP#L?uuOmIucVy{sYxswl>*|o&NKVj
zDpAe!&LNBS`LzS{jn>cneC)W%x&OBw@&A;cICZ6VOs@iOvd|65HTf4KH!3YD)Lr-O
z!q)m%Z`Zh(q*@(acJhDFzf(^yg@(P{cENkPQbw}R^wS+O@2kanB=^j$>|^^hy{&SB
z3G-sz)uOxa*jURg^*VR;R4jMwhUBYGl_ePl*Dgv*v>yGl_Q=aQA8%az#+^F-G?%Nv
z?asNDCAo#SqnvfES1y~M89P6VDbn-W*^p?V`mJ$yqYU3#MoPZTI(u+c?97*<xrIMN
z&i0FLc7A6pHq%tA`%=*^-;;gPDXJ-KmkPSpWE6zYSkV6WL_o~Jn}!iHFSgI&S;G2y
z>zv&=Sxf$}a{l{G@%8k-{36G_`rp@9oZY!B+yDK;vdgvmUVbyW-Ilv=Z?*Nj<*ZMy
zPOkoSDecD&pJz*)zRMony=HImf+^Zhz0E>5eQP-Rb_4sGvyD5lQ*Vj%zBFw9HYa>H
z+uF*=zI#XGYtLJM>I&iVZGQUZuK#`Im|ZE{nK$EAcyf={c%JC_SUP>J?1@=lFP+)W
z&;2*x+pG5sUMIz(d>s?+aRf%Rg?pz?-}~Fm_)?_V{k-Z2i=Q6;_P562gMHA=LyXk{
zEDvTMxioe1Wqa2@@9rr-4q5XivTJ^Z_r&_I>mJM&Gl|bNlg(A<eZG15%-m-^+V}5m
z_;~DUQgj(hk99$Gum^vT2gBZpjYWA^_-_B3U3EG+Zru~_tV8D&dp1-G8GU5G+WEBW
zQ=Q{8$EHbAbt^=-+p2Q=KI3|=sCOtQM{VlQi5A_vG^d%*|M{l=;Dp%Vh<z{S{l5Nx
z-%n%pJG1plM0a1`R<eA3<jtDb`SCm4j_s|y9Je#|5?@ojqWGPqq7P?@+&TD@wYRQ@
z<)p_KlLzr(`F~$8Z+$Ph{=@fcy}Il7&TgOdF8ZvncS`xb6_Yfg`S!om=CRY0JG@~-
zPLe9qr82{<23Pj)7FK!x+v$(uTR!2t$M4ka4r;vk-IFcUifi+Um5VlAo31ImddB2;
z)*rtXYf4}L%YO2ragw|4yhSq(Mg06&w`6`LJJ0;X%B?@O`0ci9t3DGw9cEHiq9Z-O
zt4}?nt2gna=bKO0#JG}5J}&xvi1XF07!m#CQ_lVTcjA65H%#9pxR}l9u$PI*$Fp-L
zT@>-W!5dSq<?^tjs8U8k_QUT_GY-#Py6oDd@J&x^r*2(yNK%I-DZszy{K3u7yq-^*
z+ih0!_4@QvYyKbA-j<pE@5rYEi|603eUYF4cK4f?Ykq#VoIYc3?()4q)}G%!qkXSx
z_D7qex<?nuZZzNj>EDD}<qe-!ZjCPb_GNS4j{SGv)b4)XuemvM=FOB@VbkBNyK>I%
zkBZ#V7kj6_t2kr4^x3kvFV~5O=Spta*{E!mZN1iYkGU9on@hoifM;?1(hlvCC%4a^
zD|u2hPnh#?eq5}K^V0J+spUEME-gLOkhO}xKhh_7Vdjp@{!L6J$!q$Te9+GmDNnq;
zY4P6a-I;ZsCu5|hM5%W)P5OOUZl%l{d5eov%Aauc=hXlG{d42LPkQ^!?}RLwCoQwl
zNN%su+k?CH8SF0l{ytu_!amQlHG8T~yls-m>6`O*=2!1Bxv<-#?$M?npDtYzue+wT
zZRsD8oBZ?a)>kD@n47=-Zuq&WZ<fcsKK;D=rc8=xkNw%xGafnJkGy$ji|Eez&lJ~8
zuI|;``_UxGU&QIe>B^fCHP4dX%@k!{C#vi+!O;K4>G}_m_m^`U+lt3t*!t~~f5rLw
zhk@(0H`hH^y?5@jb=02Kb(_CFoD%tLZB5XN>H{J2NALgK@#NAIr6jYK{*O10uG2j9
zXma(N8Amp3IQvEB<GX*CtCuo*L~J`X=i==vxp7kdQ|?SHXPw=!{%RfP=}#30>n()B
zGj`9gvatFhR<_V-!@eKRyL5a?;@>F$=UCD{f7z4CIje<YMJz)@uCZB1AN#S}KYhn}
z+aCusCM{l^bGovA;)|Et+uJ78wF-IYUFHkPoblJ~;q>=1Q?4rhZrT5P`Q@`SCKjqn
zgnvm>E!)Ia%G-7Eb$r(MX2Xj+HdRQ*cIC_5+Pf;h`DNTAw=)-eYqb|XaoKZRbEbp%
z<*$c1D?T3Ae`68E*QYzzWBav#i>8}zyPwB<sl`PxMdZm1>EKn{TdtIz*ZF&Lmpu2|
zgNOe<i=X{|bGgm7_iNwZGyC-}ye;_Iv~Qx%PQLBV`@3_=Vcuom|9MRO&%Sr!oSp!0
zb`Il}Q`yUT85oLq85nSP*m%)8Y`KhA8MXcu6y-7)7#J}yGCbyDU^vVO>ayJpyX|+_
zfTwiwwm0XFI3zha#oViSAUxrR2#c`(p0BOvkE^en?R`D#b=QP|Evg$IKYo1UoSVt=
z@9Vd(x)pj}e)s$7tQXTAr+hqd*E~!@?bgbW=XGm&b9~t+xoc$AYiZt0a$>!C;!=QT
zx5uQ7EHyg(iEB1*U|CnFVL0j7hw9I(p4lzcG!~flV3M_+(0T*6GwFXcV|l8WbJL`^
zwU|7&zEE*F*tneS`LcI8tNg#S#+p30S^nk9|6BgEI{urjo3mN2%+pPK-A_Be74z)=
z8r=QaIAi&B_j_Ls8Z3Kz&*A<X`L=les|lgk%B`PoeX!+XR}}N^ZQoWM6po!^y>;W9
z&^;EfcCY5=-}}}5-8buF!e^QmJMn5X8+cX3u<fyBf4XeWu^HFT9KMt*oNm7C>8`%5
zJD$&oUE%I${^h`ZyXJ-eetey@@xl82yZerR6^nMeeo=PjJP9-A?Xgo2Z#cHuD}Kpe
zo{5)5ZLgMp@tPiE`)js^-1IBuyS~pm_WkX~!=XPGb?liPoKb!&s`ka4i@#dpUad+$
zS#xLcJ>@LZJ4*#6cP-QX@4Yksm)c_K?P4(-kN$U1$egMvelcp=<JwjcQML687fSwR
z$d%+<1xggb?<*p1F)}b*WdtP(MkWykL_Z!m!GQYlNZoq0L=xbQsuS5%P=Z3}+{lYM
Z9*`U0&B_LnW@2DsC}m(^IK~g+0RV+eKm7mz

diff --git a/app/src/main/java/com/pixelized/headache/repository/event/Event.kt b/app/src/main/java/com/pixelized/headache/repository/event/Event.kt
index 533c8c3..134b6c0 100644
--- a/app/src/main/java/com/pixelized/headache/repository/event/Event.kt
+++ b/app/src/main/java/com/pixelized/headache/repository/event/Event.kt
@@ -1,5 +1,7 @@
 package com.pixelized.headache.repository.event
 
+import androidx.compose.ui.graphics.Color
+
 data class Event(
     val id: Long,
     val title: String,
@@ -25,74 +27,21 @@ data class Event(
         }
     }
 
-    sealed class Pill(
+    data class Pill(
+        val id: Id,
         val label: String,
         val amount: Int,
         val description: String,
+        val color: Color,
         val isValid: Boolean,
         val isMisspelled: Boolean,
     ) {
-        class Unknown(
-            amount: Int,
-            description: String,
-        ) : Pill(
-            label = "?",
-            amount = amount,
-            description = description,
-            isValid = false,
-            isMisspelled = false,
-        )
-
-        class Ibuprofene400(
-            amount: Int,
-            description: String,
-            isValid: Boolean,
-            isMisspelled: Boolean,
-        ) : Pill(
-            label = "Ibuprofène 400",
-            amount = amount,
-            description = description,
-            isValid = isValid,
-            isMisspelled = isMisspelled,
-        )
-
-        class Paracetamol1000(
-            amount: Int,
-            description: String,
-            isValid: Boolean,
-            isMisspelled: Boolean,
-        ) : Pill(
-            label = "Paracétamol 1000",
-            amount = amount,
-            description = description,
-            isValid = isValid,
-            isMisspelled = isMisspelled,
-        )
-
-        class Spifen400(
-            amount: Int,
-            description: String,
-            isValid: Boolean,
-            isMisspelled: Boolean,
-        ) : Pill(
-            label = "Spifen 400",
-            amount = amount,
-            description = description,
-            isValid = isValid,
-            isMisspelled = isMisspelled,
-        )
-
-        class Eletriptan40(
-            amount: Int,
-            description: String,
-            isValid: Boolean,
-            isMisspelled: Boolean,
-        ) : Pill(
-            label = "Élétriptan 40",
-            amount = amount,
-            description = description,
-            isValid = isValid,
-            isMisspelled = isMisspelled,
-        )
+        enum class Id(val value: Long) {
+            UNKNOWN(-1L),
+            IBUPROFENE_400(0L),
+            PARACETAMOL_1000(1L),
+            SPIFEN_400(2L),
+            ELETRIPTAN_40(3L),
+        }
     }
 }
diff --git a/app/src/main/java/com/pixelized/headache/repository/event/EventFactory.kt b/app/src/main/java/com/pixelized/headache/repository/event/EventFactory.kt
deleted file mode 100644
index 52cf15d..0000000
--- a/app/src/main/java/com/pixelized/headache/repository/event/EventFactory.kt
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.pixelized.headache.repository.event
-
-
-import android.icu.util.Calendar
-import com.pixelized.headache.utils.extention.event
-import java.util.Date
-import java.util.regex.Pattern
-import javax.inject.Inject
-
-class EventFactory @Inject constructor() {
-    private val amountSplitRegex = Pattern.compile("""\s[xX]\s*""")
-    private val calendar = Calendar.getInstance()
-
-    fun parseEvent(
-        start: Long,
-        id: Long,
-        title: String,
-        description: String,
-    ): Event {
-        val date = calendar.apply { time = Date(start) }.event
-        val pills = description
-            .takeIf { it.isNotBlank() }
-            ?.split("\n")
-            ?.mapNotNull {
-                when {
-                    it.isBlank() -> null
-                    else -> parsePill(it)
-                }
-            }
-            ?: listOf()
-
-        return Event(
-            id = id,
-            title = title,
-            description = description,
-            date = date,
-            pills = pills,
-            isValid = pills.all { it.isValid },
-            isMisspelled = pills.any { it.isMisspelled },
-        )
-    }
-
-    @Throws(Exception::class)
-    fun parsePill(pill: String): Event.Pill {
-        val split = pill.split(regex = amountSplitRegex)
-        val label = split.getOrNull(0) ?: error("missing label")
-        val amount = split.getOrNull(1)?.trim()?.toIntOrNull() ?: 1
-
-        return when {
-            label.contains(SPIFEN_400, ignoreCase = true) -> Event.Pill.Spifen400(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = false,
-            )
-
-            label.contains(ELETRIPTAN_40, ignoreCase = true) -> Event.Pill.Eletriptan40(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = false,
-            )
-
-            label.contains(IBUPROFENE_400, ignoreCase = true) -> Event.Pill.Ibuprofene400(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = false,
-            )
-
-            label.contains(PARACETAMOL_1000, ignoreCase = true) -> Event.Pill.Paracetamol1000(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = false,
-            )
-
-            SPIFEN_400_LIST.any { label.contains(it, ignoreCase = true) } -> Event.Pill.Spifen400(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = true,
-            )
-
-            ELETRIPTAN_40_LIST.any {
-                label.contains(
-                    it,
-                    ignoreCase = true
-                )
-            } -> Event.Pill.Eletriptan40(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = true,
-            )
-
-            IBUPROFENE_400_LIST.any {
-                label.contains(
-                    it,
-                    ignoreCase = true
-                )
-            } -> Event.Pill.Ibuprofene400(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = true,
-            )
-
-            PARACETAMOL_1000_LIST.any {
-                label.contains(
-                    it,
-                    ignoreCase = true
-                )
-            } -> Event.Pill.Paracetamol1000(
-                amount = amount,
-                description = pill,
-                isValid = true,
-                isMisspelled = true,
-            )
-
-            else -> Event.Pill.Unknown(
-                amount = amount,
-                description = pill,
-            )
-        }
-    }
-
-    companion object {
-        private const val PARACETAMOL_1000 = "Paracétamol 1000"
-        private val PARACETAMOL_1000_LIST = listOf<String>(
-            "Doliprane 1000",
-        )
-
-        private const val IBUPROFENE_400 = "Ibuprofène 400"
-        private val IBUPROFENE_400_LIST = listOf(
-            "Ibuprofene 400",
-            "Ibuprofen 400",
-            "Ibuprofen",
-        )
-
-        private const val SPIFEN_400 = "Spifen 400"
-        private val SPIFEN_400_LIST = listOf<String>(
-            "Spifen",
-        )
-
-        private const val ELETRIPTAN_40 = "Élétriptan 40"
-        private val ELETRIPTAN_40_LIST = listOf(
-            "Eletriptan 40",
-            "Életriptan 40",
-            "Élitriptan 40",
-            "Elitriptan 40",
-            "Eletripan 40",
-            "Elétripan 40",
-            "Elitripan 40",
-            "Elitripan",
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/repository/event/EventRepository.kt b/app/src/main/java/com/pixelized/headache/repository/event/EventRepository.kt
index 39b2de5..c7c74e2 100644
--- a/app/src/main/java/com/pixelized/headache/repository/event/EventRepository.kt
+++ b/app/src/main/java/com/pixelized/headache/repository/event/EventRepository.kt
@@ -1,17 +1,27 @@
 package com.pixelized.headache.repository.event
 
+import android.content.ContentUris
+import android.content.ContentValues
 import android.content.Context
 import android.icu.util.Calendar
+import android.icu.util.TimeZone
+import android.net.Uri
 import android.provider.CalendarContract
 import com.pixelized.headache.repository.calendar.GoogleCalendarIdRepository
+import com.pixelized.headache.repository.event.factory.EventFactory
 import com.pixelized.headache.utils.extention.event
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -21,41 +31,120 @@ class EventRepository @Inject constructor(
     private val calendarIdRepository: GoogleCalendarIdRepository,
     private val factory: EventFactory,
 ) {
+    private val timeZone = TimeZone.getTimeZone("UTC")
     private val scope = CoroutineScope(Dispatchers.IO + Job())
-    private val eventFlow = hashMapOf<Long, MutableStateFlow<List<Event>>>()
+    private val eventFlow = MutableStateFlow(mapOf<Long, Event>())
+
+    private val eventListFlow: StateFlow<Collection<Event>> = eventFlow
+        .map { events -> events.values.sortedBy { it.date } }
+        .stateIn(
+            scope = scope,
+            started = SharingStarted.Lazily,
+            initialValue = emptyList(),
+        )
 
     init {
-        scope.launch {
-            calendarIdRepository.calendarId.collect { id ->
+        calendarIdRepository.calendarId
+            .onEach { id ->
                 fetchEvents(
                     calendarId = id,
                     startDate = Event.Date(day = 1, month = Calendar.JANUARY, year = 2023),
                     endDate = Calendar.getInstance().apply { add(Calendar.DAY_OF_MONTH, 1) }.event,
-                    refresh = true,
                 )
             }
+            .launchIn(scope = scope)
+    }
+
+    fun eventsFlow(): StateFlow<Map<Long, Event>> = eventFlow
+
+    fun eventsListFlow(): StateFlow<Collection<Event>> = eventListFlow
+
+    fun event(id: Long): Event? = eventFlow.value.get(key = id)
+
+    fun createEvent(
+        calendarId: Long = calendarIdRepository.calendarId.value,
+        title: String,
+        description: String,
+        year: Int,
+        month: Int,
+        day: Int,
+    ): Boolean {
+        val (startMillis, endMillis) = Calendar.getInstance(timeZone).apply {
+            set(year, month, day, 0, 0, 0)
+            set(Calendar.MILLISECOND, 0)
+        }.let {
+            val startMillis = it.timeInMillis
+            it.add(Calendar.DAY_OF_MONTH, 1)
+            val endMillis = it.timeInMillis
+            startMillis to endMillis
         }
+
+        val values = ContentValues().apply {
+            put(CalendarContract.Events.CALENDAR_ID, calendarId)
+            put(CalendarContract.Events.TITLE, title)
+            put(CalendarContract.Events.DESCRIPTION, description)
+            put(CalendarContract.Events.DTSTART, startMillis)
+            put(CalendarContract.Events.DTEND, endMillis)
+            put(CalendarContract.Events.AVAILABILITY, CalendarContract.Events.AVAILABILITY_FREE)
+            put(CalendarContract.Events.ALL_DAY, 1)
+            put(CalendarContract.Events.EVENT_TIMEZONE, "UTC")
+        }
+
+        return context.contentResolver.insert(
+            CalendarContract.Events.CONTENT_URI,
+            values
+        ) != null
     }
 
-    fun eventFlow(
-        calendarId: Long,
-    ): StateFlow<List<Event>> {
-        return eventFlow.getOrPut(calendarId) { MutableStateFlow(emptyList()) }
+    fun updateEvent(
+        id: Long,
+        title: String? = null,
+        description: String? = null,
+        year: Int,
+        month: Int,
+        day: Int,
+    ): Boolean {
+        val (startMillis, endMillis) = Calendar.getInstance(timeZone).apply {
+            set(year, month, day, 0, 0, 0)
+            set(Calendar.MILLISECOND, 0)
+        }.let {
+            val startMillis = it.timeInMillis
+            it.add(Calendar.DAY_OF_MONTH, 1)
+            val endMillis = it.timeInMillis
+            startMillis to endMillis
+        }
+
+        val values = ContentValues().apply {
+            title?.let { put(CalendarContract.Events.TITLE, it) }
+            description?.let { put(CalendarContract.Events.DESCRIPTION, it) }
+            put(CalendarContract.Events.DTSTART, startMillis)
+            put(CalendarContract.Events.DTEND, endMillis)
+        }
+
+        val updateUri: Uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id)
+        val rows: Int = context.contentResolver.update(updateUri, values, null, null)
+
+        return rows > 0
     }
 
-    fun fetchEvents(
-        calendarId: Long,
+    fun deleteEvent(
+        eventId: Long,
+    ): Boolean {
+        val deleteUri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, eventId)
+        val success = context.contentResolver.delete(deleteUri, null, null) > 0
+        if (success) {
+            eventFlow.value = eventFlow.value.toMutableMap().also {
+                it.remove(eventId)
+            }
+        }
+        return success
+    }
+
+    suspend fun fetchEvents(
+        calendarId: Long = calendarIdRepository.calendarId.value,
         startDate: Event.Date,
         endDate: Event.Date,
-        refresh: Boolean,
-    ): List<Event> {
-        val flow = eventFlow.getOrPut(calendarId) { MutableStateFlow(emptyList()) }
-        if (flow.value.isNotEmpty() && refresh.not()) {
-            return flow.value
-        }
-
-        val events = mutableListOf<Event>()
-
+    ) = withContext(Dispatchers.IO) {
         val startCalendar = Calendar.getInstance().apply { this.event = startDate }
         val endCalendar = Calendar.getInstance().apply { this.event = endDate }
 
@@ -84,25 +173,23 @@ class EventRepository @Inject constructor(
             "${CalendarContract.Events.DTSTART} ASC"
         )
 
-        cursor?.use {
-            val idIdx = it.getColumnIndex(CalendarContract.Events._ID)
-            val titleIdx = it.getColumnIndex(CalendarContract.Events.TITLE)
-            val descIdx = it.getColumnIndex(CalendarContract.Events.DESCRIPTION)
-            val startIdx = it.getColumnIndex(CalendarContract.Events.DTSTART)
+        eventFlow.value = eventFlow.value.toMutableMap().also { events ->
+            cursor?.use {
+                val idIdx = it.getColumnIndex(CalendarContract.Events._ID)
+                val titleIdx = it.getColumnIndex(CalendarContract.Events.TITLE)
+                val descIdx = it.getColumnIndex(CalendarContract.Events.DESCRIPTION)
+                val startIdx = it.getColumnIndex(CalendarContract.Events.DTSTART)
 
-            while (it.moveToNext()) {
-                val event = factory.parseEvent(
-                    id = it.getLong(idIdx),
-                    title = it.getString(titleIdx) ?: "",
-                    description = it.getString(descIdx) ?: "",
-                    start = it.getLong(startIdx),
-                )
-                events.add(event)
+                while (it.moveToNext()) {
+                    val event = factory.parseEvent(
+                        id = it.getLong(idIdx),
+                        title = it.getString(titleIdx) ?: "",
+                        description = it.getString(descIdx) ?: "",
+                        start = it.getLong(startIdx),
+                    )
+                    events[event.id] = event
+                }
             }
         }
-
-        flow.value = events
-
-        return events
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/repository/event/factory/EventFactory.kt b/app/src/main/java/com/pixelized/headache/repository/event/factory/EventFactory.kt
new file mode 100644
index 0000000..4408044
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/repository/event/factory/EventFactory.kt
@@ -0,0 +1,42 @@
+package com.pixelized.headache.repository.event.factory
+
+import android.icu.util.Calendar
+import com.pixelized.headache.repository.event.Event
+import com.pixelized.headache.utils.extention.event
+import java.util.Date
+import javax.inject.Inject
+
+class EventFactory @Inject constructor(
+    private val pillFactory: PillFactory,
+) {
+    private val calendar = Calendar.getInstance()
+
+    fun parseEvent(
+        start: Long,
+        id: Long,
+        title: String,
+        description: String,
+    ): Event {
+        val date = calendar.apply { time = Date(start) }.event
+        val pills = description
+            .takeIf { it.isNotBlank() }
+            ?.split("\n")
+            ?.mapNotNull {
+                when {
+                    it.isBlank() -> null
+                    else -> pillFactory.parsePill(pill = it)
+                }
+            }
+            ?: listOf()
+
+        return Event(
+            id = id,
+            title = title,
+            description = description,
+            date = date,
+            pills = pills,
+            isValid = pills.all { it.isValid },
+            isMisspelled = pills.any { it.isMisspelled },
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/repository/event/factory/PillFactory.kt b/app/src/main/java/com/pixelized/headache/repository/event/factory/PillFactory.kt
new file mode 100644
index 0000000..1bd5697
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/repository/event/factory/PillFactory.kt
@@ -0,0 +1,158 @@
+package com.pixelized.headache.repository.event.factory
+
+import com.pixelized.headache.repository.event.Event
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
+import java.util.regex.Pattern
+import javax.inject.Inject
+
+class PillFactory @Inject constructor() {
+    private val amountSplitRegex = Pattern.compile("""\s[xX]\s*""")
+
+    @Throws(Exception::class)
+    fun parsePill(pill: String): Event.Pill {
+        val split = pill.split(regex = amountSplitRegex)
+        val label = split.getOrNull(0) ?: error("missing label")
+        val amount = split.getOrNull(1)?.trim()?.toIntOrNull() ?: 1
+
+        return when {
+            label == SPIFEN_400_LABEL -> {
+                Event.Pill(
+                    id = Event.Pill.Id.SPIFEN_400,
+                    label = SPIFEN_400_LABEL,
+                    color = HeadacheColorPalette.Pill.Spifen400,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = false,
+                )
+            }
+
+            label.contains(ELETRIPTAN_40_LABEL, ignoreCase = true) -> {
+                Event.Pill(
+                    id = Event.Pill.Id.ELETRIPTAN_40,
+                    label = ELETRIPTAN_40_LABEL,
+                    color = HeadacheColorPalette.Pill.Eletriptan40,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = false,
+                )
+            }
+
+            label.contains(IBUPROFENE_400_LABEL, ignoreCase = true) -> {
+                Event.Pill(
+                    id = Event.Pill.Id.IBUPROFENE_400,
+                    label = IBUPROFENE_400_LABEL,
+                    color = HeadacheColorPalette.Pill.Ibuprofene400,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = false,
+                )
+            }
+
+            label.contains(PARACETAMOL_1000_LABEL, ignoreCase = true) -> {
+                Event.Pill(
+                    id = Event.Pill.Id.PARACETAMOL_1000,
+                    label = PARACETAMOL_1000_LABEL,
+                    color = HeadacheColorPalette.Pill.Paracetamol1000,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = false,
+                )
+            }
+
+            SPIFEN_400_LIST.any { label.contains(it, ignoreCase = true) } -> {
+                Event.Pill(
+                    id = Event.Pill.Id.SPIFEN_400,
+                    label = SPIFEN_400_LABEL,
+                    color = HeadacheColorPalette.Pill.Spifen400,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = true,
+                )
+            }
+
+            ELETRIPTAN_40_LIST.any { label.contains(it, ignoreCase = true) } -> {
+                Event.Pill(
+                    id = Event.Pill.Id.ELETRIPTAN_40,
+                    label = ELETRIPTAN_40_LABEL,
+                    color = HeadacheColorPalette.Pill.Eletriptan40,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = true,
+                )
+            }
+
+            IBUPROFENE_400_LIST.any { label.contains(it, ignoreCase = true) } -> {
+                Event.Pill(
+                    id = Event.Pill.Id.IBUPROFENE_400,
+                    label = IBUPROFENE_400_LABEL,
+                    color = HeadacheColorPalette.Pill.Ibuprofene400,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = true,
+                )
+            }
+
+            PARACETAMOL_1000_LIST.any { label.contains(it, ignoreCase = true) } -> {
+                Event.Pill(
+                    id = Event.Pill.Id.PARACETAMOL_1000,
+                    label = PARACETAMOL_1000_LABEL,
+                    color = HeadacheColorPalette.Pill.Paracetamol1000,
+                    amount = amount,
+                    description = pill,
+                    isValid = true,
+                    isMisspelled = true,
+                )
+            }
+
+            else -> {
+                Event.Pill(
+                    id = Event.Pill.Id.UNKNOWN,
+                    label = "?",
+                    color = HeadacheColorPalette.Pill.Unknown,
+                    amount = amount,
+                    description = pill,
+                    isValid = false,
+                    isMisspelled = false,
+                )
+            }
+        }
+    }
+
+    companion object {
+        private const val PARACETAMOL_1000_LABEL = "Paracétamol 1000"
+        private val PARACETAMOL_1000_LIST = listOf<String>(
+            "Doliprane 1000",
+        )
+
+        private const val IBUPROFENE_400_LABEL = "Ibuprofène 400"
+        private val IBUPROFENE_400_LIST = listOf(
+            "Ibuprofene 400",
+            "Ibuprofen 400",
+            "Ibuprofen",
+        )
+
+        private const val SPIFEN_400_LABEL = "Spifen 400"
+        private val SPIFEN_400_LIST = listOf<String>(
+            "Spifen",
+        )
+
+        private const val ELETRIPTAN_40_LABEL = "Élétriptan 40"
+        private val ELETRIPTAN_40_LIST = listOf(
+            "Eletriptan 40",
+            "Életriptan 40",
+            "Élitriptan 40",
+            "Elitriptan 40",
+            "Eletripan 40",
+            "Elétripan 40",
+            "Elitripan 40",
+            "Elitripan",
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/common/error/ErrorMessage.kt b/app/src/main/java/com/pixelized/headache/ui/common/error/ErrorMessage.kt
new file mode 100644
index 0000000..2067579
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/common/error/ErrorMessage.kt
@@ -0,0 +1,42 @@
+package com.pixelized.headache.ui.common.error
+
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.platform.LocalContext
+import com.pixelized.headache.ui.page.LocalSnack
+import kotlinx.coroutines.flow.Flow
+
+@Stable
+sealed interface ErrorToast
+
+@Stable
+data class StringErrorMessage(
+    val message: String,
+) : ErrorToast
+
+@Stable
+data class ResourceErrorMessage(
+    @StringRes val message: Int,
+) : ErrorToast
+
+@Composable
+fun HandleErrorMessage(
+    context: Context = LocalContext.current,
+    snack: SnackbarHostState = LocalSnack.current,
+    errors: Flow<ErrorToast>,
+) {
+    LaunchedEffect(Unit) {
+        errors.collect { message ->
+            snack.showSnackbar(
+                message = when (message) {
+                    is StringErrorMessage -> message.message
+                    is ResourceErrorMessage -> context.getString(message.message)
+                },
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/pixelized/headache/ui/navigation/MainNavDisplay.kt b/app/src/main/java/com/pixelized/headache/ui/navigation/MainNavDisplay.kt
index 1551482..425665e 100644
--- a/app/src/main/java/com/pixelized/headache/ui/navigation/MainNavDisplay.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/navigation/MainNavDisplay.kt
@@ -3,6 +3,7 @@ package com.pixelized.headache.ui.navigation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
@@ -19,12 +20,14 @@ val LocalNavigator = staticCompositionLocalOf<Navigator> {
 
 @Composable
 fun MainNavDisplay(
+    modifier: Modifier = Modifier,
     navigator: Navigator,
 ) {
     CompositionLocalProvider(
         LocalNavigator provides navigator,
     ) {
         NavDisplay(
+            modifier = modifier,
             backStack = navigator.backStack,
             entryDecorators = listOf(
                 rememberSceneSetupNavEntryDecorator(),
diff --git a/app/src/main/java/com/pixelized/headache/ui/navigation/destination/EventDestination.kt b/app/src/main/java/com/pixelized/headache/ui/navigation/destination/EventDestination.kt
index 2594350..4eff6e4 100644
--- a/app/src/main/java/com/pixelized/headache/ui/navigation/destination/EventDestination.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/navigation/destination/EventDestination.kt
@@ -6,8 +6,8 @@ import androidx.navigation3.runtime.EntryProviderBuilder
 import androidx.navigation3.runtime.entry
 import com.pixelized.headache.repository.event.Event
 import com.pixelized.headache.ui.navigation.Navigator
-import com.pixelized.headache.ui.page.event.EventPage
-import com.pixelized.headache.ui.page.event.EventViewModel
+import com.pixelized.headache.ui.page.event.list.EventPage
+import com.pixelized.headache.ui.page.event.list.EventViewModel
 import com.pixelized.headache.utils.extention.event
 import java.util.Date
 
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/MainPage.kt b/app/src/main/java/com/pixelized/headache/ui/page/MainPage.kt
index 14136e3..56ea573 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/MainPage.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/MainPage.kt
@@ -1,14 +1,62 @@
 package com.pixelized.headache.ui.page
 
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Modifier
 import com.pixelized.headache.ui.navigation.MainNavDisplay
 import com.pixelized.headache.ui.navigation.Navigator
 
+val LocalSnack = staticCompositionLocalOf<SnackbarHostState> {
+    error("Local SnackHost no yet ready")
+}
+
+val LocalErrorSnack = staticCompositionLocalOf<SnackbarHostState> {
+    error("Local SnackHost for Error no yet ready")
+}
+
 @Composable
 fun MainPage(
     navigator: Navigator,
+    snack: SnackbarHostState = remember { SnackbarHostState() },
+    errorSnack: SnackbarHostState = remember { SnackbarHostState() },
 ) {
-    MainNavDisplay(
-        navigator = navigator,
-    )
+    CompositionLocalProvider(
+        LocalSnack provides snack,
+        LocalErrorSnack provides errorSnack,
+    ) {
+        Scaffold(
+            contentWindowInsets = remember { WindowInsets(0, 0, 0, 0) },
+            snackbarHost = {
+                SnackbarHost(
+                    hostState = snack,
+                )
+                SnackbarHost(
+                    hostState = errorSnack,
+                    snackbar = {
+                        Snackbar(
+                            containerColor = MaterialTheme.colorScheme.error,
+                            contentColor = MaterialTheme.colorScheme.onError,
+                            actionContentColor = MaterialTheme.colorScheme.onError,
+                            snackbarData = it,
+                        )
+                    }
+                )
+            },
+            content = { padding ->
+                MainNavDisplay(
+                    modifier = Modifier.padding(paddingValues = padding),
+                    navigator = navigator,
+                )
+            }
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheet.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheet.kt
new file mode 100644
index 0000000..71f4053
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheet.kt
@@ -0,0 +1,243 @@
+package com.pixelized.headache.ui.page.event.edit
+
+import android.annotation.SuppressLint
+import android.icu.text.DateFormat
+import android.icu.text.SimpleDateFormat
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.pixelized.headache.R
+import com.pixelized.headache.ui.common.error.HandleErrorMessage
+import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.utils.extention.capitalize
+import kotlinx.coroutines.launch
+import java.util.Date
+import java.util.Locale
+
+@Stable
+data class EventEditBottomSheetUio(
+    val id: Long?,
+    val date: Date,
+    val pills: List<EventPillEditUio>,
+)
+
+@Stable
+data object EventEditDefault {
+
+    @Stable
+    val padding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 16.dp)
+
+    @Stable
+    val spacing: DpSize = DpSize(width = 8.dp, height = 16.dp)
+
+    @SuppressLint("ConstantLocale")
+    @Stable
+    val formatter = SimpleDateFormat("EEEE dd MMMM yyyy", Locale.getDefault())
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun EventEditBottomSheet(
+    viewModel: EventEditBottomSheetViewModel = hiltViewModel(),
+    snack: SnackbarHostState = remember { SnackbarHostState() },
+    sheetState: SheetState = rememberModalBottomSheetState(
+        skipPartiallyExpanded = true,
+    ),
+    onDismissRequest: () -> Unit,
+) {
+    viewModel.data.value?.let { item ->
+        val scope = rememberCoroutineScope()
+
+        ModalBottomSheet(
+            sheetState = sheetState,
+            onDismissRequest = onDismissRequest,
+        ) {
+            Box(
+                contentAlignment = Alignment.BottomCenter,
+            ) {
+                EventEditContent(
+                    item = item,
+                    onAddPill = viewModel::onAddPill,
+                    onRemovePill = viewModel::onRemovePill,
+                    onDelete = { scope.launch { viewModel.delete() } },
+                    onConfirm = { scope.launch { viewModel.confirm() } },
+                )
+                SnackbarHost(
+                    hostState = snack,
+                    snackbar = {
+                        Snackbar(
+                            containerColor = MaterialTheme.colorScheme.error,
+                            contentColor = MaterialTheme.colorScheme.onError,
+                            actionContentColor = MaterialTheme.colorScheme.onError,
+                            snackbarData = it,
+                        )
+                    }
+                )
+            }
+        }
+    }
+
+    HandleErrorMessage(
+        snack = snack,
+        errors = viewModel.errors
+    )
+}
+
+@Composable
+private fun EventEditContent(
+    modifier: Modifier = Modifier,
+    padding: PaddingValues = EventEditDefault.padding,
+    spacing: DpSize = EventEditDefault.spacing,
+    formatter: DateFormat = EventEditDefault.formatter,
+    item: EventEditBottomSheetUio,
+    onAddPill: (EventPillEditUio) -> Unit,
+    onRemovePill: (EventPillEditUio) -> Unit,
+    onDelete: () -> Unit,
+    onConfirm: () -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .padding(paddingValues = padding)
+            .then(other = modifier),
+        verticalArrangement = Arrangement.spacedBy(space = spacing.height),
+    ) {
+        Text(
+            style = MaterialTheme.typography.titleLarge,
+            text = formatter.format(item.date).capitalize()
+        )
+
+        HorizontalDivider()
+
+        LazyColumn(
+            modifier = Modifier.weight(weight = 1f, fill = false),
+        ) {
+            items(
+                items = item.pills
+            ) {
+                EventPillEdit(
+                    item = it,
+                    onAdd = onAddPill,
+                    onRemove = onRemovePill,
+                )
+            }
+        }
+
+        HorizontalDivider()
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(space = spacing.width),
+        ) {
+            if (item.id != null) {
+                OutlinedButton(
+                    modifier = Modifier.weight(1f),
+                    onClick = onDelete,
+                ) {
+                    Text(
+                        text = stringResource(R.string.action_delete)
+                    )
+                }
+            }
+            Button(
+                modifier = Modifier.weight(2f),
+                onClick = onConfirm,
+            ) {
+                Text(
+                    text = stringResource(R.string.action_confirm)
+                )
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun EventEditPreview(
+    @PreviewParameter(EventEditPreviewPreviewProvider::class) preview: EventEditBottomSheetUio,
+) {
+    HeadacheTheme {
+        Surface {
+            val item = remember { mutableStateOf(preview) }
+            EventEditContent(
+                item = item.value,
+                onAddPill = { pill ->
+                    item.value = item.value.let { event ->
+                        val pills = event.pills.toMutableList()
+                        val pillIndex = pills.indexOfFirst { it.id == pill.id }
+                        pills[pillIndex] =
+                            pills[pillIndex].let { pill -> pill.copy(amount = pill.amount + 1) }
+                        event.copy(pills = pills)
+                    }
+                },
+                onRemovePill = { pill ->
+                    item.value = item.value.let { event ->
+                        val pills = event.pills.toMutableList()
+                        val pillIndex = pills.indexOfFirst { it.id == pill.id }
+                        pills[pillIndex] =
+                            pills[pillIndex].let { pill -> pill.copy(amount = pill.amount - 1) }
+                        event.copy(pills = pills)
+                    }
+                },
+                onDelete = { },
+                onConfirm = { },
+            )
+        }
+    }
+}
+
+private class EventEditPreviewPreviewProvider : PreviewParameterProvider<EventEditBottomSheetUio> {
+    override val values: Sequence<EventEditBottomSheetUio>
+        get() = sequenceOf(
+            EventEditBottomSheetUio(
+                id = null,
+                date = Date(),
+                pills = listOf(
+                    EventPillEditUio(id = 0, label = "Paracétamol 1000", 0),
+                    EventPillEditUio(id = 1, label = "Ibuprofène 400", 0),
+                    EventPillEditUio(id = 2, label = "Spifen 400", 0),
+                    EventPillEditUio(id = 3, label = "Élétriptan 40", 0),
+                )
+            ),
+            EventEditBottomSheetUio(
+                id = 1,
+                date = Date(),
+                pills = listOf(
+                    EventPillEditUio(id = 0, label = "Paracétamol 1000", 0),
+                    EventPillEditUio(id = 1, label = "Ibuprofène 400", 0),
+                    EventPillEditUio(id = 2, label = "Spifen 400", 2),
+                    EventPillEditUio(id = 3, label = "Élétriptan 40", 1),
+                )
+            ),
+        )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheetViewModel.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheetViewModel.kt
new file mode 100644
index 0000000..177f8df
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditBottomSheetViewModel.kt
@@ -0,0 +1,126 @@
+package com.pixelized.headache.ui.page.event.edit
+
+import android.icu.util.Calendar
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.pixelized.headache.R
+import com.pixelized.headache.repository.event.EventRepository
+import com.pixelized.headache.ui.common.error.ErrorToast
+import com.pixelized.headache.ui.common.error.ResourceErrorMessage
+import com.pixelized.headache.utils.extention.event
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import javax.inject.Inject
+import kotlin.math.max
+
+@HiltViewModel
+class EventEditBottomSheetViewModel @Inject constructor(
+    private val repository: EventRepository,
+    private val factory: EventEditFactory,
+) : ViewModel() {
+
+    private val _data = mutableStateOf<EventEditBottomSheetUio?>(null)
+    val data: State<EventEditBottomSheetUio?> = _data
+
+    private val _errors = MutableSharedFlow<ErrorToast>()
+    val errors: SharedFlow<ErrorToast> = _errors
+
+    fun show(
+        eventId: Long? = null,
+    ) {
+        val event = eventId?.let { id -> repository.event(id = id) }
+        _data.value = factory.convertToUio(event = event)
+    }
+
+    fun dismiss() {
+        _data.value = null
+    }
+
+    fun onAddPill(pill: EventPillEditUio) {
+        updatePill(
+            pill = pill,
+            delta = 1,
+        )
+    }
+
+    fun onRemovePill(pill: EventPillEditUio) {
+        updatePill(
+            pill = pill,
+            delta = -1,
+        )
+    }
+
+    fun updatePill(pill: EventPillEditUio, delta: Int) {
+        _data.value = _data.value?.let { data ->
+            val index = data.pills.indexOfFirst {
+                it.id == pill.id
+            }
+            val newPill = data.pills[index].copy(
+                amount = max(data.pills[index].amount + delta, 0)
+            )
+            data.copy(
+                pills = data.pills.toMutableList().also {
+                    it[index] = newPill
+                }
+            )
+        }
+    }
+
+    suspend fun delete() {
+        val event = _data.value ?: return
+        val eventId = event.id ?: return
+
+        val success = repository.deleteEvent(eventId = eventId)
+
+        if (success) {
+            _data.value = null
+        } else {
+            val message = ResourceErrorMessage(message = R.string.error_edit_calendar)
+            _errors.emit(message)
+        }
+    }
+
+    suspend fun confirm() {
+        val event = _data.value ?: return
+        val date = Calendar.getInstance().apply { time = event.date }.event
+        val description = factory.convertToDescription(pills = event.pills)
+
+        val success = if (event.id == null) {
+            repository.createEvent(
+                title = "Céphalée",
+                description = description,
+                year = date.year,
+                month = date.month,
+                day = date.day,
+            )
+        } else {
+            repository.updateEvent(
+                id = event.id,
+                title = "Céphalée",
+                description = description,
+                year = date.year,
+                month = date.month,
+                day = date.day,
+            )
+        }
+
+        if (success) {
+            repository.fetchEvents(
+                startDate = Calendar.getInstance().apply {
+                    time = event.date
+                    add(Calendar.DAY_OF_MONTH, -1)
+                }.event,
+                endDate = Calendar.getInstance().apply {
+                    time = event.date
+                    add(Calendar.DAY_OF_MONTH, 1)
+                }.event,
+            )
+            _data.value = null
+        } else {
+            val message = ResourceErrorMessage(message = R.string.error_edit_calendar)
+            _errors.emit(message)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditFactory.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditFactory.kt
new file mode 100644
index 0000000..e13ef1d
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventEditFactory.kt
@@ -0,0 +1,100 @@
+package com.pixelized.headache.ui.page.event.edit
+
+import android.icu.util.Calendar
+import com.pixelized.headache.repository.event.Event
+import com.pixelized.headache.utils.extention.event
+import java.util.Date
+import javax.inject.Inject
+
+class EventEditFactory @Inject constructor() {
+
+    fun convertToUio(
+        event: Event?,
+    ): EventEditBottomSheetUio {
+        return when (event) {
+            null -> EventEditBottomSheetUio(
+                id = null,
+                date = Date(),
+                pills = listOf(
+                    EventPillEditUio(
+                        id = Event.Pill.Id.IBUPROFENE_400.value,
+                        label = "Paracétamol 1000",
+                        amount = 0,
+                    ),
+                    EventPillEditUio(
+                        id = Event.Pill.Id.PARACETAMOL_1000.value,
+                        label = "Ibuprofène 400",
+                        amount = 0,
+                    ),
+                    EventPillEditUio(
+                        id = Event.Pill.Id.SPIFEN_400.value,
+                        label = "Spifen 400",
+                        amount = 0,
+                    ),
+                    EventPillEditUio(
+                        id = Event.Pill.Id.ELETRIPTAN_40.value,
+                        label = "Élétriptan 40",
+                        amount = 0,
+                    ),
+                ),
+            )
+
+            else -> {
+                val date = Calendar.getInstance().apply { this.event = event.date }.time
+
+                val ibuprofeneAmount = event.pills.sumOf {
+                    if (it.id == Event.Pill.Id.IBUPROFENE_400) it.amount else 0
+                }
+                val paracetamolAmount = event.pills.sumOf {
+                    if (it.id == Event.Pill.Id.PARACETAMOL_1000) it.amount else 0
+                }
+                val spifenAmount = event.pills.sumOf {
+                    if (it.id == Event.Pill.Id.SPIFEN_400) it.amount else 0
+                }
+                val eletriptanAmount = event.pills.sumOf {
+                    if (it.id == Event.Pill.Id.ELETRIPTAN_40) it.amount else 0
+                }
+
+                EventEditBottomSheetUio(
+                    id = event.id,
+                    date = date,
+                    pills = listOf(
+                        EventPillEditUio(
+                            id = Event.Pill.Id.IBUPROFENE_400.value,
+                            label = "Paracétamol 1000",
+                            amount = ibuprofeneAmount,
+                        ),
+                        EventPillEditUio(
+                            id = Event.Pill.Id.PARACETAMOL_1000.value,
+                            label = "Ibuprofène 400",
+                            amount = paracetamolAmount,
+                        ),
+                        EventPillEditUio(
+                            id = Event.Pill.Id.SPIFEN_400.value,
+                            label = "Spifen 400",
+                            amount = spifenAmount,
+                        ),
+                        EventPillEditUio(
+                            id = Event.Pill.Id.ELETRIPTAN_40.value,
+                            label = "Élétriptan 40",
+                            amount = eletriptanAmount,
+                        ),
+                    ),
+                )
+            }
+        }
+    }
+
+    fun convertToDescription(
+        pills: List<EventPillEditUio>,
+    ): String {
+        return pills
+            .mapNotNull { it.takeIf { it.amount > 0 } }
+            .joinToString(separator = "\n") {
+                when (it.amount) {
+                    1 -> it.label
+                    else -> "${it.label} x${it.amount}"
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventPillEdit.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventPillEdit.kt
new file mode 100644
index 0000000..2b1c4eb
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/edit/EventPillEdit.kt
@@ -0,0 +1,159 @@
+package com.pixelized.headache.ui.page.event.edit
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Remove
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.pixelized.headache.ui.theme.HeadacheTheme
+
+@Stable
+data class EventPillEditUio(
+    val id: Long,
+    val label: String,
+    val amount: Int,
+)
+
+@Stable
+data object EventPillEditDefault {
+    @Stable
+    val padding: PaddingValues = PaddingValues(horizontal = 0.dp, vertical = 0.dp)
+
+    @Stable
+    val spacing: Dp = 4.dp
+
+    @Stable
+    val minAmountWidth: Dp = 32.dp
+
+    @Stable
+    val buttonOutShape: Shape = RoundedCornerShape(
+        topStart = 32.dp,
+        bottomStart = 32.dp,
+        topEnd = 4.dp,
+        bottomEnd = 4.dp
+    )
+
+    @Stable
+    val buttonInShape: Shape = RoundedCornerShape(
+        topEnd = 32.dp,
+        bottomEnd = 32.dp,
+        topStart = 4.dp,
+        bottomStart = 4.dp
+    )
+}
+
+@Composable
+fun EventPillEdit(
+    modifier: Modifier = Modifier,
+    padding: PaddingValues = EventPillEditDefault.padding,
+    spacing: Dp = EventPillEditDefault.spacing,
+    minAmountWidth: Dp = EventPillEditDefault.minAmountWidth,
+    buttonOutShape: Shape = EventPillEditDefault.buttonOutShape,
+    buttonInShape: Shape = EventPillEditDefault.buttonInShape,
+    item: EventPillEditUio,
+    onAdd: (EventPillEditUio) -> Unit,
+    onRemove: (EventPillEditUio) -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .padding(paddingValues = padding)
+            .then(other = modifier),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(space = spacing),
+    ) {
+        Text(
+            modifier = Modifier.weight(weight = 1f),
+            style = MaterialTheme.typography.titleMedium,
+            text = item.label
+        )
+
+        IconButton(
+            onClick = { onRemove(item) },
+            colors = IconButtonDefaults.iconButtonColors(
+                contentColor = MaterialTheme.colorScheme.onPrimary,
+                containerColor = MaterialTheme.colorScheme.primary,
+            ),
+            shape = buttonOutShape,
+        ) {
+            Icon(
+                imageVector = Icons.Default.Remove,
+                contentDescription = null,
+            )
+        }
+
+        AnimatedContent(
+            targetState = item.amount,
+            transitionSpec = {
+                val direction = if (targetState < initialState) -1 else 1
+                val enter = fadeIn() + slideInVertically { -direction * it }
+                val exit = fadeOut() + slideOutVertically { direction * it }
+                enter togetherWith exit using SizeTransform(clip = false)
+            },
+        ) {
+            Text(
+                modifier = Modifier.widthIn(min = minAmountWidth),
+                style = MaterialTheme.typography.titleMedium,
+                textAlign = TextAlign.Center,
+                text = "$it",
+            )
+        }
+
+        IconButton(
+            onClick = { onAdd(item) },
+            colors = IconButtonDefaults.iconButtonColors(
+                contentColor = MaterialTheme.colorScheme.onPrimary,
+                containerColor = MaterialTheme.colorScheme.primary,
+            ),
+            shape = buttonInShape,
+        ) {
+            Icon(
+                imageVector = Icons.Default.Add,
+                contentDescription = null,
+            )
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun EventPillEditPreview() {
+    HeadacheTheme {
+        Surface {
+            EventPillEdit(
+                item = EventPillEditUio(
+                    id = 0,
+                    label = "Élétriptan 40",
+                    amount = 2,
+                ),
+                onAdd = { },
+                onRemove = { },
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/EventItem.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt
similarity index 89%
rename from app/src/main/java/com/pixelized/headache/ui/page/event/EventItem.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt
index bb3a549..b9144b6 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/event/EventItem.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt
@@ -1,14 +1,16 @@
-package com.pixelized.headache.ui.page.event
+package com.pixelized.headache.ui.page.event.list
 
 import android.annotation.SuppressLint
 import android.icu.text.SimpleDateFormat
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
@@ -27,6 +29,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
 import java.util.Date
 import java.util.Locale
 
@@ -72,9 +75,12 @@ fun EventItem(
     colorBoxPadding: PaddingValues = EventItemDefault.colorBoxPadding,
     formatter: SimpleDateFormat = EventItemDefault.formatter,
     item: EventItemUio,
+    onItem: (EventItemUio) -> Unit,
 ) {
     Box(
         modifier = Modifier
+            .clickable { onItem(item) }
+            .fillMaxWidth()
             .heightIn(min = minHeigh)
             .height(IntrinsicSize.Min)
             .then(other = modifier),
@@ -125,6 +131,7 @@ private fun EventItemPreview(
         Surface {
             EventItem(
                 item = preview,
+                onItem = { },
             )
         }
     }
@@ -141,6 +148,7 @@ private class EventPreviewProvider() : PreviewParameterProvider<EventItemUio> {
                         label = "Spifen 400",
                         amount = 1,
                         description = "Spifen 400",
+                        color = HeadacheColorPalette.Additional.Pink,
                         isValid = true,
                         isMisspelled = false,
                     ),
@@ -148,6 +156,7 @@ private class EventPreviewProvider() : PreviewParameterProvider<EventItemUio> {
                         label = "Élétriptan 40",
                         amount = 1,
                         description = "Élétriptan 40",
+                        color = HeadacheColorPalette.Additional.Purple,
                         isValid = true,
                         isMisspelled = false,
                     ),
@@ -170,6 +179,7 @@ private class EventPreviewProvider() : PreviewParameterProvider<EventItemUio> {
                         label = "Spifen 400",
                         amount = 1,
                         description = "Spifen 400",
+                        color = HeadacheColorPalette.Additional.Yellow,
                         isValid = true,
                         isMisspelled = false,
                     ),
@@ -177,6 +187,7 @@ private class EventPreviewProvider() : PreviewParameterProvider<EventItemUio> {
                         label = "Élétriptan 40",
                         amount = 1,
                         description = "Élitriptan 40",
+                        color = HeadacheColorPalette.Additional.Purple,
                         isValid = true,
                         isMisspelled = true,
                     ),
@@ -192,6 +203,7 @@ private class EventPreviewProvider() : PreviewParameterProvider<EventItemUio> {
                         label = "Spifen 400",
                         amount = 1,
                         description = "Spifen 400",
+                        color = HeadacheColorPalette.Additional.Yellow,
                         isValid = true,
                         isMisspelled = false,
                     ),
@@ -199,6 +211,7 @@ private class EventPreviewProvider() : PreviewParameterProvider<EventItemUio> {
                         label = "?",
                         amount = 1,
                         description = "Élitriptan 40",
+                        color = HeadacheColorPalette.Additional.Purple,
                         isValid = false,
                         isMisspelled = false,
                     ),
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/EventItemFactory.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItemFactory.kt
similarity index 90%
rename from app/src/main/java/com/pixelized/headache/ui/page/event/EventItemFactory.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItemFactory.kt
index 9a29ecc..3518135 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/event/EventItemFactory.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItemFactory.kt
@@ -1,4 +1,4 @@
-package com.pixelized.headache.ui.page.event
+package com.pixelized.headache.ui.page.event.list
 
 import android.icu.util.Calendar
 import com.pixelized.headache.repository.event.Event
@@ -10,7 +10,7 @@ class EventItemFactory @Inject constructor() {
     private val calendar = Calendar.getInstance()
 
     fun convertToUio(
-        events: List<Event>,
+        events: Collection<Event>,
     ): List<EventItemUio> {
         return events
             .sortedByDescending { it.date }
@@ -38,6 +38,7 @@ class EventItemFactory @Inject constructor() {
             label = pill.label,
             amount = pill.amount,
             description = pill.description,
+            color = pill.color,
             isValid = pill.isValid,
             isMisspelled = pill.isMisspelled,
         )
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/EventPage.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt
similarity index 52%
rename from app/src/main/java/com/pixelized/headache/ui/page/event/EventPage.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt
index 80db093..c7406f7 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/event/EventPage.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt
@@ -1,6 +1,10 @@
-package com.pixelized.headache.ui.page.event
+package com.pixelized.headache.ui.page.event.list
 
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -8,40 +12,56 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.pixelized.headache.R
 import com.pixelized.headache.ui.navigation.LocalNavigator
+import com.pixelized.headache.ui.page.event.edit.EventEditBottomSheet
+import com.pixelized.headache.ui.page.event.edit.EventEditBottomSheetViewModel
+import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
+import java.util.Date
 
 @Stable
 data object EventPageDefault {
     @Stable
-    val padding: PaddingValues = PaddingValues(vertical = 8.dp)
+    val listPadding: PaddingValues = PaddingValues(bottom = 56.dp + 16.dp * 2)
 
     @Stable
     val spacing: Dp = 0.dp
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EventPage(
     viewModel: EventViewModel = hiltViewModel(),
+    editViewModel: EventEditBottomSheetViewModel = hiltViewModel(),
 ) {
     val navigation = LocalNavigator.current
     val events = viewModel.events.collectAsStateWithLifecycle()
@@ -56,6 +76,13 @@ fun EventPage(
         onBack = { navigation.popBackstack() },
         onMisspelledFilter = viewModel::toggleMisspelledFilter,
         onInvalidFilter = viewModel::toggleErrorFilter,
+        onAddEvent = { editViewModel.show() },
+        onEvent = { editViewModel.show(eventId = it.id) }
+    )
+
+    EventEditBottomSheet(
+        viewModel = editViewModel,
+        onDismissRequest = { editViewModel.dismiss() },
     )
 }
 
@@ -63,7 +90,7 @@ fun EventPage(
 @OptIn(ExperimentalMaterial3Api::class)
 private fun EventContent(
     modifier: Modifier = Modifier,
-    padding: PaddingValues = EventPageDefault.padding,
+    listPadding: PaddingValues = EventPageDefault.listPadding,
     spacing: Dp = EventPageDefault.spacing,
     invalidFilter: State<Boolean>,
     misspelledFilter: State<Boolean>,
@@ -71,6 +98,8 @@ private fun EventContent(
     onBack: () -> Unit,
     onInvalidFilter: () -> Unit,
     onMisspelledFilter: () -> Unit,
+    onAddEvent: () -> Unit,
+    onEvent: (EventItemUio) -> Unit,
 ) {
     Scaffold(
         modifier = modifier,
@@ -126,28 +155,104 @@ private fun EventContent(
                 }
             )
         },
+        floatingActionButton = {
+            FloatingActionButton(
+                containerColor = MaterialTheme.colorScheme.primary,
+                shape = CircleShape,
+                onClick = onAddEvent,
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Add,
+                    contentDescription = null,
+                )
+            }
+        },
         content = { paddingValues ->
             LazyColumn(
                 modifier = Modifier
                     .padding(paddingValues = paddingValues)
                     .fillMaxSize(),
                 verticalArrangement = Arrangement.spacedBy(space = spacing),
-                contentPadding = padding,
-                reverseLayout = true,
+                contentPadding = listPadding,
             ) {
                 items(
                     items = events.value,
                     key = { it.id },
                     contentType = { "EventItem" },
                 ) { item ->
-                    EventItem(
-                        modifier = Modifier
-                            .animateItem()
-                            .fillMaxWidth(),
-                        item = item,
-                    )
+                    AnimatedContent(
+                        modifier = Modifier.animateItem(),
+                        targetState = item,
+                        transitionSpec = { fadeIn() togetherWith fadeOut() },
+                    ) { animatedItem ->
+                        EventItem(
+                            modifier = Modifier.fillMaxWidth(),
+                            item = animatedItem,
+                            onItem = onEvent,
+                        )
+                    }
                 }
             }
         }
     )
+}
+
+@Composable
+@Preview
+private fun EventContentPreview(
+    @PreviewParameter(EventContentPreviewProvider::class) preview: List<EventItemUio>,
+) {
+    HeadacheTheme {
+        Surface {
+            EventContent(
+                invalidFilter = remember { mutableStateOf(false) },
+                misspelledFilter = remember { mutableStateOf(false) },
+                events = remember { mutableStateOf(preview) },
+                onBack = { },
+                onInvalidFilter = { },
+                onMisspelledFilter = { },
+                onAddEvent = { },
+                onEvent = { },
+            )
+        }
+    }
+}
+
+private class EventContentPreviewProvider : PreviewParameterProvider<List<EventItemUio>> {
+    override val values: Sequence<List<EventItemUio>>
+        get() = sequenceOf(
+            listOf(
+                EventItemUio(
+                    id = 0,
+                    date = Date(),
+                    pills = emptyList(),
+                    isValid = true,
+                    isMisspelled = false,
+                ),
+                EventItemUio(
+                    id = 1,
+                    date = Date(),
+                    pills = listOf(
+                        PillUio(
+                            label = "Spifen 400",
+                            amount = 1,
+                            description = "Spifen 400",
+                            color = HeadacheColorPalette.Additional.Yellow,
+                            isValid = true,
+                            isMisspelled = false,
+                        ),
+                        PillUio(
+                            label = "Élétriptan 40",
+                            amount = 1,
+                            description = "Élitriptan 40",
+                            color = HeadacheColorPalette.Additional.Purple,
+                            isValid = true,
+                            isMisspelled = true,
+                        ),
+                    ),
+                    isValid = true,
+                    isMisspelled = false,
+                ),
+            ),
+        )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/EventViewModel.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventViewModel.kt
similarity index 53%
rename from app/src/main/java/com/pixelized/headache/ui/page/event/EventViewModel.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/event/list/EventViewModel.kt
index cc062c2..9e62d33 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/event/EventViewModel.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventViewModel.kt
@@ -1,4 +1,4 @@
-package com.pixelized.headache.ui.page.event
+package com.pixelized.headache.ui.page.event.list
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -16,14 +16,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 
 @HiltViewModel(assistedFactory = EventViewModel.Factory::class)
 class EventViewModel @AssistedInject constructor(
-    googleCalendarIdRepository: GoogleCalendarIdRepository,
     eventRepository: EventRepository,
     eventItemFactory: EventItemFactory,
     @Assisted val argument: EventDestination,
@@ -36,43 +33,36 @@ class EventViewModel @AssistedInject constructor(
     val invalidFilter: StateFlow<Boolean> = invalidFilterFlow
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    val events: StateFlow<List<EventItemUio>> = googleCalendarIdRepository.calendarId
-        .flatMapLatest { id: Long? ->
-            when (id) {
-                null -> flowOf(emptyList())
-                else -> {
-                    combine(
-                        when (argument.date) {
-                            null -> eventRepository.eventFlow(calendarId = id)
-                            else -> eventRepository.eventFlow(calendarId = id)
-                                .mapLatest { events ->
-                                    events.filter { event ->
-                                        event.date isSameMonth argument.date
-                                    }
-                                }
-                        },
-                        misspelledFilterFlow,
-                        invalidFilterFlow,
-                    ) { events, misspelled, invalid ->
-                        if (!misspelled && !invalid) {
-                            events
-                        } else {
-                            events.filter {
-                                misspelled && it.isMisspelled || invalid && it.isValid.not()
-                            }
-                        }
+    val events: StateFlow<List<EventItemUio>> = combine(
+        when (argument.date) {
+            null -> eventRepository.eventsListFlow()
+            else -> eventRepository.eventsListFlow()
+                .mapLatest { events ->
+                    events.filter { event ->
+                        event.date isSameMonth argument.date
                     }
                 }
+        },
+        misspelledFilterFlow,
+        invalidFilterFlow,
+        transform = { events, misspelled, invalid ->
+            if (!misspelled && !invalid) {
+                events
+            } else {
+                events.filter {
+                    misspelled && it.isMisspelled || invalid && it.isValid.not()
+                }
             }
         }
-        .mapLatest { events: List<Event> ->
-            eventItemFactory.convertToUio(events = events)
-        }
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.Lazily,
-            initialValue = emptyList(),
+    ).mapLatest { events: Collection<Event> ->
+        eventItemFactory.convertToUio(
+            events = events,
         )
+    }.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.Lazily,
+        initialValue = emptyList(),
+    )
 
     fun toggleMisspelledFilter() {
         misspelledFilterFlow.value = !misspelledFilterFlow.value
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/PillUio.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/PillUio.kt
similarity index 74%
rename from app/src/main/java/com/pixelized/headache/ui/page/event/PillUio.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/event/list/PillUio.kt
index fa8716a..1f22bf5 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/event/PillUio.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/PillUio.kt
@@ -1,13 +1,18 @@
-package com.pixelized.headache.ui.page.event
+package com.pixelized.headache.ui.page.event.list
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -15,12 +20,14 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
 
 @Stable
 data class PillUio(
     val label: String,
     val amount: Int,
     val description: String,
+    val color: Color,
     val isValid: Boolean,
     val isMisspelled: Boolean,
 )
@@ -44,7 +51,18 @@ fun PillItem(
         Text(
             modifier = Modifier.alignByBaseline(),
             style = MaterialTheme.typography.bodyMedium,
-            text = "- ${item.label}: ${item.amount}",
+            text = "-",
+        )
+        Box(
+            modifier = Modifier
+                .align(alignment = Alignment.CenterVertically)
+                .size(12.dp)
+                .background(color = item.color)
+        )
+        Text(
+            modifier = Modifier.alignByBaseline(),
+            style = MaterialTheme.typography.bodyMedium,
+            text = "${item.label}: ${item.amount}",
         )
         Text(
             modifier = Modifier.alignByBaseline(),
@@ -80,6 +98,7 @@ private class PillPreviewProvider : PreviewParameterProvider<PillUio> {
                 label = "Élétriptan 40",
                 amount = 2,
                 description = "Élétriptan 400 x2",
+                color = HeadacheColorPalette.Additional.Purple,
                 isValid = true,
                 isMisspelled = false,
             ),
@@ -87,6 +106,7 @@ private class PillPreviewProvider : PreviewParameterProvider<PillUio> {
                 label = "Élétriptan 400",
                 amount = 2,
                 description = "Élitriptan 400 x2",
+                color = HeadacheColorPalette.Additional.Purple,
                 isValid = true,
                 isMisspelled = true,
             ),
@@ -94,6 +114,7 @@ private class PillPreviewProvider : PreviewParameterProvider<PillUio> {
                 label = "?",
                 amount = 2,
                 description = "Ilitriptan 400 x2",
+                color = HeadacheColorPalette.Additional.Purple,
                 isValid = false,
                 isMisspelled = false,
             ),
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPage.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPage.kt
index a52aeec..3fa67d4 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPage.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPage.kt
@@ -1,17 +1,25 @@
 package com.pixelized.headache.ui.page.summary
 
-import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.Article
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.BarChart
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -21,8 +29,12 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -30,32 +42,42 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.pixelized.headache.R
 import com.pixelized.headache.ui.navigation.LocalNavigator
 import com.pixelized.headache.ui.navigation.destination.navigateToEventPage
+import com.pixelized.headache.ui.page.event.edit.EventEditBottomSheet
+import com.pixelized.headache.ui.page.event.edit.EventEditBottomSheetViewModel
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryBox
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryBoxUio
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryCell
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryItem
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryItemUio
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryTitle
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryTitleUio
+import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
 import java.util.Date
 
 @Stable
 data object MonthSummaryPageDefault {
     @Stable
-    val padding: PaddingValues = PaddingValues(vertical = 8.dp)
+    val listPadding: PaddingValues = PaddingValues(bottom = 56.dp + 16.dp * 2)
 
     @Stable
     val spacing: Dp = 0.dp
 }
 
-@Stable
-sealed interface MonthSummaryItem {
-    val date: Date
-}
-
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MonthSummaryPage(
     viewModel: MonthSummaryViewModel = hiltViewModel(),
+    editViewModel: EventEditBottomSheetViewModel = hiltViewModel(),
 ) {
     val navigation = LocalNavigator.current
     val boxMode = viewModel.boxMode.collectAsStateWithLifecycle()
     val events = viewModel.events.collectAsStateWithLifecycle()
 
     MonthSummaryContent(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .systemBarsPadding()
+            .fillMaxSize(),
         events = events,
         boxMode = boxMode,
         onBack = {
@@ -66,7 +88,15 @@ fun MonthSummaryPage(
         },
         onItem = {
             navigation.navigateToEventPage(date = it.date)
-        }
+        },
+        onAddEvent = {
+            editViewModel.show()
+        },
+    )
+
+    EventEditBottomSheet(
+        viewModel = editViewModel,
+        onDismissRequest = { editViewModel.dismiss() },
     )
 }
 
@@ -75,12 +105,13 @@ fun MonthSummaryPage(
 private fun MonthSummaryContent(
     modifier: Modifier = Modifier,
     spacing: Dp = MonthSummaryPageDefault.spacing,
-    padding: PaddingValues = MonthSummaryPageDefault.padding,
+    listPadding: PaddingValues = MonthSummaryPageDefault.listPadding,
     boxMode: State<Boolean>,
-    events: State<List<MonthSummaryItem>>,
+    events: State<Map<MonthSummaryCell, List<MonthSummaryCell>>>,
     onBack: () -> Unit,
     onDisplay: () -> Unit,
-    onItem: (MonthSummaryItem) -> Unit,
+    onItem: (MonthSummaryCell) -> Unit,
+    onAddEvent: () -> Unit,
 ) {
     Scaffold(
         modifier = modifier,
@@ -100,56 +131,65 @@ private fun MonthSummaryContent(
                     Text(text = stringResource(R.string.month_summary_title))
                 },
                 actions = {
-                    val color = animateColorAsState(
-                        when (boxMode.value) {
-                            true -> MaterialTheme.colorScheme.error
-                            else -> MaterialTheme.colorScheme.onSurface
-                        }
-                    )
-                    IconButton(
-                        onClick = onDisplay,
+                    AnimatedContent(
+                        targetState = boxMode.value,
+                        transitionSpec = { fadeIn() togetherWith fadeOut() },
                     ) {
-                        Icon(
-                            imageVector = Icons.Default.BarChart,
-                            tint = color.value,
-                            contentDescription = null,
-                        )
+                        IconButton(
+                            onClick = onDisplay,
+                        ) {
+                            Icon(
+                                imageVector = when (it) {
+                                    true -> Icons.AutoMirrored.Filled.Article
+                                    else -> Icons.Default.BarChart
+                                },
+                                contentDescription = null,
+                            )
+                        }
                     }
                 }
             )
         },
+        floatingActionButton = {
+            FloatingActionButton(
+                containerColor = MaterialTheme.colorScheme.primary,
+                shape = CircleShape,
+                onClick = onAddEvent,
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Add,
+                    contentDescription = null,
+                )
+            }
+        },
         content = { paddingValues ->
             LazyColumn(
                 modifier = Modifier
                     .padding(paddingValues = paddingValues)
                     .fillMaxSize(),
-                contentPadding = padding,
+                contentPadding = listPadding,
                 verticalArrangement = Arrangement.spacedBy(space = spacing),
-                reverseLayout = true,
+                reverseLayout = false,
             ) {
-                items(
-                    items = events.value,
-                    key = { it.date },
-                    contentType = {
-                        when (it) {
-                            is MonthSummaryBoxUio -> "MonthSummaryBoxUio"
-                            is MonthSummaryItemUio -> "MonthSummaryItemUio"
-                        }
-                    },
-                ) { item ->
-                    when (item) {
-                        is MonthSummaryBoxUio -> MonthSummaryBox(
-                            modifier = Modifier
-                                .animateItem()
-                                .fillMaxWidth(),
-                            item = item,
+                events.value.forEach { entry ->
+                    stickyHeader {
+                        MonthSummaryCell(
+                            item = entry.key,
                             onItem = onItem,
                         )
-
-                        is MonthSummaryItemUio -> MonthSummaryItem(
-                            modifier = Modifier
-                                .animateItem()
-                                .fillMaxWidth(),
+                    }
+                    items(
+                        items = entry.value,
+                        key = { it.date },
+                        contentType = {
+                            when (it) {
+                                is MonthSummaryBoxUio -> "MonthSummaryBoxUio"
+                                is MonthSummaryItemUio -> "MonthSummaryItemUio"
+                                is MonthSummaryTitleUio -> "MonthSummaryTitleUio"
+                            }
+                        },
+                    ) { item ->
+                        MonthSummaryCell(
                             item = item,
                             onItem = onItem,
                         )
@@ -158,4 +198,81 @@ private fun MonthSummaryContent(
             }
         }
     )
+}
+
+@Composable
+private fun MonthSummaryCell(
+    item: MonthSummaryCell,
+    onItem: (MonthSummaryCell) -> Unit,
+) {
+    AnimatedContent(
+        modifier = Modifier.fillMaxWidth(),
+        targetState = item,
+        transitionSpec = { fadeIn() togetherWith fadeOut() },
+    ) { item ->
+        when (item) {
+            is MonthSummaryTitleUio -> MonthSummaryTitle(
+                item = item,
+            )
+
+            is MonthSummaryBoxUio -> MonthSummaryBox(
+                item = item,
+                onItem = onItem,
+            )
+
+            is MonthSummaryItemUio -> MonthSummaryItem(
+                item = item,
+                onItem = onItem,
+            )
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun MonthSummaryPreview() {
+    HeadacheTheme {
+        MonthSummaryContent(
+            boxMode = remember { mutableStateOf(false) },
+            events = remember {
+                mutableStateOf(
+                    mapOf(
+                        MonthSummaryTitleUio(
+                            date = Date(),
+                        ) to listOf(
+                            MonthSummaryItemUio(
+                                date = Date(),
+                                days = 8,
+                                pills = listOf(
+                                    MonthSummaryPillItemUio(
+                                        label = "Spifen 400",
+                                        amount = 4,
+                                        color = HeadacheColorPalette.Pill.Spifen400,
+                                    ),
+                                    MonthSummaryPillItemUio(
+                                        label = "Élétriptan 40",
+                                        amount = 2,
+                                        color = HeadacheColorPalette.Pill.Eletriptan40,
+                                    ),
+                                ),
+                            ),
+                            MonthSummaryBoxUio(
+                                date = Date(),
+                                headacheRatio = 8f / 30f,
+                                headacheAmount = 8,
+                                headacheColor = Color.Red,
+                                pillRatio = 6f / 20f,
+                                pillAmount = 6,
+                                pillColor = Color.Blue,
+                            ),
+                        ),
+                    )
+                )
+            },
+            onBack = { },
+            onDisplay = { },
+            onItem = { },
+            onAddEvent = { },
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPillItem.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPillItem.kt
new file mode 100644
index 0000000..f879986
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryPillItem.kt
@@ -0,0 +1,88 @@
+package com.pixelized.headache.ui.page.summary
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
+
+@Stable
+data class MonthSummaryPillItemUio(
+    val label: String,
+    val amount: Int,
+    val color: Color,
+)
+
+@Stable
+data object MonthSummaryPillItemDefault {
+    @Stable
+    val padding: PaddingValues = PaddingValues(0.dp)
+
+    @Stable
+    val colorBoxSize: Dp = 8.dp
+
+    @Stable
+    val spacing: Dp = 4.dp
+}
+
+@Composable
+fun MonthSummaryPillItem(
+    modifier: Modifier = Modifier,
+    padding: PaddingValues = MonthSummaryPillItemDefault.padding,
+    spacing: Dp = MonthSummaryPillItemDefault.spacing,
+    colorBoxSize: Dp = MonthSummaryPillItemDefault.colorBoxSize,
+    item: MonthSummaryPillItemUio,
+) {
+    Row(
+        modifier = Modifier
+            .padding(paddingValues = padding)
+            .then(other = modifier),
+        horizontalArrangement = Arrangement.spacedBy(space = spacing),
+    ) {
+        Text(
+            style = MaterialTheme.typography.bodyMedium,
+            text = "-",
+        )
+        Box(
+            modifier = Modifier
+                .align(alignment = Alignment.CenterVertically)
+                .size(size = colorBoxSize)
+                .background(color = item.color)
+        )
+        Text(
+            style = MaterialTheme.typography.bodyMedium,
+            text = "${item.label} : ${item.amount}",
+        )
+    }
+}
+
+@Composable
+@Preview
+private fun MonthSummaryPillItemPreview() {
+    HeadacheTheme {
+        Surface {
+            MonthSummaryPillItem(
+                item = MonthSummaryPillItemUio(
+                    label = "Élétriptan 40",
+                    amount = 1,
+                    color = HeadacheColorPalette.Pill.Eletriptan40,
+                )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryViewModel.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryViewModel.kt
index 27f21dc..611f980 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryViewModel.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryViewModel.kt
@@ -2,23 +2,22 @@ package com.pixelized.headache.ui.page.summary
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.pixelized.headache.repository.calendar.GoogleCalendarIdRepository
 import com.pixelized.headache.repository.event.Event
 import com.pixelized.headache.repository.event.EventRepository
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryCell
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryFactory
+import com.pixelized.headache.ui.page.summary.item.MonthSummaryTitleUio
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 
 @HiltViewModel
 class MonthSummaryViewModel @Inject constructor(
-    googleCalendarIdRepository: GoogleCalendarIdRepository,
     eventRepository: EventRepository,
     eventItemFactory: MonthSummaryFactory,
 ) : ViewModel() {
@@ -27,23 +26,20 @@ class MonthSummaryViewModel @Inject constructor(
     val boxMode: StateFlow<Boolean> = displayTypeFlow
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    val events: StateFlow<List<MonthSummaryItem>> = googleCalendarIdRepository.calendarId
-        .flatMapLatest { id: Long? ->
-            when (id) {
-                null -> flowOf(emptyList())
-                else -> eventRepository.eventFlow(calendarId = id)
-            }
-        }.combine(displayTypeFlow) { events: List<Event>, display ->
+    val events: StateFlow<Map<MonthSummaryCell, List<MonthSummaryCell>>> = combine(
+        eventRepository.eventsListFlow(),
+        displayTypeFlow,
+        transform = { events: Collection<Event>, display ->
             when (display) {
                 true -> eventItemFactory.convertToBoxUio(events = events)
                 else -> eventItemFactory.convertToItemUio(events = events)
             }
         }
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.Lazily,
-            initialValue = emptyList(),
-        )
+    ).stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.Lazily,
+        initialValue = emptyMap(),
+    )
 
     fun toggleDisplay() {
         displayTypeFlow.value = displayTypeFlow.value.not()
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryBox.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryBox.kt
similarity index 95%
rename from app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryBox.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryBox.kt
index 5605ed4..c3ba0ba 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryBox.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryBox.kt
@@ -1,4 +1,4 @@
-package com.pixelized.headache.ui.page.summary
+package com.pixelized.headache.ui.page.summary.item
 
 import android.annotation.SuppressLint
 import android.icu.text.SimpleDateFormat
@@ -30,6 +30,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.utils.extention.capitalize
 import java.util.Date
 import java.util.Locale
 
@@ -42,7 +43,7 @@ data object MonthSummaryBoxDefault {
     val spacing: DpSize = DpSize(width = 8.dp, height = 4.dp)
 
     @Stable
-    val labelWidth: Dp = 64.dp + 16.dp
+    val labelWidth: Dp = 32.dp + 16.dp
 
     @Stable
     val boxHeight: Dp = 16.dp
@@ -52,7 +53,7 @@ data object MonthSummaryBoxDefault {
 
     @SuppressLint("ConstantLocale")
     @Stable
-    val formatter = SimpleDateFormat("MMM yyyy", Locale.getDefault())
+    val formatter = SimpleDateFormat("MMM", Locale.getDefault())
 }
 
 @Stable
@@ -64,7 +65,7 @@ data class MonthSummaryBoxUio(
     val pillRatio: Float?,
     val pillAmount: Int,
     val pillColor: Color,
-) : MonthSummaryItem
+) : MonthSummaryCell
 
 @Composable
 fun MonthSummaryBox(
@@ -90,7 +91,7 @@ fun MonthSummaryBox(
             modifier = Modifier.width(width = labelWidth),
             style = MaterialTheme.typography.bodyMedium,
             textAlign = TextAlign.End,
-            text = formatter.format(item.date),
+            text = formatter.format(item.date).capitalize(),
         )
         Column(
             verticalArrangement = Arrangement.spacedBy(space = spacing.height),
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryCell.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryCell.kt
new file mode 100644
index 0000000..be6308a
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryCell.kt
@@ -0,0 +1,9 @@
+package com.pixelized.headache.ui.page.summary.item
+
+import androidx.compose.runtime.Stable
+import java.util.Date
+
+@Stable
+sealed interface MonthSummaryCell {
+    val date: Date
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryFactory.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryFactory.kt
similarity index 54%
rename from app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryFactory.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryFactory.kt
index bb0104d..82a0b40 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryFactory.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryFactory.kt
@@ -1,34 +1,50 @@
-package com.pixelized.headache.ui.page.summary
+package com.pixelized.headache.ui.page.summary.item
 
 import android.icu.util.Calendar
 import androidx.compose.ui.graphics.Color
 import com.pixelized.headache.repository.event.Event
+import com.pixelized.headache.ui.page.summary.MonthSummaryPillItemUio
 import com.pixelized.headache.utils.extention.event
 import javax.inject.Inject
 import kotlin.math.max
+import kotlin.reflect.KClass
 
 class MonthSummaryFactory @Inject constructor() {
     private val calendar = Calendar.getInstance()
 
     fun convertToItemUio(
-        events: List<Event>,
-    ): List<MonthSummaryItemUio> {
+        events: Collection<Event>,
+    ): Map<MonthSummaryCell, List<MonthSummaryCell>> {
         return events
             .fold(hashMapOf<Event.Date, MutableList<Event>>()) { acc, event ->
                 acc.also { it.getOrPut(event.date.copy(day = 1)) { mutableListOf() }.add(event) }
             }
-            .mapKeys { entry ->
+            .map { entry ->
                 val pills = entry.value
-                    .fold(hashMapOf<String, Int>()) { acc, event ->
+                    .fold(hashMapOf<Event.Pill.Id, EventFolder>()) { acc, event ->
                         event.pills.forEach { pill ->
-                            acc[pill.label] = acc.getOrDefault(pill.label, 0) + pill.amount
+                            val value = acc.getOrElse(
+                                key = pill.id,
+                                defaultValue = {
+                                    EventFolder(
+                                        label = pill.label,
+                                        amount = 0,
+                                        color = pill.color,
+                                    )
+                                },
+                            )
+                            value.amount += 1
+                            acc[pill.id] = value
                         }
                         acc
                     }
-                    .mapKeys {
-                        it.key to it.value
+                    .map { entry ->
+                        MonthSummaryPillItemUio(
+                            label = entry.value.label,
+                            color = entry.value.color,
+                            amount = entry.value.amount,
+                        )
                     }
-                    .keys
                     .toList()
 
                 MonthSummaryItemUio(
@@ -37,14 +53,13 @@ class MonthSummaryFactory @Inject constructor() {
                     pills = pills,
                 )
             }
-            .keys
-            .toList()
             .sortedByDescending { it.date }
+            .groupByMonth()
     }
 
     fun convertToBoxUio(
-        events: List<Event>,
-    ): List<MonthSummaryBoxUio> {
+        events: Collection<Event>,
+    ): Map<MonthSummaryCell, List<MonthSummaryCell>> {
         var maxPillAmount = 0
         return events
             .fold(hashMapOf<Event.Date, MutableList<Event>>()) { acc, event ->
@@ -57,9 +72,10 @@ class MonthSummaryFactory @Inject constructor() {
                 )
                 entry.key
             }
-            .mapKeys { entry ->
-                val pillAmount =
-                    entry.value.sumOf { events -> events.pills.sumOf { pill -> pill.amount } }
+            .map { entry ->
+                val pillAmount = entry.value.sumOf { events ->
+                    events.pills.sumOf { pill -> pill.amount }
+                }
                 val monthMaxDay = calendar.apply {
                     event = entry.key
                     add(Calendar.MONTH, 1)
@@ -77,8 +93,25 @@ class MonthSummaryFactory @Inject constructor() {
                     pillColor = Color.Blue,
                 )
             }
-            .keys
-            .toList()
             .sortedByDescending { it.date }
+            .groupByMonth()
     }
+
+    fun List<MonthSummaryCell>.groupByMonth(): Map<MonthSummaryCell, List<MonthSummaryCell>> {
+        return this.groupBy {
+            MonthSummaryTitleUio(
+                date = calendar.apply {
+                    time = it.date
+                    set(Calendar.DAY_OF_YEAR, 1)
+                    set(Calendar.MILLISECONDS_IN_DAY, 0)
+                }.time,
+            )
+        }
+    }
+
+    private class EventFolder(
+        val label: String,
+        val color: Color,
+        var amount: Int,
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryItem.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryItem.kt
similarity index 71%
rename from app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryItem.kt
rename to app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryItem.kt
index 0b52257..c228ad8 100644
--- a/app/src/main/java/com/pixelized/headache/ui/page/summary/MonthSummaryItem.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryItem.kt
@@ -1,4 +1,4 @@
-package com.pixelized.headache.ui.page.summary
+package com.pixelized.headache.ui.page.summary.item
 
 import android.annotation.SuppressLint
 import android.icu.text.SimpleDateFormat
@@ -20,7 +20,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import com.pixelized.headache.ui.page.summary.MonthSummaryPillItem
+import com.pixelized.headache.ui.page.summary.MonthSummaryPillItemUio
 import com.pixelized.headache.ui.theme.HeadacheTheme
+import com.pixelized.headache.ui.theme.color.HeadacheColorPalette
+import com.pixelized.headache.utils.extention.capitalize
 import java.util.Date
 import java.util.Locale
 
@@ -28,8 +32,8 @@ import java.util.Locale
 data class MonthSummaryItemUio(
     override val date: Date,
     val days: Int,
-    val pills: List<Pair<String, Int>>,
-) : MonthSummaryItem
+    val pills: List<MonthSummaryPillItemUio>,
+) : MonthSummaryCell
 
 @Stable
 object MonthSummaryItemDefault {
@@ -42,7 +46,7 @@ object MonthSummaryItemDefault {
 
     @SuppressLint("ConstantLocale")
     @Stable
-    val formatter = SimpleDateFormat("MMMM yyyy", Locale.getDefault())
+    val formatter = SimpleDateFormat("MMMM", Locale.getDefault())
 }
 
 @Composable
@@ -83,20 +87,14 @@ fun MonthSummaryItem(
         }
         Column {
             item.pills.forEach {
-                Text(
-                    style = MaterialTheme.typography.bodyMedium,
-                    text = "- ${it.first} : ${it.second}",
+                MonthSummaryPillItem(
+                    item = it,
                 )
             }
         }
     }
 }
 
-@Composable
-@Stable
-fun String.capitalize() =
-    replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
-
 @Composable
 @Preview
 private fun MonthSummaryItemPreview(
@@ -120,10 +118,26 @@ private class PreviewProvider() : PreviewParameterProvider<MonthSummaryItemUio>
                 date = Date(),
                 days = 11,
                 pills = listOf(
-                    "Paracétamol 1000" to 2,
-                    "Ibuprofen 400" to 4,
-                    "Spifen 400" to 6,
-                    "Eletripan 40" to 0,
+                    MonthSummaryPillItemUio(
+                        label = "Paracétamol 1000",
+                        amount = 2,
+                        color = HeadacheColorPalette.Pill.Paracetamol1000,
+                    ),
+                    MonthSummaryPillItemUio(
+                        label = "Ibuprofen 400",
+                        amount = 4,
+                        color = HeadacheColorPalette.Pill.Ibuprofene400,
+                    ),
+                    MonthSummaryPillItemUio(
+                        label = "Spifen 400",
+                        amount = 6,
+                        color = HeadacheColorPalette.Pill.Spifen400,
+                    ),
+                    MonthSummaryPillItemUio(
+                        label = "Eletripan 40",
+                        amount = 0,
+                        color = HeadacheColorPalette.Pill.Eletriptan40,
+                    ),
                 ),
             )
         )
diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryTitle.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryTitle.kt
new file mode 100644
index 0000000..6bf9ea4
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/item/MonthSummaryTitle.kt
@@ -0,0 +1,71 @@
+package com.pixelized.headache.ui.page.summary.item
+
+import android.annotation.SuppressLint
+import android.icu.text.SimpleDateFormat
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.unit.dp
+import java.util.Date
+import java.util.Locale
+
+@Stable
+data class MonthSummaryTitleUio(
+    override val date: Date,
+) : MonthSummaryCell
+
+@Stable
+object MonthSummaryTitleDefault {
+
+    @Stable
+    val padding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+
+    @SuppressLint("ConstantLocale")
+    @Stable
+    val formatter = SimpleDateFormat("yyyy", Locale.getDefault())
+}
+
+val backgroundBrush: Brush
+    @Composable
+    @Stable
+    get() {
+        val colorScheme = MaterialTheme.colorScheme
+        return remember(colorScheme) {
+            Brush.verticalGradient(
+                listOf(
+                    colorScheme.surface,
+                    colorScheme.surface,
+                    colorScheme.surface,
+                    colorScheme.surface.copy(alpha = 0f),
+                )
+            )
+        }
+    }
+
+@Composable
+fun MonthSummaryTitle(
+    modifier: Modifier = Modifier,
+    padding: PaddingValues = MonthSummaryTitleDefault.padding,
+    formatter: SimpleDateFormat = MonthSummaryTitleDefault.formatter,
+    item: MonthSummaryTitleUio,
+) {
+    Box(
+        modifier = Modifier
+            .background(brush = backgroundBrush)
+            .then(other = modifier),
+    ) {
+        Text(
+            modifier = Modifier.padding(paddingValues = padding),
+            style = MaterialTheme.typography.titleLarge,
+            text = formatter.format(item.date)
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/theme/Color.kt b/app/src/main/java/com/pixelized/headache/ui/theme/Color.kt
deleted file mode 100644
index cc0d976..0000000
--- a/app/src/main/java/com/pixelized/headache/ui/theme/Color.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.pixelized.headache.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/ui/theme/Theme.kt b/app/src/main/java/com/pixelized/headache/ui/theme/Theme.kt
index 73ec851..e22dca7 100644
--- a/app/src/main/java/com/pixelized/headache/ui/theme/Theme.kt
+++ b/app/src/main/java/com/pixelized/headache/ui/theme/Theme.kt
@@ -1,57 +1,42 @@
 package com.pixelized.headache.ui.theme
 
-import android.app.Activity
-import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.compositionLocalOf
+import com.pixelized.headache.ui.theme.color.HeadacheColors
+import com.pixelized.headache.ui.theme.color.headacheDarkColorScheme
+import com.pixelized.headache.ui.theme.color.headacheLightColorScheme
 
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
+val LocalLwaTheme = compositionLocalOf<HeadacheTheme> {
+    error("Local Snack Controller is not yet ready")
+}
 
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
+val MaterialTheme.headache: HeadacheTheme
+    @Stable
+    @Composable
+    @ReadOnlyComposable
+    get() = LocalLwaTheme.current
 
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
+@Stable
+data class HeadacheTheme(
+    val colorScheme: HeadacheColors,
 )
 
 @Composable
 fun HeadacheTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
+        darkTheme -> headacheDarkColorScheme()
+        else -> headacheLightColorScheme()
     }
 
     MaterialTheme(
-        colorScheme = colorScheme,
+        colorScheme = colorScheme.base,
         typography = Typography,
         content = content
     )
diff --git a/app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColorPalette.kt b/app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColorPalette.kt
new file mode 100644
index 0000000..8332525
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColorPalette.kt
@@ -0,0 +1,60 @@
+package com.pixelized.headache.ui.theme.color
+
+import androidx.compose.ui.graphics.Color
+import javax.annotation.concurrent.Immutable
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
+
+@Immutable
+object HeadacheColorPalette {
+
+    @Immutable
+    object Pill {
+        val Unknown = Additional.Red
+        val Ibuprofene400 = Additional.Blue
+        val Paracetamol1000 = Additional.Green
+        val Spifen400 = Additional.Yellow
+        val Eletriptan40 = Additional.Pink
+    }
+
+    @Immutable
+    object Additional {
+        val VeryDarkBlue: Color = Color(0xFF09179D)
+        val DarkBlue: Color = Color(0xFF1A2BDB)
+        val MediumBlue: Color = Color(0xFF1523A2)
+        val Blue: Color = Color(0xFF2970F2)
+        val LightBlue: Color = Color(0xFF1A91DB)
+        val VeryLightBlue: Color = Color(0xFF1EDDEF)
+        val VeryDarkPurple: Color = Color(0xFF5F0E9E)
+        val DarkPurple: Color = Color(0xFF8330DB)
+        val Purple: Color = Color(0xFF9B54C3)
+        val LightPurple: Color = Color(0xFFBC52D9)
+        val VeryLightPurple: Color = Color(0xFFC856D1)
+        val VeryDarkGreen: Color = Color(0xFF16544A)
+        val DarkGreen: Color = Color(0xFF207A6B)
+        val Green: Color = Color(0xFF269482)
+        val LightGreen: Color = Color(0xFF2AA18D)
+        val VeryLightGreen: Color = Color(0xFF3AE0C5)
+        val VeryDarkRed: Color = Color(0xFF631221)
+        val DarkRed: Color = Color(0xFFA21D36)
+        val Red: Color = Color(0xFFC92443)
+        val LightRed: Color = Color(0xFFE32849)
+        val VeryLightRed: Color = Color(0xFFF02B4F)
+        val VeryDarkPink: Color = Color(0xFF960064)
+        val DarkPink: Color = Color(0xFFBD007E)
+        val Pink: Color = Color(0xFFD6008F)
+        val LightPink: Color = Color(0xFFE35BB5)
+        val VeryLightPink: Color = Color(0xFFFF66CC)
+        val VeryDarkYellow: Color = Color(0xFFB76036)
+        val DarkYellow: Color = Color(0xFFD48341)
+        val Yellow: Color = Color(0xFFF3A850)
+        val LightYellow: Color = Color(0xFFF5BF63)
+        val VeryLightYellow: Color = Color(0xFFF9D679)
+    }
+}
diff --git a/app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColors.kt b/app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColors.kt
new file mode 100644
index 0000000..0e9efdd
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/ui/theme/color/HeadacheColors.kt
@@ -0,0 +1,58 @@
+package com.pixelized.headache.ui.theme.color
+
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import kotlin.math.ln
+
+@Stable
+data class HeadacheColors(
+    val base: ColorScheme,
+)
+
+@Composable
+@Stable
+fun headacheDarkColorScheme(
+    base: ColorScheme = darkColorScheme(),
+) = HeadacheColors(
+    base = base,
+)
+
+@Composable
+@Stable
+fun headacheLightColorScheme(
+    base: ColorScheme = lightColorScheme(),
+) = HeadacheColors(
+    base = base,
+)
+
+
+@ReadOnlyComposable
+@Composable
+fun calculateElevatedColor(
+    color: Color,
+    onColor: Color = MaterialTheme.colorScheme.surface,
+    elevation: Dp,
+): Color {
+    return if (elevation > 0.dp) {
+        val foregroundColor = calculateForegroundColor(onColor, elevation)
+        foregroundColor.compositeOver(color)
+    } else {
+        color
+    }
+}
+
+@ReadOnlyComposable
+@Composable
+private fun calculateForegroundColor(color: Color, elevation: Dp): Color {
+    val alpha = ((4.5f * ln(elevation.value + 1)) + 2f) / 100f
+    return color.copy(alpha = alpha)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/utils/extention/CalendarEx.kt b/app/src/main/java/com/pixelized/headache/utils/extention/CalendarEx+event.kt
similarity index 100%
rename from app/src/main/java/com/pixelized/headache/utils/extention/CalendarEx.kt
rename to app/src/main/java/com/pixelized/headache/utils/extention/CalendarEx+event.kt
diff --git a/app/src/main/java/com/pixelized/headache/utils/extention/EventDateEx.kt b/app/src/main/java/com/pixelized/headache/utils/extention/EventDateEx+isSameMonth.kt
similarity index 100%
rename from app/src/main/java/com/pixelized/headache/utils/extention/EventDateEx.kt
rename to app/src/main/java/com/pixelized/headache/utils/extention/EventDateEx+isSameMonth.kt
diff --git a/app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+isElementVisible.kt b/app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+isElementVisible.kt
new file mode 100644
index 0000000..843ced4
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+isElementVisible.kt
@@ -0,0 +1,24 @@
+package com.pixelized.headache.utils.extention
+
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
+
+/**
+ * is an extension function for Modifier.
+ * It allows you to attach visibility detection logic to any composable element
+ */
+fun Modifier.isElementVisible(onVisibilityChanged: (Boolean) -> Unit): Modifier {
+    var isVisible = false
+    return this.onGloballyPositioned { layoutCoordinates ->
+        val localIsVisible = layoutCoordinates.parentLayoutCoordinates?.let {
+            val parentBounds = it.boundsInWindow()
+            val childBounds = layoutCoordinates.boundsInWindow()
+            parentBounds.overlaps(childBounds)
+        } ?: false
+        if (isVisible != localIsVisible) {
+            isVisible = localIsVisible
+            onVisibilityChanged(localIsVisible)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+thenIf.kt b/app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+thenIf.kt
new file mode 100644
index 0000000..922e090
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/utils/extention/ModifierEx+thenIf.kt
@@ -0,0 +1,10 @@
+package com.pixelized.headache.utils.extention
+
+import androidx.compose.ui.Modifier
+
+fun Modifier.thenIf(condition: Boolean, block: Modifier.() -> Modifier): Modifier {
+    return when (condition) {
+        true -> block(this)
+        else -> this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/utils/extention/StringEx+capitalize.kt b/app/src/main/java/com/pixelized/headache/utils/extention/StringEx+capitalize.kt
new file mode 100644
index 0000000..a1da870
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/utils/extention/StringEx+capitalize.kt
@@ -0,0 +1,14 @@
+package com.pixelized.headache.utils.extention
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import java.util.Locale
+
+@Composable
+@Stable
+fun String.capitalize() = replaceFirstChar {
+    when {
+        it.isLowerCase() -> it.titlecase(Locale.getDefault())
+        else -> it.toString()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/headache/utils/rememberKeyboardActions.kt b/app/src/main/java/com/pixelized/headache/utils/rememberKeyboardActions.kt
new file mode 100644
index 0000000..abab968
--- /dev/null
+++ b/app/src/main/java/com/pixelized/headache/utils/rememberKeyboardActions.kt
@@ -0,0 +1,13 @@
+package com.pixelized.headache.utils
+
+import androidx.compose.foundation.text.KeyboardActionScope
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+
+@Composable
+fun rememberKeyboardActions(
+    onAny: KeyboardActionScope.() -> Unit,
+): KeyboardActions {
+    return remember { KeyboardActions(onAny = onAny) }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5858f39..26f2570 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,12 @@
 <resources>
     <string name="app_name">Céphalée</string>
 
+    <string name="action_confirm">Confirmer</string>
+    <string name="action_delete">Supprimer</string>
+
+    <string name="error_edit_calendar">L\'édition du calendrier a échouée</string>
+
     <string name="calendar_chooser_title">Choix du calendrier</string>
     <string name="event_title">Évennement migraineux</string>
-    <string name="month_summary_title">Suivit des migraines</string>
+    <string name="month_summary_title">Suivi des migraines</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51184ac..9e124a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,11 @@
 <resources>
     <string name="app_name">Headache</string>
 
+    <string name="action_confirm">Confirm</string>
+    <string name="action_delete">Delete</string>
+
+    <string name="error_edit_calendar">Calendar edit failed.</string>
+
     <string name="calendar_chooser_title">Choose your calendar</string>
     <string name="event_title">Headache event</string>
     <string name="month_summary_title">Headache summary</string>
diff --git a/app/src/test/java/com/pixelized/headache/EventFactoryText.kt b/app/src/test/java/com/pixelized/headache/EventFactoryTest.kt
similarity index 94%
rename from app/src/test/java/com/pixelized/headache/EventFactoryText.kt
rename to app/src/test/java/com/pixelized/headache/EventFactoryTest.kt
index 94e2bda..94227c0 100644
--- a/app/src/test/java/com/pixelized/headache/EventFactoryText.kt
+++ b/app/src/test/java/com/pixelized/headache/EventFactoryTest.kt
@@ -1,10 +1,10 @@
 package com.pixelized.headache
 
-import com.pixelized.headache.repository.event.EventFactory
+import com.pixelized.headache.repository.event.factory.PillFactory
 import org.junit.Test
 
-class EventFactoryText {
-    private val factory = EventFactory()
+class EventFactoryTest {
+    private val factory = PillFactory()
 
     @Test
     fun testPill() {