Skip to content

Add battery percentage display option in menu bar icon #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srimanachanta merged 7 commits into from
May 17, 2026
Merged

Add battery percentage display option in menu bar icon #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75c1a59
feat: Add option to display battery percentage inside the menu bar ic…
DinanathDash May 13, 2026
75f32c6
refactor: resolve reviewer feedback
DinanathDash May 16, 2026
93821a6
feat: redesign inside-icon battery to mirror iOS 26 indicator
srimanachanta May 17, 2026
cc51da4
refactor: decouple PercentageDisplayLocation storage from display labels
srimanachanta May 17, 2026
2efeedf
polish: default percentage to next-to-icon, tighten picker label, dro…
srimanachanta May 17, 2026
7815965
fix: keep in-icon percentage out of the localization catalog
srimanachanta May 17, 2026
c75038c
Update Localizable.xcstrings
srimanachanta May 17, 2026
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
12 changes: 10 additions & 2 deletions Stasis/DefaultsKeys.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ import smc_power

extension MagSafeLEDState: Defaults.Serializable {}

enum PercentageDisplayLocation: String, Defaults.Serializable, CaseIterable, Identifiable {
case hidden
case nextToIcon
case insideIcon

var id: String { rawValue }
}

extension Defaults.Keys {
// General
static let launchAtLogin = Key<Bool>("launchAtLogin", default: false)

// Status Icon
static let showBatteryPercentageInStatusIcon = Key<Bool>(
"showBatteryPercentageInStatusIcon", default: false)
static let batteryPercentageDisplayLocation = Key<PercentageDisplayLocation>(
"batteryPercentageDisplayLocation", default: .nextToIcon)
static let showBatteryStateInStatusIcon = Key<Bool>(
"showBatteryStateInStatusIcon", default: true)

Expand Down
69 changes: 14 additions & 55 deletions Stasis/L10n/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,33 +812,8 @@
"Discharge the battery to your charge limit when plugged in above the target level." : {

},
"Display the current battery percentage next to the status icon in the menu bar." : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Den aktuellen Batterieprozentsatz neben dem Statussymbol in der Menüleiste anzeigen."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Mostrar el porcentaje de batería actual junto al ícono en la barra de menú."
}
},
"es-US" : {
"stringUnit" : {
"state" : "translated",
"value" : "Mostrar el porcentaje de batería actual junto al ícono en la barra de menú."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "メニューバーのステータスアイコンの横にバッテリー残量を表示します。"
}
}
}
"Display battery percentage next to or inside the menu bar icon." : {

},
"Enable heat protection" : {
"localizations" : {
Expand Down Expand Up @@ -1041,6 +1016,12 @@
}
}
}
},
"Hidden" : {

},
"Inside icon" : {

},
"Launch at login" : {
"localizations" : {
Expand Down Expand Up @@ -1265,6 +1246,9 @@
}
}
}
},
"Next to icon" : {

},
"Notifications" : {
"localizations" : {
Expand Down Expand Up @@ -1580,36 +1564,11 @@
}
}
},
"Show battery percentage" : {
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Batterieprozentsatz anzeigen"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Mostrar porcentaje de batería"
}
},
"es-US" : {
"stringUnit" : {
"state" : "translated",
"value" : "Mostrar porcentaje de batería"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "バッテリー残量を表示"
}
}
}
},
"Show battery state" : {

},
"Show percentage" : {

},
"Sleep Prevention" : {

Expand Down
4 changes: 2 additions & 2 deletions Stasis/StatusBarManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ class StatusBarManager {

struct StatusBarContentView: View {
let viewModel: MenuViewModel
@Default(.showBatteryPercentageInStatusIcon) var showPercentage
@Default(.batteryPercentageDisplayLocation) var percentageDisplayLocation
@Default(.showBatteryStateInStatusIcon) var showState

var body: some View {
BatteryIndicatorView(
batteryLevel: viewModel.displayPercentage,
chargingMode: viewModel.chargingMode,
isLowPowerModeEnabled: viewModel.isLowPowerModeEnabled,
showPercentage: showPercentage,
percentageDisplayLocation: percentageDisplayLocation,
showState: showState
)
.fixedSize()
Expand Down
Loading