Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hidden/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ class AppDelegate: NSObject, NSApplicationDelegate{
UserDefaults.Key.isAutoHide: true,
UserDefaults.Key.numberOfSecondForAutoHide: 10.0,
UserDefaults.Key.areSeparatorsHidden: false,
UserDefaults.Key.alwaysHiddenSectionEnabled: false
UserDefaults.Key.alwaysHiddenSectionEnabled: false,
UserDefaults.Key.useTransparentExpandIconEnabled: false
])
}

Expand Down
24 changes: 24 additions & 0 deletions hidden/Assets.xcassets/ic_expand_hidden.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_expand_hidden.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 30 additions & 17 deletions hidden/Base.lproj/Main.storyboard

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions hidden/Common/Assets.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@
import AppKit

struct Assets {
private static var expandIcon: String { Preferences.useTransparentExpandIconEnabled ? "ic_expand_hidden" : "ic_expand" }
private static var collapseIcon: String { "ic_collapse" }

static var expandImage: NSImage? {
if (Constant.isUsingLTRLanguage) {
return NSImage(named: NSImage.Name("ic_expand"))
return NSImage(named: NSImage.Name(expandIcon))
} else {
return NSImage(named: NSImage.Name("ic_collapse"))
return NSImage(named: NSImage.Name(collapseIcon))
}
}
static var collapseImage: NSImage? {
if (Constant.isUsingLTRLanguage) {
return NSImage(named: NSImage.Name("ic_collapse"))
return NSImage(named: NSImage.Name(collapseIcon))
} else {
return NSImage(named: NSImage.Name("ic_expand"))
return NSImage(named: NSImage.Name(expandIcon))
}
}
}
11 changes: 11 additions & 0 deletions hidden/Common/Preferences.swift
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,16 @@ enum Preferences {
}
}

static var useTransparentExpandIconEnabled: Bool {
get {
UserDefaults.standard.bool(forKey: UserDefaults.Key.useTransparentExpandIconEnabled)
}

set {
UserDefaults.standard.set(newValue, forKey: UserDefaults.Key.useTransparentExpandIconEnabled)
NotificationCenter.default.post(Notification(name: .transparentExpandIconToggle))
}
}


}
1 change: 1 addition & 0 deletions hidden/Extensions/Notification.Name+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ extension Notification.Name {

static let prefsChanged = Notification.Name("prefsChanged")
static let alwayHideToggle = Notification.Name("alwayHideToggle")
static let transparentExpandIconToggle = Notification.Name("transparentExpandToggle")
}
1 change: 1 addition & 0 deletions hidden/Extensions/UserDefault+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ extension UserDefaults {
static let areSeparatorsHidden = "areSeparatorsHidden"
static let alwaysHiddenSectionEnabled = "alwaysHiddenSectionEnabled"
static let useFullStatusBarOnExpandEnabled = "useFullStatusBarOnExpandEnabled"
static let useTransparentExpandIconEnabled = "useTransparentExpandIconEnabled"
}

open override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
Expand Down
6 changes: 6 additions & 0 deletions hidden/Features/Preferences/PreferencesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class PreferencesViewController: NSViewController {
@IBOutlet weak var checkBoxKeepInDock: NSButton!
@IBOutlet weak var checkBoxLogin: NSButton!
@IBOutlet weak var checkBoxShowPreferences: NSButton!
@IBOutlet weak var checkBoxTransparentExpandIcon: NSButton!
@IBOutlet weak var checkBoxShowAlwaysHiddenSection: NSButton!

@IBOutlet weak var checkBoxUseFullStatusbar: NSButton!
Expand Down Expand Up @@ -83,6 +84,10 @@ class PreferencesViewController: NSViewController {
Preferences.useFullStatusBarOnExpandEnabled = sender.state == .on
}

@IBAction func useTransparentExpandIconChanged(_ sender: NSButton) {
Preferences.useTransparentExpandIconEnabled = sender.state == .on
}


@IBAction func timePopupDidSelected(_ sender: NSPopUpButton) {
let selectedIndex = sender.indexOfSelectedItem
Expand Down Expand Up @@ -155,6 +160,7 @@ class PreferencesViewController: NSViewController {
checkBoxLogin.state = Preferences.isAutoStart ? .on : .off
checkBoxAutoHide.state = Preferences.isAutoHide ? .on : .off
checkBoxShowPreferences.state = Preferences.isShowPreference ? .on : .off
checkBoxTransparentExpandIcon.state = Preferences.useTransparentExpandIconEnabled ? .on : .off
checkBoxShowAlwaysHiddenSection.state = Preferences.alwaysHiddenSectionEnabled ? .on : .off
timePopup.selectItem(at: SelectedSecond.secondToPossition(seconds: Preferences.numberOfSecondForAutoHide))
}
Expand Down
11 changes: 11 additions & 0 deletions hidden/Features/StatusBar/StatusBarController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class StatusBarController {

setupUI()
setupAlwayHideStatusBar()
setupTransparentExpandIcon()
DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: {
self.collapseMenuBar()
})
Expand Down Expand Up @@ -254,4 +255,14 @@ extension StatusBarController {
self.btnAlwaysHidden = nil
}
}

private func setupTransparentExpandIcon() {
NotificationCenter.default.addObserver(self, selector: #selector(toggleTransparentExpandIconIfNeeded), name: .transparentExpandIconToggle, object: nil)
}
@objc private func toggleTransparentExpandIconIfNeeded() {
guard self.isCollapsed else { return }
if let button = btnExpandCollapse.button {
button.image = Assets.expandImage
}
}
}