Bumped package verison

simeonradivoev · Jan 30, 2021 · edded54 · edded54
1 parent 8898496
commit edded54
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/Editor/GitManager.cs b/Editor/GitManager.cs
@@ -15,9 +15,7 @@ namespace UniGit
 {
 	public class GitManager : IDisposable
 	{
-		public const string Version = "1.4.3";
-
-		private Repository repository;
+        private Repository repository;
 		private readonly GitSettingsJson gitSettings;
         private readonly UniGitData gitData;
 		private readonly object statusRetriveLock = new object();

diff --git a/Editor/GitSettingsWindow.cs b/Editor/GitSettingsWindow.cs
@@ -29,8 +29,8 @@ public class GitSettingsWindow : GitUpdatableWindow, IHasCustomMenu
 		private VisualElement settingsWindowElement;
 		private VisualElement settingsTabsElement;
 		private VisualElement tabsToolbar;
-		private Button helpButton;
-		private Button donateButton;
+		private VisualElement helpButton;
+		private VisualElement donateButton;
 
 		#endregion
 
@@ -219,14 +219,12 @@ protected override void ConstructGUI(VisualElement root)
             settingsWindowElement = root.Q("SettingsWindow");
             settingsTabsElement = root.Q("SettingsTabs");
             tabsToolbar = root.Q("TabsToolbar");
-            helpButton = root.Q<Button>("HelpSettings");
-            helpButton.tooltip = "Help";
-            donateButton = root.Q<Button>("Donate");
-            donateButton.tooltip = "Donate";
+            helpButton = root.Q<VisualElement>("HelpSettings");
+            donateButton = root.Q<VisualElement>("Donate");
 
-            helpButton.clickable.clicked += () => GitLinks.GoTo(GitLinks.SettingsWindowHelp);
-            donateButton.clickable.clicked += () => GitLinks.GoTo(GitLinks.Donate);
-		}
+            helpButton.RegisterCallback<ClickEvent>(e => GitLinks.GoTo(GitLinks.SettingsWindowHelp));
+            donateButton.RegisterCallback<ClickEvent>(e => GitLinks.GoTo(GitLinks.Donate));
+        }
 
 		protected override void OnGitUpdate(GitRepoStatus status, string[] paths)
 		{

diff --git a/Editor/UI/SettingsWindow.uxml b/Editor/UI/SettingsWindow.uxml
@@ -5,8 +5,8 @@
         <Instance template="InvalidRepository" name="InvalidRepository"/>
         <VisualElement name="SettingsWindow">
           <editor:Toolbar name="TabsToolbar">
-            <Button name="Donate" class="smallIconButton" />
-            <Button name="HelpSettings" class="smallIconButton" />
+            <VisualElement name="Donate" class="smallIconButton" tooltip="Donate" />
+            <VisualElement name="HelpSettings" class="smallIconButton" tooltip="Help" />
           </editor:Toolbar>
           <VisualElement name="SettingsTabs">
 

diff --git a/Editor/UI/SettingsWindowSheet.uss b/Editor/UI/SettingsWindowSheet.uss
@@ -13,7 +13,7 @@
 #Donate{
 	position: absolute;
 	right: 4px;
-	background-image: resource("Icons/donate");
+	background-image: resource("PreviewPackageInUse");
 }
 
 #HelpSettings{

diff --git a/Editor/Utils/GitAboutWindow.cs b/Editor/Utils/GitAboutWindow.cs
@@ -2,6 +2,7 @@
 using LibGit2Sharp;
 using UnityEditor;
 using UnityEngine;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
 
 namespace UniGit.Utils
 {
@@ -49,11 +50,12 @@ private void OnGUI()
 		{
 			var version = GlobalSettings.Version;
 
-			GUILayout.Label(GitGUI.GetTempContent("UniGit"), "TL Selection H1");
+			GUILayout.Label(GitGUI.GetTempContent("UniGit"), "LODLevelNotifyText", GUILayout.ExpandWidth(true));
 
-			GUILayout.BeginVertical("IN GameObjectHeader");
+			GUILayout.BeginVertical("AC BoldHeader");
 			GUILayout.Label(GitGUI.GetTempContent("Created by: Simeon Radivoev"));
-			GUILayout.Label(GitGUI.GetTempContent("UniGit Version: " + GitManager.Version));
+            var packageInfo = PackageInfo.FindForAssembly(this.GetType().Assembly);
+            GUILayout.Label(GitGUI.GetTempContent("UniGit Version: " + packageInfo.version));
 			GUILayout.Label(GitGUI.GetTempContent("Git Version: " + gitVersion));
 			GUILayout.Label(GitGUI.GetTempContent("LibGit2Sharp Features: " + version.Features));
 			GUILayout.Label(GitGUI.GetTempContent("License:  GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007"),EditorStyles.wordWrappedLabel);

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "com.simeonradivoev.uni-git",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "displayName": "UniGit",
   "description": "An open source GIT Unity3D editor plugin.",
-  "unity": "2019.2",
+  "unity": "2020.2",
   "dependencies": {
  },
  "keywords": [