Skip to content

Commit abaa11d

Browse files
danielchalmersdanielchalmers
authored
New theme and branding! (#26)
* Update theme, icon, branding * remove emoji from index logo * replace hidden title click button with a home icon to introduce position parity with other pages * reduce top padding reserved for headers
1 parent 017f1ec commit abaa11d

File tree

19 files changed

+10445
-10388
lines changed

19 files changed

+10445
-10388
lines changed

‎JournalApp/Components/EditCategoryDialog.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
else if (Group == "Medications")
2727
{
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">
2929
<MudNumericField @bind-Value="MedicationDose" HideSpinButtons Label="Dose" MaxLength="6" Immediate />
3030

3131
<MudTextField @bind-Value="MedicationUnit" Label="Unit" MaxLength="8" Immediate />

‎JournalApp/Components/EditDoseDialog.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<DialogContent>
1212
<MudForm>
13-
<MudText Align="Align.Center" Typo="Typo.subtitle2">
13+
<MudText Align="Align.Center" Typo="Typo.subtitle2" Class="mud-text-secondary">
1414
To change this for all days, go to "Edit medications" from the home screen.
1515
</MudText>
1616

‎JournalApp/JournalApp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
<EnableDefaultCssItems>false</EnableDefaultCssItems>
1212

13-
<ApplicationTitle>JournalApp</ApplicationTitle>
13+
<ApplicationTitle>Journal App</ApplicationTitle>
1414
<ApplicationId>com.danielchalmers.journalapp</ApplicationId>
1515
<ApplicationId Condition="'$(Configuration)' == 'DEBUG'">com.danielchalmers.journalapp.debug</ApplicationId>
1616
<ApplicationIdGuid>2B30B066-B4D9-4C17-8A4B-C72E1ABC4BF3</ApplicationIdGuid>
@@ -22,8 +22,8 @@
2222
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg_debug.svg" Condition="'$(Configuration)' == 'DEBUG'" />
2323

2424
<!-- Splash Screen -->
25-
<MauiSplashScreen Include="Resources\AppIcon\appiconfg.svg" Color="#776be7" Condition="'$(Configuration)' != 'DEBUG'" />
26-
<MauiSplashScreen Include="Resources\AppIcon\appiconfg_debug.svg" Color="#776be7" Condition="'$(Configuration)' == 'DEBUG'" />
25+
<MauiSplashScreen Include="Resources\AppIcon\appiconfg.svg" Color="#9389e8" Condition="'$(Configuration)' != 'DEBUG'" />
26+
<MauiSplashScreen Include="Resources\AppIcon\appiconfg_debug.svg" Color="#9389e8" Condition="'$(Configuration)' == 'DEBUG'" />
2727

2828
<!-- Images -->
2929
<MauiImage Include="Resources\Images\*" />

‎JournalApp/Pages/Index.razor‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
<header class="page-header">
1313
<div class="page-toolbar">
14-
<MudButton OnClick="OnTitleClicked" Ripple="false" Variant="Variant.Text">
15-
<MudText Typo="Typo.h6">🙂 @ThisAssembly.AssemblyTitle</MudText>
16-
</MudButton>
14+
<MudIconButton Icon="@Icons.Material.Rounded.Home" OnClick="GoHome" aria-label="Go to today" />
15+
16+
<MudText Typo="Typo.h6">@ThisAssembly.AssemblyTitle</MudText>
1717

1818
<MudSpacer />
1919

@@ -185,14 +185,11 @@
185185
}
186186
}
187187

188-
async Task OnTitleClicked(MouseEventArgs e)
188+
async Task GoHome()
189189
{
190-
if (e.Detail == 2)
191-
{
192-
logger.LogDebug("Title clicked twice so going to now");
193-
await GoToDay(DateOnly.FromDateTime(DateTime.Now));
194-
await ScrollToTop();
195-
}
190+
logger.LogDebug("Home button was clicked");
191+
await GoToDay(DateOnly.FromDateTime(DateTime.Now));
192+
await ScrollToTop();
196193
}
197194

