Browse Source

improve(ux): WIP feature option for the fold button position

charlie 3 years ago
parent
commit
d8632263d9

+ 10 - 0
src/main/frontend/components/settings.cljs

@@ -384,6 +384,13 @@
           #(let [value (not enable-timetracking?)]
              (config-handler/set-config! :feature/enable-timetracking? value))))
 
+(defn fold-button-on-right-row [t enable-fold-button-on-right?]
+  (toggle "enable_fold_button_right"
+          (t :settings-page/enable-fold-button-on-right)
+          enable-fold-button-on-right?
+          #(let [value (not enable-fold-button-on-right?)]
+             (config-handler/set-config! :feature/enable-fold-button-on-right? value))))
+
 (defn update-home-page
   [event]
   (let [value (util/evalue event)]
@@ -570,6 +577,7 @@
         preferred-date-format (state/get-date-formatter)
         preferred-workflow (state/get-preferred-workflow)
         enable-timetracking? (state/enable-timetracking?)
+        enable-fold-button-on-right? (state/enable-fold-button-right?)
         enable-all-pages-public? (state/all-pages-public?)
         logical-outdenting? (state/logical-outdenting?)
         preferred-pasting-file? (state/preferred-pasting-file?)
@@ -584,6 +592,8 @@
      (workflow-row t preferred-workflow)
      ;; (enable-block-timestamps-row t enable-block-timestamps?)
      (show-brackets-row t show-brackets?)
+     (when (mobile-util/native-platform?)
+       (fold-button-on-right-row t enable-fold-button-on-right?))
      (when (util/electron?) (switch-spell-check-row t))
      (outdenting-row t logical-outdenting?)
      (preferred-pasting-file t preferred-pasting-file?)

+ 2 - 2
src/main/frontend/components/sidebar.cljs

@@ -732,7 +732,7 @@
         edit? (:editor/editing? @state/state)
         default-home (get-default-home-if-valid)
         logged? (user-handler/logged-in?)
-        fold-arrow-on-right? (state/sub :mobile/fold-arrow-on-right-enabled?)
+        fold-button-on-right? (state/enable-fold-button-right?)
         show-action-bar? (state/sub :mobile/show-action-bar?)
         show-recording-bar? (state/sub :mobile/show-recording-bar?)
         preferred-language (state/sub [:preferred-language])]
@@ -758,7 +758,7 @@
       {:class (util/classnames [{:ls-left-sidebar-open left-sidebar-open?
                                  :ls-right-sidebar-open sidebar-open?
                                  :ls-wide-mode wide-mode?
-                                 :ls-fold-arrow-on-right (and (util/sm-breakpoint?) fold-arrow-on-right?)
+                                 :ls-fold-button-on-right (and (util/sm-breakpoint?) fold-button-on-right?)
                                  :ls-hl-colored ls-block-hl-colored?}])}
 
       [:button#skip-to-main

+ 1 - 1
src/main/frontend/components/theme.css

@@ -114,7 +114,7 @@ html.is-resizing-buf {
   }
 }
 
-main.ls-fold-arrow-on-right {
+main.ls-fold-button-on-right {
   #main-content-container {
     padding: 0 15px;
 

+ 2 - 0
src/main/frontend/dicts.cljc

@@ -217,6 +217,7 @@
         :settings-page/preferred-pasting-file "Preferred pasting file"
         :settings-page/enable-shortcut-tooltip "Enable shortcut tooltip"
         :settings-page/enable-timetracking "Timetracking"
+        :settings-page/enable-fold-button-on-right "Place block fold button to the right side"
         :settings-page/enable-tooltip "Tooltips"
         :settings-page/enable-journals "Journals"
         :settings-page/enable-all-pages-public "All pages public when publishing"
@@ -1647,6 +1648,7 @@
            :settings-page/preferred-workflow "首选工作流"
            :settings-page/preferred-pasting-file "保存链接为文件"
            :settings-page/enable-timetracking "开启 timetracking"
+           :settings-page/enable-fold-button-on-right "将块折叠按钮放置在右边"
            :settings-page/enable-tooltip "开启提示框"
            :settings-page/enable-journals "开启日记"
            :settings-page/enable-all-pages-public "发布所有页面"

+ 4 - 1
src/main/frontend/state.cljs

@@ -166,7 +166,6 @@
      :assets/alias-dirs                     (or (storage/get :assets/alias-dirs) [])
 
      ;; mobile
-     :mobile/fold-arrow-on-right-enabled?   true
      :mobile/container-urls                 nil
      :mobile/show-action-bar?               false
      :mobile/actioned-block                 nil
@@ -565,6 +564,10 @@ Similar to re-frame subscriptions"
   []
   (not (false? (:feature/enable-timetracking? (sub-config)))))
 
+(defn enable-fold-button-right?
+  []
+  (true? (:feature/enable-fold-button-on-right? (sub-config))))
+
 (defn enable-journals?
   ([]
    (enable-journals? (get-current-repo)))