From 9c8fd9de836485f793c22b00459a11a4028c46a2 Mon Sep 17 00:00:00 2001 From: sgt57 <198590103+sgt57@users.noreply.github.com> Date: Wed, 28 Oct 2026 17:21:38 +0800 Subject: [PATCH 1/2] fix auto night mode bug caused by inconsistent logic --- app/src/main/java/io/nekohasekai/sagernet/utils/Theme.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/nekohasekai/sagernet/utils/Theme.kt b/app/src/main/java/io/nekohasekai/sagernet/utils/Theme.kt index c4b7f9ed..0e8e5603 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/utils/Theme.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/utils/Theme.kt @@ -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 { @@ -170,9 +171,10 @@ 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 } } @@ -180,4 +182,4 @@ object Theme { AppCompatDelegate.setDefaultNightMode(getNightMode()) } -} \ No newline at end of file +} From 676ef534dcca7c160ff84d54f762a002dd232e5d Mon Sep 17 00:00:00 2001 From: sgt57 <198590103+sgt57@users.noreply.github.com> Date: Wed, 28 Oct 2026 17:21:56 +0800 Subject: [PATCH 2/2] rename night mode auto option to follow battery saver --- app/src/main/res/values-ar/arrays.xml | 2 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-be/arrays.xml | 2 +- app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-de/arrays.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/arrays.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/arrays.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fr/arrays.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-in/arrays.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/arrays.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/arrays.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/arrays.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-nb-rNO/arrays.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-nl/arrays.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/arrays.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ru/arrays.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-tr/arrays.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/arrays.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/arrays.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/arrays.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/arrays.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app/src/main/res/values-ar/arrays.xml b/app/src/main/res/values-ar/arrays.xml index 482131f7..630629b8 100644 --- a/app/src/main/res/values-ar/arrays.xml +++ b/app/src/main/res/values-ar/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 31a95ebc..52c74f11 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -150,7 +150,7 @@ اعرض العنوان دائمًا غير متوفره معيار - تلقائي + اتبع وضع توفير الطاقة إلغاء مكن اتبع النظام diff --git a/app/src/main/res/values-be/arrays.xml b/app/src/main/res/values-be/arrays.xml index 1db23f9a..8c530616 100644 --- a/app/src/main/res/values-be/arrays.xml +++ b/app/src/main/res/values-be/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index c28f770c..59c8dfb5 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -140,7 +140,7 @@ Ужыць Праграмы %d праграм - Аўтаматычна + Па рэжыме эканоміі зараду Аўтаматычнае падлучэнне Уключаць проксі пры запуску/абнаўленні праграмы, калі ён працаваў раней Заменены заўсёды ўключаным VPN diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml index acd9c3bc..a897f0f2 100644 --- a/app/src/main/res/values-de/arrays.xml +++ b/app/src/main/res/values-de/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1611d245..21d426d9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -193,7 +193,7 @@ System folgen Aktivieren Deaktivieren - Automatisch + Energiesparmodus folgen Standard Nicht verfügbar Adresse immer anzeigen diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml index a7fdde1b..b7ecf325 100644 --- a/app/src/main/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 85f1bd09..d32726cf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -193,7 +193,7 @@ Seguir sistema Permitir Desactivar - Automático + Seguir ahorro de batería Estándar No disponible Mostrar siempre la dirección diff --git a/app/src/main/res/values-fa/arrays.xml b/app/src/main/res/values-fa/arrays.xml index 25f6efb4..007c34df 100644 --- a/app/src/main/res/values-fa/arrays.xml +++ b/app/src/main/res/values-fa/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d5bbaaed..7a5523bc 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -173,7 +173,7 @@ مانند سیستم فعال غیرفعال - خودکار + مانند حالت ذخیره باتری استاندارد در دسترس نیست نشانی‌ها همواره نمایش داده شود diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml index e6ac6032..2e6be35e 100644 --- a/app/src/main/res/values-fr/arrays.xml +++ b/app/src/main/res/values-fr/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 62458e3d..2abd28e3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -193,7 +193,7 @@ Selon le système Activer Désactiver - Auto + Selon l\'économiseur de batterie Standard Non disponible Toujours afficher l\'adresse diff --git a/app/src/main/res/values-in/arrays.xml b/app/src/main/res/values-in/arrays.xml index baa66c26..fff5b243 100644 --- a/app/src/main/res/values-in/arrays.xml +++ b/app/src/main/res/values-in/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9890ddf1..aa433f3f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -193,7 +193,7 @@ Ikuti sistem Aktifkan Nonaktifkan - Otomatis + Ikuti penghemat baterai Standar Tidak tersedia Selalu tampilkan alamat diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml index aee7c56c..172eb4cf 100644 --- a/app/src/main/res/values-it/arrays.xml +++ b/app/src/main/res/values-it/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1c78cd72..ec6ed05c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -193,7 +193,7 @@ Segui il sistema Abilita Disabilita - Automatico + Segui risparmio energetico Standard Non disponibile Mostra sempre l\'indirizzo diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml index a731915c..14b4069f 100644 --- a/app/src/main/res/values-ja/arrays.xml +++ b/app/src/main/res/values-ja/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bfd855b4..e8620b5c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -165,7 +165,7 @@ システムに従う 有効 無効 - 自動 + バッテリーセーバーに従う 標準 利用不可 常にアドレスを表示 diff --git a/app/src/main/res/values-ko/arrays.xml b/app/src/main/res/values-ko/arrays.xml index a9614150..1de673ec 100644 --- a/app/src/main/res/values-ko/arrays.xml +++ b/app/src/main/res/values-ko/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 34a4b08f..37ea05fd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -164,7 +164,7 @@ 시스템 설정 따르기 활성화 비활성화 - 자동 + 절전 모드 따르기 표준 사용 불가 항상 주소 표시 diff --git a/app/src/main/res/values-nb-rNO/arrays.xml b/app/src/main/res/values-nb-rNO/arrays.xml index 99d4ef64..116e286c 100644 --- a/app/src/main/res/values-nb-rNO/arrays.xml +++ b/app/src/main/res/values-nb-rNO/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index e9d0135b..dada9b58 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -81,7 +81,7 @@ Slett trafikkstatistikk Vis alltid serveradressen på konfigurasjonskortet Vis alltid adresse - Automatisk + Følg batterisparing Deaktiver Muliggjøre %d linjer diff --git a/app/src/main/res/values-nl/arrays.xml b/app/src/main/res/values-nl/arrays.xml index bcebe0cc..d9ae3fc4 100644 --- a/app/src/main/res/values-nl/arrays.xml +++ b/app/src/main/res/values-nl/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d7cf9365..3bcb6f38 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -193,7 +193,7 @@ Systeem volgen Inschakelen Uitschakelen - Automatisch + Batterijbesparing volgen Standaard Niet beschikbaar Adres altijd tonen diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml index c7bb9255..cc1d8e00 100644 --- a/app/src/main/res/values-pt-rBR/arrays.xml +++ b/app/src/main/res/values-pt-rBR/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 508e61ee..288b1d20 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -193,7 +193,7 @@ Seguir o sistema Ativar Desativar - Automático + Seguir a economia de bateria Padrão Indisponível Sempre mostrar o endereço diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml index dfd035be..d5f26ab4 100644 --- a/app/src/main/res/values-ru/arrays.xml +++ b/app/src/main/res/values-ru/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ba531c38..9edccbe2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -30,7 +30,7 @@ Применить Приложения %d приложений -Авто +Следовать режиму энергосбережения Автоматическое подключение Включить прокси при запуске/обновлении приложения, если он был запущен до этого Автоматический выбор прокси-приложений diff --git a/app/src/main/res/values-tr/arrays.xml b/app/src/main/res/values-tr/arrays.xml index 129c43a3..e500d30b 100644 --- a/app/src/main/res/values-tr/arrays.xml +++ b/app/src/main/res/values-tr/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8494200d..7f59c942 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -102,7 +102,7 @@ Her Zaman Adresi Göster Kullanılamıyor Standart - Otomatik + Pil Tasarrufunu Takip Et Devre Dışı Bırak Etkinleştir Sistemi Takip Et diff --git a/app/src/main/res/values-uk/arrays.xml b/app/src/main/res/values-uk/arrays.xml index 5484f1ee..37cafb75 100644 --- a/app/src/main/res/values-uk/arrays.xml +++ b/app/src/main/res/values-uk/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4fe4611c..8f661c39 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -176,7 +176,7 @@ Як у системі Увімкнути Вимкнути - Авто + Як режим енергозбереження Стандартний Недоступний Завжди показувати адресу diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml index dc84097b..32bd1c0d 100644 --- a/app/src/main/res/values-zh-rCN/arrays.xml +++ b/app/src/main/res/values-zh-rCN/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9a39c98f..f609a534 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -171,7 +171,7 @@ 夜间模式 语言 启用 - 自动 + 跟随省电模式 跟随系统 TLS 安全设置 允许不安全的连接 diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml index e5679a6e..1e4d5cac 100644 --- a/app/src/main/res/values-zh-rHK/arrays.xml +++ b/app/src/main/res/values-zh-rHK/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d15ac3ce..39dfc777 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -32,7 +32,7 @@ 掃描二維碼 自動連接 禁用 - 自動 + 跟隨省電模式 套用 連接測試 停用混合傳入 diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml index e5679a6e..1e4d5cac 100644 --- a/app/src/main/res/values-zh-rTW/arrays.xml +++ b/app/src/main/res/values-zh-rTW/arrays.xml @@ -129,7 +129,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4e4a31e9..4b0ec9ac 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -166,7 +166,7 @@ 跟隨系統 啟用 停用 - 自動 + 跟隨省電模式 標準 無法使用 始終顯示位址 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index cb5005d5..ae2caf46 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -138,7 +138,7 @@ @string/follow_system @string/enable @string/disable - @string/auto + @string/follow_battery_saver diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f957dbb6..6b837fda 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -227,7 +227,7 @@ Follow system Enable Disable - Auto + Follow battery saver Standard Unavailable Always show address