Merge remote-tracking branch 'origin/master'

sabuto · sabuto · commit a7795bd1b0ce · 2022-04-02T17:23:34.000+01:00
diff --git a/src/CutCode.CrossPlatform/App.axaml.cs b/src/CutCode.CrossPlatform/App.axaml.cs
@@ -29,6 +29,8 @@ public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
+                if(ThemeService.Current.Theme == ThemeType.Light) SystemColorsConfig.LightThemeColors();
+                else SystemColorsConfig.DarkThemeColors();
                 ThemeService.Current.ThemeChanged += (sender, args) =>
                 {
                     if(ThemeService.Current.Theme == ThemeType.Light) SystemColorsConfig.LightThemeColors();
diff --git a/src/CutCode.CrossPlatform/Helpers/Languages.cs b/src/CutCode.CrossPlatform/Helpers/Languages.cs
@@ -1,13 +1,29 @@
 ﻿using System.Collections.Generic;
+using System.Linq;
+using CutCode.CrossPlatform.Services;
+using TextMateSharp.Grammars;
 
 namespace CutCode.CrossPlatform.Helpers
 {
     public static class Languages
     {
-
-        public static Dictionary<string, string> LanguagesDict = new Dictionary<string, string>()
+        private static RegistryOptions _registryOptions => new(ThemeService.Current.Theme == ThemeType.Light
+            ? ThemeName.LightPlus
+            : ThemeName.DarkPlus);
+        public static string GetLanguagePath(Language language)
+        {
+            try
+            {
+                return LanguagesDict[language.Aliases[0]];
+            }
+            catch
+            {
+                return LanguagesDict["File"];
+            }
+        }
+        private static Dictionary<string, string> LanguagesDict = new Dictionary<string, string>()
         {
-            {"All languages", IconPaths.File},
+            {"File", IconPaths.File},
             {"Python", IconPaths.Python},
             {"C++", IconPaths.Cpp},
             {"C#", IconPaths.CSharp},
diff --git a/src/CutCode.CrossPlatform/Services/DatabaseService.cs b/src/CutCode.CrossPlatform/Services/DatabaseService.cs
@@ -206,6 +206,8 @@ public bool EditCode(CodeModel code)
                 if (dbCode is not null)
                 {
                     dbCode.Cells = code.Cells;
+                    dbCode.Title = code.Title;
+                    dbCode.Language = code.Language;
                     _db.RunInTransaction(() =>
                     {
                         _db.Update(dbCode);
diff --git a/src/CutCode.CrossPlatform/ViewModels/AddViewModel.cs b/src/CutCode.CrossPlatform/ViewModels/AddViewModel.cs
@@ -7,6 +7,7 @@
 using AvaloniaEdit.TextMate.Grammars;
 using CutCode.CrossPlatform.Helpers;
 using CutCode.CrossPlatform.Models;
+using CutCode.CrossPlatform.Services;
 using CutCode.CrossPlatform.Views;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -47,7 +48,7 @@ public AddViewModel(IScreen screen)
         IsCellEmpty = true;
         Cells.CollectionChanged += (sender, args) => { IsCellEmpty = Cells.Count == 0; };
 
-        var reg = new RegistryOptions(ThemeName.Dark);
+        var reg = new RegistryOptions(ThemeService.Theme == ThemeType.Light ? ThemeName.LightPlus : ThemeName.DarkPlus);
 
         AllLanguages = new ObservableCollection<Language>(reg.GetAvailableLanguages());
         SelectedLanguage2 = reg.GetLanguageByExtension(".cs");
diff --git a/src/CutCode.CrossPlatform/ViewModels/CodeCardViewModel.cs b/src/CutCode.CrossPlatform/ViewModels/CodeCardViewModel.cs
@@ -7,15 +7,18 @@
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.Services;
 using CutCode.CrossPlatform.Views;
+using DynamicData;
 using Newtonsoft.Json;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using TextMateSharp.Grammars;
 
 namespace CutCode.CrossPlatform.ViewModels;
 
 public class CodeCardViewModel : ViewModelBase
 {
     public CodeModel Code;
+    private RegistryOptions _registryOptions;
 
     public CodeCardViewModel(CodeModel code)
     {
@@ -24,6 +27,7 @@ public CodeCardViewModel(CodeModel code)
 
     public void Initialise(CodeModel code)
     {
+        _registryOptions = new(ThemeService.Current.Theme == ThemeType.Light ? ThemeName.LightPlus : ThemeName.DarkPlus);
         Navigate = ReactiveCommand.Create(Clicked);
         Code = code;
         Title = code.Title;
@@ -64,7 +68,7 @@ public void Initialise(CodeModel code)
             }
         };
     }
-
+    
     [Reactive] public Color MainTextColor { get; set; }
 
     [Reactive] public Color CardColor { get; set; }
@@ -89,6 +93,9 @@ public void Initialise(CodeModel code)
 
     [Reactive] public Color IsFavouriteColor { get; set; }
 
+    public string LanguagePath =>
+        Languages.GetLanguagePath(_registryOptions.GetLanguageByExtension(Language));
+        
     public string Language { get; set; }
     public long LastModificationTime { get; set; }
 
diff --git a/src/CutCode.CrossPlatform/ViewModels/CodeViewModel.cs b/src/CutCode.CrossPlatform/ViewModels/CodeViewModel.cs
@@ -19,6 +19,10 @@ public class CodeViewModel : PageBaseViewModel, IRoutableViewModel
     public Language? _language;
     public CodeModel Code;
 
+    [Reactive] public ObservableCollection<Language> AllLanguages { get; set; }
+
+    [Reactive] public Language SelectedLanguage { get; set; }
+
     public CodeViewModel(CodeModel code)
     {
         Initialise(code);
@@ -69,9 +73,11 @@ public void Initialise(CodeModel code)
         Title = Code.Title;
 
         RegistryOptions reg = new RegistryOptions(ThemeName.Dark);
+        AllLanguages = new ObservableCollection<Language>(reg.GetAvailableLanguages());
         _language = reg.GetLanguageByExtension(code.Language);
         if (_language is null)
             UpdateToNewLanguages(code.Language, reg);
+        SelectedLanguage = _language;
         Language = _language.ToString();
         IsEditEnabled = false;
 
@@ -101,6 +107,12 @@ public void Initialise(CodeModel code)
         };
 
         IsFavouritePath = code.IsFavourite ? IconPaths.StarFull : IconPaths.Star;
+
+        this.WhenAnyValue(x => x.SelectedLanguage).Subscribe(x =>
+        {
+            Language = x.ToString();
+            _language = x;
+        });
     }
 
     private void UpdateToNewLanguages(string language, RegistryOptions reg)
@@ -190,7 +202,7 @@ public async void Save()
                     { "Code", x.Document.Text }
                 }).ToList();
 
-            CodeModel editedCode = new(Title, cellsList, Language,
+            CodeModel editedCode = new(Title, cellsList, _language.Extensions.First(),
                 new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds(), Code.IsFavourite);
             editedCode.SetId(Code.Id);
 
diff --git a/src/CutCode.CrossPlatform/Views/CodeCardView.axaml b/src/CutCode.CrossPlatform/Views/CodeCardView.axaml
@@ -14,6 +14,10 @@
         <converters:StringToGeometryConverter x:Key="StringToGeometryConverter"/>
     </UserControl.Resources>
     
+    <Design.DataContext>
+        <vm:CodeCardViewModel/>
+    </Design.DataContext>
+    
     <UserControl.Styles>
         <Style Selector="ToggleButton:pointerover /template/ ContentPresenter">
             <Setter Property="Background" Value="Transparent"/>
@@ -119,9 +123,9 @@
                          HorizontalAlignment="Left" VerticalAlignment="Center"
                          Margin="25,15,10,15"
                          Padding="15">
-                    <!-- <Path Stretch="UniformToFill" -->
-                    <!--       Data="{Binding Language, Converter={StaticResource StringToGeometryConverter}}" -->
-                    <!--       Fill="{Binding LanguageColor, Converter={StaticResource ColorToBrushConverter}}"/> -->
+                     <Path Stretch="UniformToFill" 
+                           Data="{Binding LanguagePath, Converter={StaticResource StringToGeometryConverter}}"
+                           Fill="{Binding LanguageColor, Converter={StaticResource ColorToBrushConverter}}"/>
                 </Viewbox>
                 <Grid Grid.Column="1" RowDefinitions="Auto, *">
                     <Grid Grid.Row="0" ColumnDefinitions="*, Auto, Auto">
@@ -130,7 +134,7 @@
                                FontFamily="{StaticResource PoppinsRegular}"
                                FontSize="17"
                                Margin="20,20,0,8"
-                               Foreground="{Binding mainTextColor, Converter={StaticResource ColorToBrushConverter}}"/>
+                               Foreground="{Binding MainTextColor, Converter={StaticResource ColorToBrushConverter}}"/>
                         <Viewbox Grid.Column="1"
                                  Height="22"
                                  HorizontalAlignment="Right"
@@ -140,15 +144,6 @@
                                   Fill="{Binding IsFavouriteColor, Converter={StaticResource ColorToBrushConverter}}"/>
                         </Viewbox>
                         
-                        <Viewbox Grid.Column="2"
-                                 Height="22"
-                                 HorizontalAlignment="Right"
-                                 Margin="0,-10,10,0">
-                            <Path Stretch="UniformToFill"
-                                  Data=""
-                                  Fill="{Binding LanguageColor, Converter={StaticResource ColorToBrushConverter}}"/>
-                        </Viewbox>
-                        
                         <ToggleButton Grid.Column="2" x:Name="MoreBtn"
                                 Background="Transparent"
                                 HorizontalAlignment="Right"
@@ -163,13 +158,14 @@
                             </Viewbox>
                         </ToggleButton>
                     </Grid>
+                    
                     <ScrollViewer Grid.Row="1" 
                                   HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
                                   Margin="20,10,12,7">
                         <Label Content="{Binding Description}"
                                FontFamily="{StaticResource PoppinsRegular}"
                                FontSize="14"
-                               Foreground="{Binding mainTextColor, Converter={StaticResource ColorToBrushConverter}}"/>
+                               Foreground="{Binding MainTextColor, Converter={StaticResource ColorToBrushConverter}}"/>
                     </ScrollViewer>
                 </Grid>
             </Grid>
diff --git a/src/CutCode.CrossPlatform/Views/CodeCellView.axaml b/src/CutCode.CrossPlatform/Views/CodeCellView.axaml
@@ -13,7 +13,9 @@
         <cv:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
     </UserControl.Resources>
     
-    
+    <Design.DataContext>
+        <vm:CodeCellViewModel/>
+    </Design.DataContext>
     
     <UserControl.Styles>
         <Style Selector="Button:pointerover /template/ ContentPresenter">
@@ -116,7 +118,6 @@
                            ShowLineNumbers="True"
                            Height="300"
                            Padding="10,0,10,10"
-                           IsReadOnly="{Binding !IsEditable}"
-                           />
+                           IsReadOnly="{Binding !IsEditable}"/>
     </Grid>
 </UserControl>
diff --git a/src/CutCode.CrossPlatform/Views/CodeCellView.axaml.cs b/src/CutCode.CrossPlatform/Views/CodeCellView.axaml.cs
@@ -11,15 +11,17 @@
 using AvaloniaEdit.TextMate;
 using AvaloniaEdit.TextMate.Grammars;
 using CutCode.CrossPlatform.Helpers;
+using CutCode.CrossPlatform.Services;
 using CutCode.CrossPlatform.ViewModels;
 using ReactiveUI;
+using TextMateSharp.Internal.Themes;
 
 namespace CutCode.CrossPlatform.Views
 {
     public class CodeCellView : ReactiveUserControl<CodeCellViewModel>
     {
         private TextEditor TextEditor => this.FindControl<TextEditor>(nameof(TextEditor));
-        private readonly TextMate.Installation _textMateInstallation;
+        private TextMate.Installation _textMateInstallation;
         private RegistryOptions _registryOptions;
 
         public CodeCellView()
@@ -33,19 +35,30 @@ public CodeCellView()
 
             TextEditor.TextArea.IndentationStrategy = new CSharpIndentationStrategy(TextEditor.Options);
 
-            _registryOptions = new RegistryOptions(ThemeName.Dark);
+            _registryOptions = new RegistryOptions(ThemeService.Current.Theme == ThemeType.Light ? ThemeName.LightPlus : ThemeName.DarkPlus);
+            ThemeService.Current.ThemeChanged += (sender, args) =>
+            {
+                _registryOptions = new RegistryOptions(ThemeService.Current.Theme == ThemeType.Light ? ThemeName.LightPlus : ThemeName.DarkPlus);
+                _textMateInstallation = TextEditor.InstallTextMate(_registryOptions);
+
+                var scopeName = _registryOptions.GetScopeByLanguageId(_currentLanguage!.Id);
+                _textMateInstallation.SetGrammar(scopeName);
+            };
+
             _textMateInstallation = TextEditor.InstallTextMate(_registryOptions);
 
-            Language csharpLanguage = _registryOptions.GetLanguageByExtension(".cs");
+            _currentLanguage = _registryOptions.GetLanguageByExtension(".cs");
 
-            string scopeName = _registryOptions.GetScopeByLanguageId(csharpLanguage.Id);
+            var scopeName = _registryOptions.GetScopeByLanguageId(_currentLanguage.Id);
             _textMateInstallation.SetGrammar(scopeName);
             GlobalEvents.OnLanguageSet += GlobalEventsOnOnLanguageSet;
             GlobalEvents.ViewRegistered(this);
         }
 
+        private Language _currentLanguage;
         private void GlobalEventsOnOnLanguageSet(object? sender, Language e)
         {
+            _currentLanguage = e;
             string scopeName = _registryOptions.GetScopeByLanguageId(e.Id);
             _textMateInstallation.SetGrammar(scopeName);
         }
diff --git a/src/CutCode.CrossPlatform/Views/CodeView.axaml b/src/CutCode.CrossPlatform/Views/CodeView.axaml

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public override void OnFrameworkInitializationCompleted()`
`29`	`29`	`{`
`30`	`30`	`if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)`
`31`	`31`	`{`
	`32`	`+ if(ThemeService.Current.Theme == ThemeType.Light) SystemColorsConfig.LightThemeColors();`
	`33`	`+ else SystemColorsConfig.DarkThemeColors();`
`32`	`34`	`ThemeService.Current.ThemeChanged += (sender, args) =>`
`33`	`35`	`{`
`34`	`36`	`if(ThemeService.Current.Theme == ThemeType.Light) SystemColorsConfig.LightThemeColors();`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,8 @@ public bool EditCode(CodeModel code)`
`206`	`206`	`if (dbCode is not null)`
`207`	`207`	`{`
`208`	`208`	`dbCode.Cells = code.Cells;`
	`209`	`+ dbCode.Title = code.Title;`
	`210`	`+ dbCode.Language = code.Language;`
`209`	`211`	`_db.RunInTransaction(() =>`
`210`	`212`	`{`
`211`	`213`	`_db.Update(dbCode);`