Skip to content

Commit 402f9c9

Browse files
justcoding121justcoding121
committed
Add icons for buttons
1 parent 4b07277 commit 402f9c9

13 files changed

+231
-27
lines changed

‎src/Bible.Alarm/Views/BiblePublications/BiblePublicationSelectionModal.xaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
xmlns:sharedControls="clr-namespace:Bible.Alarm.Views.Shared;assembly=Bible.Alarm"
1515
xmlns:system="clr-namespace:System;assembly=System.Runtime"
1616
xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
17+
xmlns:fn="clr-namespace:Bible.Alarm.Views"
1718
x:DataType="bible:BiblePublicationSelectionViewModel"
1819
Padding="0,0,0,0">
1920
<ContentPage.Resources>
@@ -175,10 +176,17 @@
175176
HorizontalOptions="Fill"
176177
VerticalOptions="Fill"
177178
Padding="20,12"
178-
Text="CLOSE"
179179
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
180180
InputTransparent="True"
181181
IsEnabled="False">
182+
<Button.Text>
183+
<FormattedString>
184+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
185+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
186+
FontSize="{DynamicResource ButtonFontSize}" />
187+
<Span Text=" CLOSE" />
188+
</FormattedString>
189+
</Button.Text>
182190
<Button.Shadow>
183191
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
184192
Offset="0,2"
@@ -200,11 +208,18 @@
200208
FontAttributes="Bold"
201209
HorizontalOptions="Fill"
202210
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
203-
Text="CLOSE"
204211
TextColor="{DynamicResource PrimaryTextColor}"
205212
VerticalOptions="Center"
206213
HeightRequest="{DynamicResource IconStandardContainerSize}"
207214
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
215+
<Button.Text>
216+
<FormattedString>
217+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
218+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
219+
FontSize="{DynamicResource ButtonFontSize}" />
220+
<Span Text=" CLOSE" />
221+
</FormattedString>
222+
</Button.Text>
208223
<Button.Shadow>
209224
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
210225
Offset="0,2"

‎src/Bible.Alarm/Views/BiblePublications/SectionSelectionModal.xaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
xmlns:sharedControls="clr-namespace:Bible.Alarm.Views.Shared;assembly=Bible.Alarm"
1414
xmlns:system="clr-namespace:System;assembly=System.Runtime"
1515
xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
16+
xmlns:fn="clr-namespace:Bible.Alarm.Views"
1617
x:DataType="bible:SectionSelectionViewModel"
1718
Padding="0,0,0,0">
1819
<ContentPage.Resources>
@@ -173,10 +174,17 @@
173174
HorizontalOptions="Fill"
174175
VerticalOptions="Fill"
175176
Padding="20,12"
176-
Text="CLOSE"
177177
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
178178
InputTransparent="True"
179179
IsEnabled="False">
180+
<Button.Text>
181+
<FormattedString>
182+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
183+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
184+
FontSize="{DynamicResource ButtonFontSize}" />
185+
<Span Text=" CLOSE" />
186+
</FormattedString>
187+
</Button.Text>
180188
<Button.Shadow>
181189
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
182190
Offset="0,2"
@@ -198,11 +206,18 @@
198206
FontAttributes="Bold"
199207
HorizontalOptions="Fill"
200208
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
201-
Text="CLOSE"
202209
TextColor="{DynamicResource PrimaryTextColor}"
203210
VerticalOptions="Center"
204211
HeightRequest="{DynamicResource IconStandardContainerSize}"
205212
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
213+
<Button.Text>
214+
<FormattedString>
215+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
216+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
217+
FontSize="{DynamicResource ButtonFontSize}" />
218+
<Span Text=" CLOSE" />
219+
</FormattedString>
220+
</Button.Text>
206221
<Button.Shadow>
207222
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
208223
Offset="0,2"

‎src/Bible.Alarm/Views/BiblePublications/TrackSelectionModal.xaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
xmlns:sharedControls="clr-namespace:Bible.Alarm.Views.Shared;assembly=Bible.Alarm"
1414
xmlns:system="clr-namespace:System;assembly=System.Runtime"
1515
xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
16+
xmlns:fn="clr-namespace:Bible.Alarm.Views"
1617
x:DataType="bible:TrackSelectionViewModel"
1718
Padding="0,0,0,0">
1819
<ContentPage.Resources>
@@ -174,10 +175,17 @@
174175
HorizontalOptions="Fill"
175176
VerticalOptions="Fill"
176177
Padding="20,12"
177-
Text="CLOSE"
178178
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
179179
InputTransparent="True"
180180
IsEnabled="False">
181+
<Button.Text>
182+
<FormattedString>
183+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
184+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
185+
FontSize="{DynamicResource ButtonFontSize}" />
186+
<Span Text=" CLOSE" />
187+
</FormattedString>
188+
</Button.Text>
181189
<Button.Shadow>
182190
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
183191
Offset="0,2"
@@ -199,11 +207,18 @@
199207
FontAttributes="Bold"
200208
HorizontalOptions="Fill"
201209
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
202-
Text="CLOSE"
203210
TextColor="{DynamicResource PrimaryTextColor}"
204211
VerticalOptions="Center"
205212
HeightRequest="{DynamicResource IconStandardContainerSize}"
206213
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
214+
<Button.Text>
215+
<FormattedString>
216+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
217+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
218+
FontSize="{DynamicResource ButtonFontSize}" />
219+
<Span Text=" CLOSE" />
220+
</FormattedString>
221+
</Button.Text>
207222
<Button.Shadow>
208223
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
209224
Offset="0,2"

‎src/Bible.Alarm/Views/FontFileResources.xaml.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,9 @@ public sealed class GlyphNames
115115
public static string Bible = "\uf647";
116116
// Font Awesome folder icon (for category selection)
117117
public static string Folder = "\uf07b";
118+
// Font Awesome xmark icon (for cancel/close buttons)
119+
public static string Xmark = "\uf00d";
120+
// Font Awesome floppy-disk icon (for save buttons)
121+
public static string FloppyDisk = "\uf0c7";
122+
// Note: Trash icon already exists above for delete buttons
118123
}

‎src/Bible.Alarm/Views/General/AndroidAlarmPermissionModal.xaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,16 @@
157157
FontAttributes="Bold"
158158
HorizontalOptions="Fill"
159159
Padding="20,12"
160-
Text="CLOSE"
161160
TextColor="{DynamicResource PrimaryTextColor}"
162161
VerticalOptions="Fill">
162+
<Button.Text>
163+
<FormattedString>
164+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
165+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
166+
FontSize="{DynamicResource ButtonFontSize}" />
167+
<Span Text=" CLOSE" />
168+
</FormattedString>
169+
</Button.Text>
163170
<Button.Shadow>
164171
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
165172
Offset="0,2"

‎src/Bible.Alarm/Views/Music/MusicSelectionModal.xaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
xmlns:sharedControls="clr-namespace:Bible.Alarm.Views.Shared;assembly=Bible.Alarm"
1414
xmlns:system="clr-namespace:System;assembly=System.Runtime"
1515
xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
16+
xmlns:fn="clr-namespace:Bible.Alarm.Views"
1617
x:DataType="music:MusicSelectionViewModel"
1718
Padding="0,0,0,0">
1819
<ContentPage.Resources>
@@ -170,10 +171,17 @@
170171
HorizontalOptions="Fill"
171172
VerticalOptions="Fill"
172173
Padding="20,12"
173-
Text="CLOSE"
174174
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
175175
InputTransparent="True"
176176
IsEnabled="False">
177+
<Button.Text>
178+
<FormattedString>
179+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
180+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
181+
FontSize="{DynamicResource ButtonFontSize}" />
182+
<Span Text=" CLOSE" />
183+
</FormattedString>
184+
</Button.Text>
177185
<Button.Shadow>
178186
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
179187
Offset="0,2"
@@ -195,11 +203,18 @@
195203
FontAttributes="Bold"
196204
HorizontalOptions="Fill"
197205
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
198-
Text="CLOSE"
199206
TextColor="{DynamicResource PrimaryTextColor}"
200207
VerticalOptions="Center"
201208
HeightRequest="{DynamicResource IconStandardContainerSize}"
202209
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
210+
<Button.Text>
211+
<FormattedString>
212+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
213+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
214+
FontSize="{DynamicResource ButtonFontSize}" />
215+
<Span Text=" CLOSE" />
216+
</FormattedString>
217+
</Button.Text>
203218
<Button.Shadow>
204219
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
205220
Offset="0,2"

‎src/Bible.Alarm/Views/Music/SongPublicationSelectionModal.xaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
xmlns:sharedControls="clr-namespace:Bible.Alarm.Views.Shared;assembly=Bible.Alarm"
1515
xmlns:system="clr-namespace:System;assembly=System.Runtime"
1616
xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
17+
xmlns:fn="clr-namespace:Bible.Alarm.Views"
1718
x:DataType="music:SongPublicationSelectionViewModel"
1819
Padding="0,0,0,0">
1920
<ContentPage.Resources>
@@ -174,10 +175,17 @@
174175
HorizontalOptions="Fill"
175176
VerticalOptions="Fill"
176177
Padding="20,12"
177-
Text="CLOSE"
178178
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
179179
InputTransparent="True"
180180
IsEnabled="False">
181+
<Button.Text>
182+
<FormattedString>
183+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
184+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
185+
FontSize="{DynamicResource ButtonFontSize}" />
186+
<Span Text=" CLOSE" />
187+
</FormattedString>
188+
</Button.Text>
181189
<Button.Shadow>
182190
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
183191
Offset="0,2"
@@ -199,11 +207,18 @@
199207
FontAttributes="Bold"
200208
HorizontalOptions="Fill"
201209
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
202-
Text="CLOSE"
203210
TextColor="{DynamicResource PrimaryTextColor}"
204211
VerticalOptions="Center"
205212
HeightRequest="{DynamicResource IconStandardContainerSize}"
206213
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
214+
<Button.Text>
215+
<FormattedString>
216+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
217+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
218+
FontSize="{DynamicResource ButtonFontSize}" />
219+
<Span Text=" CLOSE" />
220+
</FormattedString>
221+
</Button.Text>
207222
<Button.Shadow>
208223
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
209224
Offset="0,2"

‎src/Bible.Alarm/Views/Music/TrackSelectionModal.xaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,17 @@
178178
HorizontalOptions="Fill"
179179
VerticalOptions="Fill"
180180
Padding="20,12"
181-
Text="CLOSE"
182181
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
183182
InputTransparent="True"
184183
IsEnabled="False">
184+
<Button.Text>
185+
<FormattedString>
186+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
187+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
188+
FontSize="{DynamicResource ButtonFontSize}" />
189+
<Span Text=" CLOSE" />
190+
</FormattedString>
191+
</Button.Text>
185192
<Button.Shadow>
186193
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
187194
Offset="0,2"
@@ -203,11 +210,18 @@
203210
FontAttributes="Bold"
204211
HorizontalOptions="Fill"
205212
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
206-
Text="CLOSE"
207213
TextColor="{DynamicResource PrimaryTextColor}"
208214
VerticalOptions="Center"
209215
HeightRequest="{DynamicResource IconStandardContainerSize}"
210216
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
217+
<Button.Text>
218+
<FormattedString>
219+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
220+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
221+
FontSize="{DynamicResource ButtonFontSize}" />
222+
<Span Text=" CLOSE" />
223+
</FormattedString>
224+
</Button.Text>
211225
<Button.Shadow>
212226
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
213227
Offset="0,2"

‎src/Bible.Alarm/Views/Schedule/NumberOfTracksModal.xaml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
xmlns:services="clr-namespace:Bible.Alarm.Services.UI;assembly=Bible.Alarm"
1919
xmlns:system="clr-namespace:System;assembly=System.Runtime"
2020
xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
21+
xmlns:fn="clr-namespace:Bible.Alarm.Views"
2122
x:DataType="vm:NumberOfTrackContainerViewModel"
2223
Padding="0"
2324
mc:Ignorable="d">
@@ -176,10 +177,17 @@
176177
HorizontalOptions="Fill"
177178
VerticalOptions="Fill"
178179
Padding="20,12"
179-
Text="CLOSE"
180180
TextColor="{AppThemeBinding Light=#212529, Dark=White}"
181181
InputTransparent="True"
182182
IsEnabled="False">
183+
<Button.Text>
184+
<FormattedString>
185+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
186+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
187+
FontSize="{DynamicResource ButtonFontSize}" />
188+
<Span Text=" CLOSE" />
189+
</FormattedString>
190+
</Button.Text>
183191
<Button.Shadow>
184192
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
185193
Offset="0,2"
@@ -201,11 +209,18 @@
201209
FontAttributes="Bold"
202210
HorizontalOptions="Fill"
203211
Padding="{OnPlatform Android='20,6,20,10', iOS='20,12', Default='20,12'}"
204-
Text="CLOSE"
205212
TextColor="{DynamicResource PrimaryTextColor}"
206213
VerticalOptions="Center"
207214
HeightRequest="{DynamicResource IconStandardContainerSize}"
208215
IsVisible="{OnPlatform Android=True, iOS=True, WinUI=False}">
216+
<Button.Text>
217+
<FormattedString>
218+
<Span Text="{x:Static fn:GlyphNames.Xmark}"
219+
FontFamily="{x:Static fn:FontFileResources.FontAwesomeSolid}"
220+
FontSize="{DynamicResource ButtonFontSize}" />
221+
<Span Text=" CLOSE" />
222+
</FormattedString>
223+
</Button.Text>
209224
<Button.Shadow>
210225
<Shadow Brush="{AppThemeBinding Light=#E0E0E0, Dark=#000000}"
211226
Offset="0,2"

0 commit comments

Comments
 (0)