diff --git a/FoxTube/Channel.xaml b/FoxTube/Channel.xaml
index ad2768d..06d8ec5 100644
--- a/FoxTube/Channel.xaml
+++ b/FoxTube/Channel.xaml
@@ -20,12 +20,6 @@
-
-
-
-
-
-
@@ -64,8 +58,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -80,22 +83,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/FoxTube/Channel.xaml.cs b/FoxTube/Channel.xaml.cs
index caf26c7..4f170f1 100644
--- a/FoxTube/Channel.xaml.cs
+++ b/FoxTube/Channel.xaml.cs
@@ -36,7 +36,7 @@ namespace FoxTube
private void toAbout_Click(object sender, RoutedEventArgs e)
{
- content.SelectedIndex = 4;
+ content.SelectedIndex = 2;
}
public async void Initialize(string id)
@@ -65,6 +65,8 @@ namespace FoxTube
description.Text = item.Snippet.Description;
views.Text = item.Statistics.ViewCount.ToString();
registration.Text = item.Snippet.PublishedAt.ToString();
+
+ searchChannel.Text = item.Snippet.Title;
}
private void toVideos_Click(object sender, RoutedEventArgs e)
@@ -100,19 +102,9 @@ namespace FoxTube
}
}
- private void toCommunity_Click(object sender, RoutedEventArgs e)
- {
- content.SelectedIndex = 2;
- }
-
- private void toChannels_Click(object sender, RoutedEventArgs e)
- {
- content.SelectedIndex = 3;
- }
-
private async void searchButton_Click(object sender, RoutedEventArgs e)
{
- content.SelectedIndex = 5;
+ content.SelectedIndex = 3;
YouTubeService ytService = new YouTubeService(new BaseClientService.Initializer()
{
@@ -122,6 +114,7 @@ namespace FoxTube
var searchListRequest = ytService.Search.List("snippet");
searchListRequest.Q = searchField.Text;
+ searchListRequest.ChannelId = channelId;
searchListRequest.MaxResults = 25;
var response = await searchListRequest.ExecuteAsync();
@@ -136,10 +129,7 @@ namespace FoxTube
public void SetResults(string keyword, int count)
{
searchTerm.Text = keyword;
- if (count == 1000000)
- resultsCount.Text = count + "+";
- else
- resultsCount.Text = count.ToString();
+ resultsCount.Text = count.ToString();
}
public void AddItem(SearchResult result)
@@ -151,18 +141,10 @@ namespace FoxTube
resultsList.Children.Add(vCard);
break;
- case "youtube#channel":
- ChannelCard cCard = new ChannelCard(result.Id.ChannelId, result.Snippet.LiveBroadcastContent);
- resultsList.Children.Add(cCard);
- break;
-
case "youtube#playlist":
PlaylistCardWide pCard = new PlaylistCardWide(result.Id.PlaylistId);
resultsList.Children.Add(pCard);
break;
-
- default:
- break;
}
}
}
diff --git a/FoxTube/FoxTube.csproj b/FoxTube/FoxTube.csproj
index a429d15..fa88bd9 100644
--- a/FoxTube/FoxTube.csproj
+++ b/FoxTube/FoxTube.csproj
@@ -279,6 +279,9 @@
+
+ 1.0.1
+
1.32.2
diff --git a/FoxTube/VideoCard.xaml b/FoxTube/VideoCard.xaml
index 806859b..a80d955 100644
--- a/FoxTube/VideoCard.xaml
+++ b/FoxTube/VideoCard.xaml
@@ -8,7 +8,11 @@
mc:Ignorable="d"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
- SizeChanged="UserControl_SizeChanged">
+ SizeChanged="UserControl_SizeChanged"
+ d:DesignHeight="290"
+ d:DesignWidth="384"
+ MaxHeight="300"
+ MaxWidth="400">