Changed the feature name to "Dark Mode".

* Refactored the code for this feature change.
2025-08-03 10:46:53 -04:00 · 2024-07-24 11:54:23 +05:30 · 2024-07-24 11:54:23 +05:30 · 6b81b644bd
commit 6b81b644bd
parent 974c7d4832
112 changed files with 163 additions and 256 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -188,7 +188,7 @@ with where and how the new string is used. E.x. for the string

 ```
 ...
-<string name="on">This is used in the settings screen to turn on the night mode.</string>
+<string name="on">This is used in the settings screen to turn on the dark mode.</string>
 ...
 ```

--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/mimetype/MimeTypeTest.kt
@ -29,7 +29,7 @@ import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.kiwixmobile.main.KiwixMainActivity
@ -87,7 +87,7 @@ class MimeTypeTest : BaseActivityTest() {
      emptyList(),
      null,
      archive,
-      NightModeConfig(SharedPreferenceUtil(context), context),
+      DarkModeConfig(SharedPreferenceUtil(context), context),
      SuggestionSearcher(archive)
    )
    zimFileReader.getRandomArticleUrl()?.let {
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt
@ -29,7 +29,7 @@ import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
@ -95,7 +95,7 @@ class EncodedUrlTest : BaseActivityTest() {
      emptyList(),
      null,
      archive,
-      NightModeConfig(SharedPreferenceUtil(context), context),
+      DarkModeConfig(SharedPreferenceUtil(context), context),
      SuggestionSearcher(archive)
    )
    val encodedUrls = arrayOf(
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/ZimFileReaderWithSplittedZimFileTest.kt
@ -35,7 +35,7 @@ import org.junit.Test
 import org.junit.jupiter.api.fail
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.R
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
@ -124,7 +124,7 @@ class ZimFileReaderWithSplittedZimFileTest : BaseActivityTest() {
        emptyList(),
        null,
        archive,
-        NightModeConfig(SharedPreferenceUtil(context), context),
+        DarkModeConfig(SharedPreferenceUtil(context), context),
        SuggestionSearcher(archive)
      )
      Assert.assertEquals(zimFileReader.mediaCount, 16)
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/settings/SettingsRobot.kt
@ -133,7 +133,7 @@ class SettingsRobot : BaseRobot() {
  }

  fun clickNightModePreference() {
-    clickRecyclerViewItems(R.string.pref_night_mode)
+    clickRecyclerViewItems(R.string.pref_dark_mode)
  }

  fun assertNightModeDialogDisplayed() {
@ -178,7 +178,7 @@ class SettingsRobot : BaseRobot() {
  }

  private fun nightModeStrings(): Array<String> =
-    context.resources.getStringArray(R.array.pref_night_modes_entries)
+    context.resources.getStringArray(R.array.pref_dark_modes_entries)

  private fun IntArray.matchers() = map(::withText).toTypedArray()
 }
--- a/core/detekt_baseline.xml
+++ b/core/detekt_baseline.xml
@ -76,8 +76,8 @@
    <ID>TooGenericExceptionThrown:ContextExtensions.kt$throw RuntimeException("invalid attribute $attributeRes")</ID>
    <ID>TooGenericExceptionThrown:CursorExtensions.kt$throw RuntimeException("$columnName not found in $columnNames")</ID>
    <ID>TooGenericExceptionThrown:CursorExtensions.kt$throw RuntimeException("Unexpected return type ${T::class.java.simpleName}")</ID>
-    <ID>TooGenericExceptionThrown:NightModeConfig.kt$NightModeConfig.Mode.Companion$throw RuntimeException("Invalid night mode $nightMode")</ID>
-    <ID>TooGenericExceptionThrown:NightModeConfig.kt$NightModeConfig.UiMode.Companion$throw RuntimeException("Invalid night mode $uiMode")</ID>
+    <ID>TooGenericExceptionThrown:DarkModeConfig.kt$DarkModeConfig.Mode.Companion$throw RuntimeException("Invalid dark mode $darkMode")</ID>
+    <ID>TooGenericExceptionThrown:DarkModeConfig.kt$DarkModeConfig.UiMode.Companion$throw RuntimeException("Invalid dark mode $uiMode")</ID>
    <ID>TopLevelPropertyNaming:Bytes.kt$const val Eb = Pb * 1024</ID>
    <ID>TopLevelPropertyNaming:Bytes.kt$const val Gb = Mb * 1024</ID>
    <ID>TopLevelPropertyNaming:Bytes.kt$const val Kb = 1 * 1024L</ID>
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/CoreApp.kt
@ -47,7 +47,7 @@ abstract class CoreApp : Application() {
  lateinit var downloadMonitor: DownloadMonitor

  @Inject
-  lateinit var nightModeConfig: NightModeConfig
+  lateinit var darkModeConfig: DarkModeConfig

  /**
   * The init of this class does the work of initializing,
@ -85,7 +85,7 @@ abstract class CoreApp : Application() {
    coreComponent.inject(this)
    serviceWorkerInitialiser.init(this)
    downloadMonitor.init()
-    nightModeConfig.init()
+    darkModeConfig.init()
    fileLogger.writeLogFile(this)
    configureStrictMode()
  }
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/NightModeConfig.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/NightModeConfig.kt
@ -21,29 +21,28 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
 import androidx.appcompat.app.AppCompatDelegate
-import org.kiwix.kiwixmobile.core.NightModeConfig.Mode.SYSTEM
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import javax.inject.Inject

@SuppressLint("CheckResult")
-class NightModeConfig @Inject constructor(
+class DarkModeConfig @Inject constructor(
  val sharedPreferenceUtil: SharedPreferenceUtil,
  val context: Context
 ) {

  fun init() {
-    sharedPreferenceUtil.nightModes().subscribe(::setMode, Throwable::printStackTrace)
+    sharedPreferenceUtil.darkModes().subscribe(::setMode, Throwable::printStackTrace)
  }

-  fun isNightModeActive() =
-    when (sharedPreferenceUtil.nightMode) {
+  fun isDarkModeActive() =
+    when (sharedPreferenceUtil.darkMode) {
      Mode.ON -> true
      Mode.OFF -> false
-      SYSTEM -> uiMode() == UiMode.ON
+      Mode.SYSTEM -> uiMode() == UiMode.ON
    }

-  private fun setMode(nightMode: Mode) {
-    AppCompatDelegate.setDefaultNightMode(nightMode.value)
+  private fun setMode(darkMode: Mode) {
+    AppCompatDelegate.setDefaultNightMode(darkMode.value)
  }

  private fun uiMode() = UiMode.from(context.uiMode)
@ -54,9 +53,9 @@ class NightModeConfig @Inject constructor(
    SYSTEM(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);

    companion object {
-      @JvmStatic fun from(nightMode: Int) =
-        values().firstOrNull { it.value == nightMode }
-          ?: throw RuntimeException("Invalid night mode $nightMode")
+      @JvmStatic fun from(darkMode: Int) =
+        values().firstOrNull { it.value == darkMode }
+          ?: throw RuntimeException("Invalid dark mode $darkMode")
    }
  }

@ -69,7 +68,7 @@ class NightModeConfig @Inject constructor(
    companion object {
      @JvmStatic
      fun from(uiMode: Int) = values().firstOrNull { it.value == uiMode }
-        ?: throw RuntimeException("Invalid night mode $uiMode")
+        ?: throw RuntimeException("Invalid dark mode $uiMode")
    }
  }
 }
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/dao/LibkiwixBookmarks.kt
@ -30,7 +30,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.kiwix.kiwixmobile.core.CoreApp
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.isCustomApp
 import org.kiwix.kiwixmobile.core.extensions.isFileExist
@ -316,7 +316,7 @@ class LibkiwixBookmarks @Inject constructor(
                emptyList(),
                null,
                archive,
-                NightModeConfig(sharedPreferenceUtil, sharedPreferenceUtil.context),
+                DarkModeConfig(sharedPreferenceUtil, sharedPreferenceUtil.context),
                SuggestionSearcher(archive)
              )
            }
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ApplicationModule.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ApplicationModule.kt
@ -29,7 +29,7 @@ import dagger.Provides
 import io.reactivex.Scheduler
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.data.remote.ObjectBoxToLibkiwixMigrator
 import org.kiwix.kiwixmobile.core.data.remote.ObjectBoxToRoomMigrator
 import org.kiwix.kiwixmobile.core.di.qualifiers.Computation
@ -100,8 +100,8 @@ class ApplicationModule {

  @Provides
  @Singleton
-  internal fun providesZimFileReaderFactory(nightModeConfig: NightModeConfig):
-    ZimFileReader.Factory = ZimFileReader.Factory.Impl(nightModeConfig)
+  internal fun providesZimFileReaderFactory(darkModeConfig: DarkModeConfig):
+    ZimFileReader.Factory = ZimFileReader.Factory.Impl(darkModeConfig)

  @Provides
  @Singleton
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.kt
@ -98,7 +98,7 @@ import io.reactivex.processors.BehaviorProcessor
 import org.json.JSONArray
 import org.json.JSONException
 import org.kiwix.kiwixmobile.core.BuildConfig
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.R2
 import org.kiwix.kiwixmobile.core.StorageObserver
@ -243,7 +243,7 @@ abstract class CoreReaderFragment :

  @JvmField
  @Inject
-  var nightModeConfig: NightModeConfig? = null
+  var darkModeConfig: DarkModeConfig? = null

  @JvmField
  @Inject
@ -259,7 +259,7 @@ abstract class CoreReaderFragment :

  @JvmField
  @Inject
-  var painter: NightModeViewPainter? = null
+  var painter: DarkModeViewPainter? = null
  protected var currentWebViewIndex = 0
  private var currentTtsWebViewIndex = 0
  protected var actionBar: ActionBar? = null
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/NightModeViewPainter.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/NightModeViewPainter.kt
@ -20,21 +20,21 @@ package org.kiwix.kiwixmobile.core.main
 import android.graphics.ColorMatrixColorFilter
 import android.graphics.Paint
 import android.view.View
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import javax.inject.Inject

 /**
- * NightModeViewPainter class is used to apply respective filters to the views
+ * DarkModeViewPainter class is used to apply respective filters to the views
 * depending whether the app is in dark mode or not
 * Created by yashk2000 on 24/03/2020.
 */

-class NightModeViewPainter @Inject constructor(
-  private val nightModeConfig: NightModeConfig
+class DarkModeViewPainter @Inject constructor(
+  private val darkModeConfig: DarkModeConfig
 ) {

  private val invertedPaint =
-    Paint().apply { colorFilter = ColorMatrixColorFilter(KiwixWebView.NIGHT_MODE_COLORS) }
+    Paint().apply { colorFilter = ColorMatrixColorFilter(KiwixWebView.DARK_MODE_COLORS) }

  @JvmOverloads
  fun <T : View?> update(
@ -42,21 +42,21 @@ class NightModeViewPainter @Inject constructor(
    shouldActivateCriteria: ((T) -> Boolean) = { true },
    vararg additionalViews: View? = emptyArray()
  ) {
-    if (nightModeConfig.isNightModeActive()) {
+    if (darkModeConfig.isDarkModeActive()) {
      if (shouldActivateCriteria(view)) {
-        activateNightMode(view, *additionalViews)
+        activateDarkMode(view, *additionalViews)
      }
    } else {
-      deactivateNightMode(view, *additionalViews)
+      deactivateDarkMode(view, *additionalViews)
    }
  }

-  fun deactivateNightMode(vararg additionalViews: View?) {
+  private fun deactivateDarkMode(vararg additionalViews: View?) {
    additionalViews.filterNotNull()
      .forEach { it.setLayerType(View.LAYER_TYPE_NONE, null) }
  }

-  private fun activateNightMode(vararg additionalViews: View?) {
+  private fun activateDarkMode(vararg additionalViews: View?) {
    additionalViews.filterNotNull()
      .forEach { it.setLayerType(View.LAYER_TYPE_HARDWARE, invertedPaint) }
  }
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt
@ -182,7 +182,7 @@ open class KiwixWebView @SuppressLint("SetJavaScriptEnabled") constructor(
  }

  companion object {
-    val NIGHT_MODE_COLORS = floatArrayOf(
+    val DARK_MODE_COLORS = floatArrayOf(
      -1.0f, 0f, 0f, 0f,
      255f, 0f, -1.0f, 0f,
      0f, 255f, 0f, 0f,
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/TabsAdapter.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/TabsAdapter.kt
@ -48,7 +48,7 @@ import org.kiwix.kiwixmobile.core.utils.StyleUtils.fromHtml
 class TabsAdapter internal constructor(
  private val activity: AppCompatActivity,
  private val webViews: List<KiwixWebView>,
-  private val painter: NightModeViewPainter
+  private val painter: DarkModeViewPainter
 ) : RecyclerView.Adapter<TabsAdapter.ViewHolder>() {

  init {
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimFileReader.kt
@ -29,7 +29,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.kiwix.kiwixmobile.core.CoreApp
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book
 import org.kiwix.kiwixmobile.core.main.UNINITIALISER_ADDRESS
 import org.kiwix.kiwixmobile.core.main.UNINITIALISE_HTML
@ -62,7 +62,7 @@ class ZimFileReader constructor(
  val assetFileDescriptorList: List<AssetFileDescriptor> = emptyList(),
  val assetDescriptorFilePath: String? = null,
  val jniKiwixReader: Archive,
-  private val nightModeConfig: NightModeConfig,
+  private val darkModeConfig: DarkModeConfig,
  private val searcher: SuggestionSearcher
 ) {
  interface Factory {
@ -72,7 +72,7 @@ class ZimFileReader constructor(
      filePath: String? = null
    ): ZimFileReader?

-    class Impl @Inject constructor(private val nightModeConfig: NightModeConfig) :
+    class Impl @Inject constructor(private val darkModeConfig: DarkModeConfig) :
      Factory {
      override suspend fun create(file: File): ZimFileReader? =
        withContext(Dispatchers.IO) { // Bug Fix #3805
@ -80,7 +80,7 @@ class ZimFileReader constructor(
            val archive = Archive(file.canonicalPath)
            ZimFileReader(
              file,
-              nightModeConfig = nightModeConfig,
+              darkModeConfig = darkModeConfig,
              jniKiwixReader = archive,
              searcher = SuggestionSearcher(archive)
            ).also {
@ -108,7 +108,7 @@ class ZimFileReader constructor(
            null,
            assetFileDescriptorList,
            assetDescriptorFilePath = filePath,
-            nightModeConfig = nightModeConfig,
+            darkModeConfig = darkModeConfig,
            jniKiwixReader = archive,
            searcher = SuggestionSearcher(archive)
          ).also {
@ -363,7 +363,7 @@ class ZimFileReader constructor(
            it.write(UNINITIALISE_HTML.toByteArray())
          } else {
            item?.let { item ->
-              if ("text/css" == item.mimetype && nightModeConfig.isNightModeActive()) {
+              if ("text/css" == item.mimetype && darkModeConfig.isDarkModeActive()) {
                it.write(INVERT_IMAGES_VIDEO.toByteArray())
              }
              it.write(item.data.data)
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/settings/CorePrefsFragment.kt
@ -43,7 +43,7 @@ import eu.mhutti1.utils.storage.StorageDevice
 import eu.mhutti1.utils.storage.StorageSelectDialog
 import org.kiwix.kiwixmobile.core.CoreApp.Companion.coreComponent
 import org.kiwix.kiwixmobile.core.CoreApp.Companion.instance
-import org.kiwix.kiwixmobile.core.NightModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.compat.CompatHelper.Companion.getPackageInformation
 import org.kiwix.kiwixmobile.core.compat.CompatHelper.Companion.getVersionCode
@ -87,7 +87,7 @@ abstract class CorePrefsFragment :

  @JvmField
  @Inject
-  protected var nightModeConfig: NightModeConfig? = null
+  protected var darkModeConfig: DarkModeConfig? = null

  @JvmField
  @Inject
@ -234,8 +234,8 @@ abstract class CorePrefsFragment :
    }

  override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-    if (key == SharedPreferenceUtil.PREF_NIGHT_MODE) {
-      sharedPreferenceUtil?.updateNightMode()
+    if (key == SharedPreferenceUtil.PREF_DARK_MODE) {
+      sharedPreferenceUtil?.updateDarkMode()
    }
  }

@ -284,7 +284,7 @@ abstract class CorePrefsFragment :
        requireActivity()
      ).inflate(R.layout.credits_webview, null) as WebView
    view.loadUrl("file:///android_asset/credits.html")
-    if (nightModeConfig?.isNightModeActive() == true) {
+    if (darkModeConfig?.isDarkModeActive() == true) {
      view.settings.javaScriptEnabled = true
      view.setBackgroundColor(0)
    }
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.kt
@ -20,14 +20,14 @@ package org.kiwix.kiwixmobile.core.utils
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Build
-import androidx.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat.getExternalFilesDirs
 import androidx.core.content.edit
+import androidx.preference.PreferenceManager
 import io.reactivex.Flowable
 import io.reactivex.processors.PublishProcessor
-import org.kiwix.kiwixmobile.core.NightModeConfig
-import org.kiwix.kiwixmobile.core.NightModeConfig.Mode.Companion.from
+import org.kiwix.kiwixmobile.core.DarkModeConfig
+import org.kiwix.kiwixmobile.core.DarkModeConfig.Mode.Companion.from
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.extensions.isFileExist
 import java.io.File
@ -49,7 +49,7 @@ class SharedPreferenceUtil @Inject constructor(val context: Context) {
  private val _textZooms = PublishProcessor.create<Int>()
  val textZooms
    get() = _textZooms.startWith(textZoom)
-  private val nightModes = PublishProcessor.create<NightModeConfig.Mode>()
+  private val darkModes = PublishProcessor.create<DarkModeConfig.Mode>()
  private val _prefWifiOnlys = PublishProcessor.create<Boolean>()
  val prefWifiOnlys
    get() = _prefWifiOnlys.startWith(prefWifiOnly)
@ -205,15 +205,15 @@ class SharedPreferenceUtil @Inject constructor(val context: Context) {
      putBoolean(PREF_SHOW_NOTES_ALL_BOOKS, prefShowBookmarksFromCurrentBook)
    }

-  val nightMode: NightModeConfig.Mode
+  val darkMode: DarkModeConfig.Mode
    get() = from(
-      sharedPreferences.getString(PREF_NIGHT_MODE, null)?.toInt()
+      sharedPreferences.getString(PREF_DARK_MODE, null)?.toInt()
        ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
    )

-  fun nightModes(): Flowable<NightModeConfig.Mode> = nightModes.startWith(nightMode)
+  fun darkModes(): Flowable<DarkModeConfig.Mode> = darkModes.startWith(darkMode)

-  fun updateNightMode() = nightModes.offer(nightMode)
+  fun updateDarkMode() = darkModes.offer(darkMode)

  var manageExternalFilesPermissionDialog: Boolean
    get() = sharedPreferences.getBoolean(PREF_MANAGE_EXTERNAL_FILES, true)
@ -292,7 +292,7 @@ class SharedPreferenceUtil @Inject constructor(val context: Context) {
    private const val PREF_SHOW_HISTORY_ALL_BOOKS = "show_history_current_book"
    private const val PREF_SHOW_NOTES_ALL_BOOKS = "show_notes_current_book"
    private const val PREF_HOSTED_BOOKS = "hosted_books"
-    const val PREF_NIGHT_MODE = "pref_night_mode"
+    const val PREF_DARK_MODE = "pref_dark_mode"
    private const val TEXT_ZOOM = "true_text_zoom"
    private const val DEFAULT_ZOOM = 100
    const val PREF_MANAGE_EXTERNAL_FILES = "pref_manage_external_files"
--- a/core/src/main/res/values-af/strings.xml
+++ b/core/src/main/res/values-af/strings.xml
@ -30,8 +30,7 @@
  <string name="pref_display_title">Wys</string>
  <string name="pref_info_title">Inligting</string>
  <string name="pref_info_version">Weergawe</string>
-  <string name="pref_night_mode">Nag-modus</string>
-  <string name="pref_night_mode_summary">Wys artikels met omgekeerde kleure</string>
+  <string name="pref_dark_mode_summary">Wys artikels met omgekeerde kleure</string>
  <string name="pref_back_to_top">Terug na bo</string>
  <string name="pref_back_to_top_summary">Wys ’n knop onder die bladsy om na bo terug te spring</string>
  <string name="pref_language_title">Taal</string>
--- a/core/src/main/res/values-ar/strings.xml
+++ b/core/src/main/res/values-ar/strings.xml
@ -71,8 +71,7 @@
  <string name="pref_display_title">العرض</string>
  <string name="pref_info_title">معلومات</string>
  <string name="pref_info_version">الإصدار</string>
-  <string name="pref_night_mode">الوضع الليلي</string>
-  <string name="pref_night_mode_summary">عرض المقالات بألوانٍ معكوسة</string>
+  <string name="pref_dark_mode_summary">عرض المقالات بألوانٍ معكوسة</string>
  <string name="pref_back_to_top">ارجع إلى الأعلى</string>
  <string name="pref_back_to_top_summary">عرض أيقونة في نهاية الصفحة للذهاب إلى الأعلى</string>
  <string name="pref_language_title">اللغة</string>
--- a/core/src/main/res/values-ast/strings.xml
+++ b/core/src/main/res/values-ast/strings.xml
@ -54,8 +54,7 @@
  <string name="pref_display_title">Amosar</string>
  <string name="pref_info_title">Información</string>
  <string name="pref_info_version">Versión</string>
-  <string name="pref_night_mode">Mou nocherniegu</string>
-  <string name="pref_night_mode_summary">Ver los artículos colos colores invertíos</string>
+  <string name="pref_dark_mode_summary">Ver los artículos colos colores invertíos</string>
  <string name="pref_back_to_top">Volver arriba</string>
  <string name="pref_back_to_top_summary">Amosar un botón al final de la páxina pa volver al entamu</string>
  <string name="pref_language_title">Llingua</string>
--- a/core/src/main/res/values-az/strings.xml
+++ b/core/src/main/res/values-az/strings.xml
@ -23,8 +23,7 @@
  <string name="pref_display_title">Ekran</string>
  <string name="pref_info_title">Məlumat</string>
  <string name="pref_info_version">Versiya</string>
-  <string name="pref_night_mode">Gecə rejimi</string>
-  <string name="pref_night_mode_summary">Məqalələri “gecə rejimində” göstər</string>
+  <string name="pref_dark_mode_summary">Məqalələri “gecə rejimində” göstər</string>
  <string name="pref_back_to_top">Əvvələ qayıt</string>
  <string name="pref_back_to_top_summary">Səhifənin sonunda göstərilən və səhifənin əvvəlinə qaytaran düymə.</string>
  <string name="pref_language_title">Dil</string>
--- a/core/src/main/res/values-be/strings.xml
+++ b/core/src/main/res/values-be/strings.xml
@ -30,8 +30,7 @@
  <string name="pref_display_title">Паказаць</string>
  <string name="pref_info_title">Інфармацыя</string>
  <string name="pref_info_version">Версія</string>
-  <string name="pref_night_mode">Начны рэжым</string>
-  <string name="pref_night_mode_summary">Паказаць артыкулы з «павернутымі колерамі»</string>
+  <string name="pref_dark_mode_summary">Паказаць артыкулы з «павернутымі колерамі»</string>
  <string name="pref_back_to_top">Вярнуцца ўверх</string>
  <string name="pref_back_to_top_summary">Паказваць кнопку ў канцы старонкі для пракруткі ўверх</string>
  <string name="pref_language_title">Мова</string>
--- a/core/src/main/res/values-bg/strings.xml
+++ b/core/src/main/res/values-bg/strings.xml
@ -33,8 +33,7 @@
  <string name="pref_display_title">Покажете</string>
  <string name="pref_info_title">Информация</string>
  <string name="pref_info_version">Версия</string>
-  <string name="pref_night_mode">Нощен режим</string>
-  <string name="pref_night_mode_summary">Показване на статии в „нощен режим“</string>
+  <string name="pref_dark_mode_summary">Показване на статии в „нощен режим“</string>
  <string name="pref_back_to_top">Връщане в началото</string>
  <string name="pref_back_to_top_summary">Показване на бутон в края на страницата за превъртане нагоре</string>
  <string name="pref_language_title">Език</string>
--- a/core/src/main/res/values-bm/strings.xml
+++ b/core/src/main/res/values-bm/strings.xml
@ -19,8 +19,7 @@
  <string name="error_article_url_not_found">Fili: Kunnafoni (Url: %1$s)  sariziyeli tigɛra sira la.</string>
  <string name="pref_display_title">Jirayɔrɔ</string>
  <string name="pref_info_title">Kunnafoni</string>
-  <string name="pref_night_mode">A kɛ sufɛla ɲɛ ye.</string>
-  <string name="pref_night_mode_summary">Kunnafoni minnu ɲɛ cogoya yɛlɛmanen don, olu jira.</string>
+  <string name="pref_dark_mode_summary">Kunnafoni minnu ɲɛ cogoya yɛlɛmanen don, olu jira.</string>
  <string name="pref_language_title">Kan</string>
  <string name="library">Gafeso</string>
 </resources>
--- a/core/src/main/res/values-bn/strings.xml
+++ b/core/src/main/res/values-bn/strings.xml
@ -43,8 +43,7 @@
  <string name="pref_display_title">প্রদর্শন</string>
  <string name="pref_info_title">তথ্য</string>
  <string name="pref_info_version">সংস্করণ</string>
-  <string name="pref_night_mode">রাত্রি মোড</string>
-  <string name="pref_night_mode_summary">উল্টানো রঙসহ নিবন্ধ দেখান</string>
+  <string name="pref_dark_mode_summary">উল্টানো রঙসহ নিবন্ধ দেখান</string>
  <string name="pref_back_to_top">উপরে ফিরুন</string>
  <string name="pref_back_to_top_summary">উপরে স্ক্রল করতে পাতার শেষে একটি বোতাম প্রদর্শিত হবে</string>
  <string name="pref_language_title">ভাষা</string>
--- a/core/src/main/res/values-br/strings.xml
+++ b/core/src/main/res/values-br/strings.xml
@ -47,8 +47,7 @@
  <string name="pref_display_title">Diskwel</string>
  <string name="pref_info_title">Titouroù</string>
  <string name="pref_info_version">Stumm</string>
-  <string name="pref_night_mode">Mod noz</string>
-  <string name="pref_night_mode_summary">Diskouez ar pennadoù gant livioù eilpennet</string>
+  <string name="pref_dark_mode_summary">Diskouez ar pennadoù gant livioù eilpennet</string>
  <string name="pref_back_to_top">Distreiñ da grec’h ar bajenn</string>
  <string name="pref_back_to_top_summary">Diskwel ur bouton e traoñ ar bajenn evit distreiñ d’an deroù</string>
  <string name="pref_language_title">Yezh</string>
--- a/core/src/main/res/values-ca/strings.xml
+++ b/core/src/main/res/values-ca/strings.xml
@ -37,8 +37,7 @@
  <string name="pref_display_title">Visualitzar</string>
  <string name="pref_info_title">Informació</string>
  <string name="pref_info_version">Versió</string>
-  <string name="pref_night_mode">Mode nocturn</string>
-  <string name="pref_night_mode_summary">Mostrar els articles amb colors invertits</string>
+  <string name="pref_dark_mode_summary">Mostrar els articles amb colors invertits</string>
  <string name="pref_back_to_top">Tornar a dalt</string>
  <string name="pref_back_to_top_summary">Mostrar un botó al final de la pàgina per a desplaçar-se cap a la part superior</string>
  <string name="pref_language_title">Idioma</string>
--- a/core/src/main/res/values-ckb/strings.xml
+++ b/core/src/main/res/values-ckb/strings.xml
@ -41,8 +41,7 @@
  <string name="pref_display_title">پیشاندان</string>
  <string name="pref_info_title">زانیاری</string>
  <string name="pref_info_version">وەشان</string>
-  <string name="pref_night_mode">بەکەرهێنانی شەو</string>
-  <string name="pref_night_mode_summary">وتارەکان بیشان بدە بە ڕەنگی پێچەوانە</string>
+  <string name="pref_dark_mode_summary">وتارەکان بیشان بدە بە ڕەنگی پێچەوانە</string>
  <string name="pref_back_to_top">گەڕانەوە بۆ سەرەوە</string>
  <string name="pref_language_title">زمان</string>
  <string name="pref_language_chooser">زمانێک ھەڵبژێرە</string>
--- a/core/src/main/res/values-cs/strings.xml
+++ b/core/src/main/res/values-cs/strings.xml
@ -67,8 +67,7 @@
  <string name="pref_display_title">Zobrazení</string>
  <string name="pref_info_title">Informace</string>
  <string name="pref_info_version">Verze</string>
-  <string name="pref_night_mode">Noční režim</string>
-  <string name="pref_night_mode_summary">Zobrazuje stránky v invertovaných barvách.</string>
+  <string name="pref_dark_mode_summary">Zobrazuje stránky v invertovaných barvách.</string>
  <string name="pref_back_to_top">Zpět na začátek</string>
  <string name="pref_back_to_top_summary">Zobrazit tlačítko “Zpět na začátek” na konci stránky</string>
  <string name="pref_language_title">Jazyk</string>
--- a/core/src/main/res/values-cy/strings.xml
+++ b/core/src/main/res/values-cy/strings.xml
@ -26,8 +26,7 @@
  <string name="pref_display_title">Golwg</string>
  <string name="pref_info_title">Gwybodaeth</string>
  <string name="pref_info_version">Fersiwn</string>
-  <string name="pref_night_mode">Modd nos</string>
-  <string name="pref_night_mode_summary">Dangos erthyglau gyda lliwiau croes</string>
+  <string name="pref_dark_mode_summary">Dangos erthyglau gyda lliwiau croes</string>
  <string name="pref_back_to_top">Nôl i yr brig</string>
  <string name="pref_back_to_top_summary">Arddangos botwm ar waelod y dudalen i sgrolio hyd at y brig</string>
  <string name="pref_language_title">Iaith</string>
--- a/core/src/main/res/values-da/strings.xml
+++ b/core/src/main/res/values-da/strings.xml
@ -45,8 +45,7 @@
  <string name="pref_display_title">Visning</string>
  <string name="pref_info_title">Information</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Nat-tilstand</string>
-  <string name="pref_night_mode_summary">Vis artikler med farverne vendt om</string>
+  <string name="pref_dark_mode_summary">Vis artikler med farverne vendt om</string>
  <string name="pref_back_to_top">Tilbage til toppen</string>
  <string name="pref_back_to_top_summary">Få vist en knap i slutningen af siden for at rulle op til toppen</string>
  <string name="pref_language_title">Sprog</string>
--- a/core/src/main/res/values-dag/strings.xml
+++ b/core/src/main/res/values-dag/strings.xml
@ -67,8 +67,7 @@
  <string name="pref_display_title">Zaŋ wuhi</string>
  <string name="pref_info_title">Lahabali</string>
  <string name="pref_info_version">Dabam</string>
-  <string name="pref_night_mode">Zimsim dini</string>
-  <string name="pref_night_mode_summary">Onyesha makala yaliyogeuzwa\n rangi</string>
+  <string name="pref_dark_mode_summary">Onyesha makala yaliyogeuzwa\n rangi</string>
  <string name="pref_back_to_top">N labi zuɣu saa</string>
  <string name="pref_back_to_top_summary">Onyesha kitufe\n mwishoni mwa ukurasa kusogeza hadi juu</string>
  <string name="pref_language_title">Balli</string>
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@ -84,8 +84,7 @@
  <string name="pref_display_title">Anzeige</string>
  <string name="pref_info_title">Information</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Nachtmodus</string>
-  <string name="pref_night_mode_summary">Artikel mit umgekehrten Farben anzeigen</string>
+  <string name="pref_dark_mode_summary">Artikel mit umgekehrten Farben anzeigen</string>
  <string name="pref_back_to_top">Zurück nach oben</string>
  <string name="pref_back_to_top_summary">Zeige eine Schaltfläche am Seitenende an, um zum Anfang hochzuscrollen</string>
  <string name="pref_language_title">Sprache</string>
--- a/core/src/main/res/values-diq/strings.xml
+++ b/core/src/main/res/values-diq/strings.xml
@ -60,8 +60,7 @@
  <string name="pref_display_title">Bımocne</string>
  <string name="pref_info_title">Melumat</string>
  <string name="pref_info_version">Versiyon</string>
-  <string name="pref_night_mode">Moda şewer</string>
-  <string name="pref_night_mode_summary">Meqaleya dimlaşt bıyaye rengana bımocne</string>
+  <string name="pref_dark_mode_summary">Meqaleya dimlaşt bıyaye rengana bımocne</string>
  <string name="pref_back_to_top">Peyser şo serêniye</string>
  <string name="pref_back_to_top_summary">Seba ameyışê seri peyniya pele de yew gocege mocneno</string>
  <string name="pref_language_title">Zıwan</string>
--- a/core/src/main/res/values-el/strings.xml
+++ b/core/src/main/res/values-el/strings.xml
@ -57,8 +57,7 @@
  <string name="pref_display_title">Εμφάνιση</string>
  <string name="pref_info_title">Πληροφορίες</string>
  <string name="pref_info_version">Έκδοση</string>
-  <string name="pref_night_mode">Νυχτερινή λειτουργία</string>
-  <string name="pref_night_mode_summary">Προβολή λημμάτων με ανεστραμμένα χρώματα</string>
+  <string name="pref_dark_mode_summary">Προβολή λημμάτων με ανεστραμμένα χρώματα</string>
  <string name="pref_back_to_top">Επιστροφή στην κορυφή</string>
  <string name="pref_back_to_top_summary">Εμφάνιση κουμπιού στο τέλος της σελίδας για να μετακινηθείτε στην κορυφή</string>
  <string name="pref_language_title">Γλώσσα</string>
--- a/core/src/main/res/values-eo/strings.xml
+++ b/core/src/main/res/values-eo/strings.xml
@ -36,8 +36,7 @@
  <string name="pref_display_title">Montrado</string>
  <string name="pref_info_title">Informo</string>
  <string name="pref_info_version">Versio</string>
-  <string name="pref_night_mode">Nokta reĝimo</string>
-  <string name="pref_night_mode_summary">Montri artikolojn inverskolore</string>
+  <string name="pref_dark_mode_summary">Montri artikolojn inverskolore</string>
  <string name="pref_back_to_top">Reiri al Supro</string>
  <string name="pref_back_to_top_summary">Montri suprenan rulumilon paĝofine</string>
  <string name="pref_language_title">Lingvo</string>
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@ -82,8 +82,7 @@
  <string name="pref_display_title">Mostrar</string>
  <string name="pref_info_title">Información</string>
  <string name="pref_info_version">Versión</string>
-  <string name="pref_night_mode">Modo nocturno</string>
-  <string name="pref_night_mode_summary">Mostrar artículos con colores invertidos</string>
+  <string name="pref_dark_mode_summary">Mostrar artículos con colores invertidos</string>
  <string name="pref_back_to_top">Volver al principio</string>
  <string name="pref_back_to_top_summary">Mostrar un botón al final de la página para desplazarse al comienzo</string>
  <string name="pref_language_title">Idioma</string>
--- a/core/src/main/res/values-eu/strings.xml
+++ b/core/src/main/res/values-eu/strings.xml
@ -34,8 +34,7 @@
  <string name="pref_display_title">Erakutsi</string>
  <string name="pref_info_title">Informazioa</string>
  <string name="pref_info_version">Bertsioa</string>
-  <string name="pref_night_mode">Gau modua</string>
-  <string name="pref_night_mode_summary">Artikuluak alderantzizko koloreekin erakutsi</string>
+  <string name="pref_dark_mode_summary">Artikuluak alderantzizko koloreekin erakutsi</string>
  <string name="pref_back_to_top">Gora itzuli</string>
  <string name="pref_back_to_top_summary">Bistaratu botoi bat orrialdearen amaieran goiko aldera mugitzeko</string>
  <string name="pref_language_title">Hizkuntza</string>
--- a/core/src/main/res/values-fa/strings.xml
+++ b/core/src/main/res/values-fa/strings.xml
@ -37,8 +37,7 @@
  <string name="pref_display_title">نمایش</string>
  <string name="pref_info_title">اطلاعات</string>
  <string name="pref_info_version">نسخه</string>
-  <string name="pref_night_mode">حالت شبانه</string>
-  <string name="pref_night_mode_summary">نمایش مقاله‌ها با رنگ‌های معکوس‌شده</string>
+  <string name="pref_dark_mode_summary">نمایش مقاله‌ها با رنگ‌های معکوس‌شده</string>
  <string name="pref_back_to_top">بازگشت به بالای صفحه</string>
  <string name="pref_back_to_top_summary">نمایش دکمه در پایان صفحه برای انتقال به بالا</string>
  <string name="pref_language_title">زبان</string>
--- a/core/src/main/res/values-fi/strings.xml
+++ b/core/src/main/res/values-fi/strings.xml
@ -55,8 +55,7 @@
  <string name="pref_display_title">Näytä</string>
  <string name="pref_info_title">Tiedot</string>
  <string name="pref_info_version">Versio</string>
-  <string name="pref_night_mode">Yötila</string>
-  <string name="pref_night_mode_summary">Näytä artikkelit käänteisillä väreillä</string>
+  <string name="pref_dark_mode_summary">Näytä artikkelit käänteisillä väreillä</string>
  <string name="pref_back_to_top">Takaisin alkuun</string>
  <string name="pref_back_to_top_summary">Näytä painike sivun lopussa rullataksesi ylös alkuun</string>
  <string name="pref_language_title">Kieli</string>
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@ -83,8 +83,7 @@
  <string name="pref_display_title">Affichage</string>
  <string name="pref_info_title">Informations</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Mode nocturne</string>
-  <string name="pref_night_mode_summary">Afficher les articles en couleurs inversées</string>
+  <string name="pref_dark_mode_summary">Afficher les articles en couleurs inversées</string>
  <string name="pref_back_to_top">Retour en haut</string>
  <string name="pref_back_to_top_summary">Afficher un bouton en bas de la page pour revenir au début</string>
  <string name="pref_language_title">Langue</string>
--- a/core/src/main/res/values-gl/strings.xml
+++ b/core/src/main/res/values-gl/strings.xml
@ -30,8 +30,7 @@
  <string name="pref_display_title">Visualización</string>
  <string name="pref_info_title">Información</string>
  <string name="pref_info_version">Versión</string>
-  <string name="pref_night_mode">Modo nocturno</string>
-  <string name="pref_night_mode_summary">Mostrar os artigos coas cores invertidas</string>
+  <string name="pref_dark_mode_summary">Mostrar os artigos coas cores invertidas</string>
  <string name="pref_back_to_top">Volver ao inicio</string>
  <string name="pref_back_to_top_summary">Mostrar un botón ao final da páxina para volver ao inicio da mesma</string>
  <string name="pref_language_title">Lingua</string>
--- a/core/src/main/res/values-gpe/strings.xml
+++ b/core/src/main/res/values-gpe/strings.xml
@ -60,8 +60,7 @@
  <string name="pref_display_title">Display</string>
  <string name="pref_info_title">Information</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Night mode</string>
-  <string name="pref_night_mode_summary">Show articles plus inverted colors</string>
+  <string name="pref_dark_mode_summary">Show articles plus inverted colors</string>
  <string name="pref_back_to_top">Back go Top</string>
  <string name="pref_back_to_top_summary">Display sam button for de end of de page so say you go scroll up go de top</string>
  <string name="pref_language_title">Language</string>
--- a/core/src/main/res/values-gsw/strings.xml
+++ b/core/src/main/res/values-gsw/strings.xml
@ -50,8 +50,7 @@
  <string name="pref_display_title">Azeig</string>
  <string name="pref_info_title">Information</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Nachtmodus</string>
-  <string name="pref_night_mode_summary">Zeig d’Artikel mit umcherte Farbe</string>
+  <string name="pref_dark_mode_summary">Zeig d’Artikel mit umcherte Farbe</string>
  <string name="pref_back_to_top">Zruck nach obe</string>
  <string name="pref_back_to_top_summary">Zeig e Chnopf am End vo dr Syte zuem uffe rolle</string>
  <string name="pref_language_title">Sprach</string>
--- a/core/src/main/res/values-gu/strings.xml
+++ b/core/src/main/res/values-gu/strings.xml
@ -21,8 +21,7 @@
  <string name="pref_display_title">દર્શાવો</string>
  <string name="pref_info_title">માહિતી</string>
  <string name="pref_info_version">આવૃત્તિ</string>
-  <string name="pref_night_mode">રાત્રિ સ્થિતિ</string>
-  <string name="pref_night_mode_summary">ઉલ્ટા રંગો વડે લેખો દર્શાવો</string>
+  <string name="pref_dark_mode_summary">ઉલ્ટા રંગો વડે લેખો દર્શાવો</string>
  <string name="pref_back_to_top">ટોપ પર પાછા જાઓ</string>
  <string name="pref_language_title">ભાષા</string>
  <string name="pref_language_chooser">ભાષા પસંદ કરો</string>
--- a/core/src/main/res/values-ha/strings.xml
+++ b/core/src/main/res/values-ha/strings.xml
@ -64,8 +64,7 @@
  <string name="pref_display_title">Nunawa</string>
  <string name="pref_info_title">Bayani</string>
  <string name="pref_info_version">Sigar</string>
-  <string name="pref_night_mode">Yanayin dare</string>
-  <string name="pref_night_mode_summary">Nuna articles da inverted launuka</string>
+  <string name="pref_dark_mode_summary">Nuna articles da inverted launuka</string>
  <string name="pref_back_to_top">Komawa xuwa sama</string>
  <string name="pref_back_to_top_summary">Nuna maɓallin a ƙarshen shafin don gungurawa har zuwa saman</string>
  <string name="pref_language_title">Yare</string>
--- a/core/src/main/res/values-hi/strings.xml
+++ b/core/src/main/res/values-hi/strings.xml
@ -67,8 +67,7 @@
  <string name="pref_display_title">प्रदर्शन</string>
  <string name="pref_info_title">जानकारी</string>
  <string name="pref_info_version">संस्करण</string>
-  <string name="pref_night_mode">रात्रि मोड</string>
-  <string name="pref_night_mode_summary">उल्टे रंगों के साथ लेख दिखाएँ</string>
+  <string name="pref_dark_mode_summary">उल्टे रंगों के साथ लेख दिखाएँ</string>
  <string name="pref_back_to_top">वापस शीर्ष पे जाएँ</string>
  <string name="pref_back_to_top_summary">उपर तक खिसकाने के लिए पृष्ठ के अंत में एक बटन दिखाएँ</string>
  <string name="pref_language_title">भाषा</string>
--- a/core/src/main/res/values-hu/strings.xml
+++ b/core/src/main/res/values-hu/strings.xml
@ -38,8 +38,7 @@
  <string name="pref_display_title">Megjelenítés</string>
  <string name="pref_info_title">Információ</string>
  <string name="pref_info_version">Verzió</string>
-  <string name="pref_night_mode">Éjszakai mód</string>
-  <string name="pref_night_mode_summary">Inverz színek használata a cikkek megjelenítéséhez</string>
+  <string name="pref_dark_mode_summary">Inverz színek használata a cikkek megjelenítéséhez</string>
  <string name="pref_back_to_top">Vissza a lap tetejére</string>
  <string name="pref_back_to_top_summary">Gomb megjelenítése a lap alján, melynek segítségével visszatérhetsz a lap tetejére</string>
  <string name="pref_language_title">Nyelv</string>
--- a/core/src/main/res/values-ia/strings.xml
+++ b/core/src/main/res/values-ia/strings.xml
@ -62,8 +62,7 @@
  <string name="pref_display_title">Visualisation</string>
  <string name="pref_info_title">Information</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Modo nocturne</string>
-  <string name="pref_night_mode_summary">Monstrar articulos in colores invertite</string>
+  <string name="pref_dark_mode_summary">Monstrar articulos in colores invertite</string>
  <string name="pref_back_to_top">Initio del pagina</string>
  <string name="pref_back_to_top_summary">Monstrar un button al fin del pagina pro retornar al initio</string>
  <string name="pref_language_title">Lingua</string>
--- a/core/src/main/res/values-ig/strings.xml
+++ b/core/src/main/res/values-ig/strings.xml
@ -66,8 +66,7 @@
  <string name="pref_display_title">Ngosipụta</string>
  <string name="pref_info_title">Ozi</string>
  <string name="pref_info_version">Ụdị</string>
-  <string name="pref_night_mode">Ụdị abalị</string>
-  <string name="pref_night_mode_summary">Gosi akụkọ nwere agba tụgharịa</string>
+  <string name="pref_dark_mode_summary">Gosi akụkọ nwere agba tụgharịa</string>
  <string name="pref_back_to_top">gbàgarịa elu</string>
  <string name="pref_back_to_top_summary">Gosipụta bọtịnụ na njedebe nke ibe ka ịpịrị elu n’elu</string>
  <string name="pref_language_title">Ásụ̀sụ̀</string>
--- a/core/src/main/res/values-igl/strings.xml
+++ b/core/src/main/res/values-igl/strings.xml
@ -62,8 +62,7 @@
  <string name="pref_display_title">Dutẹ</string>
  <string name="pref_info_title">Inabali</string>
  <string name="pref_info_version">Enwñ ojioji</string>
-  <string name="pref_night_mode">Eju odu</string>
-  <string name="pref_night_mode_summary">Dẹńwú kúmákọ uwá kpài cọlọ èkpaíló</string>
+  <string name="pref_dark_mode_summary">Dẹńwú kúmákọ uwá kpài cọlọ èkpaíló</string>
  <string name="pref_back_to_top">Dabi tatẹ</string>
  <string name="pref_back_to_top_summary">Dí bọtíní oká cwá otîtálá ọgbá dü kẹ neke dúlotí átẹ</string>
  <string name="pref_language_title">Ichi</string>
--- a/core/src/main/res/values-in/strings.xml
+++ b/core/src/main/res/values-in/strings.xml
@ -56,8 +56,7 @@
  <string name="pref_display_title">Tampilan</string>
  <string name="pref_info_title">Informasi</string>
  <string name="pref_info_version">Versi</string>
-  <string name="pref_night_mode">Modus malam</string>
-  <string name="pref_night_mode_summary">Tampilkan artikel dengan warna terbalik</string>
+  <string name="pref_dark_mode_summary">Tampilkan artikel dengan warna terbalik</string>
  <string name="pref_back_to_top">Kembali ke Atas</string>
  <string name="pref_back_to_top_summary">Tampilkan tombol di akhir halaman untuk menggulir ke atas</string>
  <string name="pref_language_title">Bahasa</string>
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@ -68,8 +68,7 @@
  <string name="pref_display_title">Aspetto</string>
  <string name="pref_info_title">Informazioni</string>
  <string name="pref_info_version">Versione</string>
-  <string name="pref_night_mode">Modalità notte</string>
-  <string name="pref_night_mode_summary">Visualizza le voci con colori invertiti</string>
+  <string name="pref_dark_mode_summary">Visualizza le voci con colori invertiti</string>
  <string name="pref_back_to_top">Torna all’inizio</string>
  <string name="pref_back_to_top_summary">Mostra un pulsante alla fine della pagina per scorrere fino all’inizio</string>
  <string name="pref_language_title">Lingua</string>
--- a/core/src/main/res/values-iw/strings.xml
+++ b/core/src/main/res/values-iw/strings.xml
@ -68,8 +68,7 @@
  <string name="pref_display_title">תצוגה</string>
  <string name="pref_info_title">מידע</string>
  <string name="pref_info_version">גרסה</string>
-  <string name="pref_night_mode">מצב לילה</string>
-  <string name="pref_night_mode_summary">הצגת ערכים עם צבעים הפוכים</string>
+  <string name="pref_dark_mode_summary">הצגת ערכים עם צבעים הפוכים</string>
  <string name="pref_back_to_top">חזרה למעלה</string>
  <string name="pref_back_to_top_summary">הצגת כפתור בסוף העמוד לגלילה למעלה</string>
  <string name="pref_language_title">שפה</string>
--- a/core/src/main/res/values-ja/strings.xml
+++ b/core/src/main/res/values-ja/strings.xml
@ -69,8 +69,7 @@
  <string name="pref_display_title">表示</string>
  <string name="pref_info_title">情報</string>
  <string name="pref_info_version">バージョン</string>
-  <string name="pref_night_mode">夜モード</string>
-  <string name="pref_night_mode_summary">記事を反転色で表示する</string>
+  <string name="pref_dark_mode_summary">記事を反転色で表示する</string>
  <string name="pref_back_to_top">トップに戻る</string>
  <string name="pref_back_to_top_summary">ページの最後に、ページの上部にスクロールするボタンを表示する</string>
  <string name="pref_language_title">言語</string>
--- a/core/src/main/res/values-ji/strings.xml
+++ b/core/src/main/res/values-ji/strings.xml
@ -23,7 +23,6 @@
  <string name="pref_display_title">אויסשטעלונג</string>
  <string name="pref_info_title">אינפֿארמאציע</string>
  <string name="pref_info_version">ווערסיע</string>
-  <string name="pref_night_mode">נאכטמאדע</string>
  <string name="pref_back_to_top">צוריק אויבן</string>
  <string name="pref_language_title">שפראַך</string>
  <string name="pref_language_chooser">קלויבט א שפראך</string>
--- a/core/src/main/res/values-ka/strings.xml
+++ b/core/src/main/res/values-ka/strings.xml
@ -27,8 +27,7 @@
  <string name="pref_display_title">ჩვენება</string>
  <string name="pref_info_title">ინფორმაცია</string>
  <string name="pref_info_version">ვერსია</string>
-  <string name="pref_night_mode">ღამის რეჟიმი</string>
-  <string name="pref_night_mode_summary">სტატიის შებრუნებული ფერებით ჩვენება</string>
+  <string name="pref_dark_mode_summary">სტატიის შებრუნებული ფერებით ჩვენება</string>
  <string name="pref_back_to_top">თავში დაბრუნება</string>
  <string name="pref_back_to_top_summary">გვერდის ბოლოში ზევით დაბრუნების ღილაკის ჩვენება</string>
  <string name="pref_language_title">ენა</string>
--- a/core/src/main/res/values-km/strings.xml
+++ b/core/src/main/res/values-km/strings.xml
@ -21,8 +21,7 @@
  <string name="pref_display_title">ការបង្ហាញ</string>
  <string name="pref_info_title">ព័ត៌មាន</string>
  <string name="pref_info_version">កំណែ</string>
-  <string name="pref_night_mode">ម៉ូដអានពេលយប់</string>
-  <string name="pref_night_mode_summary">បង្ហាញអត្ថបទជាមួយនឹងពណ៌ដើម</string>
+  <string name="pref_dark_mode_summary">បង្ហាញអត្ថបទជាមួយនឹងពណ៌ដើម</string>
  <string name="pref_back_to_top">ត្រឡប់ទៅលើ</string>
  <string name="pref_language_title">ភាសា</string>
  <string name="library">បណ្ណាល័យ</string>
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@ -75,8 +75,7 @@
  <string name="pref_display_title">표시</string>
  <string name="pref_info_title">정보</string>
  <string name="pref_info_version">버전</string>
-  <string name="pref_night_mode">야간 모드</string>
-  <string name="pref_night_mode_summary">반전된 색으로 문서를 보여줍니다</string>
+  <string name="pref_dark_mode_summary">반전된 색으로 문서를 보여줍니다</string>
  <string name="pref_back_to_top">맨 위로 돌아가기</string>
  <string name="pref_back_to_top_summary">맨 위로 올라가는 버튼을 페이지의 끝에 표시합니다</string>
  <string name="pref_language_title">언어</string>
--- a/core/src/main/res/values-ku/strings.xml
+++ b/core/src/main/res/values-ku/strings.xml
@ -61,8 +61,7 @@
  <string name="pref_display_title">Nîşan bide</string>
  <string name="pref_info_title">Agahî</string>
  <string name="pref_info_version">Guherto</string>
-  <string name="pref_night_mode">Moda êvarê</string>
-  <string name="pref_night_mode_summary">Gotaran bi rengên vajîkirî nîşan bide</string>
+  <string name="pref_dark_mode_summary">Gotaran bi rengên vajîkirî nîşan bide</string>
  <string name="pref_back_to_top">Vegere Jor</string>
  <string name="pref_back_to_top_summary">Ji bo vegerî jor, li binê rûpelê wê bişkojek nîşan bide</string>
  <string name="pref_language_title">Ziman</string>
--- a/core/src/main/res/values-lb/strings.xml
+++ b/core/src/main/res/values-lb/strings.xml
@ -50,8 +50,7 @@
  <string name="pref_display_title">Weisen</string>
  <string name="pref_info_title">Informatioun</string>
  <string name="pref_info_version">Versioun</string>
-  <string name="pref_night_mode">Nuetsmodus</string>
-  <string name="pref_night_mode_summary">Artikele mat ëmgedréite Faarwe weisen</string>
+  <string name="pref_dark_mode_summary">Artikele mat ëmgedréite Faarwe weisen</string>
  <string name="pref_back_to_top">Zréck no uewen</string>
  <string name="pref_back_to_top_summary">Weist e Knäppchen ënnen op der Säit fir no uewen ze scrollen</string>
  <string name="pref_language_title">Sprooch</string>
--- a/core/src/main/res/values-li/strings.xml
+++ b/core/src/main/res/values-li/strings.xml
@ -23,8 +23,7 @@
  <string name="pref_display_title">Waergaaf</string>
  <string name="pref_info_title">Infermasie</string>
  <string name="pref_info_version">Versie</string>
-  <string name="pref_night_mode">Nachmodus</string>
-  <string name="pref_night_mode_summary">Tuin artikele mit ómgedrejde kluuere</string>
+  <string name="pref_dark_mode_summary">Tuin artikele mit ómgedrejde kluuere</string>
  <string name="pref_back_to_top">Trök nao baove</string>
  <string name="pref_back_to_top_summary">Tuin ’ne knoep anen ènj vanne pagina veur trögk te gaon nao baove</string>
  <string name="pref_language_title">Spraok</string>
--- a/core/src/main/res/values-ln/strings.xml
+++ b/core/src/main/res/values-ln/strings.xml
@ -59,8 +59,7 @@
  <string name="pref_display_title">Kolakisa</string>
  <string name="pref_info_title">Nsango</string>
  <string name="pref_info_version">Libongoli</string>
-  <string name="pref_night_mode">Mosala ya butu</string>
-  <string name="pref_night_mode_summary">Lakisa masolo oyo na balangi ebalusami</string>
+  <string name="pref_dark_mode_summary">Lakisa masolo oyo na balangi ebalusami</string>
  <string name="pref_back_to_top">Kozonga Likolo</string>
  <string name="pref_back_to_top_summary">Tyá butɔ moko na nsuka ya lokasa mpo na kobaluka tii na likoló</string>
  <string name="pref_language_title">Lokótá</string>
--- a/core/src/main/res/values-lt/strings.xml
+++ b/core/src/main/res/values-lt/strings.xml
@ -31,8 +31,7 @@
  <string name="pref_display_title">Rodyti</string>
  <string name="pref_info_title">Informacija</string>
  <string name="pref_info_version">Versija</string>
-  <string name="pref_night_mode">Naktinis režimas</string>
-  <string name="pref_night_mode_summary">Rodyti straipsnius su ankstesnėmis spalvomis</string>
+  <string name="pref_dark_mode_summary">Rodyti straipsnius su ankstesnėmis spalvomis</string>
  <string name="pref_back_to_top">Atgal į viršų</string>
  <string name="pref_back_to_top_summary">Rodyti  puslapio pabaigoje mygtuką sugrįžti į viršų</string>
  <string name="pref_language_title">Kalba</string>
--- a/core/src/main/res/values-lv/strings.xml
+++ b/core/src/main/res/values-lv/strings.xml
@ -18,7 +18,6 @@
  <string name="pref_display_title">Displejs</string>
  <string name="pref_info_title">Informācija</string>
  <string name="pref_info_version">Versija</string>
-  <string name="pref_night_mode">Nakts režīms</string>
  <string name="pref_language_title">Valoda</string>
  <string name="pref_language_chooser">Izvēlies valodu</string>
  <string name="delete_recent_search_item">Dzēst šo vienumu?</string>
--- a/core/src/main/res/values-mg/strings.xml
+++ b/core/src/main/res/values-mg/strings.xml
@ -26,8 +26,7 @@
  <string name="pref_display_title">Fiseho</string>
  <string name="pref_info_title">Fampahalalana</string>
  <string name="pref_info_version">Versiona</string>
-  <string name="pref_night_mode">Fiseho amin ny alina</string>
-  <string name="pref_night_mode_summary">Haneho lahatsoratra amin ny loko mivadika</string>
+  <string name="pref_dark_mode_summary">Haneho lahatsoratra amin ny loko mivadika</string>
  <string name="pref_back_to_top">Hiverina any an-tampony</string>
  <string name="pref_back_to_top_summary">Haneho bokotra amin\'ny faran\'ny pejy mba hiverenana any am-pihatombohana</string>
  <string name="pref_language_title">Tenim-pirenena</string>
--- a/core/src/main/res/values-mk/strings.xml
+++ b/core/src/main/res/values-mk/strings.xml
@ -60,8 +60,7 @@
  <string name="pref_display_title">Приказник</string>
  <string name="pref_info_title">Информации</string>
  <string name="pref_info_version">Верзија</string>
-  <string name="pref_night_mode">Ноќен режим</string>
-  <string name="pref_night_mode_summary">Прикажувај ги статиите во обратни бои</string>
+  <string name="pref_dark_mode_summary">Прикажувај ги статиите во обратни бои</string>
  <string name="pref_back_to_top">Најгоре</string>
  <string name="pref_back_to_top_summary">Прикажувај копче за враќање најгоре на крајот од страницата</string>
  <string name="pref_language_title">Јазик</string>
--- a/core/src/main/res/values-ml/strings.xml
+++ b/core/src/main/res/values-ml/strings.xml
@ -45,8 +45,7 @@
  <string name="pref_display_title">കാഴ്ച</string>
  <string name="pref_info_title">വിവരം</string>
  <string name="pref_info_version">പതിപ്പ്</string>
-  <string name="pref_night_mode">രാത്രികാല മോഡ്</string>
-  <string name="pref_night_mode_summary">ലേഖനങ്ങളുടെ നിറം നേർവിപരീതമാക്കുക</string>
+  <string name="pref_dark_mode_summary">ലേഖനങ്ങളുടെ നിറം നേർവിപരീതമാക്കുക</string>
  <string name="pref_back_to_top">തിരികെ മുകളിലേക്ക്</string>
  <string name="pref_back_to_top_summary">താളിനു താഴെയായി മുകളിലേക്ക് തിരികെ പോകാനുള്ള ബട്ടൺ കാണിക്കുക.</string>
  <string name="pref_language_title">ഭാഷ</string>
--- a/core/src/main/res/values-mn/strings.xml
+++ b/core/src/main/res/values-mn/strings.xml
@ -22,8 +22,7 @@
  <string name="pref_display_title">Үзүүлэх</string>
  <string name="pref_info_title">Мэдээлэл</string>
  <string name="pref_info_version">Хувилбар</string>
-  <string name="pref_night_mode">Night mode</string>
-  <string name="pref_night_mode_summary">Нийтлэлийн үсгийн өнгийг эсрэгээр харуулах</string>
+  <string name="pref_dark_mode_summary">Нийтлэлийн үсгийн өнгийг эсрэгээр харуулах</string>
  <string name="pref_back_to_top">Хамгийн дээр оч</string>
  <string name="pref_back_to_top_summary">Товчийг хуудасны сүүлд байршуулж дээш оч</string>
  <string name="pref_language_title">Хэл</string>
--- a/core/src/main/res/values-ms/strings.xml
+++ b/core/src/main/res/values-ms/strings.xml
@ -44,8 +44,7 @@
  <string name="pref_display_title">Paparan</string>
  <string name="pref_info_title">Maklumat</string>
  <string name="pref_info_version">Versi</string>
-  <string name="pref_night_mode">Mod malam</string>
-  <string name="pref_night_mode_summary">Paparkan rencana yang diterbalikkan warnanya</string>
+  <string name="pref_dark_mode_summary">Paparkan rencana yang diterbalikkan warnanya</string>
  <string name="pref_back_to_top">Kembali ke Atas</string>
  <string name="pref_back_to_top_summary">Paparkan butang di kaki halaman untuk menskrol kembali ke atas</string>
  <string name="pref_language_title">Bahasa</string>
--- a/core/src/main/res/values-my/strings.xml
+++ b/core/src/main/res/values-my/strings.xml
@ -36,8 +36,7 @@
  <string name="pref_display_title">မြင်ကွင်း</string>
  <string name="pref_info_title">သတင်းအချက်အလက်</string>
  <string name="pref_info_version">မူ</string>
-  <string name="pref_night_mode">ညကြည့်ပုံစံ</string>
-  <string name="pref_night_mode_summary">ဆောင်းပါးများကို အရောင်ပြောင်းပြန်သုံး၍ ပြရန်</string>
+  <string name="pref_dark_mode_summary">ဆောင်းပါးများကို အရောင်ပြောင်းပြန်သုံး၍ ပြရန်</string>
  <string name="pref_back_to_top">ထိပ်ဆုံးသို့ ပြန်သွားရန်</string>
  <string name="pref_back_to_top_summary">ထိပ်ဆုံးသို့ပြန်သွားရန်အတွက် စာမျက်နှာ၏အောက်ဆုံးတွင် ခလုတ်တစ်ခု ပြပါ။</string>
  <string name="pref_language_title">ဘာသာစကား</string>
--- a/core/src/main/res/values-nb/strings.xml
+++ b/core/src/main/res/values-nb/strings.xml
@ -34,8 +34,7 @@
  <string name="pref_display_title">Skjerm</string>
  <string name="pref_info_title">Informasjon</string>
  <string name="pref_info_version">Versjon</string>
-  <string name="pref_night_mode">Nattmodus</string>
-  <string name="pref_night_mode_summary">Vis artikler med inverterte farger</string>
+  <string name="pref_dark_mode_summary">Vis artikler med inverterte farger</string>
  <string name="pref_back_to_top">Tilbake til toppen</string>
  <string name="pref_back_to_top_summary">Vis en knapp nederst på siden for å returnere til toppen</string>
  <string name="pref_language_title">Språk</string>
--- a/core/src/main/res/values-ne/strings.xml
+++ b/core/src/main/res/values-ne/strings.xml
@ -31,8 +31,7 @@
  <string name="pref_display_title">देखाउनुहोस्</string>
  <string name="pref_info_title">जानकारी</string>
  <string name="pref_info_version">संस्करण</string>
-  <string name="pref_night_mode">रात्री मूड</string>
-  <string name="pref_night_mode_summary">उल्ट्याइएको रङका लेखहरू देखाउनुहोस्</string>
+  <string name="pref_dark_mode_summary">उल्ट्याइएको रङका लेखहरू देखाउनुहोस्</string>
  <string name="pref_back_to_top">सुरुमा जानुहोस्</string>
  <string name="pref_back_to_top_summary">पृष्ठको अन्तमा सुरुमा जने बटन देखाउने</string>
  <string name="pref_language_title">भाषा</string>
--- a/core/src/main/res/values-nl/strings.xml
+++ b/core/src/main/res/values-nl/strings.xml
@ -69,8 +69,7 @@
  <string name="pref_display_title">Weergave</string>
  <string name="pref_info_title">Informatie</string>
  <string name="pref_info_version">Versie</string>
-  <string name="pref_night_mode">Nachtmodus</string>
-  <string name="pref_night_mode_summary">Artikelen weergeven met omgekeerde kleuren</string>
+  <string name="pref_dark_mode_summary">Artikelen weergeven met omgekeerde kleuren</string>
  <string name="pref_back_to_top">Terug naar boven</string>
  <string name="pref_back_to_top_summary">Aan het einde van de pagina een knop weergeven om terug te gaan naar het begin</string>
  <string name="pref_language_title">Taal</string>
--- a/core/src/main/res/values-nqo/strings.xml
+++ b/core/src/main/res/values-nqo/strings.xml
@ -60,8 +60,7 @@
  <string name="pref_display_title">ߦߌ߬ߘߊ߬ߟߌ</string>
  <string name="pref_info_title">ߞߎ߲߬ߠߊ߬ߝߏߣߌ߲</string>
  <string name="pref_info_version">ߦߌߟߡߊ</string>
-  <string name="pref_night_mode">ߛߎߘߐߟߊ ߦߋߗߏ߮</string>
-  <string name="pref_night_mode_summary">ߞߎߡߘߊ ߟߎ߬ ߦߌ߬ߘߊ߬ ߞߐ߬ߟߐ߫ ߞߐߥߟߏߣߍ߲ ߠߎ߬ ߘߐ߫</string>
+  <string name="pref_dark_mode_summary">ߞߎߡߘߊ ߟߎ߬ ߦߌ߬ߘߊ߬ ߞߐ߬ߟߐ߫ ߞߐߥߟߏߣߍ߲ ߠߎ߬ ߘߐ߫</string>
  <string name="pref_back_to_top">ߌ ߞߐߛߊ߬ߦߌ߬ ߛߊ߲ߝߍ߬</string>
  <string name="pref_back_to_top_summary">ߞߎ߬ߘߎ ߘߏ߫ ߟߊߓߊ߯ߙߊ߫ ߞߐߜߍ ߘߎ߰ߟߊ ߘߐ߫ ߡߍ߲ ߘߴߌ ߟߊߛߋ߫ ߊ߬ ߘߊߡߌߣߊ ߟߊ߫</string>
  <string name="pref_language_title">ߞߊ߲</string>
--- a/core/src/main/res/values-oc/strings.xml
+++ b/core/src/main/res/values-oc/strings.xml
@ -28,8 +28,7 @@
  <string name="pref_display_title">Afichatge</string>
  <string name="pref_info_title">Informacion</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Mòde nocturne</string>
-  <string name="pref_night_mode_summary">Afichar los articles en colors inversadas</string>
+  <string name="pref_dark_mode_summary">Afichar los articles en colors inversadas</string>
  <string name="pref_back_to_top">Retorn al començament</string>
  <string name="pref_back_to_top_summary">Afichar un boton en bas de la pagina per tornar al començament</string>
  <string name="pref_language_title">Lenga</string>
--- a/core/src/main/res/values-or/strings.xml
+++ b/core/src/main/res/values-or/strings.xml
@ -59,8 +59,7 @@
  <string name="pref_display_title">ଦେଖଣା</string>
  <string name="pref_info_title">ସୂଚନା</string>
  <string name="pref_info_version">ସଂସ୍କରଣ</string>
-  <string name="pref_night_mode">ରାତି ମୋଡ଼</string>
-  <string name="pref_night_mode_summary">ରଙ୍ଗର ଓଲଟା କ୍ରମରେ ପ୍ରସଙ୍ଗମାନ ଦେଖାଇବେ</string>
+  <string name="pref_dark_mode_summary">ରଙ୍ଗର ଓଲଟା କ୍ରମରେ ପ୍ରସଙ୍ଗମାନ ଦେଖାଇବେ</string>
  <string name="pref_back_to_top">ଉପରକୁ ଫେରିବେ</string>
  <string name="pref_back_to_top_summary">ପୃଷ୍ଠାର ତଳୁ ଉପରକୁ ଯିବେ</string>
  <string name="pref_language_title">ଭାଷା</string>
--- a/core/src/main/res/values-pl/strings.xml
+++ b/core/src/main/res/values-pl/strings.xml
@ -73,8 +73,7 @@
  <string name="pref_display_title">Wyświetl</string>
  <string name="pref_info_title">Informacje</string>
  <string name="pref_info_version">Wersja</string>
-  <string name="pref_night_mode">Tryb nocny</string>
-  <string name="pref_night_mode_summary">Pokaż artykuły w trybie nocnym</string>
+  <string name="pref_dark_mode_summary">Pokaż artykuły w trybie nocnym</string>
  <string name="pref_back_to_top">Powrót do góry</string>
  <string name="pref_back_to_top_summary">Wyświetl przycisk na końcu strony, aby przewinąć do góry</string>
  <string name="pref_language_title">Język</string>
--- a/core/src/main/res/values-ps/strings.xml
+++ b/core/src/main/res/values-ps/strings.xml
@ -27,8 +27,7 @@
  <string name="pref_display_title">ښکارېدنه</string>
  <string name="pref_info_title">مالومات</string>
  <string name="pref_info_version">بڼه</string>
-  <string name="pref_night_mode">د شپې بڼه</string>
-  <string name="pref_night_mode_summary">رنگ اړول شوې ليکنې ښکاره کول</string>
+  <string name="pref_dark_mode_summary">رنگ اړول شوې ليکنې ښکاره کول</string>
  <string name="pref_back_to_top">بېرته سر ته</string>
  <string name="pref_back_to_top_summary">د مخ په پای کې د مخ سر ته ورتللو لپاره يوه تڼۍ ښکاره کول</string>
  <string name="pref_language_title">ژبه</string>
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@ -76,8 +76,7 @@
  <string name="pref_display_title">Exibição</string>
  <string name="pref_info_title">Informação</string>
  <string name="pref_info_version">Versão</string>
-  <string name="pref_night_mode">Modo noturno</string>
-  <string name="pref_night_mode_summary">Mostrar artigos com cores invertidas</string>
+  <string name="pref_dark_mode_summary">Mostrar artigos com cores invertidas</string>
  <string name="pref_back_to_top">Voltar ao Topo</string>
  <string name="pref_back_to_top_summary">Mostra um botão no fim da página para voltar ao topo</string>
  <string name="pref_language_title">Idioma</string>
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@ -67,8 +67,7 @@
  <string name="pref_display_title">Mostrar</string>
  <string name="pref_info_title">Informação</string>
  <string name="pref_info_version">Versão</string>
-  <string name="pref_night_mode">Modo nocturno</string>
-  <string name="pref_night_mode_summary">Mostrar artigos com as cores invertidas</string>
+  <string name="pref_dark_mode_summary">Mostrar artigos com as cores invertidas</string>
  <string name="pref_back_to_top">Voltar ao Topo</string>
  <string name="pref_back_to_top_summary">Apresentar um botão no fim da página para voltar ao topo da página</string>
  <string name="pref_language_title">Língua</string>
--- a/core/src/main/res/values-qq/strings.xml
+++ b/core/src/main/res/values-qq/strings.xml
@ -68,8 +68,8 @@
  <string name="pref_display_title">{{Identical|Display}}</string>
  <string name="pref_info_title">{{Identical|Information}}</string>
  <string name="pref_info_version">{{Identical|Version}}</string>
-  <string name="pref_night_mode">This is part of the preference settings to show the \"Night Mode\" setting.</string>
-  <string name="pref_night_mode_summary">This is part of preference settings to show the user if he enables this setting then all the articles will show with inverted colors.</string>
+  <string name="pref_dark_mode">This is part of the preference settings to show the \"Dark Mode\" setting.</string>
+  <string name="pref_dark_mode_summary">This is part of preference settings to show the user if he enables this setting then all the articles will show with inverted colors.</string>
  <string name="pref_back_to_top">{{Identical|Back to top}}</string>
  <string name="pref_back_to_top_summary">This is part of the preference settings it informs the user, by enabling this setting it displays a button while reading articles at the end of the page, and by clicking on that button it will scroll the page to the top.</string>
  <string name="pref_language_title">{{Identical|Language}}</string>
--- a/core/src/main/res/values-qu/strings.xml
+++ b/core/src/main/res/values-qu/strings.xml
@ -16,6 +16,5 @@
  <string name="pref_display_title">Qhawachiy</string>
  <string name="pref_info_title">Willay</string>
  <string name="pref_info_version">Musuqchasqa</string>
-  <string name="pref_night_mode">Tuta laya</string>
  <string name="pref_language_title">Rimay</string>
 </resources>
--- a/core/src/main/res/values-rm/strings.xml
+++ b/core/src/main/res/values-rm/strings.xml
@ -21,8 +21,7 @@
  <string name="pref_display_title">Vista</string>
  <string name="pref_info_title">Infurmaziun</string>
  <string name="pref_info_version">Versiun</string>
-  <string name="pref_night_mode">Modus da notg</string>
-  <string name="pref_night_mode_summary">Mussar artitgels cun colurs invertidas</string>
+  <string name="pref_dark_mode_summary">Mussar artitgels cun colurs invertidas</string>
  <string name="pref_back_to_top">Enavos a l’entschatta</string>
  <string name="pref_back_to_top_summary">Mussar in buttun a la fin da la pagina per ir enavos a l’entschatta</string>
  <string name="pref_language_title">Lingua</string>
--- a/core/src/main/res/values-ro/strings.xml
+++ b/core/src/main/res/values-ro/strings.xml
@ -59,8 +59,7 @@
  <string name="pref_display_title">Afișaj</string>
  <string name="pref_info_title">Informații</string>
  <string name="pref_info_version">Versiune</string>
-  <string name="pref_night_mode">Mod de noapte</string>
-  <string name="pref_night_mode_summary">Afișează articolele în culori inversate</string>
+  <string name="pref_dark_mode_summary">Afișează articolele în culori inversate</string>
  <string name="pref_back_to_top">Începutul paginii</string>
  <string name="pref_back_to_top_summary">Afișează un buton la sfârșitul paginii pentru a reveni la începutul acesteia</string>
  <string name="pref_language_title">Limba</string>
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@ -86,8 +86,7 @@
  <string name="pref_display_title">Экран</string>
  <string name="pref_info_title">Информация</string>
  <string name="pref_info_version">Версия</string>
-  <string name="pref_night_mode">Ночной режим</string>
-  <string name="pref_night_mode_summary">Показать статьи инвертированными цветами</string>
+  <string name="pref_dark_mode_summary">Показать статьи инвертированными цветами</string>
  <string name="pref_back_to_top">Вернуться наверх</string>
  <string name="pref_back_to_top_summary">Отобразить кнопку в конце страницы для прокрутки вверх</string>
  <string name="pref_language_title">Язык</string>
--- a/core/src/main/res/values-sa/strings.xml
+++ b/core/src/main/res/values-sa/strings.xml
@ -25,8 +25,7 @@
  <string name="pref_display_title">प्रदर्श्यताम्</string>
  <string name="pref_info_title">सूचना</string>
  <string name="pref_info_version">संस्करणम्</string>
-  <string name="pref_night_mode">रात्र्यवस्था</string>
-  <string name="pref_night_mode_summary">विपरितरङ्गैः लेखः दृश्यताम्</string>
+  <string name="pref_dark_mode_summary">विपरितरङ्गैः लेखः दृश्यताम्</string>
  <string name="pref_back_to_top">साक्षात् उपरि गच्छतु</string>
  <string name="pref_back_to_top_summary">साक्षात् उपरि गन्तु पृष्ठस्य अन्ते सारणकुड्मलं (scroll button) दर्श्यताम्</string>
  <string name="pref_language_title">भाषा</string>
--- a/core/src/main/res/values-sc/strings.xml
+++ b/core/src/main/res/values-sc/strings.xml
@ -59,8 +59,7 @@
  <string name="pref_display_title">Ischermu</string>
  <string name="pref_info_title">Informatziones</string>
  <string name="pref_info_version">Versione</string>
-  <string name="pref_night_mode">Modalidade pro sa note</string>
-  <string name="pref_night_mode_summary">Ammustra sos artìculos cun colores furriados</string>
+  <string name="pref_dark_mode_summary">Ammustra sos artìculos cun colores furriados</string>
  <string name="pref_back_to_top">Torra a su cumintzu</string>
  <string name="pref_back_to_top_summary">Ammustra unu butone a sa fine de sa pàgina pro torrare a su cumintzu</string>
  <string name="pref_language_title">Limba</string>
--- a/core/src/main/res/values-si/strings.xml
+++ b/core/src/main/res/values-si/strings.xml
@ -27,8 +27,7 @@
  <string name="pref_display_title">පෙන්වීම</string>
  <string name="pref_info_title">තොරතුරු</string>
  <string name="pref_info_version">අනුවාදය</string>
-  <string name="pref_night_mode">රාත්‍රී ආකාරය</string>
-  <string name="pref_night_mode_summary">ප්‍රතිවර්තිත වර්ණ සමග ලිපි පෙන්වන්න</string>
+  <string name="pref_dark_mode_summary">ප්‍රතිවර්තිත වර්ණ සමග ලිපි පෙන්වන්න</string>
  <string name="pref_back_to_top">නැවත උඩට</string>
  <string name="pref_back_to_top_summary">ඉහළට උඩු අනුචලනය කිරීමට පිටුවේ අග බොත්තමක් පෙන්වන්න</string>
  <string name="pref_language_title">භාෂාව</string>
--- a/core/src/main/res/values-sk/strings.xml
+++ b/core/src/main/res/values-sk/strings.xml
@ -59,8 +59,7 @@
  <string name="pref_display_title">Zobrazenie</string>
  <string name="pref_info_title">Informácie</string>
  <string name="pref_info_version">Verzia</string>
-  <string name="pref_night_mode">Nočný režim</string>
-  <string name="pref_night_mode_summary">Zobraziť články s obrátenými farbami</string>
+  <string name="pref_dark_mode_summary">Zobraziť články s obrátenými farbami</string>
  <string name="pref_back_to_top">Späť na začiatok</string>
  <string name="pref_back_to_top_summary">Zobraziť tlačidlo na konci stránky pre prechod na začiatok.</string>
  <string name="pref_language_title">Jazyk</string>
--- a/core/src/main/res/values-skr/strings.xml
+++ b/core/src/main/res/values-skr/strings.xml
@ -21,7 +21,6 @@
  <string name="pref_display_title">ڈسپلے</string>
  <string name="pref_info_title">معلومات</string>
  <string name="pref_info_version">ورژن</string>
-  <string name="pref_night_mode">رات آلا مزاج</string>
  <string name="pref_back_to_top">واپس اُتے ون٘ڄو</string>
  <string name="pref_language_title">زبان</string>
  <string name="pref_language_chooser">زبان چݨو</string>
--- a/core/src/main/res/values-sl/strings.xml
+++ b/core/src/main/res/values-sl/strings.xml
@ -67,8 +67,7 @@
  <string name="pref_display_title">Prikaz</string>
  <string name="pref_info_title">Informacije</string>
  <string name="pref_info_version">Različica</string>
-  <string name="pref_night_mode">Nočni način</string>
-  <string name="pref_night_mode_summary">Prikaz člankov z obrnjenimi barvami</string>
+  <string name="pref_dark_mode_summary">Prikaz člankov z obrnjenimi barvami</string>
  <string name="pref_back_to_top">Nazaj na vrh</string>
  <string name="pref_back_to_top_summary">Na dnu strani prikaži gumb za pomik na vrh strani</string>
  <string name="pref_language_title">Jezik</string>
--- a/core/src/main/res/values-so/strings.xml
+++ b/core/src/main/res/values-so/strings.xml
@ -25,8 +25,7 @@
  <string name="pref_display_title">Qaab aragga</string>
  <string name="pref_info_title">Macluumaad</string>
  <string name="pref_info_version">Nuqul</string>
-  <string name="pref_night_mode">Habka habeenkii</string>
-  <string name="pref_night_mode_summary">Itus maqaalada iyagoo leh midab madadaalo ah</string>
+  <string name="pref_dark_mode_summary">Itus maqaalada iyagoo leh midab madadaalo ah</string>
  <string name="pref_back_to_top">Ku laabo kor</string>
  <string name="pref_back_to_top_summary">Itus batoonka dhammaadka bogga si kor loogu laabto</string>
  <string name="pref_language_title">Luqad</string>
--- a/core/src/main/res/values-sq/strings.xml
+++ b/core/src/main/res/values-sq/strings.xml
@ -56,8 +56,7 @@
  <string name="pref_display_title">Ekran</string>
  <string name="pref_info_title">Informacione</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Mënyra mbrëmje</string>
-  <string name="pref_night_mode_summary">Shfaqi artikujt me ngjyra së prapthi</string>
+  <string name="pref_dark_mode_summary">Shfaqi artikujt me ngjyra së prapthi</string>
  <string name="pref_back_to_top">Mbrapsht te Kreu</string>
  <string name="pref_back_to_top_summary">Shfaq në fund të faqes një buton për t’u ngjitur sipër në krye</string>
  <string name="pref_language_title">Gjuhë</string>
--- a/core/src/main/res/values-sr/strings.xml
+++ b/core/src/main/res/values-sr/strings.xml
@ -31,8 +31,7 @@
  <string name="pref_display_title">Приказ</string>
  <string name="pref_info_title">Информације</string>
  <string name="pref_info_version">Верзија</string>
-  <string name="pref_night_mode">Ноћни режим</string>
-  <string name="pref_night_mode_summary">Прикажи чланке с обрнутим бојама</string>
+  <string name="pref_dark_mode_summary">Прикажи чланке с обрнутим бојама</string>
  <string name="pref_back_to_top">Назад на врх</string>
  <string name="pref_back_to_top_summary">Прикажи дугме на крају странице како би се могли отићи на врх</string>
  <string name="pref_language_title">Језик</string>
--- a/core/src/main/res/values-sv/strings.xml
+++ b/core/src/main/res/values-sv/strings.xml
@ -68,8 +68,7 @@
  <string name="pref_display_title">Visning</string>
  <string name="pref_info_title">Information</string>
  <string name="pref_info_version">Version</string>
-  <string name="pref_night_mode">Nattläge</string>
-  <string name="pref_night_mode_summary">Visa artiklar med inverterade färger</string>
+  <string name="pref_dark_mode_summary">Visa artiklar med inverterade färger</string>
  <string name="pref_back_to_top">Tillbaka till toppen</string>
  <string name="pref_back_to_top_summary">Visar en knapp i slutet på sidan för att rulla upp till toppen</string>
  <string name="pref_language_title">Språk</string>
--- a/core/src/main/res/values-sw/strings.xml
+++ b/core/src/main/res/values-sw/strings.xml
@ -69,8 +69,7 @@
  <string name="pref_display_title">Onesha</string>
  <string name="pref_info_title">Maarifa</string>
  <string name="pref_info_version">Toleo</string>
-  <string name="pref_night_mode">Hali ya Usiku</string>
-  <string name="pref_night_mode_summary">Onyesha makala yakiwa na rangi kubatilishwa</string>
+  <string name="pref_dark_mode_summary">Onyesha makala yakiwa na rangi kubatilishwa</string>
  <string name="pref_back_to_top">Rudi kwenye kichwa cha ukurasa</string>
  <string name="pref_back_to_top_summary">Onyesha kidude kwenye mwisho wa kurasa ili kurudi hadi sehemu ya juu</string>
  <string name="pref_language_title">Lugha</string>
--- a/core/src/main/res/values-ta/strings.xml
+++ b/core/src/main/res/values-ta/strings.xml
@ -61,8 +61,7 @@
  <string name="pref_display_title">காண்பி</string>
  <string name="pref_info_title">தகவல்</string>
  <string name="pref_info_version">பதிப்பு</string>
-  <string name="pref_night_mode">இரவுத்தோற்றம்</string>
-  <string name="pref_night_mode_summary">கட்டுரைகளை தலைகீழ் நிறங்களில் காண்பி</string>
+  <string name="pref_dark_mode_summary">கட்டுரைகளை தலைகீழ் நிறங்களில் காண்பி</string>
  <string name="pref_back_to_top">மீண்டும் மேலே</string>
  <string name="pref_back_to_top_summary">மேற்பகுதிக்குச் செல்ல, பக்கத்‌தின் அடியில் ஒரு பொத்தானை காண்பி</string>
  <string name="pref_language_title">மொழி</string>
--- a/core/src/main/res/values-te/strings.xml
+++ b/core/src/main/res/values-te/strings.xml
@ -64,8 +64,7 @@
  <string name="pref_display_title">వీక్షణం</string>
  <string name="pref_info_title">సమాచారం</string>
  <string name="pref_info_version">సంచిక</string>
-  <string name="pref_night_mode">చీకటి రీతి</string>
-  <string name="pref_night_mode_summary">వ్యాసాలను వ్యతిరేక రంగులలో చూపించు</string>
+  <string name="pref_dark_mode_summary">వ్యాసాలను వ్యతిరేక రంగులలో చూపించు</string>
  <string name="pref_back_to_top">తిరిగి పైకి</string>
  <string name="pref_back_to_top_summary">పేజీ చివర్లో పేజీ మొదటికి చేరుకునే బొత్తమును చూపండి</string>
  <string name="pref_language_title">భాష</string>
--- a/core/src/main/res/values-th/strings.xml
+++ b/core/src/main/res/values-th/strings.xml
@ -35,8 +35,7 @@
  <string name="pref_display_title">แสดงผล</string>
  <string name="pref_info_title">ข้อมูล</string>
  <string name="pref_info_version">รุ่น</string>
-  <string name="pref_night_mode">โหมดกลางคืน</string>
-  <string name="pref_night_mode_summary">แสดงบทความด้วยสีที่สลับกัน</string>
+  <string name="pref_dark_mode_summary">แสดงบทความด้วยสีที่สลับกัน</string>
  <string name="pref_back_to_top">กลับไปด้านบน</string>
  <string name="pref_back_to_top_summary">เพิ่มปุ่มด้านล่างของหน้าสำหรับเลื่อนกลับสู่ด้านบน</string>
  <string name="pref_language_title">ภาษา</string>
--- a/Show More
+++ b/Show More