From 4fdbaa66a54359f5f6490b056842e5a2701babb5 Mon Sep 17 00:00:00 2001 From: "Andres Gomez, Thomas (ITDV RL)" Date: Fri, 26 Sep 2025 13:32:24 +0200 Subject: [PATCH] Fix some small issues / typos / colors --- app/release/baselineProfiles/0/app-release.dm | Bin 4630 -> 4667 bytes app/release/baselineProfiles/1/app-release.dm | Bin 4596 -> 4630 bytes .../com/pixelized/headache/MainActivity.kt | 6 +++ .../headache/ui/common/toolbar/Toolbar.kt | 40 ++++++++++++++++++ .../ui/navigation/home/HomeNavigator.kt | 2 +- .../ui/page/calendar/CalendarChooserPage.kt | 8 +--- .../headache/ui/page/event/list/EventItem.kt | 2 +- .../headache/ui/page/event/list/EventPage.kt | 29 +++---------- .../headache/ui/page/home/HomePage.kt | 9 +--- .../page/summary/monthly/MonthSummaryPage.kt | 3 +- .../summary/monthly/item/MonthSummaryItem.kt | 1 + .../summary/monthly/item/MonthSummaryTitle.kt | 2 +- .../ui/page/summary/report/ReportBox.kt | 2 + .../ui/theme/color/HeadacheColorPalette.kt | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 16 files changed, 68 insertions(+), 42 deletions(-) create mode 100644 app/src/main/java/com/pixelized/headache/ui/common/toolbar/Toolbar.kt diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index bd1f294ebecd5404389d57871d241b0c4787bdf5..58a4441201fb4906bed7f372df8574a6678b6b32 100644 GIT binary patch delta 4512 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 delta 4458 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 HU|;|MGq&i{ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index ba348a3ab480765d9acd279dea1cb4f532f25d18..22aa0c66194f557e049412c5f14525544d1e7f44 100644 GIT binary patch delta 4507 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 D&{7u4 delta 4488 zcmbQH@tLEm*Ve&%0_uv}_HC2~P-;NHOG7nKskKIdit#Y>)|Ec?a@BSI{^!IaT z*593*d($Yr==q$_d-uPud0zP5=Glz7xqstLpUrzObNAn=t3m5`XCH3cDjjxjciH2l zWFMb(>lV1}zI9dTLEz@KFFEtMKLnaQxmdB~F=PDdE8(YHcV(IWbhs?{fq_kO*7>*2 z;+2yGYbG>z7wJtf`>~5zqVR*b$py#zCylKSEcBl%UeC6n>XDuI$KW*O>|0knW~K*+ z*&6b0&fj-r=HnF~d;YsTW{Et(Zr*;O{HsC#mU~gT&#H8HWmWtN>rGp=qveOUWZI22c*^Xy_E-99-s7>6vz`n}1J?5RwECeyPs!E9Uo(uaa7xwRl5_L7IWG0s z$?8hp9Yt}26GvR@?y~bf*dcc6=`E*fj{a4d!XKva-<9=BlgOWPcUIVKhnrI8&Hg&f zx4HV_q0y^0?LY3~ow01O&!tyYc?lGUu!*1+p$~o)3vmto>y!!h`&QIBOtLpJF=ImD`KaWO)O_n#E9%H@wWX2<{ z?~6|!>nmO~udq0I-E;1zJ4|-TFFoA)c%SU2g1~m~#ZSYsi_iBjYP@su#5@i8$A@Qq z+fjSy@T-$Og;!#@C)-EfNO?1B&AQ^o_19)3ueZ5eSHxE%aZJc;hhbDXTe8z#+w_3v zGwbEvZ(iGsh;gG2g8aTlZ6+ z_ra{?f^RD?t6bmuw%+Gu;n#VuYv*o%zH9yEm-6RjJJhdF)Tp(%&B%UhvuypFhlypc zjDsZh1#XDinAIXzcb{WZ!Mvjp2kn1#eBLByzooFS=EF{hDRZm-#7LcLkDD_+z&}-X zx5|Wv^G+^Kx}yGN!}+b+U2+9)`Cq_j>}*yA*fV$Zz{KMS^AamzuKYTGtJ1?|-#gR;$E&uJ>K~!ap_5 zU)IST_!`9!x!|G1MBylO0X%H#u%)eYskY_-RqX55M*Eo(Gov$!VzgaDeTNV~gqQ zem|W%e{!a_Joxc?r|*n)>!;5-xY^;*huY+A>cPePu19^(I{9qQs;|-V<@*}s?22of zZ4KZ^erW=RW)O zV`GBuoOjRVY#;e3|1C_tC@=o*+v|mwtNFg`hx z)Ar2znDxxTn0=Pzh58*bE6R>#9@{CCKIf#AWPiSSM4WPN_NlBl5$2C?_N0RqooP(t zGbv8^RrKIr|AU!c^Y7nGi`BmVYUyg#^kol!&J=vTInll}ndi>^hu4zNryS$^Zg3^K zpKp4b)$7`CzE;=P?MbWub?s2G;_IsK0mx&&-_Fu{A6F zZ^`JNKRs{TiTrb`Gh63BtgwG9)RZ3{DdQKdza@K)-Wi!ar#`!UH{hFcHu93@=b~-q z_0t}BPW!Or^la0mH;vL|riIkm+8+qdTE9f{{%)5o->Pml-0V8@VKeiTe>~5%Vop{! zehSKViTk-{$@LpEq!iOkUM>qd&tmW!V(pM`!o6}02rPdnArXSy8= zbUx2{8+PZ3jr8-bt(SATk8QBAKc0Q~hVk{|$>+_M)JI--`Cs_HJw_`a8=uyez`(%=c>|Zl|8k_*b`d?bN;9b3U#-axGcf zX5E)vbFAy~rle-|Op|4OKcPN&o@zGVN8L&3F^LE7KV6$TMTPyPU9g0u$`ooU0w6K(q^Ak9^2WBTOx1#UQcb=nE8|G<+-m%udENZOP=g1 zEx+09qG{FHh*L~cjjPw}T{+|5<)%Msf3BA(#%6feJTU$od*Vs;+nY09o-SK>>qpO> zr{8AQr0Xr*kvKYTL}ebD8@e zS#MmXvES*$tei(5>fgzKjXk?`lH07~!Hd~5cGiB|@VD7_-xNu|8T0vWmE`TPh`Dn; z|NE_$jJwfF){~|@^KiVk?XiExsihfj?dmTED{Yy%*u70Y%e*IZ?)L+w;2BqMS(PV*%h-QU|GCsetT%1a=`(JdAN3s$U%xNE)5H4^*KXgs z<2nm_d1WqMTFSfick-fZlc#LYzj^WKug)}> z5u2>s`9pS|&wBgA_loLHol;;|T`W5xfw|_^aYdIuj;Hn6+m3B}H+7BA^MwId_CD60_I+XU`}(Q3F8!F>yM5Yk3I55| z`9Dnme2L|Hx9#-N?`O^Tok@Os|K5eYC5jgnEmg&y+7>eY=l|#}ueo}?MTV+LGi&v! zN2eRqs(1akvcXlWhT-DhedpGQX}-1AR=1LnjxK6vo`2RMPNo0m^Uq~2Qaeo^nAhCe za_rXm{dd;9>c~I2t|sa5`TEDpwx|Bwn^dZ|&gblkZTG)4m;GW%bIy1vC&T_Owrl;T z`*TcP&uooyRol77?q%%8B!@S?+7G2Bte(^VSZ6hx#>UPR`;E-nDl4TzR5(L8Mfmoo zHHW1MoK7riePeHSSLy7Q-8GEQJRLSTd22G}|9SkmYr*lJwf`?VtMlJ|m22^{{>&lK z`**gVeslA3DqGZv# zd_UXS*Vp3Gg7eQvN*z;vwDHT0XFGa!>M1$?(=t%kzUROc`hT|2O*!K$`&@!N3y!V1 zyY6`cBW`w`p#M3?XN6*wb?g=o|OAFwUa%8$w^5oOL#?|OVzl$li+Whv3x4p-*v)5jq-F~Zj|BH|5M{Y4rz8&=AfmZ(J z4Ilq}V@ayhinNH?WEa0-{jDSQ?e34BdGF5Es$ahM^1bbczvT z{kkdL4(}${&kR!9@^Z4e+q&-AciC-~tri4KfBQpf{haisOIOp&;^#`w$UYVoZMOaU zyZ(pr_05z1ZZdf$)+Q`Iqt5vM$wRLFwOqI5zNKW(pB}o{b=$Yta{(2WfBWVH7|mM} zXr0x5Jy-M5g-e-c&s5wzC;Ojz;4v{)|K7yID^4WM`ta?Mfq<2N_FoL_1Aw}oLz z;0>j%FQyuvJa#_2_kZe3(P#JX$19y)(4iaEQTIfm$SJMrmwUgJc%>aqoNO&2|NG-_^)^GJo8>tNLsYzeb;HT4}os)7(q7a(+)vv!{H?nBu%}x6#Seubyws89%Nt zU)!=MT<`k4U%wi!I_XTB7`;@<^XdX6&jnrzB~SkPTsZY5(bDJ4bmtCV#Us{tpL!=~ z`ZtyTUX(I*)>4+3Z|iq+{INg1<7Rk(H#^6^uJbW4Aa{%>yYO4pd;2jP z@_enac3$Y9{cnYW;*q}71xze=H@D{yE@38CY;qv-1{Zn}KQ@05z6JxHq&NI=jY~CbuAT7jnMZ%J>b_GYfBRXR|1$(t`_D@nf7+zCOZR5-mb;PFGS7^>=JIZMa!&m2 z+)rL2g=t#bx3}cU^1Ytg-Kq3Hzy9W%it1{f$_d5FXM*J)m%h2Px#r2~4BNI_SKSY#`+v}s<<0O5b72+jd@=Q`WZd~G`K(JD`@Nht&kQ=5 z*y48QI7>}tUW>%!g0(Em-ajgN^|RS+{`rk>`rglt?$h4Xzd2w>ml&JJ(tV-nNqaVi zG5IaMwR+i|LZit%EmP+ETi`&*FaLw= Build.VERSION_CODES.Q) { + // Force the 3-button navigation bar to be transparent + // See: https://developer.android.com/develop/ui/views/layout/edge-to-edge#create-transparent + window.isNavigationBarContrastEnforced = false + } if (ContextCompat.checkSelfPermission(this, READ_CALENDAR) != PERMISSION_GRANTED) { requestPermissionLauncher.launch(READ_CALENDAR) diff --git a/app/src/main/java/com/pixelized/headache/ui/common/toolbar/Toolbar.kt b/app/src/main/java/com/pixelized/headache/ui/common/toolbar/Toolbar.kt new file mode 100644 index 0000000..7c09e64 --- /dev/null +++ b/app/src/main/java/com/pixelized/headache/ui/common/toolbar/Toolbar.kt @@ -0,0 +1,40 @@ +package com.pixelized.headache.ui.common.toolbar + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.material3.BottomAppBarDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarColors +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.TopAppBarScrollBehavior +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.Dp + +@Suppress("NOTHING_TO_INLINE") +@OptIn(ExperimentalMaterial3Api::class) +@Composable +inline fun Toolbar( + modifier: Modifier = Modifier, + noinline title: @Composable () -> Unit, + noinline navigationIcon: @Composable () -> Unit = {}, + noinline actions: @Composable RowScope.() -> Unit = {}, + expandedHeight: Dp = TopAppBarDefaults.TopAppBarExpandedHeight, + windowInsets: WindowInsets = TopAppBarDefaults.windowInsets, + colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors( + containerColor = BottomAppBarDefaults.containerColor, + ), + scrollBehavior: TopAppBarScrollBehavior? = null, +) { + TopAppBar( + title = title, + modifier = modifier, + navigationIcon = navigationIcon, + actions = actions, + expandedHeight = expandedHeight, + windowInsets = windowInsets, + colors = colors, + scrollBehavior = scrollBehavior, + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/pixelized/headache/ui/navigation/home/HomeNavigator.kt b/app/src/main/java/com/pixelized/headache/ui/navigation/home/HomeNavigator.kt index ff85fba..db15f1e 100644 --- a/app/src/main/java/com/pixelized/headache/ui/navigation/home/HomeNavigator.kt +++ b/app/src/main/java/com/pixelized/headache/ui/navigation/home/HomeNavigator.kt @@ -15,6 +15,6 @@ class HomeNavigator( fun popBackstack() = backStack.removeLastOrNull() fun goTo(destination: HomeDestination) { - backStack.add(destination) + backStack[0] = destination } } \ No newline at end of file diff --git a/app/src/main/java/com/pixelized/headache/ui/page/calendar/CalendarChooserPage.kt b/app/src/main/java/com/pixelized/headache/ui/page/calendar/CalendarChooserPage.kt index dca9607..473328d 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/calendar/CalendarChooserPage.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/calendar/CalendarChooserPage.kt @@ -13,8 +13,6 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.NavigationBarDefaults import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.rememberCoroutineScope @@ -24,6 +22,7 @@ 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.common.toolbar.Toolbar import com.pixelized.headache.ui.navigation.main.LocalMainNavigator import kotlinx.coroutines.launch @@ -65,10 +64,7 @@ private fun CalendarContent( Scaffold( modifier = modifier, topBar = { - TopAppBar( - colors = TopAppBarDefaults.topAppBarColors( - containerColor = NavigationBarDefaults.containerColor, - ), + Toolbar( navigationIcon = { IconButton( onClick = onBack, diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt index b9144b6..23edc7d 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventItem.kt @@ -80,9 +80,9 @@ fun EventItem( Box( modifier = Modifier .clickable { onItem(item) } - .fillMaxWidth() .heightIn(min = minHeigh) .height(IntrinsicSize.Min) + .fillMaxWidth() .then(other = modifier), contentAlignment = Alignment.CenterStart, ) { diff --git a/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt index c7e1bba..c8b0a12 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/event/list/EventPage.kt @@ -1,10 +1,6 @@ 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 @@ -22,12 +18,10 @@ import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.NavigationBarDefaults import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.minimumInteractiveComponentSize import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.runtime.State @@ -44,6 +38,7 @@ 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.common.toolbar.Toolbar import com.pixelized.headache.ui.navigation.main.LocalMainNavigator import com.pixelized.headache.ui.page.event.edit.EventEditBottomSheet import com.pixelized.headache.ui.page.event.edit.EventEditBottomSheetViewModel @@ -107,10 +102,7 @@ private fun EventContent( Scaffold( modifier = modifier, topBar = { - TopAppBar( - colors = TopAppBarDefaults.topAppBarColors( - containerColor = NavigationBarDefaults.containerColor, - ), + Toolbar( navigationIcon = { IconButton( onClick = onBack, @@ -186,17 +178,10 @@ private fun EventContent( key = { it.id }, contentType = { "EventItem" }, ) { item -> - AnimatedContent( - modifier = Modifier.animateItem(), - targetState = item, - transitionSpec = { fadeIn() togetherWith fadeOut() }, - ) { animatedItem -> - EventItem( - modifier = Modifier.fillMaxWidth(), - item = animatedItem, - onItem = onEvent, - ) - } + EventItem( + item = item, + onItem = onEvent, + ) } } } diff --git a/app/src/main/java/com/pixelized/headache/ui/page/home/HomePage.kt b/app/src/main/java/com/pixelized/headache/ui/page/home/HomePage.kt index 43263b2..74516c3 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/home/HomePage.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/home/HomePage.kt @@ -25,12 +25,9 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.NavigationBar -import androidx.compose.material3.NavigationBarDefaults import androidx.compose.material3.NavigationBarItem import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.runtime.State @@ -44,6 +41,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.pixelized.headache.R +import com.pixelized.headache.ui.common.toolbar.Toolbar import com.pixelized.headache.ui.navigation.destination.MonthSummaryDestination import com.pixelized.headache.ui.navigation.destination.ReportDestination import com.pixelized.headache.ui.navigation.destination.YearSummaryDestination @@ -167,10 +165,7 @@ private fun HomePageContent( Scaffold( modifier = modifier, topBar = { - TopAppBar( - colors = TopAppBarDefaults.topAppBarColors( - containerColor = NavigationBarDefaults.containerColor, - ), + Toolbar( title = { Text( text = stringResource(R.string.app_name), diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/MonthSummaryPage.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/MonthSummaryPage.kt index 71bf1de..a89b23d 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/MonthSummaryPage.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/MonthSummaryPage.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior 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.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState @@ -14,6 +15,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Surface +import androidx.compose.material3.minimumInteractiveComponentSize import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.runtime.State @@ -93,7 +95,6 @@ private fun MonthSummaryContent( events.value.forEach { entry -> item { MonthSummaryTitle( - modifier = Modifier.padding(top = 16.dp), item = entry.key, ) } diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryItem.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryItem.kt index 7ee80f1..1c1c572 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryItem.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryItem.kt @@ -60,6 +60,7 @@ fun MonthSummaryItem( Column( modifier = Modifier .clickable { onItem(item) } + .fillMaxWidth() .padding(paddingValues = padding) .then(other = modifier), verticalArrangement = Arrangement.spacedBy(space = spacing.height) diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryTitle.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryTitle.kt index 6c869e9..785d78d 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryTitle.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/monthly/item/MonthSummaryTitle.kt @@ -22,7 +22,7 @@ data class MonthSummaryTitleUio( object MonthSummaryTitleDefault { @Stable - val padding: PaddingValues = PaddingValues(horizontal = 16.dp) + val padding: PaddingValues = PaddingValues(start = 16.dp, top = 16.dp, end = 16.dp,) @SuppressLint("ConstantLocale") @Stable diff --git a/app/src/main/java/com/pixelized/headache/ui/page/summary/report/ReportBox.kt b/app/src/main/java/com/pixelized/headache/ui/page/summary/report/ReportBox.kt index a5bfa42..13071a7 100644 --- a/app/src/main/java/com/pixelized/headache/ui/page/summary/report/ReportBox.kt +++ b/app/src/main/java/com/pixelized/headache/ui/page/summary/report/ReportBox.kt @@ -1,10 +1,12 @@ package com.pixelized.headache.ui.page.summary.report +import android.R import android.annotation.SuppressLint import android.icu.text.DateFormat import android.icu.text.SimpleDateFormat import android.icu.util.Calendar import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box 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 index 468c5f1..9c0adc3 100644 --- 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 @@ -17,7 +17,7 @@ object HeadacheColorPalette { @Immutable object Calendar { - val Headache = Additional.LightRed + val Headache = Additional.VeryLightRed val Pill = Additional.DarkRed } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e659fe7..bd17a92 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -7,7 +7,7 @@ L\'édition du calendrier a échouée Choix du calendrier - Évennement migraineux + Évènements migraineux Suivi mensuel Suivi annuel \ 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 6a220e4..c3604ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ Calendar edit failed. Choose your calendar - Headache event + Headache events Monthly follow-up Annual follow-up \ No newline at end of file