Revert debug code.
This commit is contained in:
@@ -11,7 +11,7 @@ namespace Wino.Core.UWP.Services
|
|||||||
{
|
{
|
||||||
public class StoreRatingService : IStoreRatingService
|
public class StoreRatingService : IStoreRatingService
|
||||||
{
|
{
|
||||||
private const string RatedStorageKey = "a"; // nameof(RatedStorageKey);
|
private const string RatedStorageKey = nameof(RatedStorageKey);
|
||||||
private const string LatestAskedKey = nameof(LatestAskedKey);
|
private const string LatestAskedKey = nameof(LatestAskedKey);
|
||||||
|
|
||||||
private readonly IConfigurationService _configurationService;
|
private readonly IConfigurationService _configurationService;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Wino.Core.Services
|
|||||||
|
|
||||||
public class DatabaseService : IDatabaseService
|
public class DatabaseService : IDatabaseService
|
||||||
{
|
{
|
||||||
private const string DatabaseName = "Wino172.db";
|
private const string DatabaseName = "Wino180.db";
|
||||||
|
|
||||||
private bool _isInitialized = false;
|
private bool _isInitialized = false;
|
||||||
private readonly IApplicationConfiguration _folderConfiguration;
|
private readonly IApplicationConfiguration _folderConfiguration;
|
||||||
|
|||||||
@@ -374,60 +374,5 @@ namespace Wino.Services
|
|||||||
|
|
||||||
return dialogResult == ContentDialogResult.Primary;
|
return dialogResult == ContentDialogResult.Primary;
|
||||||
}
|
}
|
||||||
|
|
||||||
private object GetDontAskDialogContentWithIcon(string description, WinoCustomMessageDialogIcon icon, string dontAskKey = "")
|
|
||||||
{
|
|
||||||
var iconPresenter = new ContentPresenter()
|
|
||||||
{
|
|
||||||
ContentTemplate = (DataTemplate)App.Current.Resources[$"WinoCustomMessageDialog{icon}IconTemplate"],
|
|
||||||
HorizontalAlignment = HorizontalAlignment.Center
|
|
||||||
};
|
|
||||||
|
|
||||||
var viewBox = new Viewbox
|
|
||||||
{
|
|
||||||
Child = iconPresenter,
|
|
||||||
Margin = new Thickness(0, 6, 0, 0)
|
|
||||||
};
|
|
||||||
|
|
||||||
var descriptionTextBlock = new TextBlock()
|
|
||||||
{
|
|
||||||
Text = description,
|
|
||||||
TextWrapping = TextWrapping.WrapWholeWords,
|
|
||||||
VerticalAlignment = VerticalAlignment.Center
|
|
||||||
};
|
|
||||||
|
|
||||||
var containerGrid = new Grid()
|
|
||||||
{
|
|
||||||
Children =
|
|
||||||
{
|
|
||||||
viewBox,
|
|
||||||
descriptionTextBlock
|
|
||||||
},
|
|
||||||
RowSpacing = 6,
|
|
||||||
ColumnSpacing = 12
|
|
||||||
};
|
|
||||||
|
|
||||||
containerGrid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(32, GridUnitType.Pixel) });
|
|
||||||
containerGrid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) });
|
|
||||||
|
|
||||||
Grid.SetColumn(descriptionTextBlock, 1);
|
|
||||||
|
|
||||||
// Add don't ask again checkbox if key is provided.
|
|
||||||
if (!string.IsNullOrEmpty(dontAskKey))
|
|
||||||
{
|
|
||||||
var dontAskCheckBox = new CheckBox() { Content = Translator.Dialog_DontAskAgain };
|
|
||||||
|
|
||||||
dontAskCheckBox.Checked += (c, r) => { _configurationService.Set(dontAskKey, dontAskCheckBox.IsChecked.GetValueOrDefault()); };
|
|
||||||
|
|
||||||
containerGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1, GridUnitType.Auto) });
|
|
||||||
containerGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1, GridUnitType.Auto) });
|
|
||||||
|
|
||||||
Grid.SetRow(dontAskCheckBox, 1);
|
|
||||||
Grid.SetColumnSpan(dontAskCheckBox, 2);
|
|
||||||
containerGrid.Children.Add(dontAskCheckBox);
|
|
||||||
}
|
|
||||||
|
|
||||||
return containerGrid;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -449,7 +449,6 @@ namespace Wino.Views
|
|||||||
Disposables.Add(GetSuggestionBoxDisposable(CCBox));
|
Disposables.Add(GetSuggestionBoxDisposable(CCBox));
|
||||||
Disposables.Add(GetSuggestionBoxDisposable(BccBox));
|
Disposables.Add(GetSuggestionBoxDisposable(BccBox));
|
||||||
|
|
||||||
Chromium.Unloaded += Chromium_Unloaded;
|
|
||||||
Chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
Chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
||||||
Chromium.CoreWebView2Initialized += ChromiumInitialized;
|
Chromium.CoreWebView2Initialized += ChromiumInitialized;
|
||||||
|
|
||||||
@@ -467,11 +466,6 @@ namespace Wino.Views
|
|||||||
IsComposerDarkMode = underlyingThemeService.IsUnderlyingThemeDark();
|
IsComposerDarkMode = underlyingThemeService.IsUnderlyingThemeDark();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Chromium_Unloaded(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ChromiumInitialized(Microsoft.UI.Xaml.Controls.WebView2 sender, Microsoft.UI.Xaml.Controls.CoreWebView2InitializedEventArgs args)
|
private async void ChromiumInitialized(Microsoft.UI.Xaml.Controls.WebView2 sender, Microsoft.UI.Xaml.Controls.CoreWebView2InitializedEventArgs args)
|
||||||
{
|
{
|
||||||
var editorBundlePath = (await ViewModel.NativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
|
var editorBundlePath = (await ViewModel.NativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
|
||||||
|
|||||||
Reference in New Issue
Block a user