Browse Source

fix(ios): idevice info

leizhe 4 years ago
parent
commit
2269bfd136

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

@@ -240,7 +240,7 @@
                                    [".favorites" ".recent" ".dropdown-wrapper" ".nav-header"])
                                    [".favorites" ".recent" ".dropdown-wrapper" ".nav-header"])
                          (close-modal-fn)))}
                          (close-modal-fn)))}
          [:div.flex.flex-col.pb-4.wrap
          [:div.flex.flex-col.pb-4.wrap
-          {:style {:padding-top (when (mobile-util/is-native-platform?) 10)}}
+          {:style {:padding-top (if (mobile-util/native-iphone?) 10 60)}}
           [:nav.px-2.space-y-1 {:aria-label "Sidebar"}
           [:nav.px-2.space-y-1 {:aria-label "Sidebar"}
            (repo/repos-dropdown)
            (repo/repos-dropdown)
 
 

+ 30 - 21
src/main/frontend/mobile/util.cljs

@@ -30,34 +30,40 @@
 
 
 (def idevice-info
 (def idevice-info
   (atom
   (atom
-   {:iPadPro-12.9   {:width 1024 :height 1366 :statusbar 40}
-    :iPadPro-11     {:width 834  :height 1194 :statusbar 40}
-    :iPadAir-10.5   {:width 834  :height 1112 :statusbar 40}
-    :iPad-10.2	    {:width 810  :height 1080 :statusbar 40}
-    :iPadPro-9.7	{:width 768  :height 1024 :statusbar 40}
-    :iPadmini-9.7   {:width 768  :height 1024 :statusbar 40}
-    :iPadAir-9.7	{:width 768  :height 1024 :statusbar 40}
-    :iPad-9.7	    {:width 768  :height 1024 :statusbar 40}
+   {:iPadPro12.9    {:width 1024 :height 1366 :statusbar 40}
+    :iPadPro11      {:width 834  :height 1194 :statusbar 40}
+    :iPadPro10.5    {:width 834  :height 1112 :statusbar 40}
+    :iPadAir10.5    {:width 834  :height 1112 :statusbar 40}
+    :iPadAir10.9    {:width 820  :height 1180 :statusbar 40}
+    :iPad10.2	    {:width 810  :height 1080 :statusbar 40}
+    :iPadPro9.7	    {:width 768  :height 1024 :statusbar 40}
+    :iPadmini9.7    {:width 768  :height 1024 :statusbar 40}
+    :iPadAir9.7	    {:width 768  :height 1024 :statusbar 40}
+    :iPad9.7	    {:width 768  :height 1024 :statusbar 40}
+    :iPadmini8.3	{:width 744  :height 1133 :statusbar 40}
+    :iPhone7Plus	{:width 476  :height 847  :statusbar 20}
+    :iPhone6sPlus   {:width 476  :height 847  :statusbar 20}
+    :iPhone6Plus	{:width 476  :height 847  :statusbar 20}
+    :iPhone13ProMax {:width 428  :height 926  :statusbar 47}
     :iPhone12ProMax {:width 428  :height 926  :statusbar 47}
     :iPhone12ProMax {:width 428  :height 926  :statusbar 47}
     :iPhone11ProMax {:width 414  :height 896  :statusbar 44}
     :iPhone11ProMax {:width 414  :height 896  :statusbar 44}
     :iPhone11	    {:width 414  :height 896  :statusbar 48}
     :iPhone11	    {:width 414  :height 896  :statusbar 48}
     :iPhoneXSMax	{:width 414  :height 896  :statusbar 48}
     :iPhoneXSMax	{:width 414  :height 896  :statusbar 48}
     :iPhoneXR	    {:width 414  :height 896  :statusbar 48}
     :iPhoneXR	    {:width 414  :height 896  :statusbar 48}
     :iPhone8Plus	{:width 414  :height 736  :statusbar 20}
     :iPhone8Plus	{:width 414  :height 736  :statusbar 20}
-    :iPhone7Plus	{:width 414  :height 736  :statusbar 20}
-    :iPhone6sPlus   {:width 414  :height 736  :statusbar 20}
-    :iPhone6Plus	{:width 414  :height 736  :statusbar 20}
+    :iPhone13Pro	{:width 390  :height 844  :statusbar 47}
+    :iPhone13	    {:width 390  :height 844  :statusbar 47}
     :iPhone12	    {:width 390  :height 844  :statusbar 47}
     :iPhone12	    {:width 390  :height 844  :statusbar 47}
     :iPhone12Pro	{:width 390  :height 844  :statusbar 47}
     :iPhone12Pro	{:width 390  :height 844  :statusbar 47}
-    :iPhoneX	    {:width 375  :height 812  :statusbar 44}
-    :iPhone12mini   {:width 375  :height 812  :statusbar 44}
     :iPhone11Pro	{:width 375  :height 812  :statusbar 44}
     :iPhone11Pro	{:width 375  :height 812  :statusbar 44}
-    :iPhoneXS	    {:width 375  :height 812  :statusbar 48}
+    :iPhoneXS	    {:width 375  :height 812  :statusbar 44}
+    :iPhoneX	    {:width 375  :height 812  :statusbar 44}
     :iPhone8	    {:width 375  :height 667  :statusbar 20}
     :iPhone8	    {:width 375  :height 667  :statusbar 20}
     :iPhone7	    {:width 375  :height 667  :statusbar 20}
     :iPhone7	    {:width 375  :height 667  :statusbar 20}
     :iPhone6s	    {:width 375  :height 667  :statusbar 20}
     :iPhone6s	    {:width 375  :height 667  :statusbar 20}
     :iPhone6	    {:width 375  :height 667  :statusbar 20}
     :iPhone6	    {:width 375  :height 667  :statusbar 20}
-    :iPhoneSE4.7	{:width 375  :height 667  :statusbar 20}
+    :iPhone13mini   {:width 375  :height 812  :statusbar 44}
+    :iPhone12mini   {:width 375  :height 812  :statusbar 44}
     :iPhoneSE4	    {:width 320  :height 568  :statusbar 20}
     :iPhoneSE4	    {:width 320  :height 568  :statusbar 20}
     :iPodtouch5     {:width 320  :height 568  :statusbar 20}}))
     :iPodtouch5     {:width 320  :height 568  :statusbar 20}}))
 
 
@@ -75,12 +81,15 @@
          [390 844] "iPhone12"
          [390 844] "iPhone12"
          [414 736] "iPhone8Plus"
          [414 736] "iPhone8Plus"
          [414 896] "iPhone11"
          [414 896] "iPhone11"
-         [428 926] "iPhone12ProMax"
-         [768 1024] "iPad-9.7"
-         [810 1080] "iPad-10.2"
-         [834 1112] "iPadAir-10.5"
-         [834 1194] "iPadPro-11"
-         [1024 1366] "iPadPro-12.9"
+         [428 926] "iPhone13ProMax"
+         [476 847] "iPhone7Plus"
+         [744 1133] "iPadmini8.3"
+         [768 1024] "iPad9.7"
+         [810 1080] "iPad10.2"
+         [820 1180] "iPad10.9"
+         [834 1112] "iPadAir10.5"
+         [834 1194] "iPadPro11"
+         [1024 1366] "iPadPro12.9"
          "Not a known Apple device!")
          "Not a known Apple device!")
        landscape?])))
        landscape?])))
 
 

+ 8 - 1
src/main/frontend/ui.cljs

@@ -40,10 +40,17 @@
 
 
 (defn main-content-top-padding
 (defn main-content-top-padding
   []
   []
-  (if (mobile-util/native-ios?)
+  (cond
+    (mobile-util/native-iphone?)
     (- (mobile-util/get-idevice-statusbar-height) 10)
     (- (mobile-util/get-idevice-statusbar-height) 10)
+
+    (mobile-util/native-ipad?)
+    15
+    
+    :else
     0))
     0))
 
 
+
 (defonce icon-size (if (mobile-util/is-native-platform?) 23 20))
 (defonce icon-size (if (mobile-util/is-native-platform?) 23 20))
 
 
 (rum/defc ls-textarea
 (rum/defc ls-textarea