Skip to content

Commit b672fdc

Browse files
committedApr 14, 2021
Updated screenshots
1 parent c723022 commit b672fdc

18 files changed

+28
-4
lines changed
 
Loading
Loading
Loading
93.9 KB
Loading
76.2 KB
Loading
84.2 KB
Loading
Loading

‎design/AndroidPhone/Screenshot1.png

527 KB
Loading

‎design/AndroidPhone/Screenshot2.png

430 KB
Loading

‎design/AndroidPhone/Screenshot3.png

350 KB
Loading

‎design/AndroidPhone/Screenshot4.png

458 KB
Loading

‎design/Feature Graphic.png

452 KB
Loading

‎design/Screenshot5.png

122 KB
Loading

‎design/StoreIcon.png

20.9 KB
Loading

‎design/WeeklyXamarin Mobile Design.xd

1.11 MB
Binary file not shown.

‎src/WeeklyXamarin.Mobile/WeeklyXamarin.Core/Services/Acknowledgements.cs

+8
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ public Acknowledgements()
3333
{
3434
Thanks = new List<Acknowledgement>()
3535
{
36+
// 7 April 2021
37+
new Acknowledgement() {Person="mnehus", Activity=Activity.Follow},
38+
new Acknowledgement() {Person="azzraell22", Activity=Activity.Follow},
39+
new Acknowledgement() {Person="Bearom_", Activity=Activity.Follow},
40+
new Acknowledgement() {Person="pandak74", Activity=Activity.Follow},
41+
new Acknowledgement() {Person="IeuanTWalker", Activity=Activity.Subscribe },
42+
new Acknowledgement() {Person="BenBtg", Activity=Activity.Subscribe },
43+
3644
// 31 March 2021
3745
new Acknowledgement() {Person="twilightsparkle213", Activity=Activity.Follow },
3846
new Acknowledgement() {Person="celesteapps", Activity=Activity.Follow },

‎src/WeeklyXamarin.Mobile/WeeklyXamarin.Core/ViewModels/SearchViewModel.cs

+19-3
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,41 @@ public string SearchText
3434
}
3535

3636
string lastSearchTerm;
37+
private string textAtTimeOfSearching;
38+
39+
public string TextAtTimeOfSearching {
40+
get => textAtTimeOfSearching;
41+
set => SetProperty(ref textAtTimeOfSearching, value);
42+
}
3743

3844
private async Task ExecuteSearchArticlesCommand()
3945
{
4046
try
4147
{
42-
48+
4349
if (string.Equals(lastSearchTerm, SearchText, StringComparison.InvariantCultureIgnoreCase))
4450
return;
4551
lastSearchTerm = SearchText;
4652
if (IsBusy) return; //don't run a search if one is already in progress
4753
IsBusy = true;
4854
Articles.Clear();
49-
55+
5056
if (SearchText?.Length > 1)
5157
{
5258
CurrentState = ListState.Loading;
59+
textAtTimeOfSearching = SearchText;
5360
var articlesAsync = dataStore.GetArticleFromSearchAsync(SearchText);
5461
await foreach (Article article in articlesAsync)
5562
{
56-
Articles.Add(article);
63+
if (string.Equals(lastSearchTerm, SearchText, StringComparison.InvariantCultureIgnoreCase))
64+
{
65+
Articles.Add(article);
66+
}
67+
else
68+
{
69+
Articles.Clear();
70+
return;
71+
}
5772
CurrentState = ListState.None; // show the results
5873
}
5974
//lastSearchTerm = SearchText;
@@ -62,6 +77,7 @@ private async Task ExecuteSearchArticlesCommand()
6277
}
6378
else
6479
{
80+
Articles.Clear();
6581
CurrentState = ListState.None; // go to collectionview empty state
6682
}
6783
}

‎src/WeeklyXamarin.Mobile/WeeklyXamarin.Mobile/Views/SearchPage.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Margin="40"
4545
HorizontalTextAlignment="Center"
4646
Style="{StaticResource InformationText}"
47-
Text="{Binding SearchText, StringFormat='No results for &quot;{0}&quot;.'}"
47+
Text="{Binding TextAtTimeOfSearching, StringFormat='No results for &quot;{0}&quot;.'}"
4848
VerticalOptions="CenterAndExpand" />
4949
<lottie:AnimationView
5050
x:Name="animationView"

0 commit comments

Comments
 (0)
Please sign in to comment.