198195
async Task ScrollToTop()

‎JournalApp/Pages/MainLayout.razor‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,31 @@
3030
{
3131
PaletteLight = new PaletteLight()
3232
{
33-
Primary = "#776be7",
34-
PrimaryLighten = "#978dec",
35-
Info = "#776be7",
36-
AppbarText = "#ffffffe6",
37-
Background = "#f7f6fb",
38-
TextDisabled = "#424242",
33+
// https://material-foundation.github.io/material-theme-builder
34+
Primary = "#9389e8",
35+
Secondary = "#928ea6",
36+
Tertiary = "#b48399",
37+
Info = "#b48399",
38+
AppbarText = "#ffffffff",
3939
HoverOpacity = 0.1,
4040
},
4141

4242
PaletteDark = new PaletteDark()
4343
{
44-
Primary = "#776be7",
45-
Info = "#776be7",
46-
AppbarText = "#ffffffe6",
47-
TextPrimary = "#ffffffcc",
48-
TextSecondary = "#ffffff99",
49-
TextDisabled = "#ffffffb2",
44+
// https://material-foundation.github.io/material-theme-builder
45+
Primary = "#9389e8",
46+
Secondary = "#928ea6",
47+
Tertiary = "#b48399",
48+
Info = "#b48399",
49+
AppbarText = "#ffffffff",
5050
HoverOpacity = 0.1,
51+
52+
TextPrimary = "#ffffffde",
53+
TextSecondary = "#ffffff99",
5154
},
5255

5356
LayoutProperties = new()
5457
{
55-
AppbarHeight = "4em",
5658
DefaultBorderRadius = "2.0em",
5759
},
5860

‎JournalApp/Pages/SafetyPlanning/SafetyPlanItem.razor‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
<section class="@($"safety-plan-item safety-plan-item-{MarkupUtil.ToClassName(Title)}")">
44
<MudText Typo="Typo.h5">@Title</MudText>
5-
<MudText Typo="Typo.caption">@Subtitle</MudText>
5+
6+
<MudText Typo="Typo.subtitle2">@Subtitle</MudText>
7+
68
<MudTextField T="string" @bind-Text="Text" Placeholder="@Placeholder"
79
Typo="Typo.body2" Variant="Variant.Outlined" Immediate Underline="false"
810
AutoGrow Lines="3" MaxLines="10" />

‎JournalApp/Pages/SafetyPlanning/SafetyPlanPage.razor‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@namespace JournalApp
22
@page "/safetyplan"
3-
@using ApexCharts
43
@inherits JaPage
54
@implements IDisposable
65
@inject ILogger<SafetyPlanPage> logger
@@ -15,7 +14,7 @@
1514

1615
<main class="page-body">
1716
<div class="safety-plan-items-container">
18-
<MudText Align="MudBlazor.Align.Center">
17+
<MudText Align="Align.Center" Class="mud-text-secondary">
1918
Your coping strategies and sources of support that can be used before or during a crisis to help yourself stay safe.
2019
</MudText>
2120

‎JournalApp/Pages/Trends/TrendCategoryView.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ else
116116
Mode = PreferenceService.IsDarkMode ? Mode.Dark : Mode.Light,
117117
Monochrome = new ThemeMonochrome
118118
{
119-
Color = "#776be7",
119+
Color = "#9389e8",
120120
Enabled = true,
121121
},
122122
},

‎JournalApp/Pages/Worksheets/WorksheetsPage.razor.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
display: flex;
1414
flex-direction: column;
1515
gap: 2em;
16+
padding-bottom: 1em;
1617
}
1718

1819
.worksheet-group-toc {

‎JournalApp/Platforms/Android/Resources/values/colors.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#594ae2</color>
4-
<color name="colorPrimaryDark">#776be7</color>
5-
<color name="colorAccent">#ff4081</color>
3+
<color name="colorPrimary">#9389e8</color>
4+
<color name="colorPrimaryDark">#9389e8</color>
5+
<color name="colorAccent">#b48399</color>
66
</resources>

0 commit comments

Comments
 (0)