Added animation auto-start control and deleting

Author: jbondeson

package.json

@@ -1,7 +1,7 @@
 {
   "name": "kiibohd-configurator",
   "productName": "Kiibohd Configurator",
-  "version": "0.1.0-alpha7",
+  "version": "0.1.0-beta1",
   "description": "Configuration utility for Input Club keyboards",
   "keywords": [],
   "dependencies": {

resources/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kiibohd-configurator",
   "productName": "Kiibohd Configurator",
-  "version": "0.1.0-alpha7",
+  "version": "0.1.0-beta1",
   "main": "main.js",
   "description": "Configuration utility for Input Club keyboards",
   "author": "Jeremy Bondeson <[email protected]> (https://input.club)",

src/kii/ui/conf/components/customize_canned.cljs

@@ -111,6 +111,7 @@
                      ;; Add the animation & perform replacements
                      (=>> [:conf/add-animation (keyword @name)
                            {:settings (replace-all settings @values configurable)
+                            :type (:type animation)
                             :frames   (mapv #(replace-all % @values configurable) frames)}])
                      ;; Append the required custom-kll
                      (when-not (str/empty-or-nil? (:custom-kll animation))

src/kii/ui/conf/components/main.cljs

@@ -13,6 +13,7 @@
             [kii.ui.conf.components.config-visuals :refer [config-visuals]]
             [kii.ui.conf.components.static-colors :refer [static-colors]]
             [kii.ui.conf.components.customize-canned :refer [customize-canned]]
+            [kii.ui.conf.components.manage-animations :refer [manage-animations]]
             ))
 
 (defn main-comp [active-tab mode]
@@ -45,7 +46,10 @@
                         [kii.ui.conf.animation-visualize.components/visualizer]
                         [:div
                          [kii.ui.conf.config-tabs.components/config-tabs
-                          [{:id   :customize-canned
+                          [{:id   :manage-animations
+                            :icon "settings"
+                            :tab  manage-animations}
+                           {:id   :customize-canned
                             :icon "build"
                             :tab  customize-canned}
                            {:id   :custom-animation

src/kii/ui/conf/components/manage_animations.cljs

@@ -0,0 +1,65 @@
+(ns kii.ui.conf.components.manage-animations
+  (:require [reagent.core :as r]
+            [taoensso.timbre :as timbre :refer-macros [log logf]]
+            [kii.ui.re-frame :refer [<<= <== =>> >=>]]
+            [cljs-react-material-ui.reagent :as mui]
+            [cljs-react-material-ui.icons :as mui-icons]
+            [cuerdas.core :as str]
+            [kii.util :as util]
+            ))
+
+(defn alter-settings
+  [setting f]
+  (as-> setting x
+        (str/split x ",")
+        (f x)
+        (str/join "," x)))
+
+(defn manage-animations
+  []
+  (let [animations (<<= [:conf/animations])]
+    [:div
+     [:h3 "Manage Visualizations"]
+     [mui/table {:selectable false
+                 :wrapper-style {:margin-right "20px"}
+                 }
+      [mui/table-header {:display-select-all false
+                         :adjust-for-checkbox false}
+       [mui/table-row
+        [mui/table-header-column "Name"]
+        [mui/table-header-column "Auto-start?"]
+        [mui/table-header-column "Actions"]
+        ]
+          ]
+      [mui/table-body {:display-row-checkbox false}
+       (for [[key animation] (seq animations)]
+         ^{:key key}
+         [mui/table-row
+          [mui/table-row-column (name key)]
+          [mui/table-row-column
+           [mui/toggle
+            {:default-toggled (str/includes? (:settings animation) "start")
+             :disabled        (= "reaction" (:type animation))
+             :on-toggle       (fn [_ toggled]
+                                (>=> [:conf/partial-update-animation
+                                      {:settings (alter-settings
+                                                   (:settings animation)
+                                                   (if toggled
+                                                     #(conj % "start")
+                                                     (fn [x] (filter #(not= (str/trim %) "start") x))))}
+                                      key])
+                                )
+             }]
+           ]
+          [mui/table-row-column
+           [mui/icon-button
+            {:on-click #(>=> [:conf/delete-animation key])}
+            [mui-icons/action-delete
+             {:color       "gray"
+              :hover-color "black"}
+             ]
+            ]
+           ]
+          ]
+         )]]
+     ]))

src/kii/ui/conf/handlers.cljs

@@ -1,6 +1,8 @@
 (ns kii.ui.conf.handlers
   (:require [re-frame.core :as rf]
             [kii.env :as env]
+            [kii.util :refer [update-values]]
+            [taoensso.timbre :as timbre :refer-macros [log logf]]
             [kii.device.keyboard :as keyboard]
             [kii.keys.firmware.map :as fw]
             [kii.keys.core :as keys]
@@ -16,7 +18,7 @@
             [kii.ui.conf.custom-kll.handlers]
             [kii.ui.conf.subscriptions :as conf-sub]
             [kii.ui.conf.layer-select.subscriptions :as ls-sub]
-            ))
+            [cuerdas.core :as str]))
 
 (def default-conf
   {:mode         :keymap
@@ -108,11 +110,35 @@
 (rf/reg-event-db :conf/add-animation add-animation)
 
 (defn partial-update-animation
-  [db [_ data]]
-  (let [selected (-> db :conf :selected-animation)]
-    (-> db (update-in [:conf :kll :animations selected] merge data))))
+  [db [_ data name]]
+  (let [name (or name (-> db :conf :selected-animation))]
+    (-> db (update-in [:conf :kll :animations name] merge data))))
 (rf/reg-event-db :conf/partial-update-animation partial-update-animation)
 
+(defn contains-animation
+  [name line]
+  (or
+    (str/includes? line (str/fmt "A[%s]" name))
+    (str/includes? line (str/fmt "A[%s," name))))
+
+(defn delete-animation
+  [db [_ name]]
+  (-> db
+      (update-in [:conf :kll :animations] #(dissoc % name))
+      (update-in [:conf :kll :custom] (fn [m]
+                                        (update-values
+                                          m
+                                          (fn [value]
+                                            (as-> value x
+                                                  (str/rtrim x)
+                                                  (str/split x ";")
+                                                  (filterv #(not (contains-animation (clojure.core/name name) %)) x)
+                                                  (conj x "")
+                                                  (str/join ";" x))))))))
+
+
+(rf/reg-event-db :conf/delete-animation delete-animation)
+
 ;; === Triggers === ;;
 
 

src/kii/ui/conf/mode_select/components.cljs

@@ -46,7 +46,7 @@
    [:button {:class (str (:btn mode-select-style) (if (= mode :visuals) " active"))
              :disabled (false? (:visuals-enabled? active-keyboard))
              :on-click #(when-not (= mode :visuals)
-                          (rf/dispatch [:conf/set-active-config-tab :custom-animation])
+                          (rf/dispatch [:conf/set-active-config-tab :manage-animations])
                           (rf/dispatch [:conf/mode-update :visuals]))}
     "visuals"]])
 

src/kii/util.cljs

@@ -43,3 +43,7 @@
   [s]
   (js/parseFloat s))
 
+(defn update-values
+  "Creates a new map by applying the function to the values in the map."
+  [m f & args]
+  (into {} (for [[k v] m] [k (apply f v args)])))