Merge branch 'adwaita' into 'master'

Added Adwaita dark theme

See merge request postmarketOS/buffybox!20

CHANGELOG.md

@@ -10,7 +10,7 @@ If a change only affects particular applications, they are listed in parentheses
 
 ## Unreleased
 
-Nothing at the moment.
+- feat: Add adwaita-dark theme (thanks @topjor)
 
 ## 3.1.0 (2024-04-10)
 

buffyboard/screenshots/README.md

 # Buffyboard themes
 
+## adwaita-dark
+
+<img src="adwaita-dark-480x800.png" alt="480x800" height="300"/>
+<img src="adwaita-dark-800x480.png" alt="800x480" height="300"/>
+<img src="adwaita-dark-540x960.png" alt="540x960" height="300"/>
+<img src="adwaita-dark-960x540.png" alt="960x540" height="300"/>
+<img src="adwaita-dark-768x1024.png" alt="768x1024" height="300"/>
+<img src="adwaita-dark-1024x768.png" alt="1024x768" height="300"/>
+<img src="adwaita-dark-1280x800.png" alt="1280x800" height="300"/>
+<img src="adwaita-dark-1440x720.png" alt="1440x720" height="300"/>
+<img src="adwaita-dark-1920x1080.png" alt="1920x1080" height="300"/>
+
 ## breezy-dark
 
 <img src="breezy-dark-480x800.png" alt="480x800" height="300"/>

shared/themes.c

@@ -632,16 +632,170 @@ static const bbx_theme pmos_dark = {
     }
 };
 
+static const bbx_theme adwaita_dark = {
+    .name = "adwaita-dark",
+    .window = {
+        .bg_color = 0x151515
+    },
+    .header = {
+        .bg_color = 0x242424,
+        .border_width = 0,
+        .border_color = 0x242424,
+        .pad = 10,
+        .gap = 10
+    },
+    .keyboard = {
+        .bg_color = 0x242424,
+        .border_width = 2,
+        .border_color = 0x242424,
+        .pad = 20,
+        .gap = 10,
+        .keys = {
+            .border_width = 1,
+            .corner_radius = 5,
+            .key_char = {
+                .normal = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x464448,
+                    .border_color = 0x464448
+                },
+                .pressed = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x747077,
+                    .border_color = 0x747077
+                }
+            },
+            .key_non_char = {
+                .normal = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x3A3A3A,
+                    .border_color = 0x3A3A3A
+                },
+                .pressed = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x666666,
+                    .border_color = 0x666666
+                }
+            },
+            .key_mod_act = {
+                .normal = {
+                    .fg_color = 0x1E1E1E,
+                    .bg_color = 0x747077,
+                    .border_color = 0x747077
+                },
+                .pressed = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x464448,
+                    .border_color = 0x464448
+                }
+            },
+            .key_mod_inact = {
+                .normal = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x3A3A3A,
+                    .border_color = 0x3A3A3A
+                },
+                .pressed = {
+                    .fg_color = 0xDEDDDA,
+                    .bg_color = 0x3A3A3A,
+                    .border_color = 0x3A3A3A
+                }
+            }
+        }
+    },
+    .button = {
+        .border_width = 1,
+        .corner_radius = 5,
+        .pad = 8,
+        .normal = {
+            .fg_color = 0xDEDDDA,
+            .bg_color = 0x3A3A3A,
+            .border_color = 0x3A3A3A
+        },
+        .pressed = {
+            .fg_color = 0xDEDDDA,
+            .bg_color = 0x666666,
+            .border_color = 0x666666
+        }
+    },
+    .textarea = {
+        .fg_color = 0xDEDDDA,
+        .bg_color = 0x282828,
+        .border_width = 1,
+        .border_color = 0x1C71D8,
+        .corner_radius = 10,
+        .pad = 8,
+        .placeholder_color = 0x1C71D8,
+        .cursor = {
+            .width = 2,
+            .color = 0xDEDDDA,
+            .period = 700
+        }
+    },
+    .dropdown = {
+        .button = {
+            .border_width = 1,
+            .corner_radius = 5,
+            .pad = 8,
+            .normal = {
+                .fg_color = 0xDEDDDA,
+                .bg_color = 0x3A3A3A,
+                .border_color = 0x3A3A3A
+            },
+            .pressed = {
+                .fg_color = 0xDEDDDA,
+                .bg_color = 0x666666,
+                .border_color = 0x666666
+            }
+        },
+        .list = {
+            .fg_color = 0xDEDDDA,
+            .bg_color = 0x383838,
+            .selection_fg_color = 0xDEDDDA,
+            .selection_bg_color = 0x5E5E5E,
+            .border_width = 1,
+            .border_color = 0x383838,
+            .corner_radius = 5,
+            .pad = 8
+        }
+    },
+    .label = {
+        .fg_color = 0xDEDDDA,
+    },
+    .msgbox = {
+        .fg_color = 0xDEDDDA,
+        .bg_color = 0x383838,
+        .border_width = 1,
+        .border_color = 0x383838,
+        .corner_radius = 7,
+        .pad = 20,
+        .gap = 20,
+        .dimming = {
+            .color = 0x151515,
+            .opacity = 225
+        }
+    },
+    .bar = {
+        .border_width = 1,
+        .border_color = 0x1C71D8,
+        .corner_radius = 5,
+        .indicator = {
+            .bg_color = 0x1C71D8
+        }
+    }
+};
+
 /**
  * Public interface
  */
 
-const int bbx_themes_num_themes = 4;
+const int bbx_themes_num_themes = 5;
 const bbx_theme *bbx_themes_themes[] = {
     &breezy_light,
     &breezy_dark,
     &pmos_light,
-    &pmos_dark
+    &pmos_dark,
+    &adwaita_dark,
 };
 
 bbx_themes_theme_id_t bbx_themes_find_theme_with_name(const char *name) {

shared/themes.h

@@ -15,7 +15,8 @@ typedef enum {
     BBX_THEMES_THEME_BREEZY_LIGHT = 0,
     BBX_THEMES_THEME_BREEZY_DARK = 1,
     BBX_THEMES_THEME_PMOS_LIGHT = 2,
-    BBX_THEMES_THEME_PMOS_DARK = 3
+    BBX_THEMES_THEME_PMOS_DARK = 3,
+    BBX_THEMES_THEME_ADWAITA_DARK = 4,
 } bbx_themes_theme_id_t;
 
 /* Themes */

unl0kr/screenshots/README.md

 # Unl0kr themes
 
+## adwaita-dark
+
+<img src="adwaita-dark-480x800.png" alt="480x800" height="300"/>
+<img src="adwaita-dark-800x480.png" alt="800x480" height="300"/>
+<img src="adwaita-dark-540x960.png" alt="540x960" height="300"/>
+<img src="adwaita-dark-960x540.png" alt="960x540" height="300"/>
+<img src="adwaita-dark-768x1024.png" alt="768x1024" height="300"/>
+<img src="adwaita-dark-1024x768.png" alt="1024x768" height="300"/>
+<img src="adwaita-dark-1280x800.png" alt="1280x800" height="300"/>
+<img src="adwaita-dark-1440x720.png" alt="1440x720" height="300"/>
+<img src="adwaita-dark-1920x1080.png" alt="1920x1080" height="300"/>
+
 ## breezy-dark
 
 <img src="breezy-dark-480x800.png" alt="480x800" height="300"/>