diff --git a/JournalApp/Components/EditCategoryDialog.razor b/JournalApp/Components/EditCategoryDialog.razor index 258b948..672d56b 100644 --- a/JournalApp/Components/EditCategoryDialog.razor +++ b/JournalApp/Components/EditCategoryDialog.razor @@ -25,7 +25,7 @@ } else if (Group == "Medications") { -
+
diff --git a/JournalApp/Components/EditDoseDialog.razor b/JournalApp/Components/EditDoseDialog.razor index 3e6a49d..2fec1b1 100644 --- a/JournalApp/Components/EditDoseDialog.razor +++ b/JournalApp/Components/EditDoseDialog.razor @@ -10,7 +10,7 @@ - + To change this for all days, go to "Edit medications" from the home screen. diff --git a/JournalApp/JournalApp.csproj b/JournalApp/JournalApp.csproj index 36caa77..f158dd0 100644 --- a/JournalApp/JournalApp.csproj +++ b/JournalApp/JournalApp.csproj @@ -10,7 +10,7 @@ enable false - JournalApp + Journal App com.danielchalmers.journalapp com.danielchalmers.journalapp.debug 2B30B066-B4D9-4C17-8A4B-C72E1ABC4BF3 @@ -22,8 +22,8 @@ - - + + diff --git a/JournalApp/Pages/MainLayout.razor b/JournalApp/Pages/MainLayout.razor index 5215e8c..d736c5b 100644 --- a/JournalApp/Pages/MainLayout.razor +++ b/JournalApp/Pages/MainLayout.razor @@ -30,29 +30,31 @@ { PaletteLight = new PaletteLight() { - Primary = "#776be7", - PrimaryLighten = "#978dec", - Info = "#776be7", - AppbarText = "#ffffffe6", - Background = "#f7f6fb", - TextDisabled = "#424242", + // https://material-foundation.github.io/material-theme-builder + Primary = "#9389e8", + Secondary = "#928ea6", + Tertiary = "#b48399", + Info = "#b48399", + AppbarText = "#ffffffff", HoverOpacity = 0.1, }, PaletteDark = new PaletteDark() { - Primary = "#776be7", - Info = "#776be7", - AppbarText = "#ffffffe6", - TextPrimary = "#ffffffcc", - TextSecondary = "#ffffff99", - TextDisabled = "#ffffffb2", + // https://material-foundation.github.io/material-theme-builder + Primary = "#9389e8", + Secondary = "#928ea6", + Tertiary = "#b48399", + Info = "#b48399", + AppbarText = "#ffffffff", HoverOpacity = 0.1, + + TextPrimary = "#ffffffde", + TextSecondary = "#ffffff99", }, LayoutProperties = new() { - AppbarHeight = "4em", DefaultBorderRadius = "2.0em", }, diff --git a/JournalApp/Pages/SafetyPlanning/SafetyPlanItem.razor b/JournalApp/Pages/SafetyPlanning/SafetyPlanItem.razor index 57c3d0a..060bb4a 100644 --- a/JournalApp/Pages/SafetyPlanning/SafetyPlanItem.razor +++ b/JournalApp/Pages/SafetyPlanning/SafetyPlanItem.razor @@ -2,7 +2,9 @@
@Title - @Subtitle + + @Subtitle + diff --git a/JournalApp/Pages/SafetyPlanning/SafetyPlanPage.razor b/JournalApp/Pages/SafetyPlanning/SafetyPlanPage.razor index 92dd770..69f7d7b 100644 --- a/JournalApp/Pages/SafetyPlanning/SafetyPlanPage.razor +++ b/JournalApp/Pages/SafetyPlanning/SafetyPlanPage.razor @@ -1,6 +1,5 @@ @namespace JournalApp @page "/safetyplan" -@using ApexCharts @inherits JaPage @implements IDisposable @inject ILogger logger @@ -15,7 +14,7 @@
- + Your coping strategies and sources of support that can be used before or during a crisis to help yourself stay safe. diff --git a/JournalApp/Pages/Trends/TrendCategoryView.razor b/JournalApp/Pages/Trends/TrendCategoryView.razor index 03554f7..642e00a 100644 --- a/JournalApp/Pages/Trends/TrendCategoryView.razor +++ b/JournalApp/Pages/Trends/TrendCategoryView.razor @@ -116,7 +116,7 @@ else Mode = PreferenceService.IsDarkMode ? Mode.Dark : Mode.Light, Monochrome = new ThemeMonochrome { - Color = "#776be7", + Color = "#9389e8", Enabled = true, }, }, diff --git a/JournalApp/Pages/Worksheets/WorksheetsPage.razor.css b/JournalApp/Pages/Worksheets/WorksheetsPage.razor.css index 6ccdbab..a4c70ad 100644 --- a/JournalApp/Pages/Worksheets/WorksheetsPage.razor.css +++ b/JournalApp/Pages/Worksheets/WorksheetsPage.razor.css @@ -13,6 +13,7 @@ display: flex; flex-direction: column; gap: 2em; + padding-bottom: 1em; } .worksheet-group-toc { diff --git a/JournalApp/Platforms/Android/Resources/values/colors.xml b/JournalApp/Platforms/Android/Resources/values/colors.xml index fca3239..5237894 100644 --- a/JournalApp/Platforms/Android/Resources/values/colors.xml +++ b/JournalApp/Platforms/Android/Resources/values/colors.xml @@ -1,6 +1,6 @@ - #594ae2 - #776be7 - #ff4081 + #9389e8 + #9389e8 + #b48399 \ No newline at end of file diff --git a/JournalApp/Resources/AppIcon/appicon.svg b/JournalApp/Resources/AppIcon/appicon.svg index 7826fab..705f867 100644 --- a/JournalApp/Resources/AppIcon/appicon.svg +++ b/JournalApp/Resources/AppIcon/appicon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/JournalApp/Resources/AppIcon/appiconfg.svg b/JournalApp/Resources/AppIcon/appiconfg.svg index a3939da..2969cd5 100644 --- a/JournalApp/Resources/AppIcon/appiconfg.svg +++ b/JournalApp/Resources/AppIcon/appiconfg.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/JournalApp/Resources/AppIcon/appiconfg_debug.svg b/JournalApp/Resources/AppIcon/appiconfg_debug.svg index 8fde9a2..2a9ff60 100644 --- a/JournalApp/Resources/AppIcon/appiconfg_debug.svg +++ b/JournalApp/Resources/AppIcon/appiconfg_debug.svg @@ -1 +1 @@ - \ No newline at end of file +DBG \ No newline at end of file diff --git a/JournalApp/Resources/Graphics/business_card.svg b/JournalApp/Resources/Graphics/business_card.svg new file mode 100644 index 0000000..22429d6 --- /dev/null +++ b/JournalApp/Resources/Graphics/business_card.svg @@ -0,0 +1,10338 @@ + +Diary & Mood TrackerJournal App + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +• Write notes & track your day• Add all your medications• Worksheets & safety plan• Free & customizable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +• Have questions or ideas?• Want to see it on iOS?Email:DCAppHelp@outlook.comDiary & Mood TrackerJournal App diff --git a/JournalApp/Resources/Graphics/business_card_back.svg b/JournalApp/Resources/Graphics/business_card_back.svg deleted file mode 100644 index 1ae1ed2..0000000 --- a/JournalApp/Resources/Graphics/business_card_back.svg +++ /dev/null @@ -1,5167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -• Have questions or ideas?• Want to see it on iPhone?Email:DCAppHelp@outlook.comDiary & Mood TrackerJournalApp diff --git a/JournalApp/Resources/Graphics/business_card_front.svg b/JournalApp/Resources/Graphics/business_card_front.svg deleted file mode 100644 index a8cb0ff..0000000 --- a/JournalApp/Resources/Graphics/business_card_front.svg +++ /dev/null @@ -1,5154 +0,0 @@ - -Diary & Mood TrackerJournalApp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -• Write notes & track your day• Add all your medications• Worksheets & safety plan• Free & customizable diff --git a/JournalApp/Resources/Graphics/feature_graphic.svg b/JournalApp/Resources/Graphics/feature_graphic.svg index 247ad2e..b238fed 100644 --- a/JournalApp/Resources/Graphics/feature_graphic.svg +++ b/JournalApp/Resources/Graphics/feature_graphic.svg @@ -6,12 +6,40 @@ id="svg1" sodipodi:docname="feature_graphic.svg" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + inkscape:export-filename="feature_graphic.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="defs1"> + + + + + + + style="stroke-width:1.39754;fill:url(#linearGradient2)" /> + id="g636" + transform="matrix(1.432819,0,0,1.432819,-146.29767,16.459073)"> Diary & Mood Tracker - + id="tspan640-2" + x="229.89543" + y="231.62292" + style="font-size:48px">Diary & Mood Tracker + Journal App diff --git a/JournalApp/wwwroot/app.css b/JournalApp/wwwroot/app.css index 02c0f8b..35d2683 100644 --- a/JournalApp/wwwroot/app.css +++ b/JournalApp/wwwroot/app.css @@ -14,7 +14,7 @@ body { display: flex; align-items: center; justify-content: center; - background-color: #776be7; + background-color: #9389e8; position: fixed; width: 100%; height: 100% @@ -22,7 +22,7 @@ body { #loading-text { font-family: sans-serif; - font-size: 8vw; + font-size: 6vw; color: white; } @@ -88,7 +88,7 @@ h1, h2, h3, h4, h5, h6 { .mud-form { display: flex; flex-direction: column; - gap: 0.75em; + gap: 1em; } .mud-input-text { @@ -114,6 +114,10 @@ h1, h2, h3, h4, h5, h6 { margin: 0.75em !important; } +.mud-input.mud-input-outlined .mud-input-outlined-border { + border-radius: calc(var(--mud-default-borderradius) / 2); +} + .mud-radio { margin: 0 !important; margin-inline: 0 !important; @@ -130,6 +134,7 @@ h1, h2, h3, h4, h5, h6 { .mud-dialog-title, .mud-card-header { padding: 0 !important; + padding-top: 1em !important; } .mud-dialog-content, .mud-card-content { diff --git a/JournalApp/wwwroot/index.html b/JournalApp/wwwroot/index.html index 58fe67b..2b8b1ce 100644 --- a/JournalApp/wwwroot/index.html +++ b/JournalApp/wwwroot/index.html @@ -19,7 +19,7 @@
-

Loading...

+

Setting up your journal...