archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

Video cards fixes. Localization fixes. CardAdvert created

Browse Source 
Related Work Items: #244, #245
This commit is contained in:
Michael Gordeev
2019-01-07 23:51:49 +03:00
parent 3a1f5d418f
commit d11d529768
11 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube/Pages/MainPage.xaml
+1 -1
View File
@@ -36,7 +36,7 @@
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem x:Uid="/Main/adsFree" Content="Remove ads" Visibility="Collapsed" Name="removeAds">
<NavigationViewItem x:Uid="/Main/adsFree" Content="Remove ads" Visibility="Collapsed" Tapped="RemoveAds_Tapped" Name="removeAds">
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xE14D;"/>
</NavigationViewItem.Icon>
FoxTube/Pages/MainPage.xaml.cs
+12 -3
View File
@@ -41,10 +41,14 @@ namespace FoxTube
InitializeComponent();
CheckVersion();
SecretsVault.AuthorizationStateChanged += AuthorizationStateChanged;
SecretsVault.SubscriptionsChanged += SecretsVault_SubscriptionsChanged;
SecretsVault.NotPurchased += () => removeAds.Visibility = Visibility.Visible;
SecretsVault.Purchased += (sender, e) =>
{
removeAds.Visibility = (e[0] as bool?).Value ? Visibility.Collapsed : Visibility.Visible;
content.Navigate(typeof(Home));
};
SecretsVault.CheckAuthorization();
SecretsVault.CheckAddons();
@@ -351,7 +355,7 @@ namespace FoxTube
if (videoPlaceholder.Content != null)
(videoPlaceholder.Content as VideoPage).player.close_Click(this, null);
videoPlaceholder.Content = null;
Fullscreen(false);
@@ -740,5 +744,10 @@ namespace FoxTube
{
((NavigationViewItem)sender).ContextFlyout.ShowAt((NavigationViewItem)sender);
}
private void RemoveAds_Tapped(object sender, TappedRoutedEventArgs e)
{
SecretsVault.GetAdblock();
}
}
}
FoxTube/Pages/VideoGrid.xaml.cs
+3 -2
View File
@@ -1,6 +1,7 @@
using FoxTube.Controls.Adverts;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
namespace FoxTube.Pages
{
@@ -17,8 +18,8 @@ namespace FoxTube.Pages
public void Add(UIElement card)
{
list.Items.Add(card);
if (list.Items.Count % 5 == 0)
list.Items.Add(new CardAdvert());
/*if (list.Items.Count % 10 == 0)
list.Items.Add(new CardAdvert());*/
empty.Visibility = Visibility.Collapsed;
}
FoxTube/Pages/VideoPage.xaml.cs
+1
View File
@@ -1,4 +1,5 @@
using FoxTube.Controls;
using FoxTube.Controls.Adverts;
using Google.Apis.YouTube.v3;
using Google.Apis.YouTube.v3.Data;
using System;