ux: Monokai theme and Git-kraken Inspired UI

src/App.axaml.cs

@@ -122,12 +122,7 @@ public static void SetTheme(string theme, string themeOverridesFile)
             if (Current is not App app)
                 return;
 
-            if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
-                app.RequestedThemeVariant = ThemeVariant.Light;
-            else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
-                app.RequestedThemeVariant = ThemeVariant.Dark;
-            else
-                app.RequestedThemeVariant = ThemeVariant.Default;
+            app.RequestedThemeVariant = Models.AppThemes.FromName(theme);
 
             if (app._themeOverrides != null)
             {

src/Converters/BoolConverters.cs

@@ -13,6 +13,9 @@ public static class BoolConverters
         public static readonly FuncValueConverter<bool, double> IsMergedToOpacity =
             new(x => x ? 1 : 0.65);
 
+        public static readonly FuncValueConverter<bool, FontStyle> IsItalicToFontStyle =
+            new(x => x ? FontStyle.Italic : FontStyle.Normal);
+
         public static readonly FuncValueConverter<bool, IBrush> IsWarningToBrush =
             new(x => x ? Brushes.DarkGoldenrod : Application.Current?.FindResource("Brush.FG1") as IBrush);
     }

src/Converters/StringConverters.cs

@@ -29,17 +29,7 @@ public class ToThemeConverter : IValueConverter
         {
             public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
             {
-                var theme = (string)value;
-                if (string.IsNullOrEmpty(theme))
-                    return ThemeVariant.Default;
-
-                if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
-                    return ThemeVariant.Light;
-
-                if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
-                    return ThemeVariant.Dark;
-
-                return ThemeVariant.Default;
+                return Models.AppThemes.FromName(value as string);
             }
 
             public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

src/Models/AppThemes.cs

@@ -0,0 +1,49 @@
+using System;
+
+using Avalonia.Styling;
+
+namespace SourceGit.Models
+{
+    public static class AppThemes
+    {
+        public static readonly ThemeVariant Monokai = new("Monokai", ThemeVariant.Dark);
+
+        public static ThemeVariant FromName(string theme)
+        {
+            if (string.IsNullOrEmpty(theme))
+                return ThemeVariant.Default;
+
+            if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
+                return ThemeVariant.Light;
+
+            if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
+                return ThemeVariant.Dark;
+
+            if (theme.Equals("Monokai", StringComparison.OrdinalIgnoreCase))
+                return Monokai;
+
+            return ThemeVariant.Default;
+        }
+
+        public static bool IsDark(ThemeVariant variant)
+        {
+            while (variant != null)
+            {
+                if (variant == ThemeVariant.Dark)
+                    return true;
+
+                if (variant == ThemeVariant.Light)
+                    return false;
+
+                variant = variant.InheritVariant;
+            }
+
+            return false;
+        }
+
+        public static bool IsMonokai(ThemeVariant variant)
+        {
+            return variant == Monokai;
+        }
+    }
+}

src/Models/Commit.cs

@@ -15,6 +15,11 @@ public enum CommitSearchMethod
 
     public class Commit : ObservableObject
     {
+        /// <summary>
+        /// Pseudo SHA used by the "local changes" (WIP) row shown at the top of the histories graph.
+        /// </summary>
+        public const string UncommittedSHA = "0000000000000000000000000000000000000000";
+
         public string SHA { get; set; } = string.Empty;
         public User Author { get; set; } = User.Invalid;
         public ulong AuthorTime { get; set; } = 0;
@@ -34,6 +39,7 @@ public bool IsHighlightedInGraph
             set => SetProperty(ref _isHighlightedInGraph, value);
         }
 
+        public bool IsUncommitted => SHA.Equals(UncommittedSHA, StringComparison.Ordinal);
         public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;
         public bool IsCurrentHead => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null;
         public bool HasDecorators => Decorators.Count > 0;

src/Models/CommitGraph.cs

@@ -57,6 +57,7 @@ public enum DotType
             Default,
             Head,
             Merge,
+            Uncommitted,
         }
 
         public class Dot
