Merge pull request #139 from 3colorr/v1.2.3

V1.2.3

Author: 3colorr

Mizuame/Assets.xcassets/SettingsBackground.colorset/Contents.json

@@ -301,6 +301,7 @@ struct ContentView: View {
         VStack {
             if #available(macOS 14, *) {
                 TextEditor(text: $stickyText)
+                    .padding(EdgeInsets(top: 5, leading: 1, bottom: 0, trailing: 1))
                     .onChange(of: stickyText) { oldVal, newVal in
 
                         _ = redoUndoManager.snapshot(of: newVal)
@@ -326,6 +327,7 @@ struct ContentView: View {
                     }
             } else {
                 TextEditor(text: $stickyText)
+                    .padding(EdgeInsets(top: 5, leading: 1, bottom: 0, trailing: 1))
                     .onChange(of: stickyText) { val in
 
                         _ = redoUndoManager.snapshot(of: val)

Mizuame/ContentView.swift

@@ -16,8 +16,6 @@ struct SettingsView: View {
 
     var body: some View {
         ZStack {
-            Color("SettingsBackground")
-            
             if #available(macOS 14, *) {
                 MainTabViewMacOS14orNewer()
             } else {

Mizuame/Settings/SettingsView.swift

@@ -78,20 +78,17 @@ struct StickyNotePreview: View {
                     .frame(width: width, height: height / 6)
 
                 Text("settings.tab.stickynote.window.preview.messagebar")
-                    .frame(width: width, height: height / 6)
+                    .frame(width: width * 0.95, height: height / 6)
                     .font(.system(size: CGFloat(fontSize)))
                     .foregroundColor(Color(message))
                     .background(Color(messagebar))
-                
+                    .padding(5)
+
                 Text("settings.tab.stickynote.window.preview.stickynote")
-                    .frame(width: width, height: height * 3 / 6)
+                    .frame(width: width * 0.95, height: height * 3.35 / 6)
                     .font(.system(size: CGFloat(fontSize)))
                     .foregroundColor(Color(bodyForeground))
                     .background(Color(bodyBackground))
-
-                Rectangle()
-                    .fill(Color(bodyFrame))
-                    .frame(width: width, height: height / 6)
             }
         }
         .overlay {

Mizuame/Settings/StickyNotePreview.swift

@@ -16,8 +16,6 @@ struct TabGeneral: View {
 
     @AppStorage(SettingKeys.StickyNote().keyPinNote) private var isPinNote: Bool = SettingKeys.StickyNote().initialPinNote
 
-    @AppStorage(SettingKeys.StickyNote().keyLoginItems) private var isEnableLoginItems: Bool = SettingKeys.StickyNote().initialLoginItems
-
     @AppStorage(SettingKeys.StickyNote.NoteFontColor.Theme().key) private var isApplyThemeColorToFont: Bool = SettingKeys.StickyNote.NoteFontColor.Theme().initialVale
 
     @AppStorage(SettingKeys.StickyNote.NoteFontColor.Black().key) private var isApplyBlackColorToFont: Bool = SettingKeys.StickyNote.NoteFontColor.Black().initialVale
@@ -30,6 +28,9 @@ struct TabGeneral: View {
 
     @AppStorage(SettingKeys.StickyNote().keyPositionOfRoundsDecimalPoint) private var positionOfRoundsDecimalPoint: Int = SettingKeys.StickyNote().initialPositionOfRoundsDecimalPoint
 
+    @State private var isEnableLoginItems: Bool = false
+    
+    
     var body: some View {
         VStack(alignment: .center) {
             VStack(alignment: .leading, spacing: 30) {
@@ -74,6 +75,9 @@ struct TabGeneral: View {
                                 })
                             }
                         }
+                        .onAppear {
+                            isEnableLoginItems = (SMAppService.mainApp.status == .enabled)
+                        }
                     }
                 }
 

Mizuame/Settings/TabGeneral.swift

@@ -30,7 +30,7 @@ struct TabInfo: View {
                 }
 
                 VStack(alignment: .leading, spacing: 5) {
-                    Text("Version: 1.2.2").font(.body)
+                    Text("Version: 1.2.3").font(.body)
                     Text("License: MIT license").font(.body)
                     HStack {
                         Text("settings.tab.info.src").font(.body)

Mizuame/Settings/TabInfo.swift

@@ -111,7 +111,7 @@ struct TabStickyNote: View {
                     ThemePalette(message: $messageTheme, messagebar: $messagebarTheme, bodyForeground: $bodyForegroundTheme, bodyBackground: $bodyBackgroundTheme, bodyFrame: $frameTheme)
                         .padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 20))
 
-                    Spacer()
+                    Spacer(minLength: 20)
 
                     HStack {
                         Text("settings.tab.stickynote.reset.title")

Mizuame/Settings/TabStickyNote.swift

@@ -23,17 +23,23 @@ What is NOT SO GOOD point about the Mizuame?
   - https://github.com/3colorr/Mizuame-pages
 
 # Branch
-- main
-  - Releases.
-- Others
-  - Development.
+- `main` branch
+  - Represents the stable and productioin-ready code.
+- `v*.*.*` branch
+  - Represents the development code.
   - It likely contain errors.
+  - The branch will be delete when it is merged to `main` branch.
+- Others branch
+  - Represents the development and bugfix code.
+  - It likely contain many errors.
+  - The branch will be delete when it is merged to `v*.*.*` branch.
 
 # Install
 - [x] AppStore
-  - Search for "Mizuame"
+  - See https://3colorr.github.io/Mizuame-pages/#install
 - [x] Build it yourself
   - `git clone` -> Build by Xcode
+  - See also https://3colorr.github.io/Mizuame-pages/#install
 
 # Sample
 <div align="center" style="display: flex;">