Skip to content

Commit 7491ed0

Browse files
danielchalmersdanielchalmers
committed
Use Rounded icons to match overall theme
1 parent 475400d commit 7491ed0

16 files changed

+47
-47
lines changed

‎JournalApp/Components/DataPointView.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ else if (Point.Type == PointType.Sleep)
2626
{
2727
<div class="d-flex align-center flex-grow-1" style="gap: 0.5em">
2828
<MudText Class="sleep-hours" Typo="Typo.caption">@((Point.SleepHours ?? 0).ToString("00.0"))</MudText>
29-
<MudIconButton Class="less-sleep" Icon="@Icons.Material.Filled.Remove" aria-label="Less sleep" OnClick="DecrementSleep" Disabled="@(Point.SleepHours <= 0)" Size="Size.Small" />
29+
<MudIconButton Class="less-sleep" Icon="@Icons.Material.Rounded.Remove" aria-label="Less sleep" OnClick="DecrementSleep" Disabled="@(Point.SleepHours <= 0)" Size="Size.Small" />
3030
<MudSlider T="decimal" @bind-NullableValue="Point.SleepHours" Variant="Variant.Filled" Min="0" Max="24" Step="0.5m" Size="Size.Large" />
31-
<MudIconButton Class="more-sleep" Icon="@Icons.Material.Filled.Add" aria-label="More sleep" OnClick="IncrementSleep" Disabled="@(Point.SleepHours >= 24)" Size="Size.Small" />
31+
<MudIconButton Class="more-sleep" Icon="@Icons.Material.Rounded.Add" aria-label="More sleep" OnClick="IncrementSleep" Disabled="@(Point.SleepHours >= 24)" Size="Size.Small" />
3232
</div>
3333
}
3434
else if (Point.Type == PointType.Scale)
3535
{
36-
<MudRating @bind-SelectedValue="ScaleIndexForMudRating" FullIcon="@Icons.Material.Filled.Circle" EmptyIcon="@Icons.Material.Outlined.Circle" Color="Color.Primary" />
36+
<MudRating @bind-SelectedValue="ScaleIndexForMudRating" FullIcon="@Icons.Material.Rounded.Circle" EmptyIcon="@Icons.Material.Rounded.Circle" Color="Color.Primary" />
3737
}
3838
else if (Point.Type == PointType.LowToHigh)
3939
{

‎JournalApp/Components/EditCategoryDialog.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<MudDialog DefaultFocus="DefaultFocus.FirstChild" OnBackdropClick="Submit">
77
<TitleContent>
88
<div class="page-toolbar">
9-
<MudIconButton Icon="@Icons.Material.Filled.Close" aria-label="Cancel" OnClick="Cancel" />
9+
<MudIconButton Icon="@Icons.Material.Rounded.Close" aria-label="Cancel" OnClick="Cancel" />
1010

1111
<MudText Typo="Typo.h6">@(Category == null ? "New" : "Edit") @(Group == "Medications" ? "medication" : "category")</MudText>
1212

1313
<MudSpacer />
1414

1515
@if (Category != null)
1616
{
17-
<MudIconButton Icon="@Icons.Material.Filled.DeleteForever" aria-label="Delete forever" OnClick="Delete" />
17+
<MudIconButton Icon="@Icons.Material.Rounded.DeleteForever" aria-label="Delete forever" OnClick="Delete" />
1818
}
1919

20-
<MudIconButton Icon="@Icons.Material.Filled.Check" aria-label="Submit" OnClick="Submit" />
20+
<MudIconButton Icon="@Icons.Material.Rounded.Check" aria-label="Submit" OnClick="Submit" />
2121
</div>
2222
</TitleContent>
2323

‎JournalApp/Components/EditDoseDialog.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<MudDialog DefaultFocus="DefaultFocus.FirstChild" OnBackdropClick="Submit">
77
<TitleContent>
88
<div class="page-toolbar">
9-
<MudIconButton Class="cancel-button" Icon="@Icons.Material.Filled.Close" aria-label="Cancel" OnClick="Cancel" />
9+
<MudIconButton Class="cancel-button" Icon="@Icons.Material.Rounded.Close" aria-label="Cancel" OnClick="Cancel" />
1010

1111
<MudText Typo="Typo.h6">Edit day's dose</MudText>
1212

1313
<MudSpacer />
1414

15-
<MudIconButton Class="submit-button" Icon="@Icons.Material.Filled.Check" aria-label="Submit" OnClick="Submit" />
15+
<MudIconButton Class="submit-button" Icon="@Icons.Material.Rounded.Check" aria-label="Submit" OnClick="Submit" />
1616
</div>
1717
</TitleContent>
1818

‎JournalApp/Components/EditNoteDialog.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<MudDialog DefaultFocus="DefaultFocus.FirstChild" OnBackdropClick="Submit">
77
<TitleContent>
88
<div class="page-toolbar">
9-
<MudIconButton Class="cancel-button" Icon="@Icons.Material.Filled.Close" aria-label="Cancel" OnClick="Cancel" />
9+
<MudIconButton Class="cancel-button" Icon="@Icons.Material.Rounded.Close" aria-label="Cancel" OnClick="Cancel" />
1010

1111
<MudText Typo="Typo.h6">@Title</MudText>
1212

1313
<MudSpacer />
1414

15-
<MudIconButton Class="submit-button" Icon="@Icons.Material.Filled.Check" aria-label="Submit" OnClick="Submit" />
15+
<MudIconButton Class="submit-button" Icon="@Icons.Material.Rounded.Check" aria-label="Submit" OnClick="Submit" />
1616
</div>
1717
</TitleContent>
1818

‎JournalApp/Pages/Calendar/CalendarPage.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
<header class="page-header">
1111
<div class="page-toolbar">
12-
<MudIconButton Class="close-button" Icon="@Icons.Material.Filled.ArrowBack" aria-label="Return to home" OnClick="Close" />
12+
<MudIconButton Class="close-button" Icon="@Icons.Material.Rounded.ArrowBack" aria-label="Return to home" OnClick="Close" />
1313

1414
<MudText Typo="Typo.h6">Calendar</MudText>
1515

1616
<MudSpacer />
1717

18-
<MudIconButton Class="pick-palette" Icon="@Icons.Material.Filled.Palette" aria-label="Pick color palette" OnClick="OpenColorPicker" />
18+
<MudIconButton Class="pick-palette" Icon="@Icons.Material.Rounded.Palette" aria-label="Pick color palette" OnClick="OpenColorPicker" />
1919
</div>
2020

2121
<CalendarSwitcher @ref="_switcher" @bind-SelectedYear="SelectedYear" @bind-SelectedYear:after="AfterSelectedYearChanged" YearClicked="OnYearClicked" />

‎JournalApp/Pages/Calendar/CalendarSwitcher.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@namespace JournalApp
22

33
<div class="switcher">
4-
<MudIconButton Class="previous-button" Icon="@Icons.Material.Filled.ArrowBackIos" aria-label="Previous year" OnClick="PreviousYear" />
4+
<MudIconButton Class="previous-button" Icon="@Icons.Material.Rounded.ArrowBackIos" aria-label="Previous year" OnClick="PreviousYear" />
55

66
<div class="switcher-header">
77
<MudButton Class="year-button" OnClick="OnYearClicked">
88
<MudText Typo="Typo.h5">@SelectedYear</MudText>
99
</MudButton>
1010
</div>
1111

12-
<MudIconButton Class="next-button" Icon="@Icons.Material.Filled.ArrowForwardIos" aria-label="Next year" OnClick="NextYear" Disabled="@(SelectedYear >= DateTime.Now.Year)" />
12+
<MudIconButton Class="next-button" Icon="@Icons.Material.Rounded.ArrowForwardIos" aria-label="Next year" OnClick="NextYear" Disabled="@(SelectedYear >= DateTime.Now.Year)" />
1313
</div>
1414

1515
@code {

‎JournalApp/Pages/Calendar/CalendarView.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
{
88
<section class="calendar-month" id="calendar-month-@(month.Month)">
99
<header class="calendar-month-header">
10-
<MudIconButton Icon="@Icons.Material.Filled.ArrowLeft" OnClick="async () => await PreviousMonthClicked.InvokeAsync(month.Month)" aria-label="Previous month" />
10+
<MudIconButton Icon="@Icons.Material.Rounded.ArrowLeft" OnClick="async () => await PreviousMonthClicked.InvokeAsync(month.Month)" aria-label="Previous month" />
1111
<MudText Typo="Typo.h4">@(month.Name)</MudText>
12-
<MudIconButton Icon="@Icons.Material.Filled.ArrowRight" OnClick="async () => await NextMonthClicked.InvokeAsync(month.Month)" aria-label="Next month" Disabled="@(month.Month == 12 && month.Year == DateTime.Now.Year)" />
12+
<MudIconButton Icon="@Icons.Material.Rounded.ArrowRight" OnClick="async () => await NextMonthClicked.InvokeAsync(month.Month)" aria-label="Next month" Disabled="@(month.Month == 12 && month.Year == DateTime.Now.Year)" />
1313
</header>
1414

1515
<div class="mood-blocks-month">

‎JournalApp/Pages/Index.razor‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,36 @@
1717

1818
<MudSpacer />
1919

20-
<MudMenu Icon="@Icons.Material.Filled.MoreVert" aria-label="Main menu" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.BottomLeft">
21-
<MudMenuItem Icon="@Icons.Material.Filled.Category" OnClick="ManageCategories" AutoClose="false">Categories</MudMenuItem>
22-
<MudMenuItem Icon="@Icons.Material.Filled.Medication" OnClick="ManageMedications" AutoClose="false">Medications</MudMenuItem>
23-
<MudMenuItem Icon="@Icons.Material.Filled.Comment" OnClick="NewNote">New note</MudMenuItem>
24-
<MudMenuItem Icon="@Icons.Material.Filled.ShowChart" OnClick="OpenTrends" AutoClose="false">Trends</MudMenuItem>
25-
<MudMenuItem Icon="@Icons.Material.Filled.Article" OnClick="OpenWorksheets" AutoClose="false">Worksheets</MudMenuItem>
20+
<MudMenu Icon="@Icons.Material.Rounded.MoreVert" aria-label="Main menu" AnchorOrigin="Origin.BottomRight" TransformOrigin="Origin.BottomLeft">
21+
<MudMenuItem Icon="@Icons.Material.Rounded.Category" OnClick="ManageCategories" AutoClose="false">Categories</MudMenuItem>
22+
<MudMenuItem Icon="@Icons.Material.Rounded.Medication" OnClick="ManageMedications" AutoClose="false">Medications</MudMenuItem>
23+
<MudMenuItem Icon="@Icons.Material.Rounded.Comment" OnClick="NewNote">New note</MudMenuItem>
24+
<MudMenuItem Icon="@Icons.Material.Rounded.ShowChart" OnClick="OpenTrends" AutoClose="false">Trends</MudMenuItem>
25+
<MudMenuItem Icon="@Icons.Material.Rounded.Article" OnClick="OpenWorksheets" AutoClose="false">Worksheets</MudMenuItem>
2626

2727
@if (PreferenceService.SafetyPlan != null)
2828
{
29-
<MudMenuItem Icon="@Icons.Material.Filled.HealthAndSafety" OnClick="OpenSafetyPlan">Safety Plan</MudMenuItem>
29+
<MudMenuItem Icon="@Icons.Material.Rounded.HealthAndSafety" OnClick="OpenSafetyPlan">Safety Plan</MudMenuItem>
3030
}
3131

3232
<MudDivider />
3333

34-
<MudMenuItem Icon="@Icons.Material.Filled.Campaign" OnClick="OpenFeedback">Feedback</MudMenuItem>
35-
<MudMenuItem Icon="@Icons.Material.Filled.Share" OnClick="OpenShare">Share</MudMenuItem>
36-
<MudMenuItem Icon="@Icons.Material.Filled.Settings" OnClick="OpenSettings" AutoClose="false">Settings</MudMenuItem>
34+
<MudMenuItem Icon="@Icons.Material.Rounded.Campaign" OnClick="OpenFeedback">Feedback</MudMenuItem>
35+
<MudMenuItem Icon="@Icons.Material.Rounded.Share" OnClick="OpenShare">Share</MudMenuItem>
36+
<MudMenuItem Icon="@Icons.Material.Rounded.Settings" OnClick="OpenSettings" AutoClose="false">Settings</MudMenuItem>
3737
</MudMenu>
3838
</div>
3939

4040
<div class="switcher">
41-
<MudIconButton Icon="@Icons.Material.Filled.ArrowBackIos" aria-label="Previous day" OnClick="PreviousDay" Disabled="@(_day.Date.DayNumber <= 1)" />
41+
<MudIconButton Icon="@Icons.Material.Rounded.ArrowBackIos" aria-label="Previous day" OnClick="PreviousDay" Disabled="@(_day.Date.DayNumber <= 1)" />
4242

4343
<div class="switcher-header">
4444
<MudButton OnClick="OpenCalendar" aria-label="Open Calendar">
4545
<MudText Typo="Typo.h5" Align="Align.Center" GutterBottom="false">@_day.Date.ToString("ddd, MMM d")</MudText>
4646
</MudButton>
4747
</div>
4848

49-
<MudIconButton Icon="@Icons.Material.Filled.ArrowForwardIos" aria-label="Next day" OnClick="NextDay" Disabled="@(_day.Date > DateOnly.FromDateTime(DateTime.Now))" />
49+
<MudIconButton Icon="@Icons.Material.Rounded.ArrowForwardIos" aria-label="Next day" OnClick="NextDay" Disabled="@(_day.Date > DateOnly.FromDateTime(DateTime.Now))" />
5050
</div>
5151
</header>
5252

@@ -103,15 +103,15 @@
103103
<footer class="data-point-group-footer">
104104
@if (group.Key == null)
105105
{
106-
<MudButton Variant="Variant.Text" StartIcon="@Icons.Material.Filled.Category" OnClick="ManageCategories" FullWidth>Edit categories</MudButton>
106+
<MudButton Variant="Variant.Text" StartIcon="@Icons.Material.Rounded.Category" OnClick="ManageCategories" FullWidth>Edit categories</MudButton>
107107
}
108108
else if (group.Key == "Medications")
109109
{
110-
<MudButton Variant="Variant.Text" StartIcon="@Icons.Material.Filled.Medication" OnClick="ManageMedications" FullWidth>Edit medications</MudButton>
110+
<MudButton Variant="Variant.Text" StartIcon="@Icons.Material.Rounded.Medication" OnClick="ManageMedications" FullWidth>Edit medications</MudButton>
111111
}
112112
else if (group.Key == "Notes")
113113
{
114-
<MudButton Variant="Variant.Text" StartIcon="@Icons.Material.Filled.Comment" OnClick="NewNote" FullWidth>New note</MudButton>
114+
<MudButton Variant="Variant.Text" StartIcon="@Icons.Material.Rounded.Comment" OnClick="NewNote" FullWidth>New note</MudButton>
115115
}
116116
</footer>
117117
</div>

‎JournalApp/Pages/JaPage.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void ShowTeachingTip(string name, string text, bool oneTime = false)
107107
if (PreferenceService.Get($"tip_{name}", string.Empty) == "seen")
108108
return;
109109

110-
Snackbar.Add(text, Severity.Info, key: name);
110+
Snackbar.Add(text, Severity.Info, c => c.Icon = Icons.Material.Rounded.Info, name);
111111

112112
if (oneTime)
113113
PreferenceService.Set($"tip_{name}", "seen");

‎JournalApp/Pages/ManageCategoriesPage.razor‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
<header class="page-header">
99
<div class="page-toolbar">
10-
<MudIconButton Icon="@Icons.Material.Filled.ArrowBack" aria-label="Save changes and go home" OnClick="Submit" />
10+
<MudIconButton Icon="@Icons.Material.Rounded.ArrowBack" aria-label="Save changes and go home" OnClick="Submit" />
1111

1212
<MudText Typo="Typo.h6">@(Group == null ? "Categories" : Group)</MudText>
1313

1414
<MudSpacer />
1515

16-
<MudIconButton Icon="@Icons.Material.Filled.Add" aria-label="Open dialog to create new one" OnClick="New" />
16+
<MudIconButton Icon="@Icons.Material.Rounded.Add" aria-label="Open dialog to create new one" OnClick="New" />
1717
</div>
1818
</header>
1919

@@ -27,15 +27,15 @@
2727
@foreach (var c in Categories.OrderBy(c => c.Index))
2828
{
2929
<div id="@($"manage-category-{c.Guid}")" class="manage-category">
30-
<MudIconButton Class="manage-category-up-button" Icon="@Icons.Material.Filled.ArrowUpward" aria-label="Move up"
30+
<MudIconButton Class="manage-category-up-button" Icon="@Icons.Material.Rounded.ArrowUpward" aria-label="Move up"
3131
OnClick="async () => await MoveUp(c)" Edge="Edge.Start" Disabled="c.Index <= 1" />
3232

3333
<MudSwitch Class="manage-category-enabled-switch" T="bool" Value="c.Enabled" ValueChanged="async (v) => await OnEnabledChanged(c, v)"
3434
Color="Color.Primary" Style="margin-right: -0.125em;" aria-label="Show in home" />
3535

3636
<MudButton Class="manage-category-edit-button"
3737
Variant="Variant.Text" OnClick="async () => await Edit(c)" Disabled="c.ReadOnly"
38-
StartIcon="@Icons.Material.Filled.Edit" Size="Size.Large" aria-label="Make changes">@c.Name</MudButton>
38+
StartIcon="@Icons.Material.Rounded.Edit" Size="Size.Large" aria-label="Make changes">@c.Name</MudButton>
3939
</div>
4040
}
4141
}

0 commit comments

Comments
 (0)