diff --git a/FoxTube/FoxTube.csproj b/FoxTube/FoxTube.csproj index 5898399..ef7fa4e 100644 --- a/FoxTube/FoxTube.csproj +++ b/FoxTube/FoxTube.csproj @@ -431,6 +431,13 @@ + + + + + + + @@ -443,6 +450,7 @@ Microsoft Advertising SDK for XAML + 14.0 diff --git a/FoxTube/Package.appxmanifest b/FoxTube/Package.appxmanifest index 236ed91..ab1f30a 100644 --- a/FoxTube/Package.appxmanifest +++ b/FoxTube/Package.appxmanifest @@ -1,6 +1,6 @@  - + FoxTube @@ -14,7 +14,7 @@ - + diff --git a/FoxTube/Pages/MainPage.xaml b/FoxTube/Pages/MainPage.xaml index a6b2ba9..946e5a7 100644 --- a/FoxTube/Pages/MainPage.xaml +++ b/FoxTube/Pages/MainPage.xaml @@ -15,19 +15,19 @@ - - - - - + + + + + - - - - + + + + @@ -35,56 +35,61 @@ - + + Search + - + - - - - diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs index 8543a7d..6081c67 100644 --- a/FoxTube/Pages/MainPage.xaml.cs +++ b/FoxTube/Pages/MainPage.xaml.cs @@ -76,7 +76,7 @@ namespace FoxTube if (settings.Values["moblieWarning"] == null) settings.Values.Add("moblieWarning", false); if (settings.Values["videoAutoplay"] == null) - settings.Values.Add("videoAutoplay", false); + settings.Values.Add("videoAutoplay", true); if (settings.Values["themeMode"] == null) settings.Values.Add("themeMode", 2); if (settings.Values["volume"] == null) @@ -459,7 +459,7 @@ namespace FoxTube else if (args.SelectedItem == toDownloads) content.Navigate(typeof(Downloads)); else if (args.SelectedItem == toChannel) - content.Navigate(typeof(Channel), SecretsVault.UserChannel.Id); + content.Navigate(typeof(ChannelPage), SecretsVault.UserChannel.Id); else content.Navigate(typeof(ChannelPage), SecretsVault.Subscriptions[Convert.ToInt32((args.SelectedItem as NavigationViewItem).Name)].Snippet.ResourceId.ChannelId); } diff --git a/FoxTube/Pages/Settings.xaml.cs b/FoxTube/Pages/Settings.xaml.cs index 787c375..314ddfd 100644 --- a/FoxTube/Pages/Settings.xaml.cs +++ b/FoxTube/Pages/Settings.xaml.cs @@ -61,7 +61,7 @@ namespace FoxTube { if (pivot.SelectedIndex == 3 && !inboxLoaded) { - (((pivot.Items[4] as PivotItem).Content as ScrollViewer).Content as Inbox).LoadItems(); + (((pivot.Items[3] as PivotItem).Content as ScrollViewer).Content as Inbox).LoadItems(); inboxLoaded = true; } } diff --git a/FoxTube/Pages/SettingsPages/About.xaml b/FoxTube/Pages/SettingsPages/About.xaml index 1317355..a471a07 100644 --- a/FoxTube/Pages/SettingsPages/About.xaml +++ b/FoxTube/Pages/SettingsPages/About.xaml @@ -50,7 +50,7 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/FoxTube/Pages/Subscriptions.xaml.cs b/FoxTube/Pages/Subscriptions.xaml.cs index 4a56ebf..48f81bd 100644 --- a/FoxTube/Pages/Subscriptions.xaml.cs +++ b/FoxTube/Pages/Subscriptions.xaml.cs @@ -1,4 +1,5 @@ -using System; +using Google.Apis.YouTube.v3.Data; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -22,6 +23,7 @@ namespace FoxTube.Pages /// public sealed partial class Subscriptions : Page { + List list = SecretsVault.Subscriptions; public Subscriptions() { this.InitializeComponent(); diff --git a/FoxTube/Strings/en-US/Main.resw b/FoxTube/Strings/en-US/Main.resw new file mode 100644 index 0000000..3993a83 --- /dev/null +++ b/FoxTube/Strings/en-US/Main.resw @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Remove ads + + + Downloads + + + Give a feedback + + + History + + + Home + + + Watch later + + + Liked videos + + + My account + + + My channel + + + My library + + + Notifications + + + Search + + + Sign in with existing account + + + Sign in + + + Create new Google account + + + Log out + + + Subscriptions + + \ No newline at end of file diff --git a/FoxTube/Strings/en-US/Settings.resw b/FoxTube/Strings/en-US/Settings.resw new file mode 100644 index 0000000..82123d3 --- /dev/null +++ b/FoxTube/Strings/en-US/Settings.resw @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + About us + + + General + + + Help us translate this app + + + Inbox + + \ No newline at end of file diff --git a/FoxTube/Strings/en-US/Settings/About.resw b/FoxTube/Strings/en-US/Settings/About.resw new file mode 100644 index 0000000..fe5b7f8 --- /dev/null +++ b/FoxTube/Strings/en-US/Settings/About.resw @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + About us and this app + + + Contacts + + + © 2018 Michael Gordeev + + + © 2018 YouTube, LLC + + + Developed by Michael Gordeev (also known as XFox) + + + Leave feedback + + + YouTube Community Guidelines + + + Legal stuff + + + My blog (Russian language only) + + + Our Privacy Policy + + + YouTube Terms of use + + + Twitter + + + Vkontakte + + + YouTube Privacy Policy + + \ No newline at end of file diff --git a/FoxTube/Strings/en-US/Settings/General.resw b/FoxTube/Strings/en-US/Settings/General.resw new file mode 100644 index 0000000..f514f3a --- /dev/null +++ b/FoxTube/Strings/en-US/Settings/General.resw @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Play videos automatically + + + Color mode + + + Dark + + + Default + + + Light + + + Windows color settings + + + English (United States of America) + + + App interface language + + + Notify when playing on metered connection + + + Moderate + + + Notify when someone of your subscriptions uploaded new video + + + None + + + Notifications + + + Preferences + + + Playback + + + Default video playback quality + + + Region & search + + + Remember my choice + + + Reopen the app to apply changes + + + Russian (Russian Federation) + + + SafeSearch + + + Strict + + \ No newline at end of file diff --git a/FoxTube/Strings/en-US/Settings/Inbox.resw b/FoxTube/Strings/en-US/Settings/Inbox.resw new file mode 100644 index 0000000..49a664e --- /dev/null +++ b/FoxTube/Strings/en-US/Settings/Inbox.resw @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + All + + + Changelogs + + + Filter + + + Messages + + + Select item from the list + + \ No newline at end of file diff --git a/FoxTube/Strings/en-US/Settings/Translate.resw b/FoxTube/Strings/en-US/Settings/Translate.resw new file mode 100644 index 0000000..2b0d5fa --- /dev/null +++ b/FoxTube/Strings/en-US/Settings/Translate.resw @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + You can help us make this app even better by contributing to its development by translating this app. You can choose a brand new language to translate or edit mistakes in existing translations. + + + Export to PC (.zip) + + + It's quite simple: + + + Choose language you you want to translate on + + + Import language pack file to your PC + + + Help us translate this app + + + Choose language... + + + Attention! This tool is used to help us to provide our app to more people from other countries. Please, don't send not done language packs. Thanks in advance ;) + + \ No newline at end of file diff --git a/FoxTube/Strings/ru-RU/Main.resw b/FoxTube/Strings/ru-RU/Main.resw new file mode 100644 index 0000000..a5d240f --- /dev/null +++ b/FoxTube/Strings/ru-RU/Main.resw @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Убрать рекламу + + + Загрузки + + + Оставить отзыв + + + История + + + Главная + + + Посмотреть позже + + + Понравившиеся + + + Мой аккаунт + + + Мой канал + + + Библиотека + + + Уведомления + + + Поиск + + + Войти с помощью существующего аккаунта Google + + + Войти + + + Создать новый аккаунт Google + + + Выйти + + + Подписки + + \ No newline at end of file