Skip to content

Commit 78fb064

Browse files
Update VideoPlayerView (#548)
* Use `PropertyName` * Use Azure Media Services Updated Streaming Formats * Increase to v2.5.3 * Only Update VisibleRepositoriesCollection on Event when `RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized` * Update GitHubApiV3ServiceTests.cs * Revert "Update GitHubApiV3ServiceTests.cs" This reverts commit b5c21b8.
1 parent c2fd5ea commit 78fb064

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

GitTrends.Android/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="56" android:versionName="2.5.2" package="com.minnick.gittrends" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="57" android:versionName="2.5.3" package="com.minnick.gittrends" android:installLocation="auto">
33
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
44
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
55
<application android:label="GitTrends" android:fullBackupContent="@xml/auto_backup_rules">

GitTrends.Shared/Models/StreamingUrl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ public record StreamingManifest
55
public StreamingManifest(string manifestUrl)
66
{
77
ManifestUrl = manifestUrl;
8-
HlsUrl = manifestUrl + "(format=m3u8-aapl)";
9-
DashUrl = manifestUrl + "(format=mpd-time-csf)";
8+
HlsUrl = manifestUrl + "(format=m3u8-cmaf)";
9+
DashUrl = manifestUrl + "(format=mpd-time-cmaf)";
1010
}
1111

1212
public string ManifestUrl { get; }

GitTrends.iOS/CustomRenderers/VideoPlayerViewCustomRenderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
3535
{
3636
base.OnElementPropertyChanged(sender, e);
3737

38-
if (e.PropertyName is nameof(Element.Url)
38+
if (e.PropertyName == VideoPlayerView.UrlProperty.PropertyName
3939
&& _avPlayerViewController.View is not null
4040
&& Element.Url is not null)
4141
{

GitTrends.iOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
<string>processing</string>
5858
</array>
5959
<key>CFBundleShortVersionString</key>
60-
<string>2.5.2</string>
60+
<string>2.5.3</string>
6161
<key>BGTaskSchedulerPermittedIdentifiers</key>
6262
<array>
6363
<string>com.minnick.GitTrends.NotifyTrendingRepositories</string>
6464
<string>com.minnick.GitTrends.CleanUpDatabase</string>
6565
</array>
6666
<key>CFBundleVersion</key>
67-
<string>56</string>
67+
<string>57</string>
6868
<key>CFBundleLocalizations</key>
6969
<array>
7070
<string>en</string>

GitTrends/ViewModels/RepositoryViewModel.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public partial class RepositoryViewModel : BaseViewModel
3535
readonly GitHubApiRepositoriesService _gitHubApiRepositoriesService;
3636

3737
IReadOnlyList<Repository> _repositoryList = Array.Empty<Repository>();
38+
RefreshState _refreshState;
3839

3940
[ObservableProperty]
4041
bool _isRefreshing;
@@ -102,10 +103,12 @@ public static event EventHandler<PullToRefreshFailedEventArgs> PullToRefreshFail
102103

103104
RefreshState RefreshState
104105
{
106+
get => _refreshState;
105107
set
106108
{
107109
EmptyDataViewTitle = EmptyDataViewService.GetRepositoryTitleText(value, !_repositoryList.Any());
108110
EmptyDataViewDescription = EmptyDataViewService.GetRepositoryDescriptionText(value, !_repositoryList.Any());
111+
_refreshState = value;
109112
}
110113
}
111114

@@ -201,8 +204,8 @@ async Task ExecuteRefresh()
201204
AddRepositoriesToCollection(repositoriesFromDatabaseThatDontRequireUpdating, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
202205

203206

204-
var repositoriesWithoutStarsDataAndOver1000Stars = _repositoryList.Where(x => !x.ContainsViewsClonesStarsData && x.StarCount > 1000);
205-
var repositoriesWithoutStarsDataAndLessThan1000Stars = _repositoryList.Where(x => !x.ContainsViewsClonesStarsData && x.StarCount <= 1000);
207+
var repositoriesWithoutStarsDataAndOver1000Stars = _repositoryList.Where(x => !x.ContainsStarsData && x.StarCount > 1000);
208+
var repositoriesWithoutStarsDataAndLessThan1000Stars = _repositoryList.Where(x => !x.ContainsStarsData && x.StarCount <= 1000);
206209

207210
// Fetch Stars Data in Background for Repositories Containing Over 1000 Stars
208211
// GitHub API limits us to 100 StarGazers per Request, meaning that a repository with 24K Stars requires 240 round-trips from GitTrends to GitHub's servers to aggregate the data
@@ -498,8 +501,8 @@ void OnPullToRefreshFailed(PullToRefreshFailedEventArgs pullToRefreshFailedEvent
498501
_pullToRefreshFailedEventManager.RaiseEvent(this, pullToRefreshFailedEventArgs, nameof(PullToRefreshFailed));
499502
}
500503

501-
void HandleScheduleRetryRepositoriesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
502-
void HandleTrendsViewModelRepositorySavedToDatabase(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
503-
void HandleScheduleRetryRepositoriesViewsClonesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, duplicateRepositoryPriorityFilter: x => x.ContainsViewsClonesStarsData);
504+
void HandleScheduleRetryRepositoriesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized, x => x.ContainsViewsClonesStarsData);
505+
void HandleTrendsViewModelRepositorySavedToDatabase(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized, x => x.ContainsViewsClonesStarsData);
506+
void HandleScheduleRetryRepositoriesViewsClonesStarsCompleted(object sender, Repository e) => AddRepositoriesToCollection(new Repository[] { e }, _searchBarText, RefreshState is RefreshState.Succeeded or RefreshState.Uninitialized, x => x.ContainsViewsClonesStarsData);
504507
}
505508
}

0 commit comments

Comments
 (0)