Update theme, icon, branding

danielchalmers · danielchalmers · commit 2ff71a87df16 · 2024-10-11T21:59:52.000-05:00
diff --git a/JournalApp/Components/EditCategoryDialog.razor b/JournalApp/Components/EditCategoryDialog.razor
@@ -25,7 +25,7 @@
             }
             else if (Group == "Medications")
             {
-                <div class="d-flex flex-row flex-grow-1" style="gap: 0.75em">
+                <div class="d-flex flex-row flex-grow-1" style="gap: 1em">
                     <MudNumericField @bind-Value="MedicationDose" HideSpinButtons Label="Dose" MaxLength="6" Immediate />
 
                     <MudTextField @bind-Value="MedicationUnit" Label="Unit" MaxLength="8" Immediate />
diff --git a/JournalApp/Components/EditDoseDialog.razor b/JournalApp/Components/EditDoseDialog.razor
@@ -10,7 +10,7 @@
 
     <DialogContent>
         <MudForm>
-            <MudText Align="Align.Center" Typo="Typo.subtitle2">
+            <MudText Align="Align.Center" Typo="Typo.subtitle2" Class="mud-text-secondary">
                 To change this for all days, go to "Edit medications" from the home screen.
             </MudText>
 
diff --git a/JournalApp/JournalApp.csproj b/JournalApp/JournalApp.csproj
@@ -10,7 +10,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <EnableDefaultCssItems>false</EnableDefaultCssItems>
 
-    <ApplicationTitle>JournalApp</ApplicationTitle>
+    <ApplicationTitle>Journal App</ApplicationTitle>
     <ApplicationId>com.danielchalmers.journalapp</ApplicationId>
     <ApplicationId Condition="'$(Configuration)' == 'DEBUG'">com.danielchalmers.journalapp.debug</ApplicationId>
     <ApplicationIdGuid>2B30B066-B4D9-4C17-8A4B-C72E1ABC4BF3</ApplicationIdGuid>
@@ -22,8 +22,8 @@
     <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg_debug.svg" Condition="'$(Configuration)' == 'DEBUG'" />
 
     <!-- Splash Screen -->
-    <MauiSplashScreen Include="Resources\AppIcon\appiconfg.svg" Color="#776be7" Condition="'$(Configuration)' != 'DEBUG'" />
-    <MauiSplashScreen Include="Resources\AppIcon\appiconfg_debug.svg" Color="#776be7" Condition="'$(Configuration)' == 'DEBUG'" />
+    <MauiSplashScreen Include="Resources\AppIcon\appiconfg.svg" Color="#9389e8" Condition="'$(Configuration)' != 'DEBUG'" />
+    <MauiSplashScreen Include="Resources\AppIcon\appiconfg_debug.svg" Color="#9389e8" Condition="'$(Configuration)' == 'DEBUG'" />
 
     <!-- Images -->
     <MauiImage Include="Resources\Images\*" />
diff --git 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
@@ -2,7 +2,9 @@
 
 <section class="@($"safety-plan-item safety-plan-item-{MarkupUtil.ToClassName(Title)}")">
     <MudText Typo="Typo.h5">@Title</MudText>
-    <MudText Typo="Typo.caption">@Subtitle</MudText>
+
+    <MudText Typo="Typo.subtitle2">@Subtitle</MudText>
+
     <MudTextField T="string" @bind-Text="Text" Placeholder="@Placeholder"
                   Typo="Typo.body2" Variant="Variant.Outlined" Immediate Underline="false"
                   AutoGrow Lines="3" MaxLines="10" />
diff --git 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<SafetyPlanPage> logger
@@ -15,7 +14,7 @@
 
 <main class="page-body">
     <div class="safety-plan-items-container">
-        <MudText Align="MudBlazor.Align.Center">
+        <MudText Align="Align.Center" Class="mud-text-secondary">
             Your coping strategies and sources of support that can be used before or during a crisis to help yourself stay safe.
         </MudText>
 
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#594ae2</color>
-    <color name="colorPrimaryDark">#776be7</color>
-    <color name="colorAccent">#ff4081</color>
+    <color name="colorPrimary">#9389e8</color>
+    <color name="colorPrimaryDark">#9389e8</color>
+    <color name="colorAccent">#b48399</color>
 </resources>
diff --git a/JournalApp/Resources/AppIcon/appicon.svg b/JournalApp/Resources/AppIcon/appicon.svg
@@ -1 +1 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg"><path fill="#776be7" d="M0 0h512v512H0z"/></svg>
+<svg width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="prefix__a" gradientTransform="rotate(45)"><stop offset="0" stop-color="#9389e8"/><stop offset="1" stop-color="#b48399" stop-opacity=".941"/></linearGradient><linearGradient xlink:href="#prefix__a" id="prefix__b" x1="0" y1="256" x2="512" y2="256" gradientUnits="userSpaceOnUse" gradientTransform="rotate(45)"/></defs><path fill="url(#prefix__b)" d="M0 0h512v512H0z"/></svg>
diff --git a/JournalApp/Resources/AppIcon/appiconfg.svg b/JournalApp/Resources/AppIcon/appiconfg.svg
@@ -1 +1 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg"><path style="line-height:1.25;-inkscape-font-specification:Roboto" d="M213.25 186.813h18.094v96.656q0 19.594-11.813 30.656-11.718 11.063-31.312 11.063-20.344 0-31.688-10.406-11.343-10.407-11.343-29.157h18q0 11.72 6.375 18.282 6.468 6.562 18.656 6.562 11.156 0 18-7.031 6.937-7.031 7.031-19.688zm122.063 100.875h-57.188l-12.844 35.625H246.72l52.125-136.5h15.75l52.219 136.5h-18.469zm-51.75-14.813h46.406l-23.25-63.843z" aria-label="JA" font-size="192" font-family="Roboto" letter-spacing="0" word-spacing="0" fill="#fff"/></svg>
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg"><path d="M287.5 247q5.625 0 9.563-3.938Q301 239.125 301 233.5t-3.938-9.563Q293.125 220 287.5 220t-9.563 3.938Q274 227.875 274 233.5t3.938 9.563Q281.875 247 287.5 247zm-63 0q5.625 0 9.563-3.938Q238 239.125 238 233.5t-3.938-9.563Q230.125 220 224.5 220t-9.563 3.938Q211 227.875 211 233.5t3.938 9.563Q218.875 247 224.5 247zm31.5 58.5q15.3 0 27.788-8.662Q296.275 288.174 301.9 274h-91.8q5.625 14.175 18.113 22.838Q240.7 305.5 256 305.5zm0 40.5q-18.675 0-35.1-7.088-16.425-7.087-28.575-19.237-12.15-12.15-19.238-28.575Q166 274.675 166 256t7.087-35.1q7.088-16.425 19.238-28.575 12.15-12.15 28.575-19.238Q237.325 166 256 166t35.1 7.087q16.425 7.088 28.575 19.238 12.15 12.15 19.237 28.575Q346 237.325 346 256t-7.088 35.1q-7.087 16.425-19.237 28.575-12.15 12.15-28.575 19.237Q274.675 346 256 346zm0-90zm0 72q30.15 0 51.075-20.925Q328 286.15 328 256q0-30.15-20.925-51.075Q286.15 184 256 184q-30.15 0-51.075 20.925Q184 225.85 184 256q0 30.15 20.925 51.075Q225.85 328 256 328z" fill="#fff"/></svg>
diff --git a/JournalApp/Resources/AppIcon/appiconfg_debug.svg b/JournalApp/Resources/AppIcon/appiconfg_debug.svg
@@ -1 +1 @@
-<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg"><path style="line-height:1.25;-inkscape-font-specification:Roboto" d="M213.25 151.812h18.094v96.656q0 19.594-11.813 30.656-11.718 11.063-31.312 11.063-20.344 0-31.688-10.406-11.343-10.407-11.343-29.157h18q0 11.72 6.375 18.282 6.468 6.562 18.656 6.562 11.156 0 18-7.03 6.937-7.032 7.031-19.689zm122.063 100.875h-57.188l-12.844 35.625H246.72l52.125-136.5h15.75l52.219 136.5h-18.469zm-51.75-14.813h46.406l-23.25-63.843z" aria-label="JA" font-size="192" fill="#fff" font-family="Roboto" letter-spacing="0" word-spacing="0"/><path d="M188.68 359.459v-53.084h14.985q6.927 0 12.25 3.063 5.323 3.062 8.203 8.714 2.917 5.65 2.953 12.979v3.39q0 7.51-2.916 13.162-2.88 5.651-8.276 8.677-5.36 3.026-12.506 3.099zm7-47.323v41.599h7.365q8.094 0 12.578-5.031 4.521-5.032 4.521-14.328v-3.1q0-9.041-4.265-14.036-4.23-5.031-12.032-5.104zm41.964 47.323v-53.084h17.354q8.641 0 12.98 3.573 4.375 3.573 4.375 10.573 0 3.72-2.115 6.6-2.114 2.843-5.76 4.41 4.302 1.204 6.781 4.595 2.516 3.354 2.516 8.02 0 7.146-4.63 11.23-4.63 4.083-13.09 4.083zm7-24.828v19.104h11.558q4.885 0 7.692-2.516 2.844-2.552 2.844-7 0-9.588-10.427-9.588zm0-5.615h10.573q4.594 0 7.328-2.297 2.771-2.297 2.771-6.234 0-4.375-2.552-6.344-2.552-2.005-7.766-2.005h-10.354zm78.678 23.48q-2.698 3.864-7.547 5.796-4.813 1.896-11.23 1.896-6.489 0-11.52-3.026-5.032-3.062-7.802-8.677-2.735-5.615-2.808-13.016v-4.63q0-11.995 5.578-18.594 5.615-6.599 15.75-6.599 8.313 0 13.38 4.266 5.068 4.23 6.199 12.031h-7q-1.97-10.536-12.542-10.536-7.037 0-10.682 4.958-3.61 4.922-3.646 14.292v4.338q0 8.933 4.083 14.22 4.083 5.25 11.047 5.25 3.938 0 6.89-.876 2.954-.875 4.886-2.953v-11.922h-12.286v-5.687h19.25z" style="line-height:1.25;-inkscape-font-specification:Roboto" aria-label="DBG" font-size="74.667" font-family="Roboto" letter-spacing="0" word-spacing="0" fill="#0f0"/></svg>
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg"><path d="M287.5 203.625q5.625 0 9.563-3.938Q301 195.75 301 190.125t-3.938-9.563q-3.937-3.937-9.562-3.937t-9.563 3.938Q274 184.5 274 190.125t3.938 9.563q3.937 3.937 9.562 3.937zm-63 0q5.625 0 9.563-3.938Q238 195.75 238 190.125t-3.938-9.563q-3.937-3.937-9.562-3.937t-9.563 3.938Q211 184.5 211 190.125t3.938 9.563q3.937 3.937 9.562 3.937zm31.5 58.5q15.3 0 27.788-8.662 12.487-8.664 18.112-22.838h-91.8q5.625 14.175 18.113 22.838 12.487 8.662 27.787 8.662zm0 40.5q-18.675 0-35.1-7.088-16.425-7.087-28.575-19.237-12.15-12.15-19.238-28.575Q166 231.3 166 212.625t7.087-35.1q7.088-16.425 19.238-28.575 12.15-12.15 28.575-19.238 16.425-7.087 35.1-7.087t35.1 7.087q16.425 7.088 28.575 19.238 12.15 12.15 19.237 28.575Q346 193.95 346 212.625t-7.088 35.1q-7.087 16.425-19.237 28.575-12.15 12.15-28.575 19.237-16.425 7.088-35.1 7.088zm0-90zm0 72q30.15 0 51.075-20.925Q328 242.775 328 212.625q0-30.15-20.925-51.075Q286.15 140.625 256 140.625q-30.15 0-51.075 20.925Q184 182.475 184 212.625q0 30.15 20.925 51.075Q225.85 284.625 256 284.625z" fill="#fff"/><text style="line-height:1.25;-inkscape-font-specification:Roboto" x="193.016" y="432.125" font-size="64" font-family="Roboto" letter-spacing="0" word-spacing="0" fill="#0f0" transform="translate(0 -43.375)"><tspan x="193.016" y="432.125">DBG</tspan></text></svg>
diff --git a/JournalApp/Resources/Graphics/business_card.svg b/JournalApp/Resources/Graphics/business_card.svg
diff --git a/JournalApp/Resources/Graphics/business_card_back.svg b/JournalApp/Resources/Graphics/business_card_back.svg
diff --git a/JournalApp/Resources/Graphics/business_card_front.svg b/JournalApp/Resources/Graphics/business_card_front.svg
diff --git a/JournalApp/Resources/Graphics/feature_graphic.svg b/JournalApp/Resources/Graphics/feature_graphic.svg
diff --git a/JournalApp/wwwroot/app.css b/JournalApp/wwwroot/app.css
diff --git a/JournalApp/wwwroot/index.html b/JournalApp/wwwroot/index.html

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`}`
`26`	`26`	`else if (Group == "Medications")`
`27`	`27`	`{`
`28`		`- <div class="d-flex flex-row flex-grow-1" style="gap: 0.75em">`
	`28`	`+ <div class="d-flex flex-row flex-grow-1" style="gap: 1em">`
`29`	`29`	`<MudNumericField @bind-Value="MedicationDose" HideSpinButtons Label="Dose" MaxLength="6" Immediate />`
`30`	`30`
`31`	`31`	`<MudTextField @bind-Value="MedicationUnit" Label="Unit" MaxLength="8" Immediate />`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ else`
`116`	`116`	`Mode = PreferenceService.IsDarkMode ? Mode.Dark : Mode.Light,`
`117`	`117`	`Monochrome = new ThemeMonochrome`
`118`	`118`	`{`
`119`		`- Color = "#776be7",`
	`119`	`+ Color = "#9389e8",`
`120`	`120`	`Enabled = true,`
`121`	`121`	`},`
`122`	`122`	`},`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`display: flex;`
`14`	`14`	`flex-direction: column;`
`15`	`15`	`gap: 2em;`
	`16`	`+ padding-bottom: 1em;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`.worksheet-group-toc {`