feat: modular ui 💕

fix: upload to itch
eerii · Dec 1, 2023 · 76ad8df · 76ad8df
1 parent 64cafab
commit 76ad8df
Show file tree

Hide file tree

Showing 8 changed files with 264 additions and 169 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -251,29 +251,30 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
 
-  check-upload-to-itch:
+  check-if-upload-to-itch-is-configured:
     runs-on: ubuntu-latest
     outputs:
       should-upload: ${{ steps.check-env.outputs.has-itch-target }}
     steps:
       - id: check-env
         run: |
           if [[ -z "$itch_target" ]]; then
-            echo "has-itch-target == no >> $GITHUB_OUTPUT"
+            echo "has-itch-target=no" >> $GITHUB_OUTPUT
           else
-            echo "has-itch-target == yes >> $GITHUB_OUTPUT"
+            echo "has-itch-target=yes" >> $GITHUB_OUTPUT
           fi
 
   upload-to-itch:
     runs-on: ubuntu-latest
     needs:
-      - get-version
-      - check-upload-to-itch
+      - check-if-upload-to-itch-is-configured
       - release-wasm
       - release-linux
-      - release-windows
-      - release-macos
-    if: ${{ needs.check-upload-to-itch.outputs.should-upload == 'yes' }}
+      # [CHANGE]: Uncomment this if you also want to push windows and macos builds to itch automatically
+      #           It is disabled by default because these take a looong time (specially macos)
+      # - release-windows
+      # - release-macos
+    if: ${{ needs.check-if-upload-to-itch-is-configured.outputs.should-upload == 'yes' }}
 
     env:
       version: ${{needs.get-version.outputs.version}}

diff --git a/examples/dvd.rs b/examples/dvd.rs
@@ -1,6 +1,8 @@
 use bevy::{prelude::*, window::WindowResolution};
 use bevy_kira_audio::prelude::*;
+use bevy_persistent::Persistent;
 use hello_bevy::{
+    config::GameOptions,
     load::{GameAssets, SampleAssets},
     GamePlugin, GameState,
 };
@@ -75,7 +77,12 @@ struct CollisionEvent(Entity);
 // Systems
 // ·······
 
-fn init_sample(mut cmd: Commands, assets: Res<GameAssets>, info: Option<Res<GameInfo>>) {
+fn init_sample(
+    mut cmd: Commands,
+    assets: Res<GameAssets>,
+    opts: Res<Persistent<GameOptions>>,
+    info: Option<Res<GameInfo>>,
+) {
     cmd.spawn((Camera2dBundle::default(), GameCamera));
 
     if info.is_some() {
@@ -110,7 +117,7 @@ fn init_sample(mut cmd: Commands, assets: Res<GameAssets>, info: Option<Res<Game
                 TextStyle {
                     font: assets.font.clone(),
                     font_size: 192.,
-                    color: Color::WHITE,
+                    color: opts.color.mid,
                 },
             ),
             ..default()

diff --git a/examples/jump.rs b/examples/jump.rs
@@ -1,6 +1,11 @@
 use bevy::{prelude::*, window::WindowResolution};
 use bevy_persistent::Persistent;
-use hello_bevy::{config::Keybinds, input::InputState, load::GameAssets, GamePlugin, GameState};
+use hello_bevy::{
+    config::{GameOptions, Keybinds},
+    input::InputState,
+    load::GameAssets,
+    GamePlugin, GameState,
+};
 
 fn main() {
     App::new()
@@ -73,7 +78,12 @@ struct GameCamera;
 // Systems
 // ·······
 
-fn init_sample(mut cmd: Commands, assets: Res<GameAssets>, info: Option<Res<GameInfo>>) {
+fn init_sample(
+    mut cmd: Commands,
+    assets: Res<GameAssets>,
+    opts: Res<Persistent<GameOptions>>,
+    info: Option<Res<GameInfo>>,
+) {
     cmd.spawn((Camera2dBundle::default(), GameCamera));
 
     if info.is_some() {
@@ -104,7 +114,7 @@ fn init_sample(mut cmd: Commands, assets: Res<GameAssets>, info: Option<Res<Game
                 TextStyle {
                     font: assets.font.clone(),
                     font_size: 192.,
-                    color: Color::WHITE,
+                    color: opts.color.mid,
                 },
             ),
             ..default()

diff --git a/src/config.rs b/src/config.rs
@@ -7,10 +7,6 @@ use crate::{input::Bind, GameState};
 
 pub use bevy_persistent::prelude::*;
 
-// TODO: Accesibility
-//          - Change font size
-//          - Change color palette
-
 // ······
 // Plugin
 // ······
@@ -35,13 +31,15 @@ impl Plugin for ConfigPlugin {
 pub struct FontSize {
     pub title: f32,
     pub text: f32,
+    pub button_text: f32,
 }
 
 impl Default for FontSize {
     fn default() -> Self {
         Self {
             title: 48.0,
             text: 24.0,
+            button_text: 20.0,
         }
     }
 }

diff --git a/src/debug.rs b/src/debug.rs
@@ -74,7 +74,7 @@ mod only_in_debug {
 
         cmd.spawn((Camera2dBundle {
             camera_2d: Camera2d {
-                clear_color: ClearColorConfig::Custom(Color::rgba(0., 0., 0., 0.)),
+                clear_color: ClearColorConfig::Custom(Color::WHITE),
             },
             camera: Camera {
                 order: -10,

diff --git a/src/input.rs b/src/input.rs
@@ -16,8 +16,8 @@ pub enum Bind {
     Gamepad(GamepadButton),
 }
 
-impl Bind {
-    pub fn name(&self) -> String {
+impl ToString for Bind {
+    fn to_string(&self) -> String {
         match self {
             Bind::Key(key) => format!("{:?}", key),
             Bind::Mouse(button) => format!("{:?}", button),