Browse Source

enhance(mobile): remove ionic components

charlie 7 months ago
parent
commit
3fed3984d0

+ 0 - 73
src/main/mobile/components/app.cljs

@@ -34,7 +34,6 @@
             [mobile.components.demos :as demos]
             [mobile.components.ui :as ui-component]
             [mobile.components.ui-silk :as ui-silk]
-            [mobile.ionic :as ion]
             [mobile.state :as mobile-state]
             [promesa.core :as p]
             [rum.core :as rum]))
@@ -83,29 +82,6 @@
          {:style {:max-width "40vw"}}
          short-repo-name]])]))
 
-(rum/defc bottom-tabs
-  []
-  (ion/tab-bar
-    {:slot "bottom"}
-    (ion/tab-button
-      {:tab "home"}
-      (ion/tabler-icon "home" {:size 22}) "Journals")
-    (ion/tab-button
-      {:tab "search"}
-      (ion/tabler-icon "search" {:size 22}) "Search")
-    (ion/tab-button
-      {:tab "quick-add"
-       :on-pointer-down (fn [e]
-                          (util/stop e)
-                          (editor-handler/show-quick-add))}
-      (ion/tabler-icon "plus" {:size 22}) "Quick add")
-    (ion/tab-button
-      {:tab "settings"}
-      (ion/tabler-icon "settings" {:size 22}) "Settings")
-    (ion/tab-button
-      {:tab "demos"}
-      (ion/tabler-icon "bug" {:size 22}) "Demos")))
-
 (rum/defc keep-keyboard-open
   []
   [:input.absolute.top-4.left-0.w-1.h-1.opacity-0
@@ -167,55 +143,6 @@
       (some-> js/window.externalsjs (.settleStatusBar)))
     [current-repo]))
 
-(rum/defc tabs
-  [current-repo]
-  (let [[current-tab _] (mobile-state/use-tab)
-        *home-page (hooks/use-ref nil)
-        *search-page (hooks/use-ref nil)
-        [presenting-element set-presenting-element!] (hooks/use-state nil)]
-    (use-theme-effects! current-repo)
-    (hooks/use-effect!
-      (fn []
-        (case current-tab
-          "home"
-          (set-presenting-element! (rum/deref *home-page))
-          "search"
-          (set-presenting-element! (rum/deref *search-page))
-          nil))
-      [current-tab])
-    (ion/tabs
-      {:id "app-ion-tabs"
-       :onIonTabsDidChange (fn [^js e]
-                             (mobile-state/set-tab! (.-tab (.-detail e))))}
-      (ion/tab
-        {:tab "home"}
-        (ion/content
-          (home *home-page current-tab)))
-      (ion/tab
-        {:tab "search"}
-        (ion/content
-          (search/search *search-page)))
-      (ion/tab
-        {:tab "settings"}
-        (ion/content
-          (settings/page)))
-      (ion/tab
-        {:tab "demos"}
-        (ion/content
-          (demos/silkhq-demos-page)))
-
-      (bottom-tabs)
-
-      (keep-keyboard-open)
-      (ui-component/install-notifications)
-      (ui-component/install-modals)
-
-      (shui-toaster/install-toaster)
-      (shui-dialog/install-modals)
-      (shui-popup/install-popups)
-      (modal/block-modal)
-      (popup/popup))))
-
 (rum/defc journal-calendar-btn
   []
   (shui/button

+ 7 - 0
src/main/mobile/components/app.css

@@ -337,6 +337,13 @@ html[data-color=logseq] {
 
 .app-silk-sheet-scroll-content {
   @apply flex flex-col items-center;
+
+
+}
+
+.BottomSheet-bleedingBackground,
+.SheetWithDepth-bleedingBackground {
+  @apply bg-gray-01;
 }
 
 .app-silk-scroll-view {

+ 3 - 4
src/main/mobile/components/modal.cljs

@@ -11,7 +11,6 @@
             [logseq.shui.ui :as shui]
             [mobile.components.ui :as mobile-ui]
             [mobile.init :as init]
-            [mobile.ionic :as ion]
             [mobile.state :as mobile-state]
             [logseq.shui.silkhq :as silkhq]
             [rum.core :as rum]))
@@ -50,7 +49,7 @@
                    [:div.flex.justify-between.items-center.block-modal-page-header
                     [:a.opacity-40.active:opacity-60.px-2
                      {:on-pointer-down close!}
-                     (ion/tabler-icon "chevron-down" {:size 18 :stroke 3})]
+                     (shui/tabler-icon "chevron-down" {:size 18 :stroke 3})]
                     [:a.opacity-40.active:opacity-60.px-2
                      {:on-pointer-down (fn []
                                          (mobile-ui/open-popup!
@@ -78,13 +77,13 @@
                                                                           {:text "Ok"
                                                                            :role "confirm"}]}))}
                                                 [:span.text-lg.flex.gap-2.items-center
-                                                 (ion/tabler-icon "trash" {:class "opacity-80" :size 18})
+                                                 (shui/tabler-icon "trash" {:class "opacity-80" :size 18})
                                                  "Delete"])
 
                                               (ui/menu-link
                                                 {:on-click #(mobile-ui/close-popup!)}
                                                 [:span.text-lg.flex.gap-2.items-center
-                                                 (ion/tabler-icon "copy" {:class "opacity-80" :size 18})
+                                                 (shui/tabler-icon "copy" {:class "opacity-80" :size 18})
                                                  "Copy"])])
                                            {:title "Actions"
                                             :modal-props {:initialBreakpoint 0.3}}))}