diff --git a/FoxTube/Assets/LargeTile.scale-100.png b/FoxTube/Assets/LargeTile.scale-100.png
index c8493fb..7298cd0 100644
Binary files a/FoxTube/Assets/LargeTile.scale-100.png and b/FoxTube/Assets/LargeTile.scale-100.png differ
diff --git a/FoxTube/Assets/LargeTile.scale-125.png b/FoxTube/Assets/LargeTile.scale-125.png
index bbe7aac..181393f 100644
Binary files a/FoxTube/Assets/LargeTile.scale-125.png and b/FoxTube/Assets/LargeTile.scale-125.png differ
diff --git a/FoxTube/Assets/LargeTile.scale-150.png b/FoxTube/Assets/LargeTile.scale-150.png
index 29db9f5..86ceb09 100644
Binary files a/FoxTube/Assets/LargeTile.scale-150.png and b/FoxTube/Assets/LargeTile.scale-150.png differ
diff --git a/FoxTube/Assets/LargeTile.scale-200.png b/FoxTube/Assets/LargeTile.scale-200.png
index 8e7c3ff..67e53ce 100644
Binary files a/FoxTube/Assets/LargeTile.scale-200.png and b/FoxTube/Assets/LargeTile.scale-200.png differ
diff --git a/FoxTube/Assets/LargeTile.scale-400.png b/FoxTube/Assets/LargeTile.scale-400.png
index 044badc..1324e8d 100644
Binary files a/FoxTube/Assets/LargeTile.scale-400.png and b/FoxTube/Assets/LargeTile.scale-400.png differ
diff --git a/FoxTube/Assets/SmallTile.scale-100.png b/FoxTube/Assets/SmallTile.scale-100.png
index 57ff12a..be8719b 100644
Binary files a/FoxTube/Assets/SmallTile.scale-100.png and b/FoxTube/Assets/SmallTile.scale-100.png differ
diff --git a/FoxTube/Assets/SmallTile.scale-125.png b/FoxTube/Assets/SmallTile.scale-125.png
index 6eb0b02..8a8ea90 100644
Binary files a/FoxTube/Assets/SmallTile.scale-125.png and b/FoxTube/Assets/SmallTile.scale-125.png differ
diff --git a/FoxTube/Assets/SmallTile.scale-150.png b/FoxTube/Assets/SmallTile.scale-150.png
index 477431f..cdedd85 100644
Binary files a/FoxTube/Assets/SmallTile.scale-150.png and b/FoxTube/Assets/SmallTile.scale-150.png differ
diff --git a/FoxTube/Assets/SmallTile.scale-200.png b/FoxTube/Assets/SmallTile.scale-200.png
index e1f72e3..c51c898 100644
Binary files a/FoxTube/Assets/SmallTile.scale-200.png and b/FoxTube/Assets/SmallTile.scale-200.png differ
diff --git a/FoxTube/Assets/SmallTile.scale-400.png b/FoxTube/Assets/SmallTile.scale-400.png
index d060099..f392986 100644
Binary files a/FoxTube/Assets/SmallTile.scale-400.png and b/FoxTube/Assets/SmallTile.scale-400.png differ
diff --git a/FoxTube/Assets/SplashScreen.scale-100.png b/FoxTube/Assets/SplashScreen.scale-100.png
index fa640db..d7d588e 100644
Binary files a/FoxTube/Assets/SplashScreen.scale-100.png and b/FoxTube/Assets/SplashScreen.scale-100.png differ
diff --git a/FoxTube/Assets/SplashScreen.scale-125.png b/FoxTube/Assets/SplashScreen.scale-125.png
index 9188735..928e369 100644
Binary files a/FoxTube/Assets/SplashScreen.scale-125.png and b/FoxTube/Assets/SplashScreen.scale-125.png differ
diff --git a/FoxTube/Assets/SplashScreen.scale-150.png b/FoxTube/Assets/SplashScreen.scale-150.png
index 4b3520c..4b5bce1 100644
Binary files a/FoxTube/Assets/SplashScreen.scale-150.png and b/FoxTube/Assets/SplashScreen.scale-150.png differ
diff --git a/FoxTube/Assets/SplashScreen.scale-200.png b/FoxTube/Assets/SplashScreen.scale-200.png
index 2c1dd9a..ae07340 100644
Binary files a/FoxTube/Assets/SplashScreen.scale-200.png and b/FoxTube/Assets/SplashScreen.scale-200.png differ
diff --git a/FoxTube/Assets/SplashScreen.scale-400.png b/FoxTube/Assets/SplashScreen.scale-400.png
index 44ec654..c6d6ec8 100644
Binary files a/FoxTube/Assets/SplashScreen.scale-400.png and b/FoxTube/Assets/SplashScreen.scale-400.png differ
diff --git a/FoxTube/Assets/Square150x150Logo.scale-100.png b/FoxTube/Assets/Square150x150Logo.scale-100.png
index 43a79b3..79cb17d 100644
Binary files a/FoxTube/Assets/Square150x150Logo.scale-100.png and b/FoxTube/Assets/Square150x150Logo.scale-100.png differ
diff --git a/FoxTube/Assets/Square150x150Logo.scale-125.png b/FoxTube/Assets/Square150x150Logo.scale-125.png
index b688347..8361658 100644
Binary files a/FoxTube/Assets/Square150x150Logo.scale-125.png and b/FoxTube/Assets/Square150x150Logo.scale-125.png differ
diff --git a/FoxTube/Assets/Square150x150Logo.scale-150.png b/FoxTube/Assets/Square150x150Logo.scale-150.png
index 526559f..14d3871 100644
Binary files a/FoxTube/Assets/Square150x150Logo.scale-150.png and b/FoxTube/Assets/Square150x150Logo.scale-150.png differ
diff --git a/FoxTube/Assets/Square150x150Logo.scale-200.png b/FoxTube/Assets/Square150x150Logo.scale-200.png
index 83dc65c..7ad0df6 100644
Binary files a/FoxTube/Assets/Square150x150Logo.scale-200.png and b/FoxTube/Assets/Square150x150Logo.scale-200.png differ
diff --git a/FoxTube/Assets/Square150x150Logo.scale-400.png b/FoxTube/Assets/Square150x150Logo.scale-400.png
index 9ee5756..13d219a 100644
Binary files a/FoxTube/Assets/Square150x150Logo.scale-400.png and b/FoxTube/Assets/Square150x150Logo.scale-400.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
index d5b5ffc..ff4f9ff 100644
Binary files a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
index c3793c0..dfaf6e8 100644
Binary files a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
index 8d802c1..8f1b184 100644
Binary files a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
index 88e8070..e815798 100644
Binary files a/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and b/FoxTube/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.scale-100.png b/FoxTube/Assets/Square44x44Logo.scale-100.png
index c6be0fb..d7392f5 100644
Binary files a/FoxTube/Assets/Square44x44Logo.scale-100.png and b/FoxTube/Assets/Square44x44Logo.scale-100.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.scale-125.png b/FoxTube/Assets/Square44x44Logo.scale-125.png
index 2491abf..0880321 100644
Binary files a/FoxTube/Assets/Square44x44Logo.scale-125.png and b/FoxTube/Assets/Square44x44Logo.scale-125.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.scale-150.png b/FoxTube/Assets/Square44x44Logo.scale-150.png
index 356c99d..212f728 100644
Binary files a/FoxTube/Assets/Square44x44Logo.scale-150.png and b/FoxTube/Assets/Square44x44Logo.scale-150.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.scale-200.png b/FoxTube/Assets/Square44x44Logo.scale-200.png
index 5ddbf1a..dfb951d 100644
Binary files a/FoxTube/Assets/Square44x44Logo.scale-200.png and b/FoxTube/Assets/Square44x44Logo.scale-200.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.scale-400.png b/FoxTube/Assets/Square44x44Logo.scale-400.png
index fadca77..cc3ce94 100644
Binary files a/FoxTube/Assets/Square44x44Logo.scale-400.png and b/FoxTube/Assets/Square44x44Logo.scale-400.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.targetsize-16.png b/FoxTube/Assets/Square44x44Logo.targetsize-16.png
index 68cb310..a720a08 100644
Binary files a/FoxTube/Assets/Square44x44Logo.targetsize-16.png and b/FoxTube/Assets/Square44x44Logo.targetsize-16.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.targetsize-24.png b/FoxTube/Assets/Square44x44Logo.targetsize-24.png
index 0ff046a..f82e76a 100644
Binary files a/FoxTube/Assets/Square44x44Logo.targetsize-24.png and b/FoxTube/Assets/Square44x44Logo.targetsize-24.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/FoxTube/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index fca59a1..df8a96f 100644
Binary files a/FoxTube/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/FoxTube/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.targetsize-256.png b/FoxTube/Assets/Square44x44Logo.targetsize-256.png
index c0d4437..9e4160a 100644
Binary files a/FoxTube/Assets/Square44x44Logo.targetsize-256.png and b/FoxTube/Assets/Square44x44Logo.targetsize-256.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.targetsize-32.png b/FoxTube/Assets/Square44x44Logo.targetsize-32.png
index 400f032..b2e82db 100644
Binary files a/FoxTube/Assets/Square44x44Logo.targetsize-32.png and b/FoxTube/Assets/Square44x44Logo.targetsize-32.png differ
diff --git a/FoxTube/Assets/Square44x44Logo.targetsize-48.png b/FoxTube/Assets/Square44x44Logo.targetsize-48.png
index 4b5608a..2d5997a 100644
Binary files a/FoxTube/Assets/Square44x44Logo.targetsize-48.png and b/FoxTube/Assets/Square44x44Logo.targetsize-48.png differ
diff --git a/FoxTube/Assets/StoreLogo.scale-100.png b/FoxTube/Assets/StoreLogo.scale-100.png
index 500c10f..7a6c62a 100644
Binary files a/FoxTube/Assets/StoreLogo.scale-100.png and b/FoxTube/Assets/StoreLogo.scale-100.png differ
diff --git a/FoxTube/Assets/StoreLogo.scale-125.png b/FoxTube/Assets/StoreLogo.scale-125.png
index d8f7ec8..53320d0 100644
Binary files a/FoxTube/Assets/StoreLogo.scale-125.png and b/FoxTube/Assets/StoreLogo.scale-125.png differ
diff --git a/FoxTube/Assets/StoreLogo.scale-150.png b/FoxTube/Assets/StoreLogo.scale-150.png
index e7593db..f193000 100644
Binary files a/FoxTube/Assets/StoreLogo.scale-150.png and b/FoxTube/Assets/StoreLogo.scale-150.png differ
diff --git a/FoxTube/Assets/StoreLogo.scale-200.png b/FoxTube/Assets/StoreLogo.scale-200.png
index 8bdcf76..4adfe3c 100644
Binary files a/FoxTube/Assets/StoreLogo.scale-200.png and b/FoxTube/Assets/StoreLogo.scale-200.png differ
diff --git a/FoxTube/Assets/StoreLogo.scale-400.png b/FoxTube/Assets/StoreLogo.scale-400.png
index 7d33398..b4737b9 100644
Binary files a/FoxTube/Assets/StoreLogo.scale-400.png and b/FoxTube/Assets/StoreLogo.scale-400.png differ
diff --git a/FoxTube/Assets/Wide310x150Logo.scale-100.png b/FoxTube/Assets/Wide310x150Logo.scale-100.png
index 32a95cc..9698c77 100644
Binary files a/FoxTube/Assets/Wide310x150Logo.scale-100.png and b/FoxTube/Assets/Wide310x150Logo.scale-100.png differ
diff --git a/FoxTube/Assets/Wide310x150Logo.scale-125.png b/FoxTube/Assets/Wide310x150Logo.scale-125.png
index 096d24c..9723e3b 100644
Binary files a/FoxTube/Assets/Wide310x150Logo.scale-125.png and b/FoxTube/Assets/Wide310x150Logo.scale-125.png differ
diff --git a/FoxTube/Assets/Wide310x150Logo.scale-150.png b/FoxTube/Assets/Wide310x150Logo.scale-150.png
index 85c4d35..43e8890 100644
Binary files a/FoxTube/Assets/Wide310x150Logo.scale-150.png and b/FoxTube/Assets/Wide310x150Logo.scale-150.png differ
diff --git a/FoxTube/Assets/Wide310x150Logo.scale-200.png b/FoxTube/Assets/Wide310x150Logo.scale-200.png
index b50d595..d7d588e 100644
Binary files a/FoxTube/Assets/Wide310x150Logo.scale-200.png and b/FoxTube/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/FoxTube/Assets/Wide310x150Logo.scale-400.png b/FoxTube/Assets/Wide310x150Logo.scale-400.png
index 129ad62..ae07340 100644
Binary files a/FoxTube/Assets/Wide310x150Logo.scale-400.png and b/FoxTube/Assets/Wide310x150Logo.scale-400.png differ
diff --git a/FoxTube/FoxTube.csproj b/FoxTube/FoxTube.csproj
index ed064f8..0e2e574 100644
--- a/FoxTube/FoxTube.csproj
+++ b/FoxTube/FoxTube.csproj
@@ -101,6 +101,7 @@
MainPage.xaml
+
@@ -176,6 +177,9 @@
6.0.8
+
+ 2.2.0
+
diff --git a/FoxTube/MainPage.xaml b/FoxTube/MainPage.xaml
index 7829b0c..2d3dc43 100644
--- a/FoxTube/MainPage.xaml
+++ b/FoxTube/MainPage.xaml
@@ -42,23 +42,33 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,13 +85,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -114,8 +154,6 @@
-
-
diff --git a/FoxTube/MainPage.xaml.cs b/FoxTube/MainPage.xaml.cs
index 835e919..c253fc4 100644
--- a/FoxTube/MainPage.xaml.cs
+++ b/FoxTube/MainPage.xaml.cs
@@ -15,6 +15,7 @@ using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
using System.Diagnostics;
+using Microsoft.Toolkit.Uwp.Notifications;
// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
@@ -25,6 +26,7 @@ namespace FoxTube
///
public sealed partial class MainPage : Page
{
+ List notifications = new List();
public MainPage()
{
this.InitializeComponent();
@@ -49,6 +51,7 @@ namespace FoxTube
private void menuButton_Click(object sender, RoutedEventArgs e)
{
menu.IsPaneOpen = !menu.IsPaneOpen;
+ AddNotification(new Notification("Internal notification", "Menu state has been changed", DateTime.Now, NotificationType.Update));
if(menu.IsPaneOpen)
{
@@ -68,6 +71,46 @@ namespace FoxTube
}
}
+ public void AddNotification(Notification notification , bool needNotify = true)
+ {
+ notificationMenu.Content = "";
+ notifications.Add(notification);
+ noNotifText.Visibility = Visibility.Collapsed;
+ notificationPanel.Visibility = Visibility.Visible;
+ StackPanel stackPanel = new StackPanel();
+ //Channel
+ stackPanel.Children.Add(new TextBlock()
+ {
+ FontSize = 14,
+ FontStyle = Windows.UI.Text.FontStyle.Italic,
+ Foreground = new SolidColorBrush(Colors.Gray),
+ Text = notification.author
+ });
+ //Content
+ stackPanel.Children.Add(new TextBlock()
+ {
+ TextWrapping = TextWrapping.WrapWholeWords,
+ Text = notification.message,
+ });
+ //Time
+ stackPanel.Children.Add(new TextBlock()
+ {
+ FontSize = 13,
+ Foreground = new SolidColorBrush(Colors.Gray),
+ Text = notification.returnTimecode()
+ });
+
+ notificationArray.Items.Add(new ListBoxItem()
+ {
+ Padding = new Thickness(10),
+ MinHeight = 80,
+ Content = stackPanel
+ });
+
+ //Sending notification
+
+ }
+
private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
try
@@ -89,13 +132,16 @@ namespace FoxTube
private void notification_Click(object sender, RoutedEventArgs e)
{
notificationPane.IsOpen = !notificationPane.IsOpen;
- noNotifications.Visibility = Visibility.Visible;
- notificationArray.Visibility = Visibility.Collapsed;
+ notificationMenu.Content = "";
}
- private void notificationPane_LostFocus(object sender, RoutedEventArgs e)
+ private void clearNotifications_Click(object sender, RoutedEventArgs e)
{
- notificationPane.IsOpen = false;
+ notifications.Clear();
+ notificationArray.Items.Clear();
+
+ noNotifText.Visibility = Visibility.Visible;
+ notificationPanel.Visibility = Visibility.Collapsed;
}
}
}
diff --git a/FoxTube/Notification.cs b/FoxTube/Notification.cs
new file mode 100644
index 0000000..f17281b
--- /dev/null
+++ b/FoxTube/Notification.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FoxTube
+{
+ public enum NotificationType
+ {
+ NewVideo, NewComment, NewPost, Update
+ }
+
+ public class Notification
+ {
+ public string author { get; set; }
+ public string message { get; set; }
+ public DateTime time { get; set; }
+ public NotificationType Type { get; set; }
+
+ public Notification(string channelName, string content, DateTime date, NotificationType type)
+ {
+ author = channelName;
+ message = content;
+ time = date;
+ Type = type;
+ }
+
+ public string returnTimecode(bool twelveFormat = true)
+ {
+ TimeSpan diff = DateTime.Now - time;
+ if (diff.TotalDays == 0)
+ return string.Format("{0}:{1}", time.Hour, time.Minute);
+ else
+ return string.Format("{0}/{1} {2}:{3}", time.Month, time.Day, time.Hour, time.Minute);
+ }
+ }
+}
diff --git a/FoxTube/Package.appxmanifest b/FoxTube/Package.appxmanifest
index 7fc3a03..4d347cd 100644
--- a/FoxTube/Package.appxmanifest
+++ b/FoxTube/Package.appxmanifest
@@ -15,7 +15,7 @@
-
+
diff --git a/Src/FoxTubeLogo.png b/Src/FoxTubeLogo.png
new file mode 100644
index 0000000..f1371e2
Binary files /dev/null and b/Src/FoxTubeLogo.png differ
diff --git a/Src/FoxTubeLogo.psb b/Src/FoxTubeLogo.psb
new file mode 100644
index 0000000..1331bec
Binary files /dev/null and b/Src/FoxTubeLogo.psb differ