From 6baf0745f028b9b98ea42b0bcaffadfeef84ca15 Mon Sep 17 00:00:00 2001 From: Innei Date: Wed, 12 Mar 2025 20:20:51 +0800 Subject: [PATCH] feat(mobile): improve image carousel and avatar interactions - Disable page control user interaction for single image - Simplify navigation bar and background view initialization - Add Galeria wrapper to UserAvatar for image preview - Update UINavigationBar extension to use safe area layout guide Signed-off-by: Innei --- .../ImageCarouselViewController.swift | 23 ++++++++++--------- .../UINavigationBar_Extensions.swift | 10 ++------ .../src/components/ui/avatar/UserAvatar.tsx | 23 +++++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/mobile/native/ios/Packages/ImageViewer_swift/ImageCarouselViewController.swift b/apps/mobile/native/ios/Packages/ImageViewer_swift/ImageCarouselViewController.swift index 398e92170..301bc469d 100644 --- a/apps/mobile/native/ios/Packages/ImageViewer_swift/ImageCarouselViewController.swift +++ b/apps/mobile/native/ios/Packages/ImageViewer_swift/ImageCarouselViewController.swift @@ -39,18 +39,19 @@ public class ImageCarouselViewController: UIPageViewController, private var onIndexChange: ((Int) -> Void)? private(set) lazy var navBar: UINavigationBar = { - let _navBar = UINavigationBar(frame: .zero) - _navBar.isTranslucent = true - _navBar.setBackgroundImage(UIImage(), for: .default) - _navBar.shadowImage = UIImage() - return _navBar + let navbar = UINavigationBar(frame: .zero) + navbar.backgroundColor = .clear + navbar.isTranslucent = true + navbar.setBackgroundImage(UIImage(), for: .default) + navbar.shadowImage = UIImage() + return navbar }() private(set) lazy var backgroundView: UIView? = { - let _v = UIView() - _v.backgroundColor = .black - _v.alpha = 1.0 - return _v + let v = UIView() + v.backgroundColor = .black + v.alpha = 1.0 + return v }() private(set) lazy var navItem = UINavigationItem() @@ -60,7 +61,7 @@ public class ImageCarouselViewController: UIPageViewController, pageControl.translatesAutoresizingMaskIntoConstraints = false pageControl.currentPageIndicatorTintColor = .white pageControl.pageIndicatorTintColor = .gray - pageControl.isUserInteractionEnabled = true + pageControl.isUserInteractionEnabled = false return pageControl }() @@ -110,7 +111,6 @@ public class ImageCarouselViewController: UIPageViewController, private func addNavBar() { let closeBarButton = UIBarButtonItem( barButtonSystemItem: .close, - target: self, action: #selector(dismiss(_:))) @@ -179,6 +179,7 @@ public class ImageCarouselViewController: UIPageViewController, } private func addPageIndicator() { + if imageDatasource?.numberOfImages() == 1 { return } view.addSubview(pageIndicator) NSLayoutConstraint.activate([ pageIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor), diff --git a/apps/mobile/native/ios/Packages/ImageViewer_swift/UINavigationBar_Extensions.swift b/apps/mobile/native/ios/Packages/ImageViewer_swift/UINavigationBar_Extensions.swift index 7d1c138d8..ae180e279 100644 --- a/apps/mobile/native/ios/Packages/ImageViewer_swift/UINavigationBar_Extensions.swift +++ b/apps/mobile/native/ios/Packages/ImageViewer_swift/UINavigationBar_Extensions.swift @@ -7,13 +7,7 @@ extension UINavigationBar { translatesAutoresizingMaskIntoConstraints = false leftAnchor.constraint(equalTo: view.leftAnchor).isActive = true rightAnchor.constraint(equalTo: view.rightAnchor).isActive = true - - if #available(iOS 11.0, *) { - topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor) - .isActive = true - } else { - topAnchor.constraint(equalTo: view.topAnchor) - .isActive = true - } + topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor) + .isActive = true } } diff --git a/apps/mobile/src/components/ui/avatar/UserAvatar.tsx b/apps/mobile/src/components/ui/avatar/UserAvatar.tsx index aff5777e9..42ca6d5a7 100644 --- a/apps/mobile/src/components/ui/avatar/UserAvatar.tsx +++ b/apps/mobile/src/components/ui/avatar/UserAvatar.tsx @@ -3,6 +3,7 @@ import { Text, View } from "react-native" import { User4CuteReIcon } from "@/src/icons/user_4_cute_re" +import { Galeria } from "../image/galeria" import { Image } from "../image/Image" interface UserAvatarProps { @@ -40,14 +41,18 @@ export const UserAvatar = ({ image, size = 24, name, className, color }: UserAva } return ( - + + + + + ) }