Feature: user-selectable theme

App/Features/Setting/AppSetting.swift

@@ -4,18 +4,28 @@ import SharedLib
 
 final class AppSetting: ObservableObject {
     @Published var webFontSizePercent: Double
+    @Published var theme: Theme
 
     private var cancellable = Set<AnyCancellable>()
 
     init() {
         webFontSizePercent = WallabagUserDefaults.webFontSizePercent
+        theme = Theme(rawValue: WallabagUserDefaults.theme) ?? .auto
 
         $webFontSizePercent
             .sink(receiveValue: updateWebFontSizePercent)
             .store(in: &cancellable)
+
+        $theme
+            .sink(receiveValue: updateTheme)
+            .store(in: &cancellable)
     }
 
     private func updateWebFontSizePercent(_ value: Double) {
         WallabagUserDefaults.webFontSizePercent = value
     }
+
+    private func updateTheme(_ value: Theme) {
+        WallabagUserDefaults.theme = value.rawValue
+    }
 }

App/Features/Setting/SettingView.swift

@@ -1,3 +1,4 @@
+import Factory
 import SharedLib
 import SwiftUI
 
@@ -7,9 +8,17 @@ struct SettingView: View {
     @AppStorage("badge") var badge: Bool = true
     @AppStorage("defaultMode") var defaultMode: String = RetrieveMode.allArticles.rawValue
     @AppStorage("itemPerPageDuringSync") var itemPerPageDuringSync: Int = 50
+    @EnvironmentObject var appSetting: AppSetting
 
     var body: some View {
         Form {
+            Section("Appearance") {
+                Picker("Theme", selection: $appSetting.theme) {
+                    ForEach(Theme.allCases) { theme in
+                        Text(theme.name).tag(theme)
+                    }
+                }
+            }
             Section("Entries list") {
                 Toggle("Show image in list", isOn: $showImageInList)
                 Picker("Default mode", selection: $defaultMode) {
@@ -35,5 +44,6 @@ struct SettingView: View {
 struct SettingView_Previews: PreviewProvider {
     static var previews: some View {
         SettingView()
+            .environmentObject(AppSetting())
     }
 }

App/Lib/Theme.swift

@@ -0,0 +1,25 @@
+import SwiftUI
+
+enum Theme: String, CaseIterable, Identifiable {
+    case auto
+    case light
+    case dark
+
+    var id: String { rawValue }
+
+    var colorScheme: ColorScheme? {
+        switch self {
+        case .auto: return nil
+        case .light: return .light
+        case .dark: return .dark
+        }
+    }
+
+    var name: LocalizedStringKey {
+        switch self {
+        case .auto: return "Auto"
+        case .light: return "Light"
+        case .dark: return "Dark"
+        }
+    }
+}

App/Resources/ar.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "المظهر";
+"Theme" = "السمة";
+"Auto" = "تلقائي";
+"Light" = "فاتح";
+"Dark" = "داكن";

App/cs.lproj/Localizable.strings → App/Resources/cs.lproj/Localizable.strings

@@ -17,3 +17,10 @@
 
 // Menu
 "Menu" = "Nabídka";
+
+// Theme
+"Appearance" = "Vzhled";
+"Theme" = "Motiv";
+"Auto" = "Automaticky";
+"Light" = "Světlý";
+"Dark" = "Tmavý";

App/Resources/da.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Udseende";
+"Theme" = "Tema";
+"Auto" = "Auto";
+"Light" = "Lyst";
+"Dark" = "Mørkt";

App/de.lproj/Localizable.strings → App/Resources/de.lproj/Localizable.strings

@@ -48,3 +48,10 @@
 
 //Player
 "Select one entry" = "Eintrag auswählen";
+
+// Theme
+"Appearance" = "Erscheinungsbild";
+"Theme" = "Design";
+"Auto" = "Automatisch";
+"Light" = "Hell";
+"Dark" = "Dunkel";

App/en.lproj/Localizable.strings → App/Resources/en.lproj/Localizable.strings

@@ -50,3 +50,10 @@
 
 //Player
 "Select one entry" = "Select one entry";
+
+// Theme
+"Appearance" = "Appearance";
+"Theme" = "Theme";
+"Auto" = "Auto";
+"Light" = "Light";
+"Dark" = "Dark";

App/es.lproj/Localizable.strings → App/Resources/es.lproj/Localizable.strings

@@ -1,10 +1,13 @@
-
-
-
-
 // Tip View
 "This application is developed on free time" = "Esta aplicación se desarrolla en tiempo libre.";
-"Logout" = "Desconectarse";
+"Select one entry" = "Selecciona una entrada";
+
+// Theme
+"Appearance" = "Apariencia";
+"Theme" = "Tema";
+"Auto" = "Automático";
+"Light" = "Claro";
+"Dark" = "Oscuro";
 "Setting" = "Configuración";
 "About" = "Acerca de";
 

App/Resources/fa.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "ظاهر";
+"Theme" = "پوسته";
+"Auto" = "خودکار";
+"Light" = "روشن";
+"Dark" = "تیره";

App/fr.lproj/Localizable.strings → App/Resources/fr.lproj/Localizable.strings

@@ -54,3 +54,10 @@
 "Order by id" = "Trier par id";
 "Order by reading time" = "Trier par temps de lecture";
 "Sorting" = "Tri";
+
+// Theme
+"Appearance" = "Apparence";
+"Theme" = "Thème";
+"Auto" = "Auto";
+"Light" = "Clair";
+"Dark" = "Sombre";

App/Resources/gl.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Aparencia";
+"Theme" = "Tema";
+"Auto" = "Auto";
+"Light" = "Claro";
+"Dark" = "Escuro";

App/Resources/hi.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "दिखावट";
+"Theme" = "थीम";
+"Auto" = "ऑटो";
+"Light" = "हल्का";
+"Dark" = "गहरा";

App/hr.lproj/Localizable.strings → App/Resources/hr.lproj/Localizable.strings

@@ -48,3 +48,10 @@
 
 //Player
 "Select one entry" = "Odaberi unos";
+
+// Theme
+"Appearance" = "Izgled";
+"Theme" = "Tema";
+"Auto" = "Automatski";
+"Light" = "Svijetlo";
+"Dark" = "Tamno";

App/Resources/hu.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Megjelenés";
+"Theme" = "Téma";
+"Auto" = "Automatikus";
+"Light" = "Világos";
+"Dark" = "Sötét";

App/it.lproj/Localizable.strings → App/Resources/it.lproj/Localizable.strings

@@ -33,3 +33,10 @@
 
 // Menu
 "Menu" = "Menù";
+
+// Theme
+"Appearance" = "Aspetto";
+"Theme" = "Tema";
+"Auto" = "Automatico";
+"Light" = "Chiaro";
+"Dark" = "Scuro";

App/ja.lproj/Localizable.strings → App/Resources/ja.lproj/Localizable.strings

@@ -42,3 +42,10 @@
 "Loading..." = "読み込み中...";
 "Don" = "寄付";
 "Starred" = "スター";
+
+// Theme
+"Appearance" = "外観";
+"Theme" = "テーマ";
+"Auto" = "自動";
+"Light" = "ライト";
+"Dark" = "ダーク";

App/Resources/ko.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "모양";
+"Theme" = "테마";
+"Auto" = "자동";
+"Light" = "라이트";
+"Dark" = "다크";

App/Resources/nb-NO.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Utseende";
+"Theme" = "Tema";
+"Auto" = "Auto";
+"Light" = "Lyst";
+"Dark" = "Mørkt";

App/nl.lproj/Localizable.strings → App/Resources/nl.lproj/Localizable.strings

@@ -33,3 +33,10 @@
 "Loading..." = "Laden...";
 "But you can contribute financially by making a donation whenever you want to support the project." = "Maar u kunt ook financieel bijdragen door een donatie te doen u het project wilt steunen.";
 "Entries" = "Items";
+
+// Theme
+"Appearance" = "Weergave";
+"Theme" = "Thema";
+"Auto" = "Automatisch";
+"Light" = "Licht";
+"Dark" = "Donker";

App/Resources/oc.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Aparéncia";
+"Theme" = "Tèma";
+"Auto" = "Auto";
+"Light" = "Clar";
+"Dark" = "Escur";

App/Resources/pl.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Wygląd";
+"Theme" = "Motyw";
+"Auto" = "Automatyczny";
+"Light" = "Jasny";
+"Dark" = "Ciemny";

App/Resources/pt.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Aparência";
+"Theme" = "Tema";
+"Auto" = "Automático";
+"Light" = "Claro";
+"Dark" = "Escuro";

App/Resources/ro.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Aspect";
+"Theme" = "Temă";
+"Auto" = "Auto";
+"Light" = "Luminos";
+"Dark" = "Întunecat";

App/ru.lproj/Localizable.strings → App/Resources/ru.lproj/Localizable.strings

@@ -40,3 +40,10 @@
 
 // Search
 "Search" = "Поиск";
+
+// Theme
+"Appearance" = "Оформление";
+"Theme" = "Тема";
+"Auto" = "Автоматически";
+"Light" = "Светлая";
+"Dark" = "Темная";

App/Resources/sv.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Utseende";
+"Theme" = "Tema";
+"Auto" = "Auto";
+"Light" = "Ljust";
+"Dark" = "Mörkt";

App/Resources/th.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "ลักษณะ";
+"Theme" = "ธีม";
+"Auto" = "อัตโนมัติ";
+"Light" = "สว่าง";
+"Dark" = "มืด";

App/tr.lproj/Localizable.strings → App/Resources/tr.lproj/Localizable.strings

@@ -46,3 +46,10 @@
 
 //Player
 "Select one entry" = "Bir makale seçin";
+
+// Theme
+"Appearance" = "Görünüm";
+"Theme" = "Tema";
+"Auto" = "Otomatik";
+"Light" = "Açık";
+"Dark" = "Koyu";

App/Resources/uk.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+
+// Theme
+"Appearance" = "Вигляд";
+"Theme" = "Тема";
+"Auto" = "Авто";
+"Light" = "Світла";
+"Dark" = "Темна";

App/zh-Hans.lproj/Localizable.strings → App/Resources/zh-Hans.lproj/Localizable.strings

@@ -48,3 +48,10 @@
 
 //Player
 "Select one entry" = "选择一个条目";
+
+// Theme
+"Appearance" = "外观";
+"Theme" = "主题";
+"Auto" = "自动";
+"Light" = "浅色";
+"Dark" = "深色";

App/zh-Hant.lproj/Localizable.strings → App/Resources/zh-Hant.lproj/Localizable.strings

@@ -42,3 +42,10 @@
 
 // Menu
 "Menu" = "菜單";
+
+// Theme
+"Appearance" = "外觀";
+"Theme" = "主題";
+"Auto" = "自動";
+"Light" = "淺色";
+"Dark" = "深色";

App/WallabagApp.swift

@@ -39,6 +39,7 @@ struct WallabagApp: App {
                 .environment(errorHandler)
                 .environmentObject(appSetting)
                 .environment(\.managedObjectContext, coreData.viewContext)
+                .preferredColorScheme(appSetting.theme.colorScheme)
         }
         .onChange(of: scenePhase) { _, newScenePhase in
             if newScenePhase == .active {