enhance naming

Author: sprocketc

src/renderer/db.cljs

@@ -11,8 +11,8 @@
    [:pointer-pos [:tuple double? double?]]
    [:zoom-sensitivity double?]
    [:state keyword?]
-   [:grid? boolean?]
-   [:rulers? boolean?]
+   [:grid-visible? boolean?]
+   [:rulers-visible? boolean?]
    [:snap renderer.snap.db/snap]
    [:rulers-locked? boolean?]
    [:documents [:map-of :uuid renderer.document.db/document]]
@@ -38,8 +38,8 @@
    :debug-info? false
    :pen-mode? false
    :rulers-locked? false
-   :grid? false
-   :rulers? true
+   :grid-visible? false
+   :rulers-visible? true
    :snap {:enabled? true
           :threshold 100
           :options #{:centers :midpoints :corners :nodes}}

src/renderer/events.cljs

@@ -84,7 +84,7 @@
 (rf/reg-event-db
  :toggle-rulers
  (fn [db [_]]
-   (update db :rulers? not)))
+   (update db :rulers-visible? not)))
 
 #_(rf/reg-event-db
    :toggle-rulers-locked
@@ -94,10 +94,10 @@
 (rf/reg-event-db
  :toggle-grid
  (fn [db [_]]
-   (update db :grid? not)))
+   (update db :grid-visible? not)))
 
 (rf/reg-event-db
- :panel/toggle
+ :toggle-panel
  [local-storage/persist
   (rf/path :panel)]
  (fn [db [_ key]]

src/renderer/menubar/views.cljs

@@ -352,38 +352,38 @@
     :type :checkbox
     :icon "tree"
     :label "Element tree"
-    :checked? [:panel/visible? :tree]
-    :action [:panel/toggle :tree]}
+    :checked? [:panel-visible? :tree]
+    :action [:toggle-panel :tree]}
    {:key :toggle-props
     :type :checkbox
     :icon "properties"
     :label "Properties"
-    :checked? [:panel/visible? :properties]
-    :action [:panel/toggle :properties]}
+    :checked? [:panel-visible? :properties]
+    :action [:toggle-panel :properties]}
    {:key :toggle-xml
     :label "XML view"
     :type :checkbox
     :icon "code"
-    :checked? [:panel/visible? :xml]
-    :action [:panel/toggle :xml]}
+    :checked? [:panel-visible? :xml]
+    :action [:toggle-panel :xml]}
    {:key :toggle-history
     :label "History tree"
     :icon "history"
     :type :checkbox
-    :checked? [:panel/visible? :history]
-    :action [:panel/toggle :history]}
+    :checked? [:panel-visible? :history]
+    :action [:toggle-panel :history]}
    {:key :toggle-command-history
     :type :checkbox
     :label "Shell history"
     :icon "shell"
-    :checked? [:panel/visible? :repl-history]
-    :action [:panel/toggle :repl-history]}
+    :checked? [:panel-visible? :repl-history]
+    :action [:toggle-panel :repl-history]}
    {:key :toggle-timeline-panel
     :type :checkbox
     :label "Timeline editor"
     :icon "timeline"
-    :checked? [:panel/visible? :timeline]
-    :action [:panel/toggle :timeline]}
+    :checked? [:panel-visible? :timeline]
+    :action [:toggle-panel :timeline]}
    {:key :divider-2
     :type :separator}])
 
@@ -406,13 +406,13 @@
             :type :checkbox
             :label "Grid"
             :icon "grid"
