merge

8 months ago · ba4809e9b4
parent 21639638c1 4394b4ddf4
commit ba4809e9b4
7 changed files with 112 additions and 0 deletions
--- a/Src/app/src/main/java/net/micode/notes/.vs/ProjectSettings.json
+++ b/Src/app/src/main/java/net/micode/notes/.vs/ProjectSettings.json
@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
--- a/Src/app/src/main/java/net/micode/notes/.vs/VSWorkspaceState.json
+++ b/Src/app/src/main/java/net/micode/notes/.vs/VSWorkspaceState.json
@ -0,0 +1,8 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\data"
+  ],
+  "SelectedNode": "\\data\\UserDao.java",
+  "PreviewInSolutionExplorer": false
+}
--- a/Src/app/src/main/java/net/micode/notes/.vs/notes/FileContentIndex/92377f42-8e25-4653-b87b-f5c95d05f010.vsidx
+++ b/Src/app/src/main/java/net/micode/notes/.vs/notes/FileContentIndex/92377f42-8e25-4653-b87b-f5c95d05f010.vsidx
--- a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/.wsuo
+++ b/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/.wsuo
--- a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.backup.json
+++ b/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.backup.json
@ -0,0 +1,59 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\",
+  "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Notes.java||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:data\\Notes.java||{8B382828-6202-11D1-8870-0000F87579D2}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}"
+    }
+  ],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 2,
+          "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "Contact.java",
+              "DocumentMoniker": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java",
+              "RelativeDocumentMoniker": "data\\Contact.java",
+              "ToolTip": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java",
+              "RelativeToolTip": "data\\Contact.java",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
+              "WhenOpened": "2024-12-30T08:30:43.773Z",
+              "IsPinned": true,
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "Notes.java",
+              "DocumentMoniker": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Notes.java",
+              "RelativeDocumentMoniker": "data\\Notes.java",
+              "ToolTip": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Notes.java",
+              "RelativeToolTip": "data\\Notes.java",
+              "ViewState": "AgIAAGkAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
+              "WhenOpened": "2024-12-30T08:32:46.793Z",
+              "EditorCaption": ""
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.json
+++ b/Src/app/src/main/java/net/micode/notes/.vs/notes/v17/DocumentLayout.json
@ -0,0 +1,42 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\",
+  "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:data\\Contact.java||{8B382828-6202-11D1-8870-0000F87579D2}"
+    }
+  ],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 0,
+          "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "Contact.java",
+              "DocumentMoniker": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java",
+              "RelativeDocumentMoniker": "data\\Contact.java",
+              "ToolTip": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\java\\net\\micode\\notes\\data\\Contact.java",
+              "RelativeToolTip": "data\\Contact.java",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAACYAAAAHAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
+              "WhenOpened": "2024-12-30T08:30:43.773Z",
+              "IsPinned": true,
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Src/app/src/main/java/net/micode/notes/.vs/slnx.sqlite
+++ b/Src/app/src/main/java/net/micode/notes/.vs/slnx.sqlite