From fa9990c38cc9033604863546e64669b14329d097 Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 23 Jul 2024 14:52:25 +0800 Subject: [PATCH] code_style: move `SourceGit.ViewModels.RepositorySettings` to `SourceGit.Models.RepositorySettings` --- src/App.JsonCodeGen.cs | 2 +- src/Models/RepositorySettings.cs | 91 ++++++++++++++++++++++++++++++ src/ViewModels/Repository.cs | 96 ++------------------------------ 3 files changed, 96 insertions(+), 93 deletions(-) create mode 100644 src/Models/RepositorySettings.cs diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs index ffc74262..f6e3cd88 100644 --- a/src/App.JsonCodeGen.cs +++ b/src/App.JsonCodeGen.cs @@ -62,7 +62,7 @@ namespace SourceGit [JsonSerializable(typeof(Models.JetBrainsState))] [JsonSerializable(typeof(Models.ThemeOverrides))] [JsonSerializable(typeof(Models.Version))] + [JsonSerializable(typeof(Models.RepositorySettings))] [JsonSerializable(typeof(ViewModels.Preference))] - [JsonSerializable(typeof(ViewModels.RepositorySettings))] internal partial class JsonCodeGen : JsonSerializerContext { } } diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs new file mode 100644 index 00000000..98926500 --- /dev/null +++ b/src/Models/RepositorySettings.cs @@ -0,0 +1,91 @@ +using Avalonia.Collections; + +namespace SourceGit.Models +{ + public class RepositorySettings + { + public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch + { + get; + set; + } = DealWithLocalChanges.DoNothing; + + public bool FetchWithoutTags + { + get; + set; + } = false; + + public DealWithLocalChanges DealWithLocalChangesOnPull + { + get; + set; + } = DealWithLocalChanges.DoNothing; + + public bool PreferRebaseInsteadOfMerge + { + get; + set; + } = true; + + public bool FetchWithoutTagsOnPull + { + get; + set; + } = false; + + public bool PushAllTags + { + get; + set; + } = false; + + public DealWithLocalChanges DealWithLocalChangesOnCreateBranch + { + get; + set; + } = DealWithLocalChanges.DoNothing; + + public bool CheckoutBranchOnCreateBranch + { + get; + set; + } = true; + + public bool AutoStageBeforeCommit + { + get; + set; + } = false; + + public AvaloniaList Filters + { + get; + set; + } = new AvaloniaList(); + + public AvaloniaList CommitMessages + { + get; + set; + } = new AvaloniaList(); + + public void PushCommitMessage(string message) + { + var existIdx = CommitMessages.IndexOf(message); + if (existIdx == 0) + return; + + if (existIdx > 0) + { + CommitMessages.Move(existIdx, 0); + return; + } + + if (CommitMessages.Count > 9) + CommitMessages.RemoveRange(9, CommitMessages.Count - 9); + + CommitMessages.Insert(0, message); + } + } +} diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index 709b0f2b..f6ad023d 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -4,7 +4,6 @@ using System.IO; using System.Text.Json; using System.Threading.Tasks; -using Avalonia.Collections; using Avalonia.Controls; using Avalonia.Media; using Avalonia.Media.Imaging; @@ -14,93 +13,6 @@ using CommunityToolkit.Mvvm.ComponentModel; namespace SourceGit.ViewModels { - public class RepositorySettings - { - public Models.DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch - { - get; - set; - } = Models.DealWithLocalChanges.DoNothing; - - public bool FetchWithoutTags - { - get; - set; - } = false; - - public Models.DealWithLocalChanges DealWithLocalChangesOnPull - { - get; - set; - } = Models.DealWithLocalChanges.DoNothing; - - public bool PreferRebaseInsteadOfMerge - { - get; - set; - } = true; - - public bool FetchWithoutTagsOnPull - { - get; - set; - } = false; - - public bool PushAllTags - { - get; - set; - } = false; - - public Models.DealWithLocalChanges DealWithLocalChangesOnCreateBranch - { - get; - set; - } = Models.DealWithLocalChanges.DoNothing; - - public bool CheckoutBranchOnCreateBranch - { - get; - set; - } = true; - - public bool AutoStageBeforeCommit - { - get; - set; - } = false; - - public AvaloniaList Filters - { - get; - set; - } = new AvaloniaList(); - - public AvaloniaList CommitMessages - { - get; - set; - } = new AvaloniaList(); - - public void PushCommitMessage(string message) - { - var existIdx = CommitMessages.IndexOf(message); - if (existIdx == 0) - return; - - if (existIdx > 0) - { - CommitMessages.Move(existIdx, 0); - return; - } - - if (CommitMessages.Count > 9) - CommitMessages.RemoveRange(9, CommitMessages.Count - 9); - - CommitMessages.Insert(0, message); - } - } - public class Repository : ObservableObject, Models.IRepository { public string FullPath @@ -126,7 +38,7 @@ namespace SourceGit.ViewModels set => SetProperty(ref _gitDir, value); } - public RepositorySettings Settings + public Models.RepositorySettings Settings { get => _settings; } @@ -341,12 +253,12 @@ namespace SourceGit.ViewModels } catch { - _settings = new RepositorySettings(); + _settings = new Models.RepositorySettings(); } } else { - _settings = new RepositorySettings(); + _settings = new Models.RepositorySettings(); } _watcher = new Models.Watcher(this); @@ -1985,7 +1897,7 @@ namespace SourceGit.ViewModels private string _fullpath = string.Empty; private string _gitDir = string.Empty; - private RepositorySettings _settings = null; + private Models.RepositorySettings _settings = null; private Models.Watcher _watcher = null; private Histories _histories = null;