From e2ab34e390ff6c22a4392c7fc612b07fff741b5c Mon Sep 17 00:00:00 2001
From: chschtsch <chschtsch@ya.ru>
Date: Wed, 30 Dec 2015 13:11:04 +0300
Subject: [PATCH] add theme selection in settings

---
 app/src/main/res/values-de/strings.xml    |  2 +-
 app/src/main/res/values-fr/strings.xml    |  2 +-
 app/src/main/res/values-it/strings.xml    |  2 +-
 app/src/main/res/values-ja/strings.xml    |  2 +-
 app/src/main/res/values-ko/strings.xml    |  2 +-
 app/src/main/res/values-nl/strings.xml    |  2 +-
 app/src/main/res/values-pl/strings.xml    |  2 +-
 app/src/main/res/values-pt/strings.xml    |  2 +-
 app/src/main/res/values-ru/strings.xml    |  2 +-
 app/src/main/res/values-sl/strings.xml    |  2 +-
 app/src/main/res/values-sr/strings.xml    |  2 +-
 app/src/main/res/values/settings_keys.xml | 14 +++++++--
 app/src/main/res/values/strings.xml       | 15 ++++++----
 app/src/main/res/xml/settings_screen.xml  | 35 ++++++++++++++---------
 14 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d17fae7bd..0973c9f50 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -42,7 +42,7 @@
     <string name="urlNotSupportedText">URL wird nicht unterstützt.</string>
     <string name="showSimilarVideosButtonText">Ähnliche Videos</string>
     <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryVideoInfoTitle">INFO</string>
     <string name="settingsCategoryEtcTitle">ETC</string>
 <string name="searchLanguageTitle">Bevorzugte Sprache</string>
     <string name="itemThumbnailViewDescription">Video-Vorschau-Bild</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4800a7493..20a627bea 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -38,7 +38,7 @@
     <string name="urlNotSupportedText">URL non supportée.</string>
     <string name="showSimilarVideosButtonText">Vidéos similaires</string>
     <string name="settingsCategoryVideoAudioTitle">VIDÉO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFORMATION</string>
+    <string name="settingsCategoryVideoInfoTitle">INFORMATION</string>
     <string name="settingsCategoryEtcTitle">DIVERS</string>
 
     <string name="itemThumbnailViewDescription">Miniature d\'aperçu vidéo</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 931afc6c2..0bd72240f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -38,7 +38,7 @@
     <string name="showSimilarVideosButtonText">Video simili</string>
     <string name="searchLanguageTitle">Lingua preferita dei contenuti</string>
     <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryVideoInfoTitle">INFO</string>
     <string name="settingsCategoryEtcTitle">ETC</string>
 
     <string name="itemThumbnailViewDescription">Anteprima video</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 558918270..bb2ec8acd 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -38,7 +38,7 @@
     <string name="showSimilarVideosButtonText">同様の動画</string>
     <string name="searchLanguageTitle">優先される言語</string>
     <string name="settingsCategoryVideoAudioTitle">動画とｵｰﾃﾞｨｵ</string>
-    <string name="settingsCategoryVideoInfoTittle">情報</string>
+    <string name="settingsCategoryVideoInfoTitle">情報</string>
     <string name="settingsCategoryEtcTitle">その他</string>
 <string name="viewCountText">%1$s ビュー</string>
     <string name="itemThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bdb8b1084..486f28c91 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -38,7 +38,7 @@
     <string name="showSimilarVideosButtonText">유사한 비디오</string>
     <string name="searchLanguageTitle">선호하는 컨텐츠 언어</string>
     <string name="settingsCategoryVideoAudioTitle">비디오 &amp; 오디오</string>
-    <string name="settingsCategoryVideoInfoTittle">정보</string>
+    <string name="settingsCategoryVideoInfoTitle">정보</string>
     <string name="settingsCategoryEtcTitle">기타</string>
 
     <string name="itemThumbnailViewDescription">비디오 미리보기 썸네일</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0cf3b0dec..cd6599ba2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -41,7 +41,7 @@
 <string name="useExternalVideoPlayerTitle">Gebruik externe videospeler</string>
     <string name="useExternalAudioPlayerTitle">Gebruik externe audiospeler</string>
     <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; GELUID</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryVideoInfoTitle">INFO</string>
     <string name="settingsCategoryEtcTitle">ETC.</string>
 
     <string name="itemThumbnailViewDescription">Videovoorbeeld thumbnail</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 348a2e689..83705f4a1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -36,7 +36,7 @@
     <string name="showSimilarVideosButtonText">Podobne wideo</string>
     <string name="searchLanguageTitle">Preferowany język zawartości</string>
     <string name="settingsCategoryVideoAudioTitle">WIDEO &amp; DŹWIĘK</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryVideoInfoTitle">INFO</string>
     <string name="settingsCategoryEtcTitle">INNE</string>
 <string name="searchPage">"Szukaj strony: "</string>
     <string name="viewCountText">%1$s wyświetleń</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0a6cbe3c4..029832ab4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -39,7 +39,7 @@
     <string name="showSimilarVideosButtonText">Vídeos similares</string>
     <string name="searchLanguageTitle">Idioma preferencial do conteúdo</string>
     <string name="settingsCategoryVideoAudioTitle">Vídeo e áudio</string>
-    <string name="settingsCategoryVideoInfoTittle">Informações</string>
+    <string name="settingsCategoryVideoInfoTitle">Informações</string>
     <string name="settingsCategoryEtcTitle">Outras</string>
 
     <string name="itemThumbnailViewDescription">Miniatura de vídeos</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 36368fe09..4d64ee32c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -43,7 +43,7 @@
     <string name="showNextAndSimilarTitle">Показывать следующее и предложенные видео</string>
     <string name="searchLanguageTitle">Предпочитаемый язык контента</string>
 <string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
-    <string name="settingsCategoryVideoInfoTittle">ИНФОРМАЦИЯ</string>
+    <string name="settingsCategoryVideoInfoTitle">ИНФОРМАЦИЯ</string>
     <string name="settingsCategoryEtcTitle">ПРОЧЕЕ</string>
 
     <string name="itemThumbnailViewDescription">Миниатюра видео-превью</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 91f54dc11..9c683bcb5 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -36,7 +36,7 @@
     <string name="showSimilarVideosButtonText">Podobni posnetki</string>
     <string name="searchLanguageTitle">Prednostni jezik vsebine</string>
     <string name="settingsCategoryVideoAudioTitle">Video in Zvok</string>
-    <string name="settingsCategoryVideoInfoTittle">Podrobnosti</string>
+    <string name="settingsCategoryVideoInfoTitle">Podrobnosti</string>
     <string name="itemThumbnailViewDescription">Sličica predogleda videa</string>
     <string name="detailThumbnailViewDescription">Sličica predogleda videa</string>
     <string name="detailUploaderThumbnailViewDescription">Sličica pošiljalnika</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 7ab3d8eaa..436dfd780 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -43,7 +43,7 @@
     <string name="showSimilarVideosButtonText">Слични видео</string>
     <string name="searchLanguageTitle">Пожељни језик садржаја</string>
 <string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
-    <string name="settingsCategoryVideoInfoTittle">ПОДАЦИ</string>
+    <string name="settingsCategoryVideoInfoTitle">ПОДАЦИ</string>
     <string name="settingsCategoryEtcTitle">ОСТАЛО</string>
 <string name="itemThumbnailViewDescription">Сличица видео прегледа</string>
     <string name="detailThumbnailViewDescription">Сличица видео прегледа</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 8d33b8cbe..e03c1f8ad 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -2,8 +2,8 @@
 <resources>
     <!-- Categories -->
     <string name="settingsCategoryVideoAudio">settings_categoery_video_audio</string>
-    <string name="settingsCategoryVideoInfo">settings_category_video_info</string>
-    <string name="settingsCategoryEtc">settings_category_etc</string>
+    <string name="settingsCategoryAppearance">settings_category_appearance</string>
+    <string name="settingsCategoryOther">settings_category_other</string>
     <!-- Key values -->
     <string name="downloadPathPreference">download_path_preference</string>
     <string name="useExternalVideoPlayer">use_external_video_player</string>
@@ -28,6 +28,16 @@
         <item>m4a</item>
     </string-array>
     <string name="defaultAudioFormat">m4a</string>
+    <string name="themePreference">theme</string>
+    <string-array name="themeDescriptionList">
+        <item>@string/darkThemeDescription</item>
+        <item>@string/lightThemeDescription</item>
+    </string-array>
+    <string-array name="themeValueList">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string name="themeDefaultValue">0</string>
     <string name="showNextVideo">show_next_video</string>
     <string name="searchLanguage">search_language</string>
     <!-- TODO: scrape these programmatically, then store in a local cache -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 177280277..5b3d0c587 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,8 +35,11 @@
     <string name="showPlayWithKodiSummary">Displays an option to play a video via Kodi media center.</string>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Default audio format</string>
-    <string name="webMAudioDescription">WebM - free format</string>
-    <string name="m4aAudioDescription">m4a - better quality</string>
+    <string name="webMAudioDescription">WebM &#8212; free format</string>
+    <string name="m4aAudioDescription">m4a &#8212; better quality</string>
+    <string name="themePreferenceTitle">Default Resolution</string>
+    <string name="darkThemeDescription">Dark</string>
+    <string name="lightThemeDescription">Light</string>
     <string name="downloadDialogTitle">Download</string>
     <string-array name="downloadOptions">
         <item>Video</item>
@@ -47,10 +50,10 @@
     <string name="urlNotSupportedText">URL not supported.</string>
     <string name="showSimilarVideosButtonText">Similar videos</string>
     <string name="searchLanguageTitle">Preferable content language</string>
-    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">ETC</string>
-    <string name="backgroundPlayerTickerText" translatable="false">%1$s - NewPipe</string>
+    <string name="settingsCategoryVideoAudioTitle">Video &amp; Audio</string>
+    <string name="settingsCategoryAppearanceTitle">Appearance</string>
+    <string name="settingsCategoryOtherTitle">Other</string>
+    <string name="backgroundPlayerTickerText" translatable="false">%1$s &#8212; NewPipe</string>
     <string name="backgroundPlayerStartPlayingToast">Playing in background</string>
     <string name="c3sUrl" translatable="false">https://www.c3s.cc/</string>
 
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
index 98399f778..e7fc82c3e 100644
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -5,7 +5,8 @@
 
     <PreferenceCategory
         android:key="@string/settingsCategoryVideoAudio"
-        android:title="@string/settingsCategoryVideoAudioTitle">
+        android:title="@string/settingsCategoryVideoAudioTitle"
+        android:textAllCaps="true">
 
         <CheckBoxPreference
             android:key="@string/useExternalVideoPlayer"
@@ -33,8 +34,16 @@
 
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="@string/settingsCategoryVideoInfo"
-        android:title="@string/settingsCategoryVideoInfoTittle">
+        android:key="@string/settingsCategoryAppearance"
+        android:title="@string/settingsCategoryAppearanceTitle"
+        android:textAllCaps="true">
+
+        <ListPreference
+            android:key="@string/themePreference"
+            android:title="@string/themePreferenceTitle"
+            android:entries="@array/themeDescriptionList"
+            android:entryValues="@array/themeValueList"
+            android:defaultValue="@string/themeDefaultValue"/>
 
         <CheckBoxPreference
             android:key="@string/showPlayWithKodiPreference"
@@ -42,23 +51,23 @@
             android:summary="@string/showPlayWithKodiSummary"
             android:defaultValue="false" />
 
-        <ListPreference
-            android:key="@string/searchLanguage"
-            android:title="@string/searchLanguageTitle"
-            android:entries="@array/languageNames"
-            android:entryValues="@array/languageCodes"
-            android:defaultValue="en" />
-
         <CheckBoxPreference
             android:key="@string/showNextVideo"
             android:title="@string/showNextAndSimilarTitle"
             android:defaultValue="true" />
 
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:key="@string/settingsCategoryEtc"
-        android:title="@string/settingsCategoryEtcTitle">
+        android:key="@string/settingsCategoryOther"
+        android:title="@string/settingsCategoryOtherTitle"
+        android:textAllCaps="true">
+
+        <ListPreference
+            android:key="@string/searchLanguage"
+            android:title="@string/searchLanguageTitle"
+            android:entries="@array/languageNames"
+            android:entryValues="@array/languageCodes"
+            android:defaultValue="en" />
 
         <EditTextPreference
             android:key="@string/downloadPathPreference"