diff --git a/CCharLearn/Client/Program.cs b/CCharLearn/Client/Program.cs
index bcb7048..dc336f6 100644
--- a/CCharLearn/Client/Program.cs
+++ b/CCharLearn/Client/Program.cs
@@ -10,7 +10,6 @@ namespace CCharLearn
{
public class Program
{
-
public static int CCharsLeft = 0;
public static Action UpdateUiEvent;
@@ -25,7 +24,7 @@ namespace CCharLearn
{
config.SnackbarConfiguration.ShowTransitionDuration = 100;
config.SnackbarConfiguration.HideTransitionDuration = 100;
- config.SnackbarConfiguration.VisibleStateDuration = 3000;
+ config.SnackbarConfiguration.VisibleStateDuration = 5000;
config.SnackbarConfiguration.PositionClass = Defaults.Classes.Position.TopCenter;
});
builder.Services.AddBlazoredLocalStorage();
diff --git a/CCharLearn/Pages/Index.razor b/CCharLearn/Pages/Index.razor
index 07839ad..d3f1f5a 100644
--- a/CCharLearn/Pages/Index.razor
+++ b/CCharLearn/Pages/Index.razor
@@ -14,7 +14,7 @@
}
-
+
@((!continueDataExists) ? "Start learning!" : "Start new!")
@if (continueDataExists)
@@ -27,7 +27,7 @@
-
+
}
@@ -35,20 +35,14 @@
-
-
- Modifiers:
-
-
-
-
+
-
+
@if (Charecters != null)
{
-
-
+
+
@@ -96,30 +90,18 @@
bool continueDataExists = false;
int continueCharectersLeft = -1;
- private bool ignoreTone;
+ private bool isEasyMode;
- public bool IgnoreTone
+ public bool IsEasyMode
{
- get { return ignoreTone; }
+ get { return isEasyMode; }
set
{
- ignoreTone = value;
- SetIgnoreTone();
+ isEasyMode = value;
+ SetEasyMode();
}
}
- private bool useChangingFonts;
-
- public bool UseChangingFonts
- {
- get { return useChangingFonts; }
- set
- {
- useChangingFonts = value;
- SetChangingFonts();
- }
- }
-
protected async override Task OnInitializedAsync()
@@ -127,8 +109,6 @@
if (await localStorage.ContainKeyAsync("Normalized_chunk_001.json"))
isSavedLocally = true;
- continueDataExists = await localStorage.ContainKeyAsync("ContinueData");
-
SelectedChunk();
StateHasChanged();
}
@@ -171,14 +151,9 @@
StateHasChanged();
}
- async void SetIgnoreTone()
+ async void SetEasyMode()
{
- await localStorage.SetItemAsync("IgnoreTone", ignoreTone);
- }
-
- async void SetChangingFonts()
- {
- await localStorage.SetItemAsync("ChangingFonts", UseChangingFonts);
+ await localStorage.SetItemAsync("EasyMode", isEasyMode);
}
async Task LoadAllChunksIntoLocalStorage()
@@ -230,7 +205,7 @@
{
if (firstRender)
{
-
+ continueDataExists = await localStorage.ContainKeyAsync("ContinueData");
}
if (continueDataExists)
@@ -238,14 +213,9 @@
continueCharectersLeft = await localStorage.GetItemAsync("ContinueCharectersLeft");
}
- if (await localStorage.ContainKeyAsync("IgnoreTone"))
+ if (await localStorage.ContainKeyAsync("EasyMode"))
{
- ignoreTone = await localStorage.GetItemAsync("IgnoreTone");
- }
-
- if (await localStorage.ContainKeyAsync("ChangingFonts"))
- {
- UseChangingFonts = await localStorage.GetItemAsync("ChangingFonts");
+ isEasyMode = await localStorage.GetItemAsync("EasyMode");
}
}
}
\ No newline at end of file
diff --git a/CCharLearn/Pages/Learn.razor b/CCharLearn/Pages/Learn.razor
index 29a8701..fdf9354 100644
--- a/CCharLearn/Pages/Learn.razor
+++ b/CCharLearn/Pages/Learn.razor
@@ -42,14 +42,7 @@
@if (!Answers.Any(x => x == null))
{
- if (useChagingFonts)
- {
- @GetDisplayChar()
- }
- else
- {
- @GetDisplayChar()
- }
+ @GetDisplayChar()
}
@@ -62,7 +55,7 @@
@for (int i = 0; i < Answers.Length; i++)
{
int buttonIndex = i;
- SelectButton(buttonIndex)"
Color="@(Answers[buttonIndex].isSelected ? Color.Primary : Color.Default)">
@@ -87,39 +80,21 @@
{
Submit
}
- @if (ignoreTone)
+ @if (isEasyMode)
{
• Easy mode enabled
}
- @if (useChagingFonts)
- {
- • Changing fonts enabled
- }
-@*Used to load all fonts into memory instead of loading from http each time*@
-@if (useChagingFonts && !hasLoadedFontsToMemory)
-{
- @for (int i = 0; i < extraFonts.Length; i++)
- {
-
i
- }
-}
-
@code {
bool isSavedLocally = false;
- bool ignoreTone = false;
+ bool isEasyMode = false;
bool selectedCorrect = false;
- bool useChagingFonts = false;
- string? currentFont = null;
- string[] extraFonts = { "HanyiSentyRubber", "mini-jian-caocuyuan", "myoungheihk", "UnboundedSans", "wt064", "XiaolaiSC-Regular", "chinese1", "chinese2" };
- bool hasLoadedFontsToMemory = false;
-
public Answer[] Answers = new Answer[4];
public void SelectButton(int selectedIndex)
{
@@ -154,14 +129,9 @@
protected override async Task OnInitializedAsync()
{
Program.UpdateUiEvent += OnUiUpdate;
- if (await localStorage.ContainKeyAsync("IgnoreTone"))
+ if (await localStorage.ContainKeyAsync("EasyMode"))
{
- ignoreTone = await localStorage.GetItemAsync("IgnoreTone");
- }
-
- if (await localStorage.ContainKeyAsync("ChangingFonts"))
- {
- useChagingFonts = await localStorage.GetItemAsync("ChangingFonts");
+ isEasyMode = await localStorage.GetItemAsync("EasyMode");
}
bool continueLast =
@@ -178,21 +148,13 @@
await LoadCharectersFromChunk();
}
- if (ignoreTone)
+ if (isEasyMode)
DontSkipTheseCChar.ForEach(x => x.cchar.pinyin = x.cchar.pinyin.Unidecode());
- if (useChagingFonts)
- {
- ChangeFont();
- }
-
Program.CCharsLeft = DontSkipTheseCChar.Count;
Program.InvokeUiUpdate();
GenerateQuestion();
-
- await Task.Delay(100);
- hasLoadedFontsToMemory = true;
}
async Task LoadCharectersFromChunk()
@@ -272,12 +234,6 @@
navigator.NavigateTo("");
}
- async void ChangeFont()
- {
- int randomIndex = Random.Shared.Next(0, extraFonts.Length);
- currentFont = extraFonts[randomIndex];
- }
-
async void Submit()
{
bool isCorrect = Answers.Any(x => x.isCorrect && x.isSelected);
@@ -288,7 +244,6 @@
{
Snackbar.Add($"Definition: {correctCChar.definition}", Severity.Success, config => { config.VisibleStateDuration = 1000; });
increaseCCharStat(GetCorrectCCharStats(), StatType.NumOfCorrects);
- ChangeFont();
}
else
{
@@ -317,18 +272,7 @@
await SaveContinueData();
- if (isCorrect)
- {
- GenerateQuestion();
- }
- else
- {
- foreach (var anwser in Answers)
- {
- anwser.isSelected = false;
- }
- StateHasChanged();
- }
+ GenerateQuestion();
}
async Task SaveContinueData()
@@ -419,7 +363,7 @@
public void ShowMeaning()
{
- Snackbar.Add($"Definition: {GetCorrectCChar().definition}", Severity.Info, conf => conf.VisibleStateDuration = 1000);
+ Snackbar.Add($"Definition: {GetCorrectCChar().definition}", Severity.Info);
}
public void ShowPinyin()
@@ -434,7 +378,7 @@
if (firstRender)
{
// Gets chinese voice on windows or iphone.
- this.SpeechVoice = ((IEnumerable)(await this.SpeechSynthesis.GetVoicesAsync())).FirstOrDefault(v => v.Name.Contains("Yaoyao") || v.Name.Contains("Ting-Ting") || v.Name.ToLower().Contains("cn"));
+ this.SpeechVoice = ((IEnumerable)(await this.SpeechSynthesis.GetVoicesAsync())).FirstOrDefault(v => v.Name.Contains("Yaoyao") || v.Name.Contains("Ting-Ting"));
this.StateHasChanged();
}
}
@@ -443,7 +387,7 @@
{
if (SpeechVoice == null)
{
- Snackbar.Add("Couldn't play sound.\nLikely reason: Chinese speech not installed", Severity.Error);
+ Snackbar.Add("Couldn't play sound", Severity.Error);
return;
}
diff --git a/CCharLearn/Pages/Learn.razor.css b/CCharLearn/Pages/Learn.razor.css
deleted file mode 100644
index 5f28270..0000000
--- a/CCharLearn/Pages/Learn.razor.css
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/CCharLearn/wwwroot/css/app.css b/CCharLearn/wwwroot/css/app.css
index 4a85e01..37dfb60 100644
--- a/CCharLearn/wwwroot/css/app.css
+++ b/CCharLearn/wwwroot/css/app.css
@@ -96,46 +96,4 @@ a, .btn-link {
}
.loading-progress-text:after {
content: var(--blazor-load-percentage-text, "Loading");
- }
-
-@font-face {
- font-family: 'HanyiSentyRubber';
- src: url(../fonts/HanyiSentyRubber.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'mini-jian-caocuyuan';
- src: url(../fonts/mini-jian-caocuyuan.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'myoungheihk';
- src: url(../fonts/myoungheihk.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'UnboundedSans';
- src: url(../fonts/UnboundedSans.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'wt064';
- src: url(../fonts/wt064.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'XiaolaiSC-Regular';
- src: url(../fonts/XiaolaiSC-Regular.ttf) format('truetype');
-}
-
-/*优设标题黑*/
-@font-face {
- font-family: 'chinese1';
- src: url(../fonts/chinese1.ttf) format('truetype');
-}
-
-/*站酷仓耳渔阳体*/
-@font-face {
- font-family: 'chinese2';
- src: url(../fonts/chinese2.ttf) format('truetype');
-}
\ No newline at end of file
+ }
\ No newline at end of file
diff --git a/CCharLearn/wwwroot/fonts/HanyiSentyRubber.ttf b/CCharLearn/wwwroot/fonts/HanyiSentyRubber.ttf
deleted file mode 100644
index df3f929..0000000
Binary files a/CCharLearn/wwwroot/fonts/HanyiSentyRubber.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/UnboundedSans.ttf b/CCharLearn/wwwroot/fonts/UnboundedSans.ttf
deleted file mode 100644
index 1ed1755..0000000
Binary files a/CCharLearn/wwwroot/fonts/UnboundedSans.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/XiaolaiSC-Regular.ttf b/CCharLearn/wwwroot/fonts/XiaolaiSC-Regular.ttf
deleted file mode 100644
index 82e28f4..0000000
Binary files a/CCharLearn/wwwroot/fonts/XiaolaiSC-Regular.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/chinese1.ttf b/CCharLearn/wwwroot/fonts/chinese1.ttf
deleted file mode 100644
index 3729151..0000000
Binary files a/CCharLearn/wwwroot/fonts/chinese1.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/chinese2.ttf b/CCharLearn/wwwroot/fonts/chinese2.ttf
deleted file mode 100644
index 027535f..0000000
Binary files a/CCharLearn/wwwroot/fonts/chinese2.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/mini-jian-caocuyuan.ttf b/CCharLearn/wwwroot/fonts/mini-jian-caocuyuan.ttf
deleted file mode 100644
index 8919b7f..0000000
Binary files a/CCharLearn/wwwroot/fonts/mini-jian-caocuyuan.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/myoungheihk.ttf b/CCharLearn/wwwroot/fonts/myoungheihk.ttf
deleted file mode 100644
index 3483fd9..0000000
Binary files a/CCharLearn/wwwroot/fonts/myoungheihk.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/fonts/wt064.ttf b/CCharLearn/wwwroot/fonts/wt064.ttf
deleted file mode 100644
index 075f994..0000000
Binary files a/CCharLearn/wwwroot/fonts/wt064.ttf and /dev/null differ
diff --git a/CCharLearn/wwwroot/index.html b/CCharLearn/wwwroot/index.html
index 423b62c..fc45e07 100644
--- a/CCharLearn/wwwroot/index.html
+++ b/CCharLearn/wwwroot/index.html
@@ -31,7 +31,7 @@
-
+