@@ -199,7 +200,9 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                 var position = new Point(major?.LastX ?? offsetX, offsetY);
                 var dotColor = major?.Path.Color ?? 0;
                 var anchor = new Dot() { Center = position, Color = dotColor, IsHighlighted = isHighlighted };
-                if (commit.IsCurrentHead)
+                if (commit.IsUncommitted)
+                    anchor.Type = DotType.Uncommitted;
+                else if (commit.IsCurrentHead)
                     anchor.Type = DotType.Head;
                 else if (commit.Parents.Count > 1)
                     anchor.Type = DotType.Merge;

src/Models/TextMateHelper.cs

@@ -4,7 +4,6 @@
 
 using Avalonia;
 using Avalonia.Platform;
-using Avalonia.Styling;
 
 using AvaloniaEdit;
 using AvaloniaEdit.TextMate;
@@ -127,18 +126,22 @@ public static class TextMateHelper
     {
         public static TextMate.Installation CreateForEditor(TextEditor editor)
         {
-            return editor.InstallTextMate(Application.Current?.ActualThemeVariant == ThemeVariant.Dark ?
-                new RegistryOptionsWrapper(ThemeName.DarkPlus) :
-                new RegistryOptionsWrapper(ThemeName.LightPlus));
+            return editor.InstallTextMate(new RegistryOptionsWrapper(GetThemeName()));
         }
 
         public static void SetThemeByApp(TextMate.Installation installation)
         {
             if (installation is { RegistryOptions: RegistryOptionsWrapper reg })
-            {
-                var isDark = Application.Current?.ActualThemeVariant == ThemeVariant.Dark;
-                installation.SetTheme(reg.LoadTheme(isDark ? ThemeName.DarkPlus : ThemeName.LightPlus));
-            }
+                installation.SetTheme(reg.LoadTheme(GetThemeName()));
+        }
+
+        private static ThemeName GetThemeName()
+        {
+            var variant = Application.Current?.ActualThemeVariant;
+            if (AppThemes.IsMonokai(variant))
+                return ThemeName.Monokai;
+
+            return AppThemes.IsDark(variant) ? ThemeName.DarkPlus : ThemeName.LightPlus;
         }
 
         public static void SetGrammarByFileName(TextMate.Installation installation, string filePath)

src/Resources/Icons.axaml

@@ -91,6 +91,7 @@
   <StreamGeometry x:Key="Icons.List">M0 33h1024v160H0zM0 432h1024v160H0zM0 831h1024v160H0z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Loading">M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Local">M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Monitor">M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Lock">M832 464h-68V240a128 128 0 00-128-128h-248a128 128 0 00-128 128v224H192c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32v-384c0-18-14-32-32-32zm-292 237v53a8 8 0 01-8 8h-40a8 8 0 01-8-8v-53a48 48 0 1156 0zm152-237H332V240a56 56 0 0156-56h248a56 56 0 0156 56v224z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Logs">M908 366h-25V248a18 18 0 00-0-2 20 20 0 00-5-13L681 7 681 7a19 19 0 00-4-3c-0-0-1-1-1-1a29 29 0 00-4-2L671 1a24 24 0 00-5-1H181a40 40 0 00-40 40v326h-25c-32 0-57 26-57 57v298c0 32 26 57 57 57h25v204c0 22 18 40 40 40H843a40 40 0 0040-40v-204h25c32 0 57-26 57-57V424a57 57 0 00-57-57zM181 40h465v205c0 11 9 20 20 20h177v101H181V40zm413 527c0 89-54 143-134 143-81 0-128-61-128-138 0-82 52-143 132-143 84 0 129 63 129 138zm-440 139V433h62v220h108v52h-170zm690 267H181v-193H843l0 193zm18-280a305 305 0 01-91 15c-50 0-86-12-111-37-25-23-39-59-38-99 0-90 66-142 155-142 35 0 62 7 76 13l-13 49c-15-6-33-12-63-12-51 0-90 29-90 88 0 56 35 89 86 89 14 0 25-2 30-4v-57h-42v-48h101v143zM397 570c0 53 25 91 66 91 42 0 65-40 65-92 0-49-23-91-66-91-42 0-66 40-66 93z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Menu">M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z</StreamGeometry>

src/Resources/Locales/ca_ES.axaml

@@ -664,6 +664,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'any passat</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Fa {0} minuts</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Fa {0} mesos</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">Fa 1 setmana</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">Fa {0} setmanes</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Fa {0} anys</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ahir</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferències</x:String>

src/Resources/Locales/de_DE.axaml

@@ -640,6 +640,8 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Letztes Jahr</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Vor {0} Minuten</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Vor {0} Monaten</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">Vor 1 Woche</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">Vor {0} Wochen</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Vor {0} Jahren</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Gestern</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Einstellungen</x:String>

src/Resources/Locales/el_GR.axaml

@@ -639,6 +639,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Πέρυσι</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} λεπτά πριν</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} μήνες πριν</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 εβδομάδα πριν</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} εβδομάδες πριν</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} χρόνια πριν</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Χθες</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Προτιμήσεις</x:String>

