improvements

Author: streetturtle

streak-bar/streak-bar/AppDelegate.swift

@@ -43,7 +43,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         self.statusBarItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
 
         if let button = statusBarItem.button {
-            let width = viewMode == .week ? daysBefore*3 + 20 : daysBefore * 22 + 20
+            let width = viewMode == .week ? daysBefore * 3 + 20 : (daysBefore + 1) * 17 + 20
 
             button.frame = NSRect(x: 0, y: 0, width: width, height: 22)
 

streak-bar/streak-bar/Views/SettingsView.swift

@@ -71,46 +71,51 @@ struct SettingsView: View {
 
             HStack(alignment: .center) {
                 Text("\(viewMode.rawValue.capitalized)s before:").frame(width: 90, alignment: .trailing)
-                                TextField("", value: $daysBefore, format: .number)
-                                    .textFieldStyle(RoundedBorderTextFieldStyle())
-                                    .disableAutocorrection(true)
-                                    .textContentType(.password)
-                                    .frame(width: 40)
-                                    .frame(alignment: .center)
-                                    .multilineTextAlignment(.trailing)
-                                    .focusable(false)
-                //                                    .disabled(true)
-                
-                Stepper("", onIncrement: {
-                    if viewMode == .week && daysBefore < 50 {
-                        daysBefore += 5
-                    } else if viewMode == .day && daysBefore < 10 {
-                        daysBefore += 1
+                HStack {
+                    HStack(spacing: 0) {
+                        Text(String(daysBefore))
+//                        TextField("", value: $daysBefore, format: .number)
+//                            .textFieldStyle(RoundedBorderTextFieldStyle())
+//                            .disableAutocorrection(true)
+//                            .textContentType(.password)
+//                            .frame(width: 40)
+//                            .frame(alignment: .center)
+//                            .multilineTextAlignment(.trailing)
+//                            .focusable(false)
+                        //                                    .disabled(true)
+                        
+                        Stepper("", onIncrement: {
+                            if viewMode == .week && daysBefore < 50 {
+                                daysBefore += 5
+                            } else if viewMode == .day && daysBefore < 10 {
+                                daysBefore += 1
+                            }
+                        }, onDecrement: {
+                            if viewMode == .week && daysBefore > 0 {
+                                daysBefore -= 5
+                            } else if viewMode == .day && daysBefore > 0 {
+                                daysBefore -= 1
+                            }                })
                     }
-                }, onDecrement: {
-                    if viewMode == .week && daysBefore > 0 {
-                        daysBefore -= 5
-                    } else if viewMode == .day && daysBefore > 0 {
-                        daysBefore -= 1
-                    }                })
-                
-                
-                //                TextField("", value: $daysBefore, format: .number)
-                //                    .textFieldStyle(RoundedBorderTextFieldStyle())
-                //                    .disableAutocorrection(true)
-                //                    .textContentType(.password)
-                //                    .frame(width: 40)
-                //                    .frame(alignment: .center)
-                //                    .multilineTextAlignment(.trailing)
-                
-                Button(action: {
-                    appDelegate.redrawBarItem()
-                },
-                       label: {
-                    HoverableLabel(iconName: "arrow.triangle.2.circlepath")
-                })
-                .buttonStyle(.borderless)
-                .help("Re-draw")
+                    .padding(.leading, 2)
+                    
+                    //                TextField("", value: $daysBefore, format: .number)
+                    //                    .textFieldStyle(RoundedBorderTextFieldStyle())
+                    //                    .disableAutocorrection(true)
+                    //                    .textContentType(.password)
+                    //                    .frame(width: 40)
+                    //                    .frame(alignment: .center)
+                    //                    .multilineTextAlignment(.trailing)
+                    
+                    Button(action: {
+                        appDelegate.redrawBarItem()
+                    },
+                           label: {
+                        HoverableLabel(iconName: "arrow.triangle.2.circlepath")
+                    })
+                    .buttonStyle(.borderless)
+                    .help("Re-draw")
+                }
             }
 
             HStack(alignment: .center) {

streak-bar/streak-bar/Views/StatusItemView.swift

@@ -33,7 +33,6 @@ struct StatusItemView: View {
             HStack(spacing: 1) {
                 ForEach(viewModel.contributions, id:\.self) { week in
                     ForEach(week.contributionDays, id:\.date) { day in
-//                        Circle()
                         RoundedRectangle(cornerRadius: 4)
                             .fill(Theme.themes[theme]![day.contributionLevel]!.opacity(day.contributionLevel == .NONE && !transparency ? 0 : 1))
                             .frame(width: 16, height: 16)