Skip to content

Fix auto dark mode and rename it to follow battery saver #116

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
Mahdi-zarei merged 2 commits into from
Oct 31, 2026
Merged

Fix auto dark mode and rename it to follow battery saver #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c8fd9d
fix auto night mode bug caused by inconsistent logic
sgt57 Oct 28, 2026
676ef53
rename night mode auto option to follow battery saver
sgt57 Oct 28, 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
6 changes: 4 additions & 2 deletions app/src/main/java/io/nekohasekai/sagernet/utils/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatDelegate
import io.nekohasekai.sagernet.R
import io.nekohasekai.sagernet.database.DataStore
import io.nekohasekai.sagernet.ktx.app
import io.nekohasekai.sagernet.SagerNet

object Theme {

Expand Down Expand Up @@ -170,14 +171,15 @@ object Theme {

fun usingNightMode(): Boolean {
return when (DataStore.nightTheme) {
0 -> (app.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
1 -> true
2 -> false
else -> (app.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
else -> SagerNet.power.isPowerSaveMode
}
}

fun applyNightTheme() {
AppCompatDelegate.setDefaultNightMode(getNightMode())
}

}
}
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<string name="always_show_address">اعرض العنوان دائمًا</string>
<string name="unavailable">غير متوفره</string>
<string name="standard">معيار</string>
<string name="auto">تلقائي</string>
<string name="follow_battery_saver">اتبع وضع توفير الطاقة</string>
<string name="disable">إلغاء</string>
<string name="enable">مكن</string>
<string name="follow_system">اتبع النظام</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-be/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-be/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<string name="apply">Ужыць</string>
<string name="apps">Праграмы</string>
<string name="apps_message">%d праграм</string>
<string name="auto">Аўтаматычна</string>
<string name="follow_battery_saver">Па рэжыме эканоміі зараду</string>
<string name="auto_connect">Аўтаматычнае падлучэнне</string>
<string name="auto_connect_summary">Уключаць проксі пры запуску/абнаўленні праграмы, калі ён працаваў раней</string>
<string name="auto_connect_superseded">Заменены заўсёды ўключаным VPN</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">System folgen</string>
<string name="enable">Aktivieren</string>
<string name="disable">Deaktivieren</string>
<string name="auto">Automatisch</string>
<string name="follow_battery_saver">Energiesparmodus folgen</string>
<string name="standard">Standard</string>
<string name="unavailable">Nicht verfügbar</string>
<string name="always_show_address">Adresse immer anzeigen</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">Seguir sistema</string>
<string name="enable">Permitir</string>
<string name="disable">Desactivar</string>
<string name="auto">Automático</string>
<string name="follow_battery_saver">Seguir ahorro de batería</string>
<string name="standard">Estándar</string>
<string name="unavailable">No disponible</string>
<string name="always_show_address">Mostrar siempre la dirección</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fa/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fa/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<string name="follow_system">مانند سیستم</string>
<string name="enable">فعال</string>
<string name="disable">غیرفعال</string>
<string name="auto">خودکار</string>
<string name="follow_battery_saver">مانند حالت ذخیره باتری</string>
<string name="standard">استاندارد</string>
<string name="unavailable">در دسترس نیست</string>
<string name="always_show_address">نشانی‌ها همواره نمایش داده شود</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">Selon le système</string>
<string name="enable">Activer</string>
<string name="disable">Désactiver</string>
<string name="auto">Auto</string>
<string name="follow_battery_saver">Selon l\'économiseur de batterie</string>
<string name="standard">Standard</string>
<string name="unavailable">Non disponible</string>
<string name="always_show_address">Toujours afficher l\'adresse</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-in/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-in/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">Ikuti sistem</string>
<string name="enable">Aktifkan</string>
<string name="disable">Nonaktifkan</string>
<string name="auto">Otomatis</string>
<string name="follow_battery_saver">Ikuti penghemat baterai</string>
<string name="standard">Standar</string>
<string name="unavailable">Tidak tersedia</string>
<string name="always_show_address">Selalu tampilkan alamat</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">Segui il sistema</string>
<string name="enable">Abilita</string>
<string name="disable">Disabilita</string>
<string name="auto">Automatico</string>
<string name="follow_battery_saver">Segui risparmio energetico</string>
<string name="standard">Standard</string>
<string name="unavailable">Non disponibile</string>
<string name="always_show_address">Mostra sempre l\'indirizzo</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ja/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
<string name="follow_system">システムに従う</string>
<string name="enable">有効</string>
<string name="disable">無効</string>
<string name="auto">自動</string>
<string name="follow_battery_saver">バッテリーセーバーに従う</string>
<string name="standard">標準</string>
<string name="unavailable">利用不可</string>
<string name="always_show_address">常にアドレスを表示</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ko/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ko/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<string name="follow_system">시스템 설정 따르기</string>
<string name="enable">활성화</string>
<string name="disable">비활성화</string>
<string name="auto">자동</string>
<string name="follow_battery_saver">절전 모드 따르기</string>
<string name="standard">표준</string>
<string name="unavailable">사용 불가</string>
<string name="always_show_address">항상 주소 표시</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-nb-rNO/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-nb-rNO/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<string name="clear_traffic_statistics">Slett trafikkstatistikk</string>
<string name="always_show_address_sum">Vis alltid serveradressen på konfigurasjonskortet</string>
<string name="always_show_address">Vis alltid adresse</string>
<string name="auto">Automatisk</string>
<string name="follow_battery_saver">Følg batterisparing</string>
<string name="disable">Deaktiver</string>
<string name="enable">Muliggjøre</string>
<string name="lines">%d linjer</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-nl/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-nl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">Systeem volgen</string>
<string name="enable">Inschakelen</string>
<string name="disable">Uitschakelen</string>
<string name="auto">Automatisch</string>
<string name="follow_battery_saver">Batterijbesparing volgen</string>
<string name="standard">Standaard</string>
<string name="unavailable">Niet beschikbaar</string>
<string name="always_show_address">Adres altijd tonen</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pt-rBR/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pt-rBR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<string name="follow_system">Seguir o sistema</string>
<string name="enable">Ativar</string>
<string name="disable">Desativar</string>
<string name="auto">Automático</string>
<string name="follow_battery_saver">Seguir a economia de bateria</string>
<string name="standard">Padrão</string>
<string name="unavailable">Indisponível</string>
<string name="always_show_address">Sempre mostrar o endereço</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<string name="apply">Применить</string>
<string name="apps">Приложения</string>
<string name="apps_message">%d приложений</string>
<string name="auto">Авто</string>
<string name="follow_battery_saver">Следовать режиму энергосбережения</string>
<string name="auto_connect">Автоматическое подключение</string>
<string name="auto_connect_summary">Включить прокси при запуске/обновлении приложения, если он был запущен до этого</string>
<string name="auto_select_proxy_apps">Автоматический выбор прокси-приложений</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-tr/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-tr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<string name="always_show_address">Her Zaman Adresi Göster</string>
<string name="unavailable">Kullanılamıyor</string>
<string name="standard">Standart</string>
<string name="auto">Otomatik</string>
<string name="follow_battery_saver">Pil Tasarrufunu Takip Et</string>
<string name="disable">Devre Dışı Bırak</string>
<string name="enable">Etkinleştir</string>
<string name="follow_system">Sistemi Takip Et</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-uk/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-uk/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<string name="follow_system">Як у системі</string>
<string name="enable">Увімкнути</string>
<string name="disable">Вимкнути</string>
<string name="auto">Авто</string>
<string name="follow_battery_saver">Як режим енергозбереження</string>
<string name="standard">Стандартний</string>
<string name="unavailable">Недоступний</string>
<string name="always_show_address">Завжди показувати адресу</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rCN/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<string name="night_mode">夜间模式</string>
<string name="language">语言</string>
<string name="enable">启用</string>
<string name="auto">自动</string>
<string name="follow_battery_saver">跟随省电模式</string>
<string name="follow_system">跟随系统</string>
<string name="security_settings">TLS 安全设置</string>
<string name="allow_insecure">允许不安全的连接</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rHK/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rHK/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<string name="add_profile_methods_scan_qr_code">掃描二維碼</string>
<string name="auto_connect">自動連接</string>
<string name="disable">禁用</string>
<string name="auto">自動</string>
<string name="follow_battery_saver">跟隨省電模式</string>
<string name="apply">套用</string>
<string name="connection_test">連接測試</string>
<string name="disable_mixed_inbound">停用混合傳入</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rTW/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="notification_action_entries">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<string name="follow_system">跟隨系統</string>
<string name="enable">啟用</string>
<string name="disable">停用</string>
<string name="auto">自動</string>
<string name="follow_battery_saver">跟隨省電模式</string>
<string name="standard">標準</string>
<string name="unavailable">無法使用</string>
<string name="always_show_address">始終顯示位址</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<item>@string/follow_system</item>
<item>@string/enable</item>
<item>@string/disable</item>
<item>@string/auto</item>
<item>@string/follow_battery_saver</item>
</string-array>

<string-array name="group_types">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
<string name="follow_system">Follow system</string>
<string name="enable">Enable</string>
<string name="disable">Disable</string>
<string name="auto">Auto</string>
<string name="follow_battery_saver">Follow battery saver</string>
<string name="standard">Standard</string>
<string name="unavailable">Unavailable</string>
<string name="always_show_address">Always show address</string>
Expand Down