src/Resources/Locales/en_US.axaml

@@ -660,6 +660,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Last year</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutes ago</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} months ago</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 week ago</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} weeks ago</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} years ago</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Yesterday</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferences</x:String>

src/Resources/Locales/es_ES.axaml

@@ -664,6 +664,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Último año</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">Hace {0} minutos</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">Hace {0} meses</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">Hace 1 semana</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">Hace {0} semanas</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">Hace {0} años</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ayer</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferencias</x:String>

src/Resources/Locales/fr_FR.axaml

@@ -608,6 +608,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'an dernier</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">il y a {0} minutes</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">il y a {0} mois</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">il y a 1 semaine</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">il y a {0} semaines</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">il y a {0} ans</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Hier</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Préférences</x:String>

src/Resources/Locales/he_IL.axaml

@@ -608,6 +608,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">בשנה שעברה</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">לפני {0} דקות</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">לפני {0} חודשים</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">לפני שבוע</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">לפני {0} שבועות</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">לפני {0} שנים</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">אתמול</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">העדפות</x:String>

src/Resources/Locales/id_ID.axaml

@@ -640,6 +640,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Tahun lalu</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} menit lalu</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} bulan lalu</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 minggu lalu</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} minggu lalu</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} tahun lalu</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Kemarin</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferensi</x:String>

src/Resources/Locales/it_IT.axaml

@@ -561,6 +561,8 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">L'anno scorso</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minuti fa</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} mesi fa</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 settimana fa</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} settimane fa</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} anni fa</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ieri</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferenze</x:String>

src/Resources/Locales/ja_JP.axaml

@@ -654,6 +654,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">昨年</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} 分前</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} ヶ月前</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 週間前</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} 週間前</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} 年前</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">昨日</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">設定</x:String>

src/Resources/Locales/ko_KR.axaml

@@ -611,6 +611,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">작년</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0}분 전</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0}개월 전</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1주 전</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0}주 전</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0}년 전</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">어제</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">환경설정</x:String>

src/Resources/Locales/pt_BR.axaml

@@ -391,6 +391,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">Ano passado</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} minutos atrás</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} meses atrás</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 semana atrás</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} semanas atrás</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} anos atrás</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Ontem</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Preferências</x:String>

src/Resources/Locales/ru_RU.axaml

@@ -664,6 +664,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">В прошлом году</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} минут назад</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} месяцев назад</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 неделю назад</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} недель назад</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} лет назад</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Вчера</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Параметры</x:String>

src/Resources/Locales/ta_IN.axaml

@@ -386,6 +386,8 @@
   <x:String x:Key="Text.Period.LastYear" xml:space="preserve">கடந்த ஆண்டு</x:String>
   <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0} நிமையங்களுக்கு முன்பு</x:String>
   <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0} திங்களுக்கு முன்பு</x:String>
+  <x:String x:Key="Text.Period.WeekAgo" xml:space="preserve">1 வாரம் முன்பு</x:String>
+  <x:String x:Key="Text.Period.WeeksAgo" xml:space="preserve">{0} வாரங்களுக்கு முன்பு</x:String>
   <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0} ஆண்டுகளுக்கு முன்பு</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">நேற்று</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">விருப்பத்தேர்வுகள்</x:String>