Skip to content

Commit a1924c4

Browse files
justcoding121justcoding121
committed
Update text to be more friendly
1 parent 3fdeed5 commit a1924c4

File tree

6 files changed

+41
-30
lines changed

6 files changed

+41
-30
lines changed

‎src/Bible.Alarm/App.xaml.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ private void UpdateThemeAwareColorResources()
138138
Resources["PrimaryTextColor"] = ThemeColors.PrimaryText.Get(theme);
139139
Resources["SelectedItemBackgroundColor"] = ThemeColors.SelectedItemBackground.Get(theme);
140140
Resources["DisabledTextColor"] = ThemeColors.DisabledText.Get(theme);
141+
Resources["PrimaryColor"] = ThemeColors.Primary.Get(theme);
142+
Resources["PrimaryLightColor"] = ThemeColors.PrimaryLight.Get(theme);
141143
}
142144
catch (Exception ex)
143145
{

‎src/Bible.Alarm/Common/ThemeColors.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,21 @@ public static class Primary
103103
public static Color SlateBlue => Color.FromArgb("#6A5ACD");
104104
public static Color LightPurple => Color.FromArgb("#9370DB");
105105
public static Color LightPurpleForDark => Color.FromArgb("#E8E0FF");
106+
107+
// Theme-aware primary color - lighter in dark mode for better contrast
108+
public static Color Dark => Color.FromArgb("#B8A0F0"); // Lighter purple for dark mode
109+
public static Color Light => Color.FromArgb("#6A5ACD"); // Original slate blue for light mode
110+
111+
public static Color Get(AppTheme theme) => theme == AppTheme.Dark ? Dark : Light;
112+
}
113+
114+
public static class PrimaryLight
115+
{
116+
// Theme-aware primary light color - used for highlights and lighter accents
117+
public static Color Dark => Color.FromArgb("#D0C0F8"); // Even lighter purple for dark mode highlights
118+
public static Color Light => Color.FromArgb("#9370DB"); // Original light purple for light mode
119+
120+
public static Color Get(AppTheme theme) => theme == AppTheme.Dark ? Dark : Light;
106121
}
107122

108123
// Day/Calendar Colors (used in converters)

‎src/Bible.Alarm/ViewModels/Schedule/NumberOfTrackContainerViewModel.cs‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ public NumberOfTracksListViewItemModel? CurrentNumberOfTracks
275275
{
276276
// Notify that the Text property (computed from CurrentNumberOfTracks) has changed
277277
OnPropertyChanged(nameof(CurrentNumberOfTracksText));
278+
OnPropertyChanged(nameof(TracksLabelText));
278279
}
279280
}
280281
}
@@ -305,6 +306,21 @@ public bool HasSectionStructure
305306
/// </summary>
306307
public string TrackLabelText => HasSectionStructure ? "Chapters to play each time" : "Episodes to play each time";
307308

309+
/// <summary>
310+
/// Gets the combined label text showing the number with "chapters or episodes" format.
311+
/// Returns format like "3 chapters or episodes" (not bold).
312+
/// </summary>
313+
public string TracksLabelText
314+
{
315+
get
316+
{
317+
var number = CurrentNumberOfTracks?.Value ?? 0;
318+
if (number == 0)
319+
return "chapters or episodes";
320+
return $"{number} chapters or episodes";
321+
}
322+
}
323+
308324
/// <summary>
309325
/// Gets the header text for the tracks selection modal.
310326
/// Returns "Select Number of Chapters" for sectioned publications,
@@ -314,12 +330,12 @@ public bool HasSectionStructure
314330

315331
/// <summary>
316332
/// Gets the label text for the "restart incomplete" toggle.
317-
/// Returns "Restart incomplete chapters from the beginning?" for sectioned publications,
318-
/// or "Restart incomplete episodes from the beginning?" for non-sectioned publications.
333+
/// Returns "Restart incomplete chapters from the beginning" for sectioned publications,
334+
/// or "Restart incomplete episodes from the beginning" for non-sectioned publications.
319335
/// </summary>
320336
public string RestartLabelText => HasSectionStructure
321-
? "Restart incomplete chapters from the beginning?"
322-
: "Restart incomplete episodes from the beginning?";
337+
? "Restart incomplete chapters from the beginning"
338+
: "Restart incomplete episodes from the beginning";
323339

324340
public bool NotificationEnabled
325341
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
TextColor="{DynamicResource TextPrimaryColor}"
6464
VerticalOptions="Center"
6565
VerticalTextAlignment="Center">
66-
Play music before Bible audio
66+
Begin with music
6767
</Label>
6868
<Grid Grid.Column="1"
6969
ColumnSpacing="0"

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

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,30 +53,15 @@
5353
HorizontalOptions="Fill"
5454
VerticalOptions="Fill"
5555
IsVisible="True">
56-
<Grid.ColumnDefinitions>
57-
<ColumnDefinition Width="*" />
58-
<ColumnDefinition Width="Auto" />
59-
</Grid.ColumnDefinitions>
60-
<Label Grid.Column="0"
61-
FontSize="{DynamicResource LargeFontSize}"
56+
<Label FontSize="{DynamicResource LargeFontSize}"
6257
FontAttributes="None"
6358
HorizontalOptions="Fill"
6459
HorizontalTextAlignment="Start"
65-
Text="{Binding TrackLabelText}"
60+
Text="{Binding TracksLabelText}"
6661
TextColor="{DynamicResource TextPrimaryColor}"
6762
VerticalOptions="Center"
6863
VerticalTextAlignment="Center"
6964
IsVisible="True" />
70-
<Label Grid.Column="1"
71-
FontSize="{DynamicResource LargeFontSize}"
72-
FontAttributes="Bold"
73-
HorizontalOptions="End"
74-
Margin="12,0,0,0"
75-
Text="{Binding CurrentNumberOfTracksText, TargetNullValue=''}"
76-
TextColor="{StaticResource PrimaryColor}"
77-
VerticalOptions="Center"
78-
VerticalTextAlignment="Center"
79-
IsVisible="True" />
8065
</Grid>
8166
</core:SfEffectsView>
8267
<!-- Divider -->
@@ -179,7 +164,7 @@
179164
TextColor="{DynamicResource TextPrimaryColor}"
180165
VerticalOptions="Center"
181166
VerticalTextAlignment="Center">
182-
Tap to play
167+
Wait until I tap alarm notification to start playing
183168
</Label>
184169
<Grid Grid.Column="1"
185170
HorizontalOptions="End"

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Sunday}}"
132132
HorizontalOptions="Fill"
133133
VerticalOptions="Fill"
134-
HorizontalTextAlignment="Center"
135134
VerticalTextAlignment="Center"
136135
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
137136
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />
@@ -198,7 +197,6 @@
198197
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Monday}}"
199198
HorizontalOptions="Fill"
200199
VerticalOptions="Fill"
201-
HorizontalTextAlignment="Center"
202200
VerticalTextAlignment="Center"
203201
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
204202
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />
@@ -265,7 +263,6 @@
265263
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Tuesday}}"
266264
HorizontalOptions="Fill"
267265
VerticalOptions="Fill"
268-
HorizontalTextAlignment="Center"
269266
VerticalTextAlignment="Center"
270267
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
271268
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />
@@ -332,7 +329,6 @@
332329
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Wednesday}}"
333330
HorizontalOptions="Fill"
334331
VerticalOptions="Fill"
335-
HorizontalTextAlignment="Center"
336332
VerticalTextAlignment="Center"
337333
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
338334
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />
@@ -399,7 +395,6 @@
399395
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Thursday}}"
400396
HorizontalOptions="Fill"
401397
VerticalOptions="Fill"
402-
HorizontalTextAlignment="Center"
403398
VerticalTextAlignment="Center"
404399
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
405400
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />
@@ -466,7 +461,6 @@
466461
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Friday}}"
467462
HorizontalOptions="Fill"
468463
VerticalOptions="Fill"
469-
HorizontalTextAlignment="Center"
470464
VerticalTextAlignment="Center"
471465
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
472466
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />
@@ -533,7 +527,6 @@
533527
TextColor="{Binding DaysOfWeek, Converter={StaticResource dayColorConverter}, ConverterParameter={StaticResource Saturday}}"
534528
HorizontalOptions="Fill"
535529
VerticalOptions="Fill"
536-
HorizontalTextAlignment="Center"
537530
VerticalTextAlignment="Center"
538531
MinimumWidthRequest="{DynamicResource IconStandardContainerSize}"
539532
MinimumHeightRequest="{DynamicResource IconStandardContainerSize}" />

0 commit comments

Comments
 (0)