Resolve rebase conflicts and fix models.ts structure

Author: tristonarmstrong

app.go

@@ -407,7 +407,7 @@ func (a *App) SaveAndApplyTheme(req SaveAndApplyThemeRequest) (*theme.ApplyResul
 	} else if !os.IsNotExist(err) {
 		return nil, fmt.Errorf("check theme folder: %w", err)
 	}
-	wallpaperDest, err := a.writer.GenerateOmarchyV4Only(state, targetDir)
+	wallpaperDest, err := a.writer.GenerateOmarchyV4Only(state, req.Settings, targetDir)
 	if err != nil {
 		return nil, fmt.Errorf("save theme: %w", err)
 	}

frontend/wailsjs/go/models.ts

@@ -499,6 +499,7 @@ export namespace theme {
 	    includeVscode: boolean;
 	    includeNeovim: boolean;
 	    selectedNeovimConfig: string;
+	    includedApps?: Record<string, boolean>;
 	    excludedApps?: Record<string, boolean>;
 
 	    static createFrom(source: any = {}) {
@@ -511,6 +512,7 @@ export namespace theme {
 	        this.includeVscode = source["includeVscode"];
 	        this.includeNeovim = source["includeNeovim"];
 	        this.selectedNeovimConfig = source["selectedNeovimConfig"];
+	        this.includedApps = source["includedApps"];
 	        this.excludedApps = source["excludedApps"];
 	    }
 	}
@@ -560,91 +562,6 @@ export namespace theme {
 		    return a;
 		}
 	}
-
-        static createFrom(source: any = {}) {
-            return new ApplyResult(source);
-        }
-
-        constructor(source: any = {}) {
-            if ('string' === typeof source) source = JSON.parse(source);
-            this.success = source['success'];
-            this.isOmarchy = source['isOmarchy'];
-            this.themePath = source['themePath'];
-        }
-    }
-    export class Settings {
-        includeZed: boolean;
-        includeVscode: boolean;
-        includeNeovim: boolean;
-        selectedNeovimConfig: string;
-        includedApps?: Record<string, boolean>;
-        excludedApps?: Record<string, boolean>;
-
-        static createFrom(source: any = {}) {
-            return new Settings(source);
-        }
-
-        constructor(source: any = {}) {
-            if ('string' === typeof source) source = JSON.parse(source);
-            this.includeZed = source['includeZed'];
-            this.includeVscode = source['includeVscode'];
-            this.includeNeovim = source['includeNeovim'];
-            this.selectedNeovimConfig = source['selectedNeovimConfig'];
-            this.includedApps = source['includedApps'];
-            this.excludedApps = source['excludedApps'];
-        }
-    }
-    export class StateSnapshot {
-        palette: string[];
-        wallpaperPath: string;
-        lightMode: boolean;
-        lockedColors: Record<number, boolean>;
-        colorRoles: template.ColorRoles;
-        extendedColors: Record<string, string>;
-        extractionMode: string;
-        additionalImages: string[];
-        appOverrides: Record<string, any>;
-
-        static createFrom(source: any = {}) {
-            return new StateSnapshot(source);
-        }
-
-        constructor(source: any = {}) {
-            if ('string' === typeof source) source = JSON.parse(source);
-            this.palette = source['palette'];
-            this.wallpaperPath = source['wallpaperPath'];
-            this.lightMode = source['lightMode'];
-            this.lockedColors = source['lockedColors'];
-            this.colorRoles = this.convertValues(
-                source['colorRoles'],
-                template.ColorRoles
-            );
-            this.extendedColors = source['extendedColors'];
-            this.extractionMode = source['extractionMode'];
-            this.additionalImages = source['additionalImages'];
-            this.appOverrides = source['appOverrides'];
-        }
-
-        convertValues(a: any, classs: any, asMap: boolean = false): any {
-            if (!a) {
-                return a;
-            }
-            if (a.slice && a.map) {
-                return (a as any[]).map(elem =>
-                    this.convertValues(elem, classs)
-                );
-            } else if ('object' === typeof a) {
-                if (asMap) {
-                    for (const key of Object.keys(a)) {
-                        a[key] = new classs(a[key]);
-                    }
-                    return a;
-                }
-                return new classs(a);
-            }
-            return a;
-        }
-    }
 }
 
 export namespace wallhaven {

internal/theme/writer.go

@@ -262,7 +262,7 @@ func (w *Writer) processOmarchyV4Templates(
 // GenerateOmarchyV4Only writes the files Omarchy v4 reads directly from a
 // reusable theme folder. Omarchy generates all other app-specific files.
 // Returns the wallpaper destination path ("" when no wallpaper was set).
-func (w *Writer) GenerateOmarchyV4Only(state *ThemeState, outputPath string) (string, error) {
+func (w *Writer) GenerateOmarchyV4Only(state *ThemeState, settings Settings, outputPath string) (string, error) {
 	variables := template.BuildVariables(state.ColorRoles, state.LightMode, state.ExtendedColors)
 	if err := validateTemplateInputs(variables, state.AppOverrides); err != nil {
 		return "", err
@@ -271,7 +271,7 @@ func (w *Writer) GenerateOmarchyV4Only(state *ThemeState, outputPath string) (st
 	if err != nil {
 		return "", err
 	}
-	w.processOmarchyV4Templates(outputPath, variables, state.AppOverrides, state.ExtendedColors)
+	w.processOmarchyV4Templates(outputPath, variables, settings, state.AppOverrides, state.ExtendedColors)
 	return wallpaperDest, nil
 }
 

internal/theme/writer_test.go

@@ -308,7 +308,7 @@ func TestGenerateOmarchyV4OnlyRemovesLegacyFiles(t *testing.T) {
 	state := NewThemeState()
 	state.ColorRoles.Background = "#1e1e2e"
 	state.ColorRoles.Magenta = "#ff0000"
-	if _, err := writer.GenerateOmarchyV4Only(state, themeDir); err != nil {
+	if _, err := writer.GenerateOmarchyV4Only(state, Settings{IncludedApps: map[string]bool{"icons": true}}, themeDir); err != nil {
 		t.Fatal(err)
 	}