Skip to content

Commit 425ba68

Browse files
committed
v1.2.7
- Changed the formatting for settings and labels in the about tab slightly. - Changed the capitalizations for all the buttons for consistency reasons. - Fixed the news tab downloading article data and images twice in the background on startup.
1 parent 49fd2a1 commit 425ba68

13 files changed

Lines changed: 57 additions & 55 deletions

Controls/CRButton.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Controls/CRInfo.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Controls/CRLabel.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Controls/CRNews.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -388,15 +388,20 @@ private async Task<NewsStorage> ParseLink(NewsStorage newsStorage)
388388
newsStorage.ThumbnailUrl = thumbnailMatch.Groups[1].Value;
389389
Int32 jpg = newsStorage.ThumbnailUrl.IndexOf(".jpg");
390390
Int32 png = newsStorage.ThumbnailUrl.IndexOf(".png");
391+
Int32 webp = newsStorage.ThumbnailUrl.IndexOf(".webp");
391392

392-
if (jpg != -1)
393+
if (jpg > 0)
393394
{
394395
newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, jpg) + ".jpg");
395396
}
396-
else if (png != -1)
397+
else if (png > 0)
397398
{
398399
newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, png) + ".png");
399400
}
401+
else if (webp > 0)
402+
{
403+
newsStorage.ThumbnailUrl = (newsStorage.ThumbnailUrl.Substring(0, webp) + ".webp"); // .NET doesn't support webp, so this doesn't work for now. Would need a third party library.
404+
}
400405
}
401406

402407
Match thumbnailMatchAlt = Regex.Match(pageBody, "<p dir=\"ltr\"><img src=\"(.*)\" data-id=\"");
@@ -486,9 +491,9 @@ public async void LoadAllIndexes()
486491

487492
if (newsStorage.ThumbnailImage == null)
488493
{
489-
newsStorage.ThumbnailUrl = "https://i.imgur.com/dmpY0zQ.png";
490-
newsStorage.ThumbnailUrlAlt = "";
491-
newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrl);
494+
newsStorage.ThumbnailUrl = "";
495+
newsStorage.ThumbnailUrlAlt = "https://i.imgur.com/dmpY0zQ.png";
496+
newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrlAlt);
492497
}
493498
}
494499
}
@@ -532,9 +537,9 @@ private async void LoadIndex()
532537

533538
if (newsStorage.ThumbnailImage == null)
534539
{
535-
newsStorage.ThumbnailUrl = "https://i.imgur.com/dmpY0zQ.png";
536-
newsStorage.ThumbnailUrlAlt = "";
537-
newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrl);
540+
newsStorage.ThumbnailUrl = "";
541+
newsStorage.ThumbnailUrlAlt = "https://i.imgur.com/dmpY0zQ.png";
542+
newsStorage.ThumbnailImage = await Downloaders.DownloadImage(newsStorage.ThumbnailUrlAlt);
538543
}
539544

540545
_articles[_index] = newsStorage;

Controls/CRTextbox.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)