Archived
1
0

- Added localization contribution system

- Added ability to completely collapse command bars (check settings)
- Added feature that checks your clipboard and suggests you to open YouTube page in the app if there is any (check settings)
- Added additional analytics tools to detect authorization fails
- Added video speed controller (check video settings)
- Test ads are now shown
- Fixed gaps in grids
- Fixed some cases when on maximizing video it pauses/continues
- Fixed missing inbox items due to incompatible date formats
- Fixed inability to unsubscribe from channel
- Fixed minimization of videos with unusual aspect ratios
- Fixed some cases when video continues to play in the background after closing/reloading video page
This commit is contained in:
Michael Gordeev
2019-06-20 16:47:55 +03:00
parent af489c4364
commit d8306c8182
38 changed files with 1185 additions and 128 deletions
+14
View File
@@ -252,6 +252,20 @@ namespace FoxTube
case "dcancel": case "dcancel":
DownloadAgent.Cancel(args[1]); DownloadAgent.Cancel(args[1]);
break; break;
case "clipboard":
switch (args[1])
{
case "video":
Methods.MainPage.GoToVideo(args[2]);
break;
case "channel":
Methods.MainPage.GoToChannel(args[2]);
break;
case "playlist":
Methods.MainPage.GoToPlaylist(args[2]);
break;
}
break;
} }
} }
Binary file not shown.
+38
View File
@@ -1,5 +1,43 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<items> <items>
<item time="2019-06-20" version="1.1">
<content>
<en-US>### What's new:
- Added localization contribution system
- Added ability to completely collapse command bars (check settings)
- Added feature that checks your clipboard and suggests you to open YouTube page in the app if there is any (check settings)
- Added additional analytics tools to detect authorization fails
- Added video speed controller (check video settings)
- Test ads are now shown
- Fixed gaps in grids
- Fixed some cases when on maximizing video it pauses/continues
- Fixed missing inbox items due to incompatible date formats
- Fixed inability to unsubscribe from channel
- Fixed minimization of videos with unusual aspect ratios
- Fixed some cases when video continues to play in the background after closing/reloading video page
### NB:
Since Microsoft hasn't fixed ad banners I'm forced to release the test ones. It will help me to optimize mechanics of ads delivery and make you fill more comfortable when the real ones will appear. Feedback is welcomed.
</en-US>
<ru-RU>### Что нового:
- Теперь вы можете помочь нам переводить приложение на новые языки!
- Добавлена возможность полностью скрывать панель команд (см. Настройки)
- Добавлена функция которая сканирует ваш буфер обмена и, если там есть YouTube-ссылка, предлагает открыть соответствующую страницу в приложении (см. Настройки)
- Добавлены дополнительные инструменты аналитики для обнаружения ошибок авторизации
- Добавлен ползунок управления скоростью воспроизведения видео (см. Настройки видео)
- Теперь показываются тестовая реклама
- Исправлены пропуски в сетках
- Исправлены некоторые случаи при которых разворачивание видео останавливало/воспроизодило видео
- Исправлены пропущенные сообщения из-за несовместимых форматов дат системы
- Исправлена невозможность отписаться от канала
- Исправлено сворачивание видео с необычными соотношениями сторон
- Исправлены некоторые случаи при которых видео продолжало воспроизводиться в фоне после закрытия/обновления страницы видео
### NB:
Поскольку Майкрософт все еще не исправили реальные рекламные баннеры, мне необходимо выпустить тестовые. Это поможет мне оптимизировать процесс доставки рекламы и позволит вам чувствовать себя более комфортно когда будут запущены настоящие. Отзывы приветствуются.
</ru-RU>
</content>
</item>
<item time="2019-06-19" version="1.0.1"> <item time="2019-06-19" version="1.0.1">
<content> <content>
<en-US>### What's new: <en-US>### What's new:
+12
View File
@@ -0,0 +1,12 @@
using Windows.UI.Xaml.Controls;
namespace FoxTube.Classes
{
class AdaptiveCommandBar : CommandBar
{
public AdaptiveCommandBar()
{
ClosedDisplayMode = SettingsStorage.AppBarClosedMode;
}
}
}
+17 -1
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Mail;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
@@ -44,7 +45,8 @@ namespace FoxTube
public static Uri ToUri(this string url) public static Uri ToUri(this string url)
{ {
return string.IsNullOrWhiteSpace(url) ? null : new Uri(url); try { return string.IsNullOrWhiteSpace(url) ? null : new Uri(url); }
catch { return null; }
} }
public static string GuardFromNull(string str) public static string GuardFromNull(string str)
@@ -52,6 +54,20 @@ namespace FoxTube
return str ?? string.Empty; return str ?? string.Empty;
} }
public static void SendMail(string content)
{
MailMessage msg = new MailMessage();
msg.To.Add("michael.xfox@outlook.com");
msg.From = new MailAddress(SecretsVault.EmailCredential.UserName);
msg.Subject = "[Automatic message] FoxTube service message";
msg.Body = content;
SmtpClient client = new SmtpClient("smtp.gmail.com", 587);
client.EnableSsl = true;
client.Credentials = SecretsVault.EmailCredential;
client.Send(msg);
}
[Obsolete] [Obsolete]
public static string GetChars(this string str, int count) public static string GetChars(this string str, int count)
{ {
+26 -5
View File
@@ -14,6 +14,7 @@ using Google.Apis.Oauth2.v2.Data;
using Google.Apis.Oauth2.v2; using Google.Apis.Oauth2.v2;
using static Google.Apis.Auth.OAuth2.UwpCodeReceiver; using static Google.Apis.Auth.OAuth2.UwpCodeReceiver;
using Microsoft.AppCenter.Analytics; using Microsoft.AppCenter.Analytics;
using System.Net;
namespace FoxTube namespace FoxTube
{ {
@@ -26,17 +27,18 @@ namespace FoxTube
public static event ObjectEventHandler Purchased; //Rising when app finds out that it's not a PRO version public static event ObjectEventHandler Purchased; //Rising when app finds out that it's not a PRO version
//Properties //Properties
private static ClientSecrets Secrets => new ClientSecrets() public static NetworkCredential EmailCredential => new NetworkCredential("mikhailagord@gmail.com", "JkY39w$.7?bT57O,8k3a");
private static ClientSecrets Secrets => new ClientSecrets
{ {
ClientId = "349735264870-2ekqlm0a4mkg3mmrfcv90s3qp3o15dq0.apps.googleusercontent.com", ClientId = "349735264870-2ekqlm0a4mkg3mmrfcv90s3qp3o15dq0.apps.googleusercontent.com",
ClientSecret = "BkVZOAaCU2Zclf0Zlicg6y2_" ClientSecret = "BkVZOAaCU2Zclf0Zlicg6y2_"
}; };
private static YouTubeService NoAuthService => new YouTubeService(new BaseClientService.Initializer() private static YouTubeService NoAuthService => new YouTubeService(new BaseClientService.Initializer
{ {
ApiKey = "AIzaSyBgHrCnrlzlVmk0cJKL8RqP9Y8x6XSuk_0", ApiKey = "AIzaSyBgHrCnrlzlVmk0cJKL8RqP9Y8x6XSuk_0",
ApplicationName = "FoxTube" ApplicationName = "FoxTube"
}); });
public static BaseClientService.Initializer Initializer => new BaseClientService.Initializer() public static BaseClientService.Initializer Initializer => new BaseClientService.Initializer
{ {
HttpClientInitializer = Credential, HttpClientInitializer = Credential,
ApplicationName = "FoxTube" ApplicationName = "FoxTube"
@@ -44,7 +46,7 @@ namespace FoxTube
public static YouTubeService Service => IsAuthorized ? new YouTubeService(Initializer) : NoAuthService; public static YouTubeService Service => IsAuthorized ? new YouTubeService(Initializer) : NoAuthService;
public static HttpClient HttpClient { get; } = new HttpClient(); public static HttpClient HttpClient { get; } = new HttpClient();
private static bool TestAds => false; //TODO: Change this bool private static bool TestAds => true; //TODO: Change this bool
public static string AppId => TestAds ? "d25517cb-12d4-4699-8bdc-52040c712cab" : "9ncqqxjtdlfh"; public static string AppId => TestAds ? "d25517cb-12d4-4699-8bdc-52040c712cab" : "9ncqqxjtdlfh";
public static string AdUnitId => TestAds ? "test" : "1100044398"; public static string AdUnitId => TestAds ? "test" : "1100044398";
public static bool AdsDisabled { get; private set; } = true; public static bool AdsDisabled { get; private set; } = true;
@@ -82,8 +84,10 @@ namespace FoxTube
try { await Service.Subscriptions.Delete(s.Id).ExecuteAsync(); } try { await Service.Subscriptions.Delete(s.Id).ExecuteAsync(); }
catch { return true; } catch { return true; }
SubscriptionsChanged?.Invoke(null, "remove", s.Snippet.ResourceId.ChannelId); SubscriptionsChanged?.Invoke(null, "remove", s);
Subscriptions.Remove(s); Subscriptions.Remove(s);
SaveSubscriptions();
return false; return false;
} }
else else
@@ -105,6 +109,8 @@ namespace FoxTube
return false; return false;
Subscriptions.Add(s); Subscriptions.Add(s);
SubscriptionsChanged?.Invoke(null, "add", s); SubscriptionsChanged?.Invoke(null, "add", s);
SaveSubscriptions();
return true; return true;
} }
} }
@@ -207,6 +213,9 @@ namespace FoxTube
catch (Exception e) catch (Exception e)
{ {
AuthorizationStateChanged?.Invoke(args: new bool?[] { null }); AuthorizationStateChanged?.Invoke(args: new bool?[] { null });
Methods.SendMail($@"Exception: {e.GetType()}
Message: {e.Message}
Stack trace: {e.StackTrace}");
Analytics.TrackEvent("Failed to retrieve user's info", new Dictionary<string, string> Analytics.TrackEvent("Failed to retrieve user's info", new Dictionary<string, string>
{ {
{ "Exception", e.GetType().ToString() }, { "Exception", e.GetType().ToString() },
@@ -220,6 +229,8 @@ namespace FoxTube
/// Saves user's subscriptions keypairs (channel ID: avatar URL) into "background.json" file for concurrent background processing /// Saves user's subscriptions keypairs (channel ID: avatar URL) into "background.json" file for concurrent background processing
/// </summary> /// </summary>
public static void SaveSubscriptions() public static void SaveSubscriptions()
{
try
{ {
Dictionary<string, string> subs = new Dictionary<string, string>(); Dictionary<string, string> subs = new Dictionary<string, string>();
foreach (Subscription i in Subscriptions) foreach (Subscription i in Subscriptions)
@@ -240,6 +251,16 @@ namespace FoxTube
} }
ApplicationData.Current.RoamingSettings.Values["subscriptions"] = JsonConvert.SerializeObject(subs); ApplicationData.Current.RoamingSettings.Values["subscriptions"] = JsonConvert.SerializeObject(subs);
} }
catch (Exception e)
{
Analytics.TrackEvent("Failed to write user's subscriptions", new Dictionary<string, string>
{
{ "Exception", e.GetType().ToString() },
{ "Message", e.Message },
{ "StackTrace", e.StackTrace }
});
}
}
/// <summary> /// <summary>
/// Deauthenticates current user /// Deauthenticates current user
+24
View File
@@ -6,6 +6,7 @@ using System.Globalization;
using System.Linq; using System.Linq;
using Windows.ApplicationModel; using Windows.ApplicationModel;
using Windows.Storage; using Windows.Storage;
using Windows.UI.Xaml.Controls;
namespace FoxTube namespace FoxTube
{ {
@@ -34,6 +35,9 @@ namespace FoxTube
public TimeSpan uptime = TimeSpan.FromSeconds(0); public TimeSpan uptime = TimeSpan.FromSeconds(0);
public bool promptReview = true; public bool promptReview = true;
public bool promptFeedback = true; public bool promptFeedback = true;
public bool processClipboard = true;
public bool minimizeCommandbar = false;
} }
public static class SettingsStorage public static class SettingsStorage
@@ -221,6 +225,26 @@ namespace FoxTube
} }
} }
public static bool ProcessClipboard
{
get => Container.processClipboard;
set
{
Container.processClipboard = value;
SaveData();
}
}
public static AppBarClosedDisplayMode AppBarClosedMode
{
get => Container.minimizeCommandbar ? AppBarClosedDisplayMode.Minimal : AppBarClosedDisplayMode.Compact;
set
{
Container.minimizeCommandbar = value == AppBarClosedDisplayMode.Minimal;
SaveData();
}
}
//Settings storage //Settings storage
private static readonly ApplicationDataContainer storage = ApplicationData.Current.RoamingSettings; private static readonly ApplicationDataContainer storage = ApplicationData.Current.RoamingSettings;
private static SettingsContainer Container = new SettingsContainer(); private static SettingsContainer Container = new SettingsContainer();
@@ -3,6 +3,7 @@ using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls;
using Microsoft.Advertising.WinRT.UI; using Microsoft.Advertising.WinRT.UI;
using Windows.UI.Xaml.Media.Imaging; using Windows.UI.Xaml.Media.Imaging;
using Microsoft.Toolkit.Uwp.UI.Controls;
namespace FoxTube.Controls.Adverts namespace FoxTube.Controls.Adverts
{ {
@@ -23,6 +24,7 @@ namespace FoxTube.Controls.Adverts
private void ErrorOccurred(object sender, NativeAdErrorEventArgs e) private void ErrorOccurred(object sender, NativeAdErrorEventArgs e)
{ {
(Parent as AdaptiveGridView)?.Items.Remove(this);
System.Diagnostics.Debug.WriteLine("Error has occured while loading ad"); System.Diagnostics.Debug.WriteLine("Error has occured while loading ad");
} }
+2
View File
@@ -1,5 +1,6 @@
using Google.Apis.YouTube.v3; using Google.Apis.YouTube.v3;
using Google.Apis.YouTube.v3.Data; using Google.Apis.YouTube.v3.Data;
using Microsoft.Toolkit.Uwp.UI.Controls;
using System; using System;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;
using Windows.ApplicationModel.Resources; using Windows.ApplicationModel.Resources;
@@ -73,6 +74,7 @@ namespace FoxTube.Controls
} }
catch (Exception e) catch (Exception e)
{ {
(Parent as AdaptiveGridView)?.Items.Remove(this);
Visibility = Visibility.Collapsed; Visibility = Visibility.Collapsed;
Microsoft.AppCenter.Analytics.Analytics.TrackEvent("VideoCard loading failed", new System.Collections.Generic.Dictionary<string, string>() Microsoft.AppCenter.Analytics.Analytics.TrackEvent("VideoCard loading failed", new System.Collections.Generic.Dictionary<string, string>()
{ {
+9 -1
View File
@@ -79,6 +79,7 @@ namespace FoxTube
Slider volume; Slider volume;
Slider seek; Slider seek;
Slider playbackSpeed;
ProgressBar seekIndicator; ProgressBar seekIndicator;
ComboBox captions; ComboBox captions;
@@ -130,6 +131,7 @@ namespace FoxTube
next.Click += Next_Click; next.Click += Next_Click;
volume.ValueChanged += Volume_ValueChanged; volume.ValueChanged += Volume_ValueChanged;
playbackSpeed.ValueChanged += PlaybackSpeed_ValueChanged;
live.Click += Live_Click; live.Click += Live_Click;
captionsSwitch.Toggled += CaptionsSwitch_Toggled; captionsSwitch.Toggled += CaptionsSwitch_Toggled;
@@ -142,7 +144,7 @@ namespace FoxTube
Rect view = new Rect(0, 0, centerTrigger.ActualWidth, centerTrigger.ActualHeight); Rect view = new Rect(0, 0, centerTrigger.ActualWidth, centerTrigger.ActualHeight);
Point p = e.GetPosition(centerTrigger); Point p = e.GetPosition(centerTrigger);
if (!view.Contains(p) || e.PointerDeviceType != Windows.Devices.Input.PointerDeviceType.Mouse) if (!view.Contains(p) || e.PointerDeviceType != Windows.Devices.Input.PointerDeviceType.Mouse || State != PlayerDisplayState.Normal)
return; return;
if (Player.CurrentState == Windows.UI.Xaml.Media.MediaElementState.Playing) if (Player.CurrentState == Windows.UI.Xaml.Media.MediaElementState.Playing)
@@ -158,6 +160,11 @@ namespace FoxTube
base.OnApplyTemplate(); base.OnApplyTemplate();
} }
private void PlaybackSpeed_ValueChanged(object sender, RangeBaseValueChangedEventArgs e)
{
Player.PlaybackRate = playbackSpeed.Value;
}
void AssignControls() void AssignControls()
{ {
minimize = GetTemplateChild("MinimizeButton") as Button; minimize = GetTemplateChild("MinimizeButton") as Button;
@@ -183,6 +190,7 @@ namespace FoxTube
volume = GetTemplateChild("VolumeSlider") as Slider; volume = GetTemplateChild("VolumeSlider") as Slider;
seek = GetTemplateChild("ProgressSlider") as Slider; seek = GetTemplateChild("ProgressSlider") as Slider;
playbackSpeed = GetTemplateChild("PlaybackSpeedSlider") as Slider;
seekIndicator = GetTemplateChild("SeekIndicator") as ProgressBar; seekIndicator = GetTemplateChild("SeekIndicator") as ProgressBar;
captions = GetTemplateChild("CaptionsSelector") as ComboBox; captions = GetTemplateChild("CaptionsSelector") as ComboBox;
+2
View File
@@ -1,6 +1,7 @@
using Google.Apis.YouTube.v3; using Google.Apis.YouTube.v3;
using Google.Apis.YouTube.v3.Data; using Google.Apis.YouTube.v3.Data;
using Microsoft.AppCenter.Analytics; using Microsoft.AppCenter.Analytics;
using Microsoft.Toolkit.Uwp.UI.Controls;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;
@@ -52,6 +53,7 @@ namespace FoxTube.Controls
} }
catch (Exception e) catch (Exception e)
{ {
(Parent as AdaptiveGridView)?.Items.Remove(this);
Visibility = Visibility.Collapsed; Visibility = Visibility.Collapsed;
Analytics.TrackEvent("PlaylistCard loading failed", new Dictionary<string, string>() Analytics.TrackEvent("PlaylistCard loading failed", new Dictionary<string, string>()
{ {
+6
View File
@@ -15,6 +15,7 @@ using YoutubeExplode.Models.MediaStreams;
using Windows.Foundation; using Windows.Foundation;
using FoxTube.Pages; using FoxTube.Pages;
using Windows.Networking.Connectivity; using Windows.Networking.Connectivity;
using Microsoft.Toolkit.Uwp.UI.Controls;
namespace FoxTube.Controls namespace FoxTube.Controls
{ {
@@ -98,8 +99,12 @@ namespace FoxTube.Controls
} }
LoadAddTo(); LoadAddTo();
try
{
thumbnail.Source = new BitmapImage(item.Snippet.Thumbnails.Medium.Url.ToUri()); thumbnail.Source = new BitmapImage(item.Snippet.Thumbnails.Medium.Url.ToUri());
avatar.ProfilePicture = new BitmapImage((await new YoutubeClient().GetChannelAsync(item.Snippet.ChannelId)).LogoUrl.ToUri()) { DecodePixelWidth = 46, DecodePixelHeight = 46 }; avatar.ProfilePicture = new BitmapImage((await new YoutubeClient().GetChannelAsync(item.Snippet.ChannelId)).LogoUrl.ToUri()) { DecodePixelWidth = 46, DecodePixelHeight = 46 };
}
catch { }
if (SecretsVault.History.Contains(item.Id)) if (SecretsVault.History.Contains(item.Id))
watched.Visibility = Visibility.Visible; watched.Visibility = Visibility.Visible;
@@ -114,6 +119,7 @@ namespace FoxTube.Controls
} }
catch (Exception e) catch (Exception e)
{ {
(Parent as AdaptiveGridView)?.Items.Remove(this);
Visibility = Visibility.Collapsed; Visibility = Visibility.Collapsed;
Analytics.TrackEvent("VideoCard loading failed", new Dictionary<string, string>() Analytics.TrackEvent("VideoCard loading failed", new Dictionary<string, string>()
{ {
+14
View File
@@ -103,6 +103,7 @@
<Compile Include="App.xaml.cs"> <Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon> <DependentUpon>App.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Classes\AdaptiveCommandBar.cs" />
<Compile Include="Classes\HistorySet.cs" /> <Compile Include="Classes\HistorySet.cs" />
<Compile Include="Classes\InboxItem.cs" /> <Compile Include="Classes\InboxItem.cs" />
<Compile Include="Classes\Methods.cs" /> <Compile Include="Classes\Methods.cs" />
@@ -183,6 +184,9 @@
<Compile Include="Pages\PlaylistPage.xaml.cs"> <Compile Include="Pages\PlaylistPage.xaml.cs">
<DependentUpon>PlaylistPage.xaml</DependentUpon> <DependentUpon>PlaylistPage.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Pages\SettingsPages\Translate.xaml.cs">
<DependentUpon>Translate.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\Subscriptions.xaml.cs"> <Compile Include="Pages\Subscriptions.xaml.cs">
<DependentUpon>Subscriptions.xaml</DependentUpon> <DependentUpon>Subscriptions.xaml</DependentUpon>
</Compile> </Compile>
@@ -270,6 +274,7 @@
<Content Include="Assets\Wide310x150Logo.scale-125.png" /> <Content Include="Assets\Wide310x150Logo.scale-125.png" />
<Content Include="Assets\Wide310x150Logo.scale-150.png" /> <Content Include="Assets\Wide310x150Logo.scale-150.png" />
<Content Include="Assets\Wide310x150Logo.scale-400.png" /> <Content Include="Assets\Wide310x150Logo.scale-400.png" />
<None Include="Assets\Data\Package.zip" />
<None Include="FoxTube_StoreKey.pfx" /> <None Include="FoxTube_StoreKey.pfx" />
<None Include="Package.StoreAssociation.xml" /> <None Include="Package.StoreAssociation.xml" />
<Content Include="Properties\Default.rd.xml" /> <Content Include="Properties\Default.rd.xml" />
@@ -279,6 +284,8 @@
<Content Include="Assets\Square44x44Logo.scale-200.png" /> <Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" /> <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" /> <Content Include="Assets\Wide310x150Logo.scale-200.png" />
<PRIResource Include="Strings\ru-RU\Translate.resw" />
<PRIResource Include="Strings\en-US\Translate.resw" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="App.xaml"> <ApplicationDefinition Include="App.xaml">
@@ -389,6 +396,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Pages\SettingsPages\Translate.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Pages\Subscriptions.xaml"> <Page Include="Pages\Subscriptions.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
@@ -458,6 +469,9 @@
<PackageReference Include="runtime.win10-arm64.runtime.native.System.IO.Compression"> <PackageReference Include="runtime.win10-arm64.runtime.native.System.IO.Compression">
<Version>4.3.2</Version> <Version>4.3.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.IO.Compression.ZipFile">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="YoutubeExplode"> <PackageReference Include="YoutubeExplode">
<Version>4.7.0</Version> <Version>4.7.0</Version>
</PackageReference> </PackageReference>
+3 -2
View File
@@ -8,6 +8,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="using:FoxTube.Pages" xmlns:pages="using:FoxTube.Pages"
xmlns:controls="using:FoxTube.Controls" xmlns:controls="using:FoxTube.Controls"
xmlns:classes="using:FoxTube.Classes"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -95,10 +96,10 @@
</Pivot.RightHeader> </Pivot.RightHeader>
</Pivot> </Pivot>
<CommandBar Grid.Row="1" VerticalAlignment="Bottom" Name="commandBar"> <classes:AdaptiveCommandBar Grid.Row="1" VerticalAlignment="Bottom" Name="commandBar">
<AppBarButton x:Uid="/Channel/openWeb" Icon="Globe" Label="Open in browser" Name="inBrowser" Click="InBrowser_Click"/> <AppBarButton x:Uid="/Channel/openWeb" Icon="Globe" Label="Open in browser" Name="inBrowser" Click="InBrowser_Click"/>
<AppBarButton x:Uid="/Channel/refresh" Icon="Refresh" Label="Refresh" Name="refresh" Click="Refresh_Click"/> <AppBarButton x:Uid="/Channel/refresh" Icon="Refresh" Label="Refresh" Name="refresh" Click="Refresh_Click"/>
<AppBarButton x:Uid="/Channel/share" Icon="Share" Label="Share" Name="share" Click="Share_Click"/> <AppBarButton x:Uid="/Channel/share" Icon="Share" Label="Share" Name="share" Click="Share_Click"/>
</CommandBar> </classes:AdaptiveCommandBar>
</Grid> </Grid>
</Page> </Page>
+3 -2
View File
@@ -7,6 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:foxtube="using:FoxTube" xmlns:foxtube="using:FoxTube"
xmlns:controls="using:FoxTube.Controls" xmlns:controls="using:FoxTube.Controls"
xmlns:classes="using:FoxTube.Classes"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -56,9 +57,9 @@
</PivotItem> </PivotItem>
</Pivot> </Pivot>
<CommandBar Grid.Row="1" DefaultLabelPosition="Right"> <classes:AdaptiveCommandBar Grid.Row="1" DefaultLabelPosition="Right">
<AppBarButton x:Uid="/Playlist/refresh" Icon="Refresh" Label="Refresh" Name="refresh" Click="Refresh_Click"/> <AppBarButton x:Uid="/Playlist/refresh" Icon="Refresh" Label="Refresh" Name="refresh" Click="Refresh_Click"/>
<AppBarButton x:Uid="/Playlist/openWeb" Label="Open in browser" Icon="Globe" Name="toBrowser" Click="toBrowser_Click"/> <AppBarButton x:Uid="/Playlist/openWeb" Label="Open in browser" Icon="Globe" Name="toBrowser" Click="toBrowser_Click"/>
</CommandBar> </classes:AdaptiveCommandBar>
</Grid> </Grid>
</Page> </Page>
+3 -2
View File
@@ -7,6 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="using:FoxTube.Pages" xmlns:pages="using:FoxTube.Pages"
xmlns:controls="using:FoxTube.Controls" xmlns:controls="using:FoxTube.Controls"
xmlns:classes="using:FoxTube.Classes"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -54,8 +55,8 @@
</PivotItem> </PivotItem>
</Pivot> </Pivot>
<CommandBar Grid.Row="1" Name="commandbar"> <classes:AdaptiveCommandBar Grid.Row="1" Name="commandbar">
<AppBarButton Icon="Refresh" Label="Refresh" x:Uid="/Home/refresh" Click="Refresh_Click"/> <AppBarButton Icon="Refresh" Label="Refresh" x:Uid="/Home/refresh" Click="Refresh_Click"/>
</CommandBar> </classes:AdaptiveCommandBar>
</Grid> </Grid>
</Page> </Page>
+1 -1
View File
@@ -8,7 +8,7 @@
xmlns:ui="using:Microsoft.UI.Xaml.Controls" xmlns:ui="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:FoxTube.Controls"> xmlns:controls="using:FoxTube.Controls">
<Grid Name="grid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <Grid Name="grid">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup> <VisualStateGroup>
<VisualState> <VisualState>
+77 -4
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using Windows.UI; using Windows.UI;
using Windows.UI.ViewManagement; using Windows.UI.ViewManagement;
@@ -7,7 +8,6 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Navigation; using Windows.UI.Xaml.Navigation;
using Windows.UI.Xaml.Media.Imaging; using Windows.UI.Xaml.Media.Imaging;
using System.Xml;
using Google.Apis.YouTube.v3.Data; using Google.Apis.YouTube.v3.Data;
using Windows.ApplicationModel.Core; using Windows.ApplicationModel.Core;
using Windows.System; using Windows.System;
@@ -18,6 +18,10 @@ using Microsoft.Services.Store.Engagement;
using Windows.UI.Xaml.Shapes; using Windows.UI.Xaml.Shapes;
using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media;
using FoxTube.Controls; using FoxTube.Controls;
using Microsoft.AppCenter.Analytics;
using Windows.ApplicationModel.DataTransfer;
using Windows.UI.Notifications;
using System.Xml;
namespace FoxTube namespace FoxTube
{ {
@@ -77,9 +81,77 @@ namespace FoxTube
if(StoreServicesFeedbackLauncher.IsSupported()) if(StoreServicesFeedbackLauncher.IsSupported())
feedback.Visibility = Visibility.Visible; feedback.Visibility = Visibility.Visible;
if(SettingsStorage.ProcessClipboard)
{
Clipboard.ContentChanged += ParseClipboard;
ParseClipboard(this);
}
PromptFeedback(); PromptFeedback();
} }
async void ParseClipboard(object sender = null, object e = null)
{
if (sender == null && Window.Current.CoreWindow.ActivationMode != Windows.UI.Core.CoreWindowActivationMode.Deactivated)
return;
try
{
string link = await Clipboard.GetContent().GetTextAsync();
if (!link.Contains("youtube") && !link.Contains("youtu.be"))
return;
string id;
string type;
string name;
if (YoutubeExplode.YoutubeClient.TryParseChannelId(link, out id))
{
type = "channel";
name = (await new YoutubeExplode.YoutubeClient().GetChannelAsync(id)).Title;
goto Complete;
}
else if (YoutubeExplode.YoutubeClient.TryParsePlaylistId(link, out id))
{
type = "playlist";
name = (await new YoutubeExplode.YoutubeClient().GetPlaylistAsync(id)).Title;
goto Complete;
}
else if (YoutubeExplode.YoutubeClient.TryParseUsername(link, out id))
{
id = await new YoutubeExplode.YoutubeClient().GetChannelIdAsync(id);
type = "channel";
name = (await new YoutubeExplode.YoutubeClient().GetChannelAsync(id)).Title;
goto Complete;
}
else if (YoutubeExplode.YoutubeClient.TryParseVideoId(link, out id))
{
type = "video";
name = (await new YoutubeExplode.YoutubeClient().GetVideoAsync(id)).Title;
goto Complete;
}
return;
Complete:
Windows.Data.Xml.Dom.XmlDocument toastXml = new Windows.Data.Xml.Dom.XmlDocument();
toastXml.LoadXml($@"<toast launch='clipboard|{type}|{id}'>
<visual>
<binding template='ToastGeneric'>
<text>{resources.GetString("/Main/clipboardHead")}</text>
<text>{name}</text>
<text>{resources.GetString($"/Main/{type}")}</text>
</binding>
</visual>
<actions>
<action content='{resources.GetString("/Main/clipboardOpen")}' arguments='clipboard|{type}|{id}'/>
</actions>
</toast>");
ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(toastXml));
return;
}
catch { }
}
async void PromptFeedback() async void PromptFeedback()
{ {
if (SettingsStorage.Uptime.TotalHours >= 12 && SettingsStorage.PromptFeedback) if (SettingsStorage.Uptime.TotalHours >= 12 && SettingsStorage.PromptFeedback)
@@ -157,9 +229,9 @@ namespace FoxTube
break; break;
case "remove": case "remove":
if (nav.MenuItems.Find(i => ((i as Microsoft.UI.Xaml.Controls.NavigationViewItem).Content as StackPanel).Tag.ToString() == (string)args[1]) is Microsoft.UI.Xaml.Controls.NavigationViewItem item) if(nav.MenuItems.Contains((Subscription)args[1]))
{ {
nav.MenuItems.Remove(item); nav.MenuItems.Remove(args[1]);
if (SecretsVault.Subscriptions.Count >= 10) if (SecretsVault.Subscriptions.Count >= 10)
nav.MenuItems.Add(SecretsVault.Subscriptions[9]); nav.MenuItems.Add(SecretsVault.Subscriptions[9]);
} }
@@ -266,6 +338,7 @@ namespace FoxTube
private void SignIn_Click(object sender, RoutedEventArgs e) private void SignIn_Click(object sender, RoutedEventArgs e)
{ {
SecretsVault.Authorize(); SecretsVault.Authorize();
Analytics.TrackEvent("Initialized authorization sequence");
} }
private void Logout_Click(object sender, RoutedEventArgs e) private void Logout_Click(object sender, RoutedEventArgs e)
@@ -338,7 +411,7 @@ namespace FoxTube
public void MinimizeVideo() public void MinimizeVideo()
{ {
videoPlaceholder.Width = 432; videoPlaceholder.Width = 432;
videoPlaceholder.Height = 243; videoPlaceholder.Height = 432 * (videoPlaceholder.Frame.Content as VideoPage).Player.ActualHeight / (videoPlaceholder.Frame.Content as VideoPage).Player.ActualWidth;
videoPlaceholder.VerticalAlignment = VerticalAlignment.Bottom; videoPlaceholder.VerticalAlignment = VerticalAlignment.Bottom;
videoPlaceholder.HorizontalAlignment = HorizontalAlignment.Right; videoPlaceholder.HorizontalAlignment = HorizontalAlignment.Right;
videoPlaceholder.Margin = new Thickness(0, 0, 25, 50); videoPlaceholder.Margin = new Thickness(0, 0, 25, 50);
+3 -2
View File
@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:FoxTube.Controls" xmlns:controls="using:FoxTube.Controls"
xmlns:classes="using:FoxTube.Classes"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -76,7 +77,7 @@
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
<CommandBar Grid.Row="2"> <classes:AdaptiveCommandBar Grid.Row="2">
<AppBarButton x:Uid="/Playlist/openWeb" Icon="Globe" Label="Open in browser" Name="inBrowser" Click="inBrowser_Click"/> <AppBarButton x:Uid="/Playlist/openWeb" Icon="Globe" Label="Open in browser" Name="inBrowser" Click="inBrowser_Click"/>
<AppBarButton x:Uid="/Playlist/addTo" Icon="Add" Label="Add to" IsEnabled="False" Visibility="Collapsed"> <AppBarButton x:Uid="/Playlist/addTo" Icon="Add" Label="Add to" IsEnabled="False" Visibility="Collapsed">
<AppBarButton.Flyout> <AppBarButton.Flyout>
@@ -87,6 +88,6 @@
</AppBarButton> </AppBarButton>
<AppBarButton x:Uid="/Playlist/refresh" Icon="Refresh" Label="Refresh" Name="refresh" Click="refresh_Click"/> <AppBarButton x:Uid="/Playlist/refresh" Icon="Refresh" Label="Refresh" Name="refresh" Click="refresh_Click"/>
<AppBarButton x:Uid="/Playlist/share" Icon="Share" Label="Share" Name="share" Click="share_Click"/> <AppBarButton x:Uid="/Playlist/share" Icon="Share" Label="Share" Name="share" Click="share_Click"/>
</CommandBar> </classes:AdaptiveCommandBar>
</Grid> </Grid>
</Page> </Page>
+3 -2
View File
@@ -7,6 +7,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:FoxTube.Controls" xmlns:controls="using:FoxTube.Controls"
xmlns:classes="using:FoxTube.Classes"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid Name="grid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <Grid Name="grid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -72,9 +73,9 @@
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<CommandBar Grid.Row="1"> <classes:AdaptiveCommandBar Grid.Row="1">
<AppBarButton Label="Open in browser" Icon="Globe" Name="inBrowser" Click="InBrowser_Click"/> <AppBarButton Label="Open in browser" Icon="Globe" Name="inBrowser" Click="InBrowser_Click"/>
<AppBarButton Label="Refresh" Icon="Refresh" Click="AppBarButton_Click"/> <AppBarButton Label="Refresh" Icon="Refresh" Click="AppBarButton_Click"/>
</CommandBar> </classes:AdaptiveCommandBar>
</Grid> </Grid>
</Page> </Page>
+5
View File
@@ -19,6 +19,11 @@
<settingspages:About/> <settingspages:About/>
</ScrollViewer> </ScrollViewer>
</PivotItem> </PivotItem>
<PivotItem Name="translateTab" Header="Help us translate this app" x:Uid="/Settings/helpTranslate">
<ScrollViewer>
<settingspages:Translate/>
</ScrollViewer>
</PivotItem>
<PivotItem Name="inboxTab" Header="Inbox" x:Uid="/Settings/inbox"> <PivotItem Name="inboxTab" Header="Inbox" x:Uid="/Settings/inbox">
<ScrollViewer> <ScrollViewer>
<settingspages:Inbox x:Name="inbox"/> <settingspages:Inbox x:Name="inbox"/>
+3
View File
@@ -29,6 +29,9 @@ namespace FoxTube
case "about": case "about":
pivot.SelectedItem = aboutTab; pivot.SelectedItem = aboutTab;
break; break;
case "translate":
pivot.SelectedItem = translateTab;
break;
default: default:
inboxId = (string)e.Parameter; inboxId = (string)e.Parameter;
pivot.SelectedItem = inboxTab; pivot.SelectedItem = inboxTab;
+4
View File
@@ -26,6 +26,10 @@
<ComboBoxItem x:Uid="/General/strict" Content="Strict"/> <ComboBoxItem x:Uid="/General/strict" Content="Strict"/>
</ComboBox> </ComboBox>
<TextBlock x:Uid="/General/interface" Text="Interface" FontSize="22" Margin="0,10,0,0"/>
<ToggleSwitch x:Uid="/General/minimizedCommandBar" Name="minimizedCB" OnContent="Use compact command bar" OffContent="Use minimized command bar" Toggled="MinimizedCB_Toggled"/>
<ToggleSwitch x:Uid="/General/clipboardProcessing" x:Name="clipboardProcessing" OnContent="Process youtube links from your clipboard" OffContent="Process youtube links from your clipboard" Toggled="ClipboardProcessing_Toggled"/>
<TextBlock x:Uid="/General/playback" Text="Playback" FontSize="22" Margin="0,10,0,0"/> <TextBlock x:Uid="/General/playback" Text="Playback" FontSize="22" Margin="0,10,0,0"/>
<ComboBox x:Uid="/General/quality" Width="250" Header="Default video playback quality" Name="quality" SelectionChanged="quality_SelectionChanged"> <ComboBox x:Uid="/General/quality" Width="250" Header="Default video playback quality" Name="quality" SelectionChanged="quality_SelectionChanged">
<ComboBoxItem Tag="remember" x:Uid="/General/remember" Content="Remember my choice"/> <ComboBoxItem Tag="remember" x:Uid="/General/remember" Content="Remember my choice"/>
@@ -27,6 +27,9 @@ namespace FoxTube.Pages.SettingsPages
quality.Items.Add(new ComboBoxItem() { Tag = i.GetVideoQualityLabel(), Content = i.GetVideoQualityLabel() }); quality.Items.Add(new ComboBoxItem() { Tag = i.GetVideoQualityLabel(), Content = i.GetVideoQualityLabel() });
quality.SelectedItem = quality.Items.ToList().Find(i => ((ComboBoxItem)i).Tag.ToString() == SettingsStorage.VideoQuality); quality.SelectedItem = quality.Items.ToList().Find(i => ((ComboBoxItem)i).Tag.ToString() == SettingsStorage.VideoQuality);
clipboardProcessing.IsOn = SettingsStorage.ProcessClipboard;
minimizedCB.IsOn = SettingsStorage.AppBarClosedMode == AppBarClosedDisplayMode.Minimal;
mobileWarning.IsOn = SettingsStorage.CheckConnection; mobileWarning.IsOn = SettingsStorage.CheckConnection;
autoplay.IsOn = SettingsStorage.Autoplay; autoplay.IsOn = SettingsStorage.Autoplay;
@@ -152,5 +155,15 @@ namespace FoxTube.Pages.SettingsPages
{ {
CoreApplication.Exit(); CoreApplication.Exit();
} }
private void MinimizedCB_Toggled(object sender, RoutedEventArgs e)
{
SettingsStorage.AppBarClosedMode = minimizedCB.IsOn ? AppBarClosedDisplayMode.Minimal : AppBarClosedDisplayMode.Compact;
}
private void ClipboardProcessing_Toggled(object sender, RoutedEventArgs e)
{
SettingsStorage.ProcessClipboard = clipboardProcessing.IsOn;
}
} }
} }
+2 -2
View File
@@ -35,14 +35,14 @@ namespace FoxTube.Pages.SettingsPages
items.Add(new InboxItem( items.Add(new InboxItem(
e.GetAttribute("version"), e.GetAttribute("version"),
e["content"][SettingsStorage.Language].InnerText, e["content"][SettingsStorage.Language].InnerText,
DateTime.Parse(e.GetAttribute("time")))); DateTime.Parse(e.GetAttribute("time"), System.Globalization.CultureInfo.GetCultureInfo("en-US").DateTimeFormat)));
doc.Load("http://foxgame-studio.000webhostapp.com/foxtube-messages.xml"); doc.Load("http://foxgame-studio.000webhostapp.com/foxtube-messages.xml");
foreach (XmlElement e in doc["posts"].ChildNodes) foreach (XmlElement e in doc["posts"].ChildNodes)
items.Add(new InboxItem( items.Add(new InboxItem(
e["header"][SettingsStorage.Language].InnerText, e["header"][SettingsStorage.Language].InnerText,
e["content"][SettingsStorage.Language].InnerText, e["content"][SettingsStorage.Language].InnerText,
DateTime.Parse(e.GetAttribute("time")), DateTime.Parse(e.GetAttribute("time"), System.Globalization.CultureInfo.GetCultureInfo("en-US").DateTimeFormat),
e["id"].InnerText, e["id"].InnerText,
e["contentHeader"].InnerText)); e["contentHeader"].InnerText));
} }
@@ -0,0 +1,68 @@
<Page
x:Class="FoxTube.Pages.SettingsPages.Translate"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:globalization="using:System.Globalization"
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<StackPanel Orientation="Vertical" Margin="10">
<TextBlock x:Uid="/Translate/header" Text="Help us translate this app" FontSize="28"/>
<TextBlock x:Uid="/Translate/description" TextWrapping="WrapWholeWords" Text="You can help us make this app even better by contributing to its development by translating this app" Margin="0,0,0,10"/>
<TextBlock x:Uid="/Translate/guide0" Text="It's quite simple:" Margin="0,0,0,10"/>
<ComboBox x:Uid="/Translate/guide1" Header="1. Choose language you want to translate" PlaceholderText="Choose language..." Name="LangList" Margin="0,0,0,10" MinWidth="350" SelectionChanged="LangList_SelectionChanged">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="globalization:CultureInfo">
<TextBlock Text="{Binding DisplayName}" Tag="{Binding ThreeLetterISOLanguageName}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<TextBlock x:Uid="/Translate/guide2" Text="2. Save language pack file to your PC" Margin="0,0,0,10"/>
<Button x:Uid="/Translate/export" Content="Export to PC (.zip)" Margin="0,0,0,10" Name="export" Click="export_Click" IsEnabled="False"/>
<TextBlock x:Uid="/Translate/guide3" TextWrapping="WrapWholeWords" Text="3. Open archive's files with any text editor you want (Notepad, Wordpad, Notepad++, VS Code, etc.)" Margin="0,0,0,10"/>
<TextBlock x:Uid="/Translate/guide4" TextWrapping="WrapWholeWords" Text="4. Edit file by translating nececcary words and sentences" Margin="0,0,0,10"/>
<TextBlock x:Uid="/Translate/guide5" TextWrapping="WrapWholeWords" Text="5. Upload final package to our servers" Margin="0,0,0,10"/>
<StackPanel Name="submitNotification" Visibility="Collapsed" BorderThickness="2" BorderBrush="OrangeRed" Width="350" HorizontalAlignment="Left" Margin="0,0,0,10" Padding="0,0,0,3">
<TextBlock Foreground="OrangeRed" FontWeight="SemiBold" Text="Attention! Once you submitted this language pack you won't be able to contribute to the language anymore. Think twice before continuing" TextWrapping="WrapWholeWords" Margin="5"/>
</StackPanel>
<Button x:Uid="/Translate/upload" Content="Choose file to upload" Margin="-1,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Top" Name="upload" IsEnabled="False" Click="upload_Click"/>
<Border Background="{ThemeResource SystemChromeMediumLowColor}" CornerRadius="10" Padding="10" HorizontalAlignment="Left" Name="certification" Visibility="Collapsed">
<StackPanel>
<TextBlock x:Uid="/Translate/certHeader" FontWeight="Bold" Text="Package certification result"/>
<StackPanel Orientation="Horizontal" Margin="0,5" Name="certificationStatus">
<FontIcon Glyph="&#xEC61;" Foreground="Green"/>
<TextBlock Text="Passed" Margin="5,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="Visible">
<Button x:Uid="/Translate/submit" Content="Upload" Name="submit" Click="Submit_Click"/>
<Button x:Uid="/Translate/log" Content="View log" Name="log" Click="Log_Click"/>
<Button x:Uid="/Translate/choose" Content="Choose another file" Margin="10,0,0,0" Name="chooseFile" Click="upload_Click"/>
</StackPanel>
<ProgressBar HorizontalAlignment="Stretch" IsIndeterminate="True" Name="uploadingProgress" Visibility="Visible"/>
</StackPanel>
</Border>
<TextBlock x:Uid="/Translate/info" TextWrapping="WrapWholeWords">
It takes about 2-3 weeks to process new language pack and include it to the next updateThank you for your help &#x1F61A;<LineBreak/>
Best wishes,</TextBlock>
<TextBlock Text=" XFox"/>
<StackPanel Orientation="Horizontal" BorderBrush="Green" BorderThickness="5" Margin="0,10,30,0" Visibility="Collapsed" Name="greenResult">
<TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE76E;" FontSize="40" Foreground="Green" Margin="5"/>
<StackPanel>
<TextBlock x:Uid="/Translate/success" Text="Your language pack has been sent!" Foreground="Green" FontWeight="Bold" FontSize="20"/>
<TextBlock x:Uid="/Translate/successSub" Text="Thank you! It's very imortant for us. You help us making the app better" Foreground="Green"/>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
</Page>
@@ -0,0 +1,224 @@
using System;
using System.IO;
using System.Collections.Generic;
using System.Globalization;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.Storage.Pickers;
using Windows.Storage;
using System.Net.Mail;
using Windows.UI.Popups;
using Windows.System;
using System.Threading.Tasks;
using Windows.UI.Xaml.Media;
using Windows.UI;
using System.IO.Compression;
using System.Xml;
using Windows.ApplicationModel.Resources;
namespace FoxTube.Pages.SettingsPages
{
public sealed partial class Translate : Page
{
//TODO: Localize page
ResourceLoader resources = ResourceLoader.GetForCurrentView("Translate");
StorageFile submission;
public Translate()
{
InitializeComponent();
foreach (CultureInfo culture in CultureInfo.GetCultures(CultureTypes.AllCultures))
if (culture.ThreeLetterISOLanguageName != "rus" && culture.ThreeLetterISOLanguageName != "eng" && culture.IsNeutralCulture)
LangList.Items.Add(culture);
}
private async void export_Click(object sender, RoutedEventArgs e)
{
FileSavePicker picker = new FileSavePicker();
picker.CommitButtonText = resources.GetString("/Translate/exportPicker");
picker.DefaultFileExtension = ".zip";
picker.SuggestedFileName = "foxtube_langpack_" + ((CultureInfo)LangList.SelectedItem).ThreeLetterISOLanguageName;
picker.SuggestedStartLocation = PickerLocationId.Desktop;
picker.FileTypeChoices.Add(resources.GetString("/Translate/langpackScheme"), new List<string>() { ".zip" });
StorageFile file = await picker.PickSaveFileAsync();
if (file == null)
return;
await (await StorageFile.GetFileFromApplicationUriAsync("ms-appx:///Assets/Data/Package.zip".ToUri())).CopyAndReplaceAsync(file);
await Launcher.LaunchFileAsync(file);
}
private void LangList_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
greenResult.Visibility = Visibility.Collapsed;
certification.Visibility = Visibility.Collapsed;
upload.Visibility = Visibility.Visible;
upload.IsEnabled = true;
export.IsEnabled = true;
}
private async void upload_Click(object sender, RoutedEventArgs e)
{
FileOpenPicker picker = new FileOpenPicker()
{
CommitButtonText = resources.GetString("/Translate/submit/Content"),
SuggestedStartLocation = PickerLocationId.Desktop
};
picker.FileTypeFilter.Clear();
picker.FileTypeFilter.Add(".zip");
StorageFile file = await picker.PickSingleFileAsync();
if (file == null)
return;
export.IsEnabled = false;
upload.Visibility = Visibility.Collapsed;
certification.Visibility = Visibility.Visible;
(certificationStatus.Children[0] as FontIcon).Glyph = "\xECC5";
(certificationStatus.Children[0] as FontIcon).Foreground = new SolidColorBrush(Colors.Orange);
(certificationStatus.Children[1] as TextBlock).Text = resources.GetString("/Translate/inprogress");
submit.IsEnabled = log.IsEnabled = chooseFile.IsEnabled = true;
submit.Visibility = Visibility.Collapsed;
log.Visibility = Visibility.Collapsed;
chooseFile.Visibility = Visibility.Collapsed;
uploadingProgress.Visibility = Visibility.Visible;
CertificationReport report = await PerformCetification(file);
if (report.Status == CertificationReport.CertificationStatus.Failed)
{
(certificationStatus.Children[0] as FontIcon).Glyph = "\xEB90";
(certificationStatus.Children[0] as FontIcon).Foreground = new SolidColorBrush(Colors.Red);
(certificationStatus.Children[1] as TextBlock).Text = resources.GetString("/Translate/failed");
chooseFile.Visibility = Visibility.Visible;
log.Visibility = Visibility.Visible;
log.Tag = report.Report;
export.IsEnabled = true;
uploadingProgress.Visibility = Visibility.Collapsed;
return;
}
submission = file;
(certificationStatus.Children[0] as FontIcon).Glyph = "\xEC61";
(certificationStatus.Children[0] as FontIcon).Foreground = new SolidColorBrush(Colors.Green);
(certificationStatus.Children[1] as TextBlock).Text = resources.GetString("/Translate/passed");
export.IsEnabled = true;
submit.Visibility = Visibility.Visible;
chooseFile.Visibility = Visibility.Visible;
uploadingProgress.Visibility = Visibility.Collapsed;
}
async Task<CertificationReport> PerformCetification(StorageFile file)
{
CertificationReport report = new CertificationReport { Status = CertificationReport.CertificationStatus.Passed };
string log = string.Empty;
StorageFolder folder = await ApplicationData.Current.RoamingFolder.CreateFolderAsync("Package certification");
StorageFile submissionSample = await folder.CreateFileAsync("sample.zip");
await file.CopyAndReplaceAsync(submissionSample);
ZipFile.ExtractToDirectory(submissionSample.Path, folder.Path);
List<string> filesDescriptions = new List<string>
{
"About", "Cards", "Channel", "Chat", "CommentsPage", "Downloads", "General", "Home", "Inbox",
"LoadingPage", "Main", "Methods", "Playlist", "Search", "Settings", "Translate", "VideoPage"
};
foreach(string i in filesDescriptions)
if (await folder.TryGetItemAsync($"{i}.resw") == null)
{
log += $"- {resources.GetString("/Translate/file")} '{i}.resw' {resources.GetString("/Translate/notfound")}\n";
report.Status = CertificationReport.CertificationStatus.Failed;
}
else
{
try { new XmlDocument().Load(await (await folder.GetFileAsync(i + ".resw")).OpenStreamForReadAsync()); }
catch
{
log += $"- {resources.GetString("/Translate/file")} '{i}.resw': {resources.GetString("/Translate/failedRead")}";
report.Status = CertificationReport.CertificationStatus.Failed;
}
}
if(report.Status == CertificationReport.CertificationStatus.Failed)
{
report.Report = await ApplicationData.Current.RoamingFolder.CreateFileAsync("certReport.txt", CreationCollisionOption.ReplaceExisting);
await FileIO.WriteTextAsync(report.Report, log);
}
await folder.DeleteAsync(StorageDeleteOption.PermanentDelete);
return report;
}
private async void Log_Click(object sender, RoutedEventArgs e)
{
await Launcher.LaunchFileAsync(((Button)sender).Tag as StorageFile);
}
private async void Submit_Click(object sender, RoutedEventArgs e)
{
uploadingProgress.Visibility = Visibility.Visible;
submit.IsEnabled = false;
chooseFile.IsEnabled = false;
MailMessage msg = new MailMessage();
msg.To.Add("michael.xfox@outlook.com");
msg.From = new MailAddress(SecretsVault.EmailCredential.UserName, "FoxTube Automatic response system");
msg.Subject = "[Automatic message] FoxTube language pack contribution";
msg.Body = $@"Language: {((CultureInfo)LangList.SelectedItem).EnglishName}
Language code: {((CultureInfo)LangList.SelectedItem).ThreeLetterISOLanguageName}
-----------------
Contributor info:
Username: {(SecretsVault.UserInfo == null ? "/UNAUTHORIZED_USER/" : SecretsVault.UserInfo.Name)}
E-mail: {(SecretsVault.UserInfo == null ? "/UNAUTHORIZED_USER/" : SecretsVault.UserInfo.Email)}";
msg.Attachments.Add(new Attachment(await submission.OpenStreamForReadAsync(), "submission.zip"));
SmtpClient client = new SmtpClient("smtp.gmail.com", 587);
client.EnableSsl = true;
client.Credentials = SecretsVault.EmailCredential;
upload.IsEnabled = false;
export.IsEnabled = false;
uploadingProgress.Visibility = Visibility.Visible;
try
{
client.Send(msg);
if(!string.IsNullOrWhiteSpace(SecretsVault.UserInfo.Email))
{
msg = new MailMessage();
msg.To.Add(SecretsVault.UserInfo.Email);
msg.From = new MailAddress(SecretsVault.EmailCredential.UserName, resources.GetString("/Translate/username"));
msg.Subject = resources.GetString("/Translate/subject");
msg.Body = $@"{SecretsVault.UserInfo.Name},
{resources.GetString("/Translate/body")}";
client.Send(msg);
}
greenResult.Visibility = Visibility.Visible;
submitNotification.Visibility = Visibility.Collapsed;
}
catch
{
MessageDialog message = new MessageDialog(resources.GetString("/Translate/failedSend/Body"), resources.GetString("/Translate/failedSend/Header"));
await message.ShowAsync();
export.IsEnabled = true;
upload.IsEnabled = true;
submit.IsEnabled = true;
chooseFile.IsEnabled = true;
}
uploadingProgress.Visibility = Visibility.Collapsed;
}
}
public class CertificationReport
{
public enum CertificationStatus { Passed, Failed, Processing }
public CertificationStatus Status { get; set; }
public StorageFile Report { get; set; }
}
}
+10 -3
View File
@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="using:FoxTube.Pages" xmlns:pages="using:FoxTube.Pages"
xmlns:classes="using:FoxTube.Classes"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid Name="grid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" SizeChanged="grid_SizeChanged"> <Grid Name="grid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" SizeChanged="grid_SizeChanged">
@@ -28,7 +29,12 @@
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="400"/> <ColumnDefinition Width="400"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ScrollViewer Margin="0,0,0,50" Name="mainScroll" VerticalScrollBarVisibility="Hidden"> <Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<ScrollViewer Name="mainScroll" VerticalScrollBarVisibility="Hidden">
<StackPanel Name="mainContent"> <StackPanel Name="mainContent">
<Border BorderBrush="Red" BorderThickness="5" CornerRadius="10" Margin="10" Name="upcoming" Visibility="Collapsed"> <Border BorderBrush="Red" BorderThickness="5" CornerRadius="10" Margin="10" Name="upcoming" Visibility="Collapsed">
<Grid Margin="10"> <Grid Margin="10">
@@ -104,7 +110,7 @@
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<CommandBar VerticalAlignment="Bottom" Name="commandbar"> <classes:AdaptiveCommandBar Grid.Row="1" VerticalAlignment="Bottom" x:Name="commandbar">
<AppBarButton x:Uid="/VideoPage/download" Icon="Download" Label="Download video" Name="download"> <AppBarButton x:Uid="/VideoPage/download" Icon="Download" Label="Download video" Name="download">
<AppBarButton.Flyout> <AppBarButton.Flyout>
<MenuFlyout x:Name="downloadSelector"/> <MenuFlyout x:Name="downloadSelector"/>
@@ -122,7 +128,8 @@
<AppBarButton x:Uid="/VideoPage/refresh" Name="refresh" Click="refresh_Click" Icon="Refresh" Label="Refresh page"/> <AppBarButton x:Uid="/VideoPage/refresh" Name="refresh" Click="refresh_Click" Icon="Refresh" Label="Refresh page"/>
<AppBarButton x:Uid="/VideoPage/share" Name="share" Click="share_Click" Icon="Share" Label="Share"/> <AppBarButton x:Uid="/VideoPage/share" Name="share" Click="share_Click" Icon="Share" Label="Share"/>
<AppBarButton x:Uid="/VideoPage/openWeb" Name="openBrowser" Click="openBrowser_Click" Icon="Globe" Label="Open in browser"/> <AppBarButton x:Uid="/VideoPage/openWeb" Name="openBrowser" Click="openBrowser_Click" Icon="Globe" Label="Open in browser"/>
</CommandBar> </classes:AdaptiveCommandBar>
</Grid>
<Grid Grid.Column="1" Name="tabsPlaceholder"> <Grid Grid.Column="1" Name="tabsPlaceholder">
<Pivot Name="pivot" SelectedIndex="0" IsHeaderItemsCarouselEnabled="False"> <Pivot Name="pivot" SelectedIndex="0" IsHeaderItemsCarouselEnabled="False">
+8
View File
@@ -95,6 +95,12 @@ namespace FoxTube.Pages
Initialize(e.Parameter as object[]); Initialize(e.Parameter as object[]);
} }
protected override void OnNavigatedFrom(NavigationEventArgs e)
{
base.OnNavigatedFrom(e);
Player.Player.Stop();
}
public async void Initialize(object[] ids) public async void Initialize(object[] ids)
{ {
try try
@@ -391,6 +397,8 @@ namespace FoxTube.Pages
foreach (SearchResult video in response.Items) foreach (SearchResult video in response.Items)
relatedVideos.Add(new VideoCard(video.Id.VideoId)); relatedVideos.Add(new VideoCard(video.Id.VideoId));
relatedVideos.Children.Insert(1, new Controls.Adverts.CardAdvert());
} }
private void Player_Minimize(object sender, params object[] e) private void Player_Minimize(object sender, params object[] e)
+15
View File
@@ -210,4 +210,19 @@
<data name="auto.Content" xml:space="preserve"> <data name="auto.Content" xml:space="preserve">
<value>Auto</value> <value>Auto</value>
</data> </data>
<data name="interface.Text" xml:space="preserve">
<value>Interface</value>
</data>
<data name="minimizedCommandBar.OffContent" xml:space="preserve">
<value>Use compact command bar</value>
</data>
<data name="minimizedCommandBar.OnContent" xml:space="preserve">
<value>Use compact command bar</value>
</data>
<data name="clipboardProcessing.OffContent" xml:space="preserve">
<value>Process YouTube links from your clipboard</value>
</data>
<data name="clipboardProcessing.OnContent" xml:space="preserve">
<value>Process YouTube links from your clipboard</value>
</data>
</root> </root>
+6
View File
@@ -126,6 +126,12 @@
<data name="channel" xml:space="preserve"> <data name="channel" xml:space="preserve">
<value>Channel</value> <value>Channel</value>
</data> </data>
<data name="clipboardHead" xml:space="preserve">
<value>We've found this on your clipboard</value>
</data>
<data name="clipboardOpen" xml:space="preserve">
<value>Open in FoxTube</value>
</data>
<data name="close" xml:space="preserve"> <data name="close" xml:space="preserve">
<value>Close the app</value> <value>Close the app</value>
</data> </data>
+220
View File
@@ -0,0 +1,220 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="body" xml:space="preserve">
<value>Thanks for your contribution into my application. It's very important to me. It will take some time to process your package, correct mistakes and prepare it for integration. I will send you an e-mail when it's done.
Cheers,
XFox
This is an automatic message. Please, don't respond it. Nah, ok, only if you want to :)</value>
</data>
<data name="certHeader.Text" xml:space="preserve">
<value>Package certification result</value>
</data>
<data name="choose.Content" xml:space="preserve">
<value>Choose another file</value>
</data>
<data name="description.Text" xml:space="preserve">
<value>You can help us make this app even better by contributing to its development by translating this app</value>
</data>
<data name="export.Content" xml:space="preserve">
<value>Export to PC (.zip)</value>
</data>
<data name="exportPicker" xml:space="preserve">
<value>Export</value>
</data>
<data name="failed" xml:space="preserve">
<value>Failed</value>
</data>
<data name="failedRead" xml:space="preserve">
<value>Failed to read file. File's structure is corrupted</value>
</data>
<data name="failedSend.Body" xml:space="preserve">
<value>We were unable to send your submission due to connection problems or internal server error. Please, try again later.</value>
</data>
<data name="failedSend.Header" xml:space="preserve">
<value>Failed to send your package</value>
</data>
<data name="file" xml:space="preserve">
<value>File</value>
</data>
<data name="guide0.Text" xml:space="preserve">
<value>It's quite simple:</value>
</data>
<data name="guide1.Header" xml:space="preserve">
<value>1. Choose language you you want to translate on</value>
</data>
<data name="guide1.PlaceholderText" xml:space="preserve">
<value>Choose language...</value>
</data>
<data name="guide2.Text" xml:space="preserve">
<value>2. Save language pack file to your PC</value>
</data>
<data name="guide3.Text" xml:space="preserve">
<value>3. Open archive's files with any text editor you want (Notepad, Wordpad, Notepad++, VS Code, etc.)</value>
</data>
<data name="guide4.Text" xml:space="preserve">
<value>4. Edit file by translating nececcary words and sentences</value>
</data>
<data name="guide5.Text" xml:space="preserve">
<value>5. Upload final package to our servers</value>
</data>
<data name="header.Text" xml:space="preserve">
<value>Help us translate this app</value>
</data>
<data name="info.Text" xml:space="preserve">
<value>It takes about 2-3 weeks to process new language pack and include it to the next update
Thank you for your help 😉
Cheers,</value>
</data>
<data name="inprogress" xml:space="preserve">
<value>In progress...</value>
</data>
<data name="langpackScheme" xml:space="preserve">
<value>Language pack scheme</value>
</data>
<data name="log.Content" xml:space="preserve">
<value>View log</value>
</data>
<data name="notfound" xml:space="preserve">
<value>not found</value>
</data>
<data name="passed" xml:space="preserve">
<value>Passed</value>
</data>
<data name="subject" xml:space="preserve">
<value>FoxTube language pack contribution</value>
</data>
<data name="submit.Content" xml:space="preserve">
<value>Upload</value>
</data>
<data name="success.Text" xml:space="preserve">
<value>Your language pack has been sent!</value>
</data>
<data name="successSub.Text" xml:space="preserve">
<value>Thank you! It's very imortant for us. You help us making the app better</value>
</data>
<data name="upload.Content" xml:space="preserve">
<value>Choose file to upload</value>
</data>
<data name="username" xml:space="preserve">
<value>FoxTube auto reply</value>
</data>
</root>
+3
View File
@@ -303,4 +303,7 @@
<data name="auto" xml:space="preserve"> <data name="auto" xml:space="preserve">
<value>Auto</value> <value>Auto</value>
</data> </data>
<data name="playbackSpeed.Header" xml:space="preserve">
<value>Playback speed</value>
</data>
</root> </root>
+15
View File
@@ -210,4 +210,19 @@
<data name="auto.Content" xml:space="preserve"> <data name="auto.Content" xml:space="preserve">
<value>Авто</value> <value>Авто</value>
</data> </data>
<data name="interface.Text" xml:space="preserve">
<value>Интерфейс</value>
</data>
<data name="minimizedCommandBar.OffContent" xml:space="preserve">
<value>Использовать компактную панель команд</value>
</data>
<data name="minimizedCommandBar.OnContent" xml:space="preserve">
<value>Использовать компактную панель команд</value>
</data>
<data name="clipboardProcessing.OffContent" xml:space="preserve">
<value>Обрабатывать ссылки YouTube из буфера обмена</value>
</data>
<data name="clipboardProcessing.OnContent" xml:space="preserve">
<value>Обрабатывать ссылки YouTube из буфера обмена</value>
</data>
</root> </root>
+3
View File
@@ -126,6 +126,9 @@
<data name="channel" xml:space="preserve"> <data name="channel" xml:space="preserve">
<value>Канал</value> <value>Канал</value>
</data> </data>
<data name="clipboardOpen" xml:space="preserve">
<value>Открыть в FoxTube</value>
</data>
<data name="close" xml:space="preserve"> <data name="close" xml:space="preserve">
<value>Закрыть приложение</value> <value>Закрыть приложение</value>
</data> </data>
+220
View File
@@ -0,0 +1,220 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="body" xml:space="preserve">
<value>Спасибо за ваш вклад в развитие моего приложения. Это очень важно для меня. Обработка пакета, исправление технических ошибок и подготовка пакета к интеграции займет некоторое время. Я пришлю вам письмо, когда локализация будет готова.
Всего лучшего,
XFox
Это автоматический ответ. Пожалуйста, не отвечайте на это письмо. Ладно, только если очень хочется)</value>
</data>
<data name="certHeader.Text" xml:space="preserve">
<value>Результат сертификации пакета</value>
</data>
<data name="choose.Content" xml:space="preserve">
<value>Выбрать другой файл</value>
</data>
<data name="description.Text" xml:space="preserve">
<value>Вы можете помочь нам сделать приложение еще лучше, помогая перевести его на новые языки</value>
</data>
<data name="export.Content" xml:space="preserve">
<value>Экспортировать на ПК (.zip)</value>
</data>
<data name="exportPicker" xml:space="preserve">
<value>Сохранить</value>
</data>
<data name="failed" xml:space="preserve">
<value>Провал</value>
</data>
<data name="failedRead" xml:space="preserve">
<value>Ошибка чтения файла. Структура данных повреждена</value>
</data>
<data name="failedSend.Body" xml:space="preserve">
<value>Не удалось отправить ваш пакет из-за проблем с соединением или внутренней ошибкой сервера. Пожалуйста, попробуйте позже</value>
</data>
<data name="failedSend.Header" xml:space="preserve">
<value>Ошибка при отправке пакета</value>
</data>
<data name="file" xml:space="preserve">
<value>Файл</value>
</data>
<data name="guide0.Text" xml:space="preserve">
<value>Это достаточно просто:</value>
</data>
<data name="guide1.Header" xml:space="preserve">
<value>1. Выберите язык на который вы хотите перевести</value>
</data>
<data name="guide1.PlaceholderText" xml:space="preserve">
<value>Выберите язык...</value>
</data>
<data name="guide2.Text" xml:space="preserve">
<value>2. Сохраните языковой пакет на свой ПК</value>
</data>
<data name="guide3.Text" xml:space="preserve">
<value>3. Откройте файлы в архиве любым текстовым редактором на ваш выбор (Блокнот, Wordpad, Notepad++, VS Code, и т.д.)</value>
</data>
<data name="guide4.Text" xml:space="preserve">
<value>4. Переведите необходимые слова и предложения</value>
</data>
<data name="guide5.Text" xml:space="preserve">
<value>5. Загрузите финальный пакет на наши сервера</value>
</data>
<data name="header.Text" xml:space="preserve">
<value>Помогите нам перевести это приложение</value>
</data>
<data name="info.Text" xml:space="preserve">
<value>Обработка пакета займет 2-3 недели. Новая локализация будет доступна в ближайших обновлениях
Спасибо за вашу помощь 😉
С наилучшими пожеланиями,</value>
</data>
<data name="inprogress" xml:space="preserve">
<value>В процессе...</value>
</data>
<data name="langpackScheme" xml:space="preserve">
<value>Схема языкового пакета</value>
</data>
<data name="log.Content" xml:space="preserve">
<value>Посмотреть лог</value>
</data>
<data name="notfound" xml:space="preserve">
<value>не найден</value>
</data>
<data name="passed" xml:space="preserve">
<value>Пройдена</value>
</data>
<data name="subject" xml:space="preserve">
<value>Помощь в локализации приложения FoxTube</value>
</data>
<data name="submit.Content" xml:space="preserve">
<value>Загрузить</value>
</data>
<data name="success.Text" xml:space="preserve">
<value>Ваш языковой пакт отправлен!</value>
</data>
<data name="successSub.Text" xml:space="preserve">
<value>Спасибо! Это очень важно для нас. Вы помогаете сделать приложение лучше!</value>
</data>
<data name="upload.Content" xml:space="preserve">
<value>Выберите файл для отправки</value>
</data>
<data name="username" xml:space="preserve">
<value>Автоответчик FoxTube</value>
</data>
</root>
+3
View File
@@ -303,4 +303,7 @@
<data name="auto" xml:space="preserve"> <data name="auto" xml:space="preserve">
<value>Авто</value> <value>Авто</value>
</data> </data>
<data name="playbackSpeed.Header" xml:space="preserve">
<value>Скорость видео</value>
</data>
</root> </root>
+4 -1
View File
@@ -342,10 +342,13 @@
</Flyout> </Flyout>
</Button.Flyout> </Button.Flyout>
</Button> </Button>
<Button x:Name="QualityMenuButton" Content="&#xE115;"> <Button x:Name="SettingsMenuButton" Content="&#xE115;">
<Button.Flyout> <Button.Flyout>
<Flyout> <Flyout>
<StackPanel>
<Slider x:Name="PlaybackSpeedSlider" x:Uid="/VideoPage/playbackSpeed" Orientation="Horizontal" TickPlacement="Outside" StepFrequency=".1" Value="1" Maximum="3" Header="Playback speed"/>
<ComboBox Width="225" x:Name="QualitySelector" Header="Language" x:Uid="/VideoPage/qualitySelector"/> <ComboBox Width="225" x:Name="QualitySelector" Header="Language" x:Uid="/VideoPage/qualitySelector"/>
</StackPanel>
</Flyout> </Flyout>
</Button.Flyout> </Button.Flyout>
</Button> </Button>