Time for a new release.

woachk · Apr 12, 2017 · 5f27ddb · 5f27ddb
1 parent cde7ba3
commit 5f27ddb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/MastodonUWA/MainPage.xaml.cs b/MastodonUWA/MainPage.xaml.cs
@@ -78,7 +78,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             var isDark = Application.Current.RequestedTheme == ApplicationTheme.Dark;
             if (isDark)
             {
-                SPanel.Background = new SolidColorBrush(Windows.UI.Colors.DarkGray);
+                SPanel.Background = new SolidColorBrush(Windows.UI.Colors.Black);
             }
             TootCollectionBind = new ObservableCollection<object>();
             TootContainer.DataContext = TootCollectionBind;

diff --git a/MastodonUWA/Toot.xaml.cs b/MastodonUWA/Toot.xaml.cs
@@ -41,6 +41,7 @@ public sealed partial class Toot : UserControl
         public string toot_id;
         public string content;
         IAsyncAction tootrefresh;
+        int tapdisabled = 0;
         dynamic toot;
 
         public Toot()
@@ -94,6 +95,7 @@ public Toot(dynamic status, int principal)
             }
             else
             {
+                tapdisabled = 1;
                 TootContents.NavigationCompleted -= TootContents_NavigationCompleted;
                 TootContents.NavigationCompleted += TootContents_NavigationCompletedPrimaryToot;
                 RecWeb.Visibility = Visibility.Collapsed;
@@ -150,6 +152,10 @@ private void TootContents_PointerPressed(object sender, PointerRoutedEventArgs e
 
         private void Grid_Tapped(object sender, TappedRoutedEventArgs e)
         {
+            if (tapdisabled == 1)
+            {
+                return;
+            }
             Frame rootFrame = Window.Current.Content as Frame;
             rootFrame.Navigate(typeof(TootDetails), toot);
         }

diff --git a/MastodonUWA/TootDetails.xaml.cs b/MastodonUWA/TootDetails.xaml.cs
@@ -47,7 +47,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             var isDark = Application.Current.RequestedTheme == ApplicationTheme.Dark;
             if (isDark)
             {
-                SPanel.Background = new SolidColorBrush(Windows.UI.Colors.DarkGray);
+                SPanel.Background = new SolidColorBrush(Windows.UI.Colors.Black);
             }
             dynamic toot_id = (dynamic)e.Parameter;
             AuthenticateClass token = GetToken.getAuthClass();