-            :checked? [:grid?]
+            :checked? [:grid-visible?]
             :action [:toggle-grid]}
            {:key :toggle-rulers
             :type :checkbox
             :label "Rulers"
             :icon "ruler-combined"
-            :checked? [:rulers?]
+            :checked? [:rulers-visible?]
             :action [:toggle-rulers]}
            {:key :toggle-debug-info
             :type :checkbox

src/renderer/reepl/core.cljs

@@ -78,7 +78,7 @@
                        :complete-word
                        :on-change]))]}
   (let [{:keys [_pos _count _text]} @state
-        repl-history? @(rf/subscribe [:panel/visible? :repl-history])]
+        repl-history? @(rf/subscribe [:panel-visible? :repl-history])]
     [:div.flex.p-0.5.items-center.m-1
      [:div.flex.text-xs.self-start {:class "m-0.5"} (replumb/get-prompt)]
      ^{:key (str (hash (:js-cm-opts cm-opts)))}
@@ -98,7 +98,7 @@
        :active-text "Hide command output"
        :inactive-icon "chevron-up"
        :inactive-text "Show command output"
-       :action #(rf/dispatch [:panel/toggle :repl-history])}
+       :action #(rf/dispatch [:toggle-panel :repl-history])}
       {:style {:height "16px"}}]]))
 
 (defn set-print!
@@ -180,7 +180,7 @@
 
     (set-print! add-log)
     [:<>
-     (when @(rf/subscribe [:panel/visible? :repl-history])
+     (when @(rf/subscribe [:panel-visible? :repl-history])
        [repl-items-panel @items show-value-opts set-text])
 
      [:div.relative.whitespace-pre-wrap.font-mono

src/renderer/subs.cljs

@@ -135,20 +135,20 @@
  :-> :rulers-locked?)
 
 (rf/reg-sub
- :rulers?
- :-> :rulers?)
+ :rulers-visible?
+ :-> :rulers-visible?)
 
 (rf/reg-sub
- :grid?
- :-> :grid?)
+ :grid-visible?
+ :-> :grid-visible?)
 
 (rf/reg-sub
- :panel/visible?
+ :panel-visible?
  (fn [db [_ key]]
    (-> db :panel key :visible?)))
 
 (rf/reg-sub
- :theme/mode
+ :theme-mode
  (fn [db _]
    (-> db :theme :mode)))
 

src/renderer/timeline/views.cljs

@@ -111,7 +111,7 @@
      [snap-controls]
      [comp/icon-button "times"
       {:title "Hide timeline"
-       :on-click #(rf/dispatch [:panel/toggle :timeline])}]]))
+       :on-click #(rf/dispatch [:toggle-panel :timeline])}]]))
 
 (defn register-listeners
   [timeline-ref]
@@ -152,7 +152,7 @@
   []
   (let [time @(rf/subscribe [::timeline.s/time])
         end @(rf/subscribe [::timeline.s/end])
-        timeline? @(rf/subscribe [:panel/visible? :timeline])]
+        timeline? @(rf/subscribe [:panel-visible? :timeline])]
     [:div.h-px.block
      {:style {:width (str (* (/ time end) 100) "%")
               :background (when-not (or (zero? time) (zero? end) timeline?)

src/renderer/tool/container/canvas.cljs

@@ -37,7 +37,7 @@
         tool @(rf/subscribe [:tool])
         primary-tool @(rf/subscribe [:primary-tool])
         rotate @(rf/subscribe [::document.s/rotate])
-        grid? @(rf/subscribe [:grid?])
+        grid? @(rf/subscribe [:grid-visible?])
         state @(rf/subscribe [:state])
         pointer-handler #(pointer/event-handler % element)
         pivot-point @(rf/subscribe [:pivot-point])

src/renderer/toolbar/status.cljs

@@ -47,25 +47,25 @@
 
 (def view-radio-buttons
   [{:title "Timeline"
-    :active? [:panel/visible? :timeline]
+    :active? [:panel-visible? :timeline]
     :icon "timeline"
-    :action [:panel/toggle :timeline]}
+    :action [:toggle-panel :timeline]}
    {:title "Grid"
-    :active? [:grid?]
+    :active? [:grid-visible?]
     :icon "grid"
     :action [:toggle-grid]}
    {:title "Rulers"
-    :active? [:rulers?]
+    :active? [:rulers-visible?]
     :icon "ruler-combined"
     :action [:toggle-rulers]}
    {:title "History"
-    :active? [:panel/visible? :history]
+    :active? [:panel-visible? :history]
     :icon "history"
-    :action [:panel/toggle :history]}
+    :action [:toggle-panel :history]}
    {:title "XML"
-    :active? [:panel/visible? :xml]
+    :active? [:panel-visible? :xml]
     :icon "code"
-    :action [:panel/toggle :xml]}])
+    :action [:toggle-panel :xml]}])
 
 (defn set-zoom
   [e v]
@@ -102,7 +102,7 @@
 
 (defn root []
   (let [zoom @(rf/subscribe [::document.s/zoom])
-        timeline? @(rf/subscribe [:panel/visible? :timeline])]
+        timeline? @(rf/subscribe [:panel-visible? :timeline])]
     [:<>
      [:div.toolbar.bg-primary.mt-px
       [color-v/picker]

src/renderer/utils/keyboard.cljs

@@ -80,10 +80,10 @@
                  [{:keyCode (key-codes "P")
                    :ctrlKey true
                    :shiftKey true}]]
-                [[:panel/toggle :tree]
+                [[:toggle-panel :tree]
                  [{:keyCode (key-codes "T")
                    :ctrlKey true}]]
-                [[:panel/toggle :properties]
+                [[:toggle-panel :properties]
                  [{:keyCode (key-codes "P")
                    :ctrlKey true}]]
                 [[::element.e/stroke->path]

src/renderer/views.cljs

@@ -27,7 +27,7 @@
 
 (defn frame-panel
   []
-  (let [rulers? @(rf/subscribe [:rulers?])
+  (let [rulers? @(rf/subscribe [:rulers-visible?])
         read-only? @(rf/subscribe [::document.s/read-only?])
         loading? @(rf/subscribe [::worker.s/loading?])]
     [:div.flex.flex-col.flex-1.h-full
@@ -82,7 +82,7 @@
       {:id "frame-panel"
        :order 1}
       [frame-panel]]
-     (when @(rf/subscribe [:panel/visible? :history])
+     (when @(rf/subscribe [:panel-visible? :history])
        [:<>
         [:> PanelResizeHandle
          {:id "history-resize-handle"
@@ -94,7 +94,7 @@
          [:div.v-scroll.p-1.bg-primary.h-full.ml-px
           [history/root]]]])
 
-     (when @(rf/subscribe [:panel/visible? :xml])
+     (when @(rf/subscribe [:panel-visible? :xml])
        (let [xml @(rf/subscribe [::element.s/xml])]
          [:<>
           [:> PanelResizeHandle
@@ -111,8 +111,8 @@
 
 (defn editor
   []
-  (let [timeline? @(rf/subscribe [:panel/visible? :timeline])
-        repl-history? @(rf/subscribe [:panel/visible? :repl-history])]
+  (let [timeline? @(rf/subscribe [:panel-visible? :timeline])
+        repl-history? @(rf/subscribe [:panel-visible? :repl-history])]
     [:> PanelGroup
      ;; REVIEW: We need to rerender the group to properly resize the panels.
      {:key (str timeline? repl-history?)
@@ -133,7 +133,7 @@
     [win/app-header]
     (if (seq @(rf/subscribe [:documents]))
       [:div.flex.h-full.flex-1.overflow-hidden
-       (when @(rf/subscribe [:panel/visible? :tree])
+       (when @(rf/subscribe [:panel-visible? :tree])
          [:div.flex.flex-col
           {:style {:width "227px"}}
           [doc/actions]
@@ -143,7 +143,7 @@
         [:div.flex.h-full.flex-1
          [:div.flex.h-full.flex-col.flex-1
           [editor]]
-         (when @(rf/subscribe [:panel/visible? :properties])
+         (when @(rf/subscribe [:panel-visible? :properties])
            [:div.flex
             {:style {:width "300px"}}
             [attr/form]])

src/renderer/window/views.cljs

@@ -52,7 +52,7 @@
      [:div.flex.h-full.flex-1.drag]
      [button {:action [:theme/cycle-mode]
               :title "Theme mode"
-              :icon (name @(rf/subscribe [:theme/mode]))
+              :icon (name @(rf/subscribe [:theme-mode]))
               :class "bg-primary"}]
      (when (and platform/electron? (not fullscreen?) (not platform/mac?))
        (into [:div.text-right]