From 6dd3e19b8a2eeccb63597903b0400a7864addb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE?= Date: Mon, 21 Apr 2025 18:27:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0UI=E6=A0=B7=E5=BC=8F=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 2 + Podfile.lock | 6 +- Thimra/AppDelegate/AppDelegate+Config.swift | 6 +- .../Base/Controller/SPTabBarController.swift | 2 +- Thimra/Base/Controller/SPViewController.swift | 21 +- Thimra/Base/Extension/UIColor+SPAdd.swift | 24 + Thimra/Base/Networking/Base/SPURLPath.swift | 3 +- .../Controller/SPExplorePageController.swift | 138 +++ .../tabbar_icon_01.imageset/Contents.json | 4 +- .../tabbar_icon_01.imageset/Frame@2x.png | Bin 0 -> 935 bytes .../tabbar_icon_01.imageset/Frame@3x.png | Bin 0 -> 1400 bytes .../tabbar_icon_01.imageset/home@2x.png | Bin 1601 -> 0 bytes .../tabbar_icon_01.imageset/home@3x.png | Bin 3059 -> 0 bytes .../Contents.json | 4 +- .../Frame@2x.png | Bin 0 -> 1688 bytes .../Frame@3x.png | Bin 0 -> 2899 bytes .../home@2x.png | Bin 2476 -> 0 bytes .../home@3x.png | Bin 4536 -> 0 bytes .../tabbar_icon_02.imageset/Contents.json | 4 +- .../tabbar_icon_02.imageset/Explore@2x.png | Bin 1306 -> 0 bytes .../tabbar_icon_02.imageset/Explore@3x.png | Bin 2475 -> 0 bytes .../tabbar_icon_02.imageset/Frame@2x.png | Bin 0 -> 1023 bytes .../tabbar_icon_02.imageset/Frame@3x.png | Bin 0 -> 1415 bytes .../Contents.json | 4 +- .../Explore@2x.png | Bin 2278 -> 0 bytes .../Explore@3x.png | Bin 4075 -> 0 bytes .../Frame@2x.png | Bin 0 -> 1648 bytes .../Frame@3x.png | Bin 0 -> 2721 bytes .../tabbar_icon_04.imageset/Contents.json | 4 +- .../tabbar_icon_04.imageset/Frame@2x.png | Bin 0 -> 810 bytes .../tabbar_icon_04.imageset/Frame@3x.png | Bin 0 -> 1163 bytes .../tabbar_icon_04.imageset/My list@2x.png | Bin 872 -> 0 bytes .../tabbar_icon_04.imageset/My list@3x.png | Bin 1511 -> 0 bytes .../Contents.json | 4 +- .../Frame@2x.png | Bin 0 -> 1784 bytes .../Frame@3x.png | Bin 0 -> 3215 bytes .../My list@2x.png | Bin 1856 -> 0 bytes .../My list@3x.png | Bin 3270 -> 0 bytes .../tabbar_icon_05.imageset/Contents.json | 4 +- .../tabbar_icon_05.imageset/Frame@2x.png | Bin 0 -> 1072 bytes .../tabbar_icon_05.imageset/Frame@3x.png | Bin 0 -> 1570 bytes .../TabBar/tabbar_icon_05.imageset/Me@2x.png | Bin 1558 -> 0 bytes .../TabBar/tabbar_icon_05.imageset/Me@3x.png | Bin 3112 -> 0 bytes .../Contents.json | 4 +- .../Frame@2x.png | Bin 0 -> 1910 bytes .../Frame@3x.png | Bin 0 -> 3113 bytes .../Me@2x.png | Bin 2232 -> 0 bytes .../Me@3x.png | Bin 4219 -> 0 bytes .../collect_icon_01.imageset/Contents.json | 4 +- .../collect_icon_01.imageset/Frame@2x.png | Bin 0 -> 836 bytes .../collect_icon_01.imageset/Frame@3x.png | Bin 0 -> 1312 bytes .../icon/collect_icon_01.imageset/收藏@2x.png | Bin 1358 -> 0 bytes .../icon/collect_icon_01.imageset/收藏@3x.png | Bin 2343 -> 0 bytes .../Contents.json | 4 +- .../Frame@2x.png | Bin 0 -> 1152 bytes .../Frame@3x.png | Bin 0 -> 1622 bytes .../收藏@2x.png | Bin 1829 -> 0 bytes .../收藏@3x.png | Bin 3353 -> 0 bytes Thimra/Source/Thimra-Bridging-Header.h | 2 + .../UIViewController+WMPageController.h | 20 + .../UIViewController+WMPageController.m | 25 + .../WMPageController/WMMenuView/WMMenuItem.h | 37 + .../WMPageController/WMMenuView/WMMenuItem.m | 108 +++ .../WMPageController/WMMenuView/WMMenuView.h | 110 +++ .../WMPageController/WMMenuView/WMMenuView.m | 578 ++++++++++++ .../WMMenuView/WMProgressView.h | 29 + .../WMMenuView/WMProgressView.m | 145 +++ .../WMMenuView/WMScrollView.h | 13 + .../WMMenuView/WMScrollView.m | 23 + .../WMPageController/WMPageController.h | 360 ++++++++ .../WMPageController/WMPageController.m | 861 ++++++++++++++++++ 71 files changed, 2525 insertions(+), 28 deletions(-) create mode 100644 Thimra/Class/Explore/Controller/SPExplorePageController.swift create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/home@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/home@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01_selected.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01_selected.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01_selected.imageset/home@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01_selected.imageset/home@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Explore@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Explore@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Explore@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Explore@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Frame@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04.imageset/My list@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04.imageset/My list@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/My list@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/My list@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Me@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Me@3x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05_selected.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05_selected.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05_selected.imageset/Me@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05_selected.imageset/Me@3x.png create mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/收藏@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/收藏@3x.png create mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Frame@2x.png create mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Frame@3x.png delete mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/收藏@2x.png delete mode 100644 Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/收藏@3x.png create mode 100644 Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.h create mode 100644 Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.m create mode 100755 Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.h create mode 100755 Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.m create mode 100755 Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.h create mode 100755 Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.m create mode 100755 Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.h create mode 100755 Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.m create mode 100644 Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.h create mode 100644 Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.m create mode 100755 Thimra/Thirdparty/WMPageController/WMPageController.h create mode 100755 Thimra/Thirdparty/WMPageController/WMPageController.m diff --git a/Podfile b/Podfile index b483f89..195ef0a 100644 --- a/Podfile +++ b/Podfile @@ -33,6 +33,8 @@ target 'Thimra' do pod 'Kingfisher' #图片加载 pod 'EmptyStateKit' #空数据页面 pod 'ReachabilitySwift' #网络状态监控 + pod 'WMZPageController' #分页控制器 + diff --git a/Podfile.lock b/Podfile.lock index 9506ec1..4c78339 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -15,6 +15,7 @@ PODS: - SmartCodable (4.3.2) - SnapKit (5.7.1) - Toast (4.1.1) + - WMZPageController (1.5.5) - YYKit (1.0.9): - YYKit/no-arc (= 1.0.9) - YYKit/no-arc (1.0.9) @@ -33,6 +34,7 @@ DEPENDENCIES: - SmartCodable - SnapKit - Toast + - WMZPageController - YYKit - ZFPlayer/AVPlayer @@ -50,6 +52,7 @@ SPEC REPOS: - SmartCodable - SnapKit - Toast + - WMZPageController - YYKit - ZFPlayer @@ -66,9 +69,10 @@ SPEC CHECKSUMS: SmartCodable: 88fbf3d65207c2376fdbce4b080a3d578cb51be8 SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e + WMZPageController: 87dd82d1e3528cd362de19b9a74fd6890d6e1906 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13 -PODFILE CHECKSUM: 1ac1768b638088622600b82e65d3eb429873c448 +PODFILE CHECKSUM: 6569d2af22714fb67d77646500c1ce1c95d63b3c COCOAPODS: 1.16.2 diff --git a/Thimra/AppDelegate/AppDelegate+Config.swift b/Thimra/AppDelegate/AppDelegate+Config.swift index fbef84c..b399337 100644 --- a/Thimra/AppDelegate/AppDelegate+Config.swift +++ b/Thimra/AppDelegate/AppDelegate+Config.swift @@ -28,12 +28,12 @@ extension AppDelegate { let font = UIFont.fontRegular(ofSize: 10) - let normalColor = UIColor.color7F7F80() - let selectedColor = UIColor.colorFF0089() + let normalColor = UIColor.color828284() + let selectedColor = UIColor.colorFFFFFF() let backgroundImage = UIImage(color: .clear) - let backgroundColor = UIColor.black + let backgroundColor = UIColor.color201A1A(alpha: 0.93) let shadowImage = UIImage() let shadowColor = UIColor.clear diff --git a/Thimra/Base/Controller/SPTabBarController.swift b/Thimra/Base/Controller/SPTabBarController.swift index 921647b..aae513e 100644 --- a/Thimra/Base/Controller/SPTabBarController.swift +++ b/Thimra/Base/Controller/SPTabBarController.swift @@ -14,7 +14,7 @@ class SPTabBarController: UITabBarController { let nav1 = createNavigationController(viewController: SPHomePageController(), title: "Home".localized, image: UIImage(named: "tabbar_icon_01"), selectedImage: UIImage(named: "tabbar_icon_01_selected")) - let nav2 = createNavigationController(viewController: SPExploreViewController(), title: "For You".localized, image: UIImage(named: "tabbar_icon_02"), selectedImage: UIImage(named: "tabbar_icon_02_selected")) + let nav2 = createNavigationController(viewController: SPExplorePageController(), title: "For You".localized, image: UIImage(named: "tabbar_icon_02"), selectedImage: UIImage(named: "tabbar_icon_02_selected")) let nav4 = createNavigationController(viewController: SPMyListViewController(), title: "My list".localized, image: UIImage(named: "tabbar_icon_04"), selectedImage: UIImage(named: "tabbar_icon_04_selected")) diff --git a/Thimra/Base/Controller/SPViewController.swift b/Thimra/Base/Controller/SPViewController.swift index a88e1f2..02a0a15 100644 --- a/Thimra/Base/Controller/SPViewController.swift +++ b/Thimra/Base/Controller/SPViewController.swift @@ -29,11 +29,22 @@ class SPViewController: UIViewController, JYPageChildContollerProtocol { return imageView; }() + ///头部渐变色 + private lazy var toGradientView: SPGradientView = { + let view = SPGradientView() + view.colors = [UIColor.color290D0F().cgColor, UIColor.color230E11().cgColor, UIColor.color181115().cgColor, UIColor.color121317(alpha: 0).cgColor] + view.startPoint = .init(x: 0.5, y: 0) + view.endPoint = .init(x: 0.5, y: 1) + view.locations = [0, 0.33, 0.66, 1] + return view + }() + override func viewDidLoad() { super.viewDidLoad() self.isViewDidLoad = true self.edgesForExtendedLayout = [] + setBgImageView() if let navi = navigationController { @@ -46,8 +57,14 @@ class SPViewController: UIViewController, JYPageChildContollerProtocol { } func setBgImageView() { - self.view = self._bgImageView - self.view.backgroundColor = .black + self.view.backgroundColor = .color121317() + + self.view.addSubview(toGradientView) + + toGradientView.snp.makeConstraints { make in + make.left.right.top.equalToSuperview() + make.height.equalTo(kSPStatusbarHeight + 420) + } } override func viewDidAppear(_ animated: Bool) { diff --git a/Thimra/Base/Extension/UIColor+SPAdd.swift b/Thimra/Base/Extension/UIColor+SPAdd.swift index 3a07a02..87c0b0e 100644 --- a/Thimra/Base/Extension/UIColor+SPAdd.swift +++ b/Thimra/Base/Extension/UIColor+SPAdd.swift @@ -84,5 +84,29 @@ extension UIColor { static func color888888(alpha: CGFloat = 1) -> UIColor { return color(hex: 0x888888, alpha: alpha) } + + static func color201A1A(alpha: CGFloat = 1) -> UIColor { + return color(hex: 0x201A1A, alpha: alpha) + } + + static func color828284(alpha: CGFloat = 1) -> UIColor { + return color(hex: 0x828284, alpha: alpha) + } + + static func color121317(alpha: CGFloat = 1) -> UIColor { + return color(hex: 0x121317, alpha: alpha) + } + + static func color290D0F(alpha: CGFloat = 1) -> UIColor { + return color(hex: 0x290D0F, alpha: alpha) + } + + static func color230E11(alpha: CGFloat = 1) -> UIColor { + return color(hex: 0x230E11, alpha: alpha) + } + + static func color181115(alpha: CGFloat = 1) -> UIColor { + return color(hex: 0x181115, alpha: alpha) + } } diff --git a/Thimra/Base/Networking/Base/SPURLPath.swift b/Thimra/Base/Networking/Base/SPURLPath.swift index 3735547..1943545 100644 --- a/Thimra/Base/Networking/Base/SPURLPath.swift +++ b/Thimra/Base/Networking/Base/SPURLPath.swift @@ -18,11 +18,12 @@ import UIKit https://api-zyreotv.zyreotv.com/7834f11d/ - https://thimratv.com + https://api-thimratv.thimratv.com */ #if DEBUG let SPBaseURL = "https://test1-api.guyantv.com" +//let SPBaseURL = "https://api-thimratv.thimratv.com" let SPURLPathPrefix = "" //let SPBaseURL = "https://api-mireotv.mireotv.com" //let SPURLPathPrefix = "/4da6fd4c" diff --git a/Thimra/Class/Explore/Controller/SPExplorePageController.swift b/Thimra/Class/Explore/Controller/SPExplorePageController.swift new file mode 100644 index 0000000..44fa9c6 --- /dev/null +++ b/Thimra/Class/Explore/Controller/SPExplorePageController.swift @@ -0,0 +1,138 @@ +// +// SPExplorePageController.swift +// Thimra +// +// Created by Overseas on 2025/4/21. +// + +import UIKit + + +class SPExplorePageController: SPViewController { + + private lazy var titles: [String] = { + let arr = ["Shorts".localized, "Featured".localized, "All".localized] + return arr + }() + + private lazy var itemWidthArr: [NSNumber] = { + var arr: [NSNumber] = [] + self.titles.forEach { + var width = $0.size(font: .systemFont(ofSize: 14)).width + 16 + if width < 50 { + width = 50 + } + arr.append(NSNumber(value: width)) + } + return arr + }() + + private lazy var menuWidth: CGFloat = { + var width: CGFloat = 0.0 + itemWidthArr.forEach { + width += CGFloat($0.floatValue) + } + return width + }() + + + private lazy var pageView: WMPageController = { + var itemWidthArr: [NSNumber] = [] + + self.titles.forEach { + var width = $0.size(font: .systemFont(ofSize: 14)).width + 16 + if width < 50 { + width = 50 + } + itemWidthArr.append(NSNumber(value: width)) + } + + let pageView = WMPageController() + pageView.delegate = self + pageView.dataSource = self + pageView.titleSizeNormal = 14 + pageView.titleSizeSelected = 14 + pageView.titleColorNormal = .colorFFFFFF() + pageView.titleColorSelected = .colorFFFFFF() + pageView.progressColor = .colorFFFFFF(alpha: 0.22) + pageView.menuViewStyle = .flood + pageView.menuViewLayoutMode = .center + pageView.itemsWidths = itemWidthArr + pageView.progressHeight = 24 + + return pageView + }() + + private lazy var menuBgView: UIView = { + let view = UIView() + view.addEffectView(style: .light) + view.layer.cornerRadius = 15 + view.layer.masksToBounds = true + return view + }() + + override func viewDidLoad() { + super.viewDidLoad() + + + _setupUI() + + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + self.navigationController?.setNavigationBarHidden(true, animated: true) + } + +} + +extension SPExplorePageController { + + private func _setupUI() { + addChild(pageView) + + self.view.addSubview(self.pageView.view) + self.pageView.view.addSubview(menuBgView) + self.pageView.view.bringSubviewToFront(self.pageView.menuView!) + + self.pageView.view.snp.makeConstraints { make in + make.edges.equalToSuperview() + } + + menuBgView.snp.makeConstraints { make in + make.center.equalTo(self.pageView.menuView!) + make.width.equalTo(menuWidth + 8) + make.height.equalTo(30) + } + } + +} + + +//MARK: -------------- WMPageControllerDelegate & WMPageControllerDataSource -------------- +extension SPExplorePageController: WMPageControllerDelegate, WMPageControllerDataSource { + + func pageController(_ pageController: WMPageController, preferredFrameForContentView contentView: WMScrollView) -> CGRect { + return CGRect(x: 0, y: 0, width: kSPScreenWidth, height: kSPScreenHeight - kSPTabBarHeight) + } + + func pageController(_ pageController: WMPageController, preferredFrameFor menuView: WMMenuView) -> CGRect { + return CGRect(x: 0, y: kSPStatusbarHeight + 10, width: kSPScreenWidth, height: 30) + } + + func pageController(_ pageController: WMPageController, titleAt index: Int) -> String { + return titles[index] + } + + func numbersOfChildControllers(in pageController: WMPageController) -> Int { + return titles.count + } + + func pageController(_ pageController: WMPageController, viewControllerAt index: Int) -> UIViewController { + return SPExploreViewController() + } + + + + +} diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Contents.json b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Contents.json index b60f645..6aa90f6 100644 --- a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Contents.json +++ b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "home@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "home@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Frame@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Frame@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2898f0e2a2ba9febdcfa253a66748d6f448ce103 GIT binary patch literal 935 zcmV;Y16cftP)4-+{rbEV+3a{BVhJ!_- zC_3O=++;?eTYdBW^F8`dTlZ4c$wb^xU$BS+mOwoO_|(5+^G$l{Gzk1K`+YPT{_?yU zdKdF_ANH|ce+R?i?`yEY+ODPbQ2BvRJbl6}W=tOYzCU`Zf2Y&g6#_2iuE#Egm>lE( zjA0GdGUO>exUO@!$p0T-XG1qDYXp7Vd#DE(2r)IfnJ{d|QcfP}Mh@4}%}O((^`P@Z zavMsu@9SY1+U+Pr_X=h=#8|jWzFEo;(gWv}9^U#!p77eH}fR zvWjkU6JjdrujyCxSN1sw&iha>m^?@IdhHI!dk;FndbL{pFDB1F&s~%2TIfngx<&r# z?6q2FKjDSI0D|u8?9tfisUWZa0*$DhtTmm=Ubow=!V95;i|m>9UoazTkhZE+f(RjV zpNdTw6QM49W(DXVuYax~DC!1@8xnnNjx@kD^7$SV}>&L6ySTak%x3I_on+=wXFzIXjS^;-32Ku!CuYyi)1;S$57jCuuPf$`)Qc|+b`~x({s6|R8*gpUO002ov JPDHLkV1jg|u8sfz literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Frame@3x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01.imageset/Frame@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..fa3e82a68fcdd364c72daeea02874e1bf273d59b GIT binary patch literal 1400 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 literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01_selected.imageset/home@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_01_selected.imageset/home@2x.png deleted file mode 100644 index c41c38c71e7e10bd1f6ec4f7ed2cd72c83748eef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2476 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 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Frame@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Frame@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6024d383f01b8f5ee052aa2becf05567e50fa34a GIT binary patch literal 1023 zcmVz!E!0g>v>CANfq7cpSS<269&lKP| zV_V8#8VwR|aG*YvjFiwMXAJ_l#+7~(o6go`3J^k`lYMi}raJF01J@m0<8zvfiBI^| z$?6k3G70{b)y}hT9fh~$5-y-ZD8@%utdY|z^gkik&#YFixpDYUwHhxq!lWTb4hO;E zP}e7ZZ$R<}Ps3s7VRrbFvCPTbc>(B$@#?%#0f`SJ=9cCK2*_vW1tf3aAmG)Q(0Dwy zY0CkXp>iXlkpSFiH5ZHEo^$Kob-e*pLnuI(>=+4%-jdNnFkU;jw?QH9dnk!bR<>jx zphSdSVFGeVrUk~-VgdTSSS3zO2?(0jcT=+xBFg6C^fHqwqfls8XJ@Vh<~)ml5ZxAF z6A~ZO?L>(R1%#D_)51pW9$P}4L-&5g;5jM z?L>*46+oq(q__aE@OAx4jY1~Go4{nI(RqVGWdCrJXQn$N0N=XjPcxpte9Pjwb*UW^ zpl&hh_z=f_+z?{zbvbFb^MgdLfQJWJVWt)Gc>lqm+kygU3R~)yep?oNgo>bKB{G|E zwr`;znJZvfY=R~2qv&A4Yw9Y)CZK~hqRkrf4-Ui>3ZgwDqti#M9AB+ER(Vi_u`F?7 ta;mxZkdG2~r~o>Z%sUs@vuDp{{03g8r981`la2rY002ovPDHLkV1o8e(X0Rf literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Frame@3x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02.imageset/Frame@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..fa87279b4f7b2cc40471a495a32210609106e72e GIT binary patch literal 1415 zcmV;21$g?2P)E6pS^2Mx#+nDRzg&2CNP9P*@ZZ=DM)KJB;IdGI-C1 zu+{_`4#(dClnaIOT3Dr&=Q!+ZyWM^?z5`ewvYvZL9#WpwYBf(v*`NboY$(O?kS^75 z9Daz+5MNi(d#qtoT+Z3l_g~KY{r)_wZVfDeU*5&PQCU4*UUp}&BG=c~uA#8_S#+)x$?5Eww ziapF1L>aS!$ zsCc7ZufN&Oeczv=NzbTEV;eGe*dXh6)>^L&jUl|M3?_ax|i_cg*#iQ}^ zB2sFT|B0P6gY>%j84j=LOU|%2I?vN(uYyq%qY*KR^MFNiY8x2%tq)m%5b9wx8uxNu z8ufM|Lhw`R=!T zsRB8U@5W{F{AGx)W5`;td3}w~ad6r+yHf9cnU_^N&p4=59W?}kdCWx_x@L`wLTReujHXwk)+1k!tGK?{LQ0_lD9L7VI5cN3NfMEUHj+IuGu z=WrO8qhx=2eb{d*ftJY=$rIKEqS%LKIiNI{NAiSKfl!ze&TBtu3W(;(@HmCyNd$U+ zelAuZDVY{w(>#}&j7C=vn@+)+vK+~qq(`>ygD8iCDcJ9n3Cx>%Sf6~6JW-gFrc5B_ za2~eV?D9tPM8UmS-0a481vI<&AW#Te)5$iPogT@XQmSzfH9MR$zXNM1EzBsn4|)qd z2fq1xzl!8Db3sH21yZ+Q554&s`5^0y7ji(0oX&f_&J?VnNAm1lIq6#|{iDmv_7p6l zNAk4d%;cIvEod>n-g$&A6E7Ieq9}pr*Bf-Zog3I9(F(LYmlP3d#La2D;zXaG_#j#{ zX>x^C3#!%FjS%V+78}%@@Bs(wtXJFsxgvSOsz5Y{jw9nET5MJHwDl^HJYn4jMGsPf zX={q)lZ9Ny&$BlvS3Qz9?c#~OOxiE@i)6D;0jmmJ00Bz!*{_s|Z+bynjW3#89!mj%Z7VQew+ zVkm9o?!g8~?Zt!;n)1pm(;Pdk;l_Wh_#AsCD>hXdA+Z54E#Sr~N-vR8&+{R8&;t=QnNC VUJV;qsPg~-002ovPDHLkV1l!mo>Kq- literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Contents.json b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Contents.json index 08d1e99..6aa90f6 100644 --- a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Contents.json +++ b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Explore@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Explore@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Explore@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Explore@2x.png deleted file mode 100644 index 8acae82b92972d5182f53085958f583f4ebccb1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2278 zcmVPx-ph-kQRA@u(nSW4J*A>UV=k8lUC5oc78mfyU4uYCsh(Bu!Nz>HE%s5l0Njh4w zz_Nhpq%(Hf8SU)u)J%U*ZLF{h5@~ft^P{bq+OdhT`!N2BV$djxzXlXFj-n!BK=$oB z-S^nt@^p=F!4Na`{yL*3U$h1PKP}+PaY{K8Mh~Wn zqU-m=0&MpVl}}u_nJc@MSjX#?1=Jnn zDH!i3RQ-5vtmE_!pkU2b75Gl~WZVkS$}7sHHL2C^PBRKL<~ie&q~uZnD*z;FeFSJr z!rGGO&Ghdn(<=bYg|f$wE>ekIV2lWXoMO<5#I=q$K1+$#0?!KsUJ20nkX(xZxoS^c z@b;Svg%#9XfTV<<0eFRhcbQ= zG|t`EtL=w>NeWo~3DG2mRTZ51A4s_kQrs_@un^o$!Hl;p5Wm))jMSeqV}X9^u>N^N zr*i8TqpFLW!ed;udxuiMqPtViX7O9whx~Q%mAh$qhYOvzdq)hwz~x|GNC>;fo!tf4 zCvlq-qU+d@ie)XD#N{7VWs|V}4x|Nml*S~p>i_A;*Yj(8e!Wt#ZU&S10Du&&TQJC5 zRHhB>O2D03y~MC#7yvHiuOAOV+X%4TE0_cVA4~k{KXfw^n*55oJ!xHOv-aGQzkWUw zmV+o;ABU(`4XCevrE1aUXyaZi*f7IFxGO-o4+Bk5`I+RZMW@2=A^=)oW=xn^2j)pc zXtS`glc1btuo`7jRdAp!{9Y3fWKlW5{~7*z{?73G#=Ld9OWeL{(I7P0c*Ni7LKa1W zus#>;<6>|k2uF^dXvhi&d<5WP(VH(o#U>(B1b3|lD-i|nWsRQS1&Q~PDi`gJrH>ie zONDPft`hcxAqjyOlfB>9ce@C{Cxw4o7c@~Gz=tgC-wXjjU)mUd0k#N!V?@Od8q6pb zi_8W4-`9s?vwBqJ_m&s{E);I|F(HSTWg?{}mVxh(Rq1A@a$|LB^%7GDo7uU}+uv~p zw=own;zSYTKm!{(w?_485ll?sz;BSINp8yCL1mJ0a#}V%1iw#cd8r;Grni)s!4>Qsg#2Ux1ncOSz>Z{nE)BP95>EE6iE zZ2|!sz-f91fs?fi7$lGP&M^X@@PuRcJZ8&k zgmNun%$ra#{aG{&cbC>aBij(yXdUSEDJ`P;@9?g}N4mrVLM3su|@qnPZMRC$qMVLeB7H87*+s zaoDG7E`)fwLkzAF5KvVWLI|i(VdmMQcG%+3uDejCXG+xTYJF*aCM$uriI7gO9@NBAAXRqIutp||Gdplt&dMFOIKH6+O!j0N0DO7A_>u9+ z+Cj7|ba81{0$p>mDzgrno#(KlUQZ>oU1+i=!wB%Pqrn&StsDZmuBpQ-tWw+}6|9}A zrkli_HwW^y--6IOr96FDxZ@GW$!7xyc)}MYA{=)WOw-D1V;y!J?@lEEd5S09 z2yoDGO1D68*<6o#(%inhYl+rDgPvn3Y4^&hnM4;c@0e3IaMwr0C!U7Nty8_}wFe!| zk1{$}5wIWx(;hqvT-O?!|CB4|#$3cYU2#(>psozpeF)gXeCy>b&&0?@-n3~$ zf_09@$T^TzKF$d6QSn**9MJaJCp=>#06i!1<*`;e(aR_DShTs_6z#f+{Y7UM2!XdW zIbxhsNqsrHJT>ZlI2MQljx&)|VruyqBS3BOx$YQXay{XBG%A4E$@V+WP9hQ;3H
  • )^}NPrJZE<1x2Gd-1nVn;2>5WV<9Rye+6)(;9JhDmO<-!B_a(t4MF{2K^BnG!I#0p8l`><+P z!Y{D-Nm3+yODoBTYPCm{qkFT$2ca=vvEND;61D-WH{%F&=9baL zyUo|DznJ<>c@q;o1Te8kpR3423w*B2Yhv*K0;Zv`UL0g_UH||907*qoM6N<$g2E9^ A`Tzg` diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Explore@3x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_02_selected.imageset/Explore@3x.png deleted file mode 100644 index 04d80d085eeef013ed4090ff4a17c8343d9aa481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4075 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 dEkT{*_y2zn1i^!lq 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 literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04.imageset/Frame@3x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04.imageset/Frame@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b3785afc7f672202ac30eeffce1cfc36805ab93c GIT binary patch literal 1163 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 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Contents.json b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Contents.json index 14066fc..6aa90f6 100644 --- a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Contents.json +++ b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "My list@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "My list@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Frame@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/Frame@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..58cacb63edb253c4b8784947e518b9951a0bb230 GIT binary patch literal 1784 zcmVNukwD}&c?D_{ZRukA+IQ!8&TQ}Y(dA9sS3~GY=FQB#GiRT3&fEtu z4&!iRgUDqOA}*$`idq?r9h?wCoPd!6G2ejy9~_`IsL~3CV15gAi>b9y+im)>0A~6z zYBkhOQ>%yJ00|HpO;o`c1JPV;XtxfwP7Hwr)gl7!uPj`-6Qoq{WY*ds_AC$rC8DtX zK=^|oAaqjg1v4f}ZRJ0IQP&^+{$NlSx>g{$9yCUtfd17=P{a%&H0xz-O}u9e{3GMa zFk^b#NWXQEBX|kWV~A+36|XVAKseSdGrUS@W@(vHBy#Trr#YZ;0|7C8=nuM7}%cM4$)dDC{z>1q60aAd>t7FFe2<18$p5$vtT-H7+0UJj9XKmOG6?djv67wy;V}Sx_a4%5Q;bOYiTa z#>u6nu<_8Rkhl;mkOLO<0T@X7;6=0AkOoIV{x^s<7IVzKnw z!;mYaJ38U(N7g~Qy)))Pj-hbHnXl&dN54PtjzTV`+Ymw>#dGX!?-UbCi*v$50>imWm0ynWY|Mw5>mrKdLiw)LxuK}y);{am z-&>lRAX|Wx+8<#LXy0cmu>W%oa8}L{d^54jn!*J+<3Xgmi$DAXS1(;wQReWD-SGL2 zT}p_hYgWPI8=s+Zhw}d}jEGqVY0@v6+CrfPAMnZpug|+%sfX(qR|<%DEvd`rbLoFY zr_>p>n97Hli9%?L((t$JRnI0;?SIFFVsPH$cvt(wmoEI0pFE(7IYSVv@H&b(fq7I> zPz0?}FH9!pi$y}cn^cg1n{fiR$+V!@Pp+bhKjE0n)Uo+I#997n)2J&0P!(sy5|#;_ zpxCF;twm8r%p*WN`e^=@7pZF;!K&B$~ zJHy@rpoyP?73+)+)&(+r82-!x8|VA1F>E{Og`W7`Xgm{Hw%MIp!JY$`9_+JB=_l;< zOdnW@=J0Yn5EfJBPL~$}WGu)jqMEY3%46(?Y%Yn`O@vFdtc5_Bh4e1McvcJ`pI1s% zE56MkDcuFaRzn^ts64a_lXAWyRMo9(?IRlK`=^s<}s#-1Jz# zoPXcF@a)@f2+q0;oQ=0{dJ)c?{N8LfG2eb5Fc^SwdERTh64{DbbEHcucrAv>B_&W> z_Z-wbwZT4WGi^3cj_=zKd$w$czmiQcm$&)Dg@o`(GR!%VdDTJ`;Y6CW6cOGusXHPL zXv}lGleGTck;9gGX8Kj4JC)iT9`nOxYgWVNy&uEFYgg%gdcQIyjrH8Kp7yf9@>z52 z-1;-!cT3=fciw_U)ywU+6Vx`)n#L?#v#DzUV~t~EjgPi$gXUyYHreo4zARvQk=pOE znl!rSyKgM>to1sgwIrK)!$hO827fkeTTXl5-1`YsuU)NhLO#HLq_=ajfMhGIe{e~7 z`sB&@cl-vU;au^~HsAgg9Q|w`)-HMg8F%$H9#6KL;x z`w71}nZ)<&Ut=LI4n%)A1RMgRwT7715BO+(5E_hkmqmL1^lz+`vTXXpMQ%0yN|x4Z zV3Z+l4U2y?1lWpwVJi;tpVdgfSfeI3ADI9K32SC2>VGQ76pXb)xL(0nWGw&M9fxta a?%+Q$wLaqy^~7@k0000dmPh)2FnjNv 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 BD6jwk literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/My list@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/My list@2x.png deleted file mode 100644 index 0450fbda44d522ff619c7e2e347af9e8a16f0f99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1856 zcmV-G2fz4Px*`bk7VRA@u(neT5?*BQsZ&#{xZBq2c4Gz=7)&Er>S<_wmR!cZ(Gv>$9vC8}nk zKklV9xiM7To4wgyp#2AXL9J_?;#-X>D{4hmZB;j|a@4_sXpk9@5|}rpC@fhYfRCP!{h7di0sLYhJ^GVi-_LVSotfx5ydF~Q0<&=1MkSJ$vfpHuI|!7n>FN5a zYk+_5F*kXI=Y0awsr1OYVw}J7^eYWsUzzrq^9n&0xH9*7D-S_EJnT&lLk1df-A~Ulsgu$fE#=!u5wbdt50n8a}EKkRS-_;rOl@0AqWP z9s{GpXvB1^|oXKSExWLM*yh#(&^Wf#L95HUJS>D`Pty0Vv1Mb)Wkw80E#NaHnmx z91D4HBfw10HN-4oiM1C6aB}y=V$|gJ5>QpN z63m%p@-J-y*_|v|_s4^70p8QVY9kYtKen|f0OfRY@0HpLZ>7dy#}Le%5tKVxmmm5W zKpJd-ZSDXr87FK77-X%EwG|DZAl`mqVsTZj;)g`!pH~US-v!Gzx0u!A>8}2S1gjL* zSDRbh0bDTpH8GV!Yhs&S0ZcocG_F4)g!sCISS<@O=)bj>7gc9aemx8My;tel-ITd#3?!JLu?^7b z4q(toX~egd(RF6aJp-6Gl>l5YQV9k$hSZzPjcx(XYOt$OSWRYgNdX3pvua#5zTRXu zy8}3D3{F*}ur`=YB?UNd3{EKkz1eJX3vfXL)ILB~v$>|E0B4Ph38+;FtT&tM+ySJF zOBzi91WbQP0nQj{8-T%ji@Dkzz-c3`2@(k~SuJK`NdZ#EdH5v;c8gN^|H zxbLIwB=emBx2pnLdqsRB%YyxN0<(As=tL%$bq7g9nWODpk@X+F+WP8%e2S*4VRE1wc1_Az)`DV1XHutyx+cF_0RTL+tS;Wc~o~RtAqTQ6Dk360maWADT%O#k{;3n`@A}4W8`&bhAfzUSviG z0lukg$iFerN5FTK^8`A+En5Dqxl(f8KRA++$$EnCmjDW*eVz!WZ_Ie3pUz06$V-cam}Aai#i#06sfWMK}P)1`y5%qjY8=PR|Mx;jKX44|vWv9b;Yv uJ`YFlWuNx}?qxLH^mShWH&MHnZTSOBw diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/My list@3x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_04_selected.imageset/My list@3x.png deleted file mode 100644 index 8c8ca56bac40cbe0865aeb1be6ae2ba0534a9304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3270 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 Eg7d%}VE_OC diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Contents.json b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Contents.json index ceb7e15..6aa90f6 100644 --- a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Contents.json +++ b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Me@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Me@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Frame@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Frame@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cfc6ef0cc8856e15f1354ebcb64ca2a7338509e7 GIT binary patch literal 1072 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 UOWWP_0000007*qoM6N<$g2R)_mjD0& literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Me@2x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05.imageset/Me@2x.png deleted file mode 100644 index f0c1586449bc5e5ffdb8f8b9a5d2a7ca751b9188..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1558 zcmV+x2I={UP)Px)&`Cr=RA@u(SYfCYRS=%pT{OWTFW(LNVeo{Y!nfz#%QG=jdKVOo6#UVnek3Ux z7#1lM6&WcQ1_>D&8WtHD{qTW?g@ML3GPKvzz31$cjD&>zVdTpFA-vRk?z9uT@w(mT zp1Z4v;Qrk?GxMD}GxNz3jTJsRGL_~f39}zDS z(K!I91Hh3>moA;GR;$e$5xv3@sMTtBl}e?xM6?0z2^ES<% zJ^OMVAh`gXK7D$+F=l)0(f95mDXqyajpRZ70vP*8C)2 zh@){LilPO!RmvK`*x1;ktyb$85nTj;ij?xa)fHI^CDHvJ0Om0eA;bqZN38)Ur2<4O zw_2^`<#Ktijq+|~lv4cwz;-T1Q8cSst^Spz!wNtchEEXDS8E|{EQA=!GJYfeYpwTjV*`LiLWm>R)0qh%48xa* zXj|O&H%KYpPL(kS>h0~_iHO6#?|-?*&~ElISGJ4*L7<#51LeFlAgd6K%7P%sbk0VmlXIs|om%L59w%}p@XRNqwcY{%ueI0zn;8M6)YFLg1v6D4#QLHU zNT1LeA;gChbD&fzZ8yezSuU5kNBr;O9Pm8v-Db1-c{hYlYrPf#cC_bRCmWd&2!ddl z>$>}iXqS}odD}!RBA4X`#W=XDWzY;G263BsW7f?{l=JCS zhjAb1CnDc=Xt8y+T~2GwW9iRv9~cutWL}spfPd<;O;Y7`JUy2_A4J^X`~JUuXEME3 z07gegOH-yy`8A$@c^Z3YU|`^EQAa09`aain`S#)J)vNc-nKOr}`*lAn0IVSl!?YS% zk*qAko&GDOcvM|%)4F=j!fQsD)d)z=jO)|hnQLkxnGI*OuKZ0FZ@k9drnF=NIS zM0}ZdM2I*fgg9X3c_P#`06xbY$8nr}yguY9&2gM{{r&wvbYqxjY-7w09#i9uL<0cW z`Rh{WPWp2JNI-DKV7|gbIDeak5O3OmNcmMFd*a%)Ys>Riw%hPwIT7M-g0fQhYyRI8BHMw%-%A%r+ zu|fcpQV$>^Gtv9wZQW5JMAh;M@sKkJ0B4D4NuHf(*L|SfF|GAuM05ZVdw5=UU3X>H z0G{ed76qRr>yri|E{nl`X9K=nCRYTMQqS_7%PVr`NJ5C$^B7N)Ia#x>w%G#}1~Ad6 z<2Y-4-~Tv|^XZu|3|F;UtzF4wSXZ*HpHQ+^=Rup-9l7gvC$Pyfi#Kx9iD=mKJnQFZ z{e+ZK2N7`zCmsMS6+)aTa`PQ>isyiXTo8DTDWzO$qu&|;^K?Y)8y_Eku4w6-%rP#> z)22=1Eyy_`#EUl+fQ_Px=;z>k7RCr$PTX~R_#T9?AznPuc6$k}xVzMCy1sB+v@7oJW0$PF^4aVRR@uEbG zN4$?hLqJPoL`iA9f*6l@AQDAUD^a|~QesKDI`bWSz#37qQtGlME|_I@=IfVvo1Ut5 zi)HsaX3?tcf4{H0-~09J*YCalHNtS)BLX;#&z=z&250~a83t$=pkPj9*n);F=o@T7 zsZ?sTrfCNPzz6^sO+=$v9Yo9lz^4H4@9ysIkLv2`IuMb9sp_xykZ-YcI$a@zIG%`( zLd1g*t@M0c2U$q`am45deOolr31mHbi{Hb=|c@^jS$s$qv_bGi7CExrq}eX85OuhK6V~ z8ZF6Yv!&5!G%keLPfB?tBAx;O2>=jES>9?NAmXxkJie;X-wzP|^$8uI*4Eb8u3fth zC89e4fI;H6i-_JQqPybp_@k31P1@l{3AV^_A8%IbfFO^bWhKTzrpV0~c_Y%=xtE;O&4nuObuvjcMorul{0QPC@;JLj_ zL|5p#-Wb-Y7aBmyau!M{7b9Ys0_X3Vrd`zD-o9<-%$a<2huSzyh(sbk2Y}m%h!=z% zc7v4i#IP146oA;w9mhG3h;CDkn2+ZBVzJmYez%hsBu&#i91-sYfCJRRyryZ|Nr^<_ zb1&oU?%z-VvTb`V5#6tjZ;oAluW8!tRaI4dG7U*%kc1G+iKxf#5z%TX<%KmhHU9}B zKwy9z$C)ane5}{%EiEf6`+YG^lz|j=9Oqyq%Xk%FF4T4Xo*;o`Ab{8@yRQ3Z05}~0 zBqFZK<#Oi-UA2LL=E5y6&8snwk&&ju{9b$8nC8Qm#~S&KB2o zPpGM>N&6KhjDE^-uOy;l)mFROFpQ;s#|{LLX__3(a^S{${&HQ{?+EL7^{Wu~Gfk7X zn4?b99c5)@6DCZU;441z4UlP?^AYhOrN~BI*MAg5sj&N6mh}JtEKrMgqhT0J{LJAC zAoe}ETO_OSZ;`t4rl^94{UmEtge z4I-8Uz#Dl1P6|83_o_(W{~gB}Bc)sg06*g-7y#z!y8gV^aXka1$`@A>(NaXz0O00i zGPy(*xxCI_)c^%cy+xBg#9M~m=6Fgnx@UFs;c^AAi?s=aOvV{BFYINj!Pz!&kfXPpzo$> zu0_NX_&+ISqPn`eaiBiEzXt{AVZ$)a>^tFm@4Z*9Y1-q6I1>OqbX|AmV8VUVG%v`X zjCZN=*tZqpEH65J%`zh5)MPT*;AOvhwxHfl8UP;Eb)Dm(ue5w{7O^brG9ko8 zM3gEiDLG>>@kdirQzDnkJ&lMvUDuuG)uHxtit$37%K5YqB9TZWnu-n3K|+X)s>HFe zqoZTS?&{53wrq)i@x>Ph#^dp=g8`=?^rlUl_RZyTkttKAeCjpo?W_3u_3I;J#*BFf z5vvh#J0kwrYs}`^f;dnlqNn)2i-t6v-{rM=9PPN$C&LOcopV*%ia($dniCr+H$>17Ph7PMx~8m+Rj z@|t{ddNuEBM7*xKxp~=OB4sav1^t)hoIH8*A|kp@jrF^hmX@2m%IO&(p3HHanNrHf z0ic|S*1N8Ia&2vGdr+mq?7wm2#<8WPrCjbf8UTD-x-WoQT3SYScXz+ZISv5qK*U*I zkIyi{*xgv^boyW+#2f0K&W^=mvnneqho)f00$G-IIRM>F{&>HY z0p9>AE8@J2L5UJkb2J*AGiAyYCM)c<*3{Ire=e7MRxMnX@9cD4f5NXofdEn|#lrwF zTalXXk3=F@4&{||Z^hMR!p(@tsRfsV*F~ez`I9G4?$|2;srvMx0Kg|22asKPrr1Km zFjn{#C`dmpm*hE*w;*CE5p5SjoR&x=UI`MB2eP1oGVHJs@g^ebq1fe_V;77XHR{3f z(;G{!#Gt#0f?1pXlN*l#bS$jiz!Rudh+u`bY`(YQs8g} z@|XGRr+pNGVih7@9tJn4#~KH_QiJ(Vv09mKQV_T&B9K!4CK`?YBP{35&N!RRPG>$4 z08CJ_vHyD{7K<(M6A<>NU#I}_Bx<{zMMPHtzz@~Le1G<<>k{{*ImxFn8JjJ*zCIQxz*Lx8~lKj zPN(@U?k|d=-!nv>n4Z=&?c(lrg(dOw;_f5Q5{Oo?8X=9^(>S*B|sFtYukDh++mmKcC`&@O~-f zl44SCiUJUCt5hmg7l}lc0l?u(ne9Y$M-Y0jy3)QZ&tT;fvhZT))m$#OsHUdo-C}IF zq5x#ucD#nY@quF|xJ;n}OO4%rcII9>%yHEk* zoM`9Horg#%`EH9NTRw*Qxzh!PVZ7>RTlLq6iQ@pUqHyFB(U<&CZ^VcZZ-$uzh6Yd} zCnBPSy&kgglYm7*gTp-pjZlRaRDp^1`P-O*d`YRFTPK*w^vt#=N4Ph`2JDOkNlmouIiGJ7deTDiD!R zr6ZI;MahZwq%7aYW-=M(O!CXd!mCDRmNA9q;~>sEkOi5hnaDq%|TJWskgEuQS2jFpM6;m!B30Aj`72*2@etF1&$ZwoZ|b2PzaQfVeEfclpOUZ5Kd|H4xvv%!pnCw|R0*^!^`tDtMHU_hFX+00005FhA32oHuxL1?$z&K%FVKhxW#+ikl=dFV;*-kCcy=kI>! zoO|yAOw%+?(=`2`gm8z5h?3kTO!E=Zhr5|r;WW4X+E!?ir z#Hoi{lkk8lXwnceUTgym5lg+?I=G$X=9_y+NemTdej@BmwoEDA6p$cIqr6t+wCl;qmphF4KPzI&`E;M z7_02`cBeMAAbJ^KPZMfhMtfAZJOzLr65C}2Sp)Sva7RelRrwRyQDljX#g(AsL1k)$ z;k38iGW=!5#-;*Kdm#v@A3`ip2-5l~!~s^kp8~lC>D7J6@3FeYy8B?!M=h{0y9e}l zlsUz`l<}JPP9sZC(y*HQ z!gH{^^#e6@@zZv?@JUVuImTeshJ2TAUhU*At;P}WA4@;4g7OV8?EQ8--WO0yAq*4j zLF45R`zS!|^&s;4><#M>=g)(J@_vZ&{trL@1h;P7P<$4=@*)PaX2`R|ts!c2L}yK( zsFbEFL1>%lWii$z7e`WSlMIzcZd3?|6jTg+l#*;1$@ScATX6M(eemqpp8-DnAVVeK z_e1#e@2l`->p{gdKC2FrZ#D}2Xn=zBx2d$6Q6tM@zo8lfY|ihp1Hm9RFrJ}Ld7aSA z0O%Ru>rl_Ym7$_~zlN1u_RcP_?=HV*27G@g2Y+3@te!7@^(Cl(W+h6D+$HKT)rm_9}diZ_H^!x&*9vu)9RZ?Ha-t?o?a<|46`ssbG#Zj zxaYk{NZk`l$?!}&vh$`-!ek5}y`C>+1_caK7CQYLvdZJODPu?(k?`X1m4S-T%C}xu zGf?1fmekae7@pv6}NJkY-2u- z*TT8eXW-276R>9UCRng$H7tAWW%%{*5r{F!ABx?hpfuC-U`0)x&0DTaH~*JiAB_c} zQ45Hh-z5&zwW$L#3o2OonW*ysL*>xkeNom~x9bg{x|s@kV!#qMa&fHI#1E+~R)(rJ zAY#DEUMy%Mw9;}NMm<>=$+J2y23Id%VNdG}Tw6a25>GyE(=Nr)gCb9!{ceD$T-Ei< zjF*Ry>|rTdz6`^Oh56Av8Ngsv5Rp?okuGd%G!cs{1LiGU0QL2=;SUqoFtUiES?J}R zv6QO|Ow<5FzEO6i9T*@u8B(wwWwl9KbtGG8wKTBd!Cj0mivQfikN3O__p-<9(SvB6 z=f0~M9d%?|nfb94tdvGA!>E`P!g#BKfU2&6TI0wyXBVA;R5l_FG09Rq88!SJD^E2D zwsK3_MGHlJA7C*gclDW`3Ii;|sHErod@tj>tDs{bYJEC@IZY~Mz$t26WkU#bm9|w| z0+;%NsE$Y)&E@>_zQ{1Lk|j7<#KE0Iq1VkAn2k09Y`D}sn1;AI#x%S8kD3JW=~x5GmbpFl=fX&<*4Eelx#AR+@j-;bN6^Q_7mCEx5DtrL57(}nBAI8@&*TaHeiSA z?Q)*yv95T$cIPnzn`&qx1_*>?dToIbgR-ud#E>B5B1?!Z;FXgl=wg3PC07*qoM6N<$g8V>%TL1t6 literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05_selected.imageset/Frame@3x.png b/Thimra/Source/Assets.xcassets/TabBar/tabbar_icon_05_selected.imageset/Frame@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..8b3799bd0bec973ce35a521e788f9886ab80828e GIT binary patch literal 3113 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 RG~ECI002ovPDHLkV1kY`4441_ diff --git a/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Contents.json b/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Contents.json index 2fcc7b2..5c4d3b1 100644 --- a/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Contents.json +++ b/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "收藏@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "收藏@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Frame@2x.png b/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Frame@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..71c1a96f598a9ec324ecd5a4dd2ab980d833268e GIT binary patch literal 836 zcmV-K1H1f*P)0@%Rr1f&x@^pJA#g(H?^$&&5& z-T7jIL!1}s`AHUl5JCtcgb+fAk`R&7+fHxKWbl3s@sfnFJ_^FHU9Zm$ z;x$+mxvP-b2ju6IpK2_fZZ(ZZ3*)Qj8X0A6VPr~%%Ht&*tZOWlW3oTB%;Zmg$^Mi= zCONz0kYaRM-I5bG9fv<5vL*jqEsR^pkPpnSt+5p3S4zBR8OfjA#*MBNM)naSAv3Ju zu5^QVZuH;X>&N|SwQ4bf6#{hvaCqeHva{cPeyjw&w_9s}=Er}X{loK5I>393K?mwu zZ;v#64W*u(r1O(}Q+4YT1LrPDrVBQhr;Te4^r^$VzKMycT@UmL*d^x6`Lp>1>_3E8 zz@9K)e_apsN%~w%J;HCoZwgwS@HegpJGU@f=w0Dh{LMiN^O>A^%~se;?_7e$Ddx&| zNaa1fW8dJ5-hN}c{vaS&gXz3>Pt$Xcob(B7X*#wjfj*I2DqoEVf~R**=@a^_A0AL% z+3|XH*ZC?+9T_cPjLZO?r;aO>p+)569`z^4aHL)qWq(V6qB1;jl67ttU^ebhGfF-${2l|G{Vvi-c_IgHHE@Bq3 zv0Iozc@!clF<{&pe(3GH-5*M!R1~(1yz8M`3XoZ8{fmYvccmhQYv{~sLjAj%!k2lL zmQ#-?Y-KdxNa-D@lUaEkbpHUQBEK%l$9k6_WV&hN^FAmQnbnDXxD^gwIz{f?v_{G3 ze7E^Y5&t29`Y#GwOo9FOcbyi+`wEGWY1z9@pmxQ#EFpvtLI@#*n64Mw6ZP(-<>lo7 O00004RSY literal 0 HcmV?d00001 diff --git a/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Frame@3x.png b/Thimra/Source/Assets.xcassets/icon/collect_icon_01.imageset/Frame@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e8a27726e126e965085595f45e3eab61aa58fdbc GIT binary patch literal 1312 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 diff --git a/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Contents.json b/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Contents.json index 2fcc7b2..5c4d3b1 100644 --- a/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Contents.json +++ b/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "收藏@2x.png", + "filename" : "Frame@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "收藏@3x.png", + "filename" : "Frame@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Frame@2x.png b/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/Frame@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1b1b2f30b42125eaee31623e095155859883042c GIT binary patch literal 1152 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 TsL{NB00000NkvXXu0mjfyOw-i diff --git a/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/收藏@3x.png b/Thimra/Source/Assets.xcassets/icon/collect_icon_01_selected.imageset/收藏@3x.png deleted file mode 100644 index 74c35e77898d371e99ae23ce68d353870e35ec74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3353 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 diff --git a/Thimra/Source/Thimra-Bridging-Header.h b/Thimra/Source/Thimra-Bridging-Header.h index e40e6ad..30f41af 100644 --- a/Thimra/Source/Thimra-Bridging-Header.h +++ b/Thimra/Source/Thimra-Bridging-Header.h @@ -13,3 +13,5 @@ #import #import #import +#import +#import "WMPageController.h" diff --git a/Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.h b/Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.h new file mode 100644 index 0000000..2f789e0 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.h @@ -0,0 +1,20 @@ +// +// UIViewController+WMPageController.h +// WMPageController +// +// Created by Mark on 15/6/11. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import + +@class WMPageController; + +@interface UIViewController (WMPageController) + +/** + 获取控制器所在的WMPageController + */ +@property (nonatomic, nullable, strong, readonly) WMPageController *wm_pageController; + +@end diff --git a/Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.m b/Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.m new file mode 100644 index 0000000..13f4e91 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/UIViewController+WMPageController.m @@ -0,0 +1,25 @@ +// +// UIViewController+WMPageController.m +// WMPageController +// +// Created by Mark on 15/6/11. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import "UIViewController+WMPageController.h" +#import "WMPageController.h" + +@implementation UIViewController (WMPageController) + +- (WMPageController *)wm_pageController { + UIViewController *parentViewController = self.parentViewController; + while (parentViewController) { + if ([parentViewController isKindOfClass:[WMPageController class]]) { + return (WMPageController *)parentViewController; + } + parentViewController = parentViewController.parentViewController; + } + return nil; +} + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.h b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.h new file mode 100755 index 0000000..bf1da29 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.h @@ -0,0 +1,37 @@ +// +// WMMenuItem.h +// WMPageController +// +// Created by Mark on 15/4/26. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import +@class WMMenuItem; + +typedef NS_ENUM(NSUInteger, WMMenuItemState) { + WMMenuItemStateSelected, + WMMenuItemStateNormal, +}; + +NS_ASSUME_NONNULL_BEGIN +@protocol WMMenuItemDelegate +@optional +- (void)didPressedMenuItem:(WMMenuItem *)menuItem; +@end + +@interface WMMenuItem : UILabel + +@property (nonatomic, assign) CGFloat rate; ///> 设置 rate, 并刷新标题状态 (0~1) +@property (nonatomic, assign) CGFloat normalSize; ///> Normal状态的字体大小，默认大小为15 +@property (nonatomic, assign) CGFloat selectedSize; ///> Selected状态的字体大小，默认大小为18 +@property (nonatomic, strong) UIColor *normalColor; ///> Normal状态的字体颜色，默认为黑色 (可动画) +@property (nonatomic, strong) UIColor *selectedColor; ///> Selected状态的字体颜色，默认为红色 (可动画) +@property (nonatomic, assign) CGFloat speedFactor; ///> 进度条的速度因数，默认 15，越小越快, 必须大于0 +@property (nonatomic, nullable, weak) id delegate; +@property (nonatomic, assign, readonly) BOOL selected; + +- (void)setSelected:(BOOL)selected withAnimation:(BOOL)animation; + +@end +NS_ASSUME_NONNULL_END diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.m b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.m new file mode 100755 index 0000000..9d747c3 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuItem.m @@ -0,0 +1,108 @@ +// +// WMMenuItem.m +// WMPageController +// +// Created by Mark on 15/4/26. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import "WMMenuItem.h" + +@implementation WMMenuItem { + CGFloat _selectedRed, _selectedGreen, _selectedBlue, _selectedAlpha; + CGFloat _normalRed, _normalGreen, _normalBlue, _normalAlpha; + int _sign; + CGFloat _gap; + CGFloat _step; + __weak CADisplayLink *_link; +} + +#pragma mark - Public Methods +- (instancetype)initWithFrame:(CGRect)frame { + if (self = [super initWithFrame:frame]) { + self.normalColor = [UIColor blackColor]; + self.selectedColor = [UIColor blackColor]; + self.normalSize = 15; + self.selectedSize = 18; + self.numberOfLines = 0; + + [self setupGestureRecognizer]; + } + return self; +} + +- (CGFloat)speedFactor { + if (_speedFactor <= 0) { + _speedFactor = 15.0; + } + return _speedFactor; +} + +- (void)setupGestureRecognizer { + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(touchUpInside:)]; + [self addGestureRecognizer:tap]; +} + +- (void)setSelected:(BOOL)selected withAnimation:(BOOL)animation { + _selected = selected; + if (!animation) { + self.rate = selected ? 1.0 : 0.0; + return; + } + _sign = (selected == YES) ? 1 : -1; + _gap = (selected == YES) ? (1.0 - self.rate) : (self.rate - 0.0); + _step = _gap / self.speedFactor; + if (_link) { + [_link invalidate]; + } + CADisplayLink *link = [CADisplayLink displayLinkWithTarget:self selector:@selector(rateChange)]; + [link addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; + _link = link; +} + +- (void)rateChange { + if (_gap > 0.000001) { + _gap -= _step; + if (_gap < 0.0) { + self.rate = (int)(self.rate + _sign * _step + 0.5); + return; + } + self.rate += _sign * _step; + } else { + self.rate = (int)(self.rate + 0.5); + [_link invalidate]; + _link = nil; + } +} + +// 设置rate,并刷新标题状态 +- (void)setRate:(CGFloat)rate { + if (rate < 0.0 || rate > 1.0) { return; } + _rate = rate; + CGFloat r = _normalRed + (_selectedRed - _normalRed) * rate; + CGFloat g = _normalGreen + (_selectedGreen - _normalGreen) * rate; + CGFloat b = _normalBlue + (_selectedBlue - _normalBlue) * rate; + CGFloat a = _normalAlpha + (_selectedAlpha - _normalAlpha) * rate; + self.textColor = [UIColor colorWithRed:r green:g blue:b alpha:a]; + CGFloat minScale = self.normalSize / self.selectedSize; + CGFloat trueScale = minScale + (1 - minScale)*rate; + self.transform = CGAffineTransformMakeScale(trueScale, trueScale); +} + +- (void)setSelectedColor:(UIColor *)selectedColor { + _selectedColor = selectedColor; + [selectedColor getRed:&_selectedRed green:&_selectedGreen blue:&_selectedBlue alpha:&_selectedAlpha]; +} + +- (void)setNormalColor:(UIColor *)normalColor { + _normalColor = normalColor; + [normalColor getRed:&_normalRed green:&_normalGreen blue:&_normalBlue alpha:&_normalAlpha]; +} + +- (void)touchUpInside:(id)sender { + if ([self.delegate respondsToSelector:@selector(didPressedMenuItem:)]) { + [self.delegate didPressedMenuItem:self]; + } +} + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.h b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.h new file mode 100755 index 0000000..f3ca76b --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.h @@ -0,0 +1,110 @@ +// +// WMMenuView.h +// WMPageController +// +// Created by Mark on 15/4/26. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import +#import "WMMenuItem.h" +#import "WMProgressView.h" +@class WMMenuView; + +typedef NS_ENUM(NSUInteger, WMMenuViewStyle) { + WMMenuViewStyleDefault, // 默认 + WMMenuViewStyleLine, // 带下划线 (若要选中字体大小不变，设置选中和非选中大小一样即可) + WMMenuViewStyleTriangle, // 三角形 (progressHeight 为三角形的高, progressWidths 为底边长) + WMMenuViewStyleFlood, // 涌入效果 (填充) + WMMenuViewStyleFloodHollow, // 涌入效果 (空心的) + WMMenuViewStyleSegmented, // 涌入带边框,即网易新闻选项卡 +}; + +// 原先基础上添加了几个方便布局的枚举，更多布局格式可以通过设置 `itemsMargins` 属性来自定义 +// 以下布局均只在 item 个数较少的情况下生效，即无法滚动 MenuView 时. +typedef NS_ENUM(NSUInteger, WMMenuViewLayoutMode) { + WMMenuViewLayoutModeScatter, // 默认的布局模式, item 会均匀分布在屏幕上，呈分散状 + WMMenuViewLayoutModeLeft, // Item 紧靠屏幕左侧 + WMMenuViewLayoutModeRight, // Item 紧靠屏幕右侧 + WMMenuViewLayoutModeCenter, // Item 紧挨且居中分布 +}; + +@protocol WMMenuViewDelegate +@optional +- (BOOL)menuView:(WMMenuView *)menu shouldSelesctedIndex:(NSInteger)index; +- (void)menuView:(WMMenuView *)menu didSelesctedIndex:(NSInteger)index currentIndex:(NSInteger)currentIndex; +- (CGFloat)menuView:(WMMenuView *)menu widthForItemAtIndex:(NSInteger)index; +- (CGFloat)menuView:(WMMenuView *)menu itemMarginAtIndex:(NSInteger)index; +- (CGFloat)menuView:(WMMenuView *)menu titleSizeForState:(WMMenuItemState)state atIndex:(NSInteger)index; +- (UIColor *)menuView:(WMMenuView *)menu titleColorForState:(WMMenuItemState)state atIndex:(NSInteger)index; +- (void)menuView:(WMMenuView *)menu didLayoutItemFrame:(WMMenuItem *)menuItem atIndex:(NSInteger)index; +@end + +@protocol WMMenuViewDataSource + +@required +- (NSInteger)numbersOfTitlesInMenuView:(WMMenuView *)menu; +- (NSString *)menuView:(WMMenuView *)menu titleAtIndex:(NSInteger)index; + +@optional +/** + * 角标 (例如消息提醒的小红点) 的数据源方法，在 WMPageController 中实现这个方法来为 menuView 提供一个 badgeView + 需要在返回的时候同时设置角标的 frame 属性，该 frame 为相对于 menuItem 的位置 + * + * @param index 角标的序号 + * + * @return 返回一个设置好 frame 的角标视图 + */ +- (UIView *)menuView:(WMMenuView *)menu badgeViewAtIndex:(NSInteger)index; + +/** + * 用于定制 WMMenuItem，可以对传出的 initialMenuItem 进行修改定制，也可以返回自己创建的子类，需要注意的是，此时的 item 的 frame 是不确定的，所以请勿根据此时的 frame 做计算！ + 如需根据 frame 修改，请使用代理 + * + * @param menu 当前的 menuView，frame 也是不确定的 + * @param initialMenuItem 初始化完成的 menuItem + * @param index Item 所属的位置; + * + * @return 定制完成的 MenuItem + */ +- (WMMenuItem *)menuView:(WMMenuView *)menu initialMenuItem:(WMMenuItem *)initialMenuItem atIndex:(NSInteger)index; + +@end + +@interface WMMenuView : UIView +@property (nonatomic, strong) NSArray *progressWidths; +@property (nonatomic, weak) WMProgressView *progressView; +@property (nonatomic, assign) CGFloat progressHeight; +@property (nonatomic, assign) WMMenuViewStyle style; +@property (nonatomic, assign) WMMenuViewLayoutMode layoutMode; +@property (nonatomic, assign) CGFloat contentMargin; +@property (nonatomic, strong) UIColor *lineColor; +@property (nonatomic, assign) CGFloat progressViewBottomSpace; +@property (nonatomic, weak) id delegate; +@property (nonatomic, weak) id dataSource; +@property (nonatomic, weak) UIView *leftView; +@property (nonatomic, weak) UIView *rightView; +@property (nonatomic, copy) NSString *fontName; +@property (nonatomic, weak) UIScrollView *scrollView; +/** 进度条的速度因数，默认为 15，越小越快， 大于 0 */ +@property (nonatomic, assign) CGFloat speedFactor; +@property (nonatomic, assign) CGFloat progressViewCornerRadius; +@property (nonatomic, assign) BOOL progressViewIsNaughty; +@property (nonatomic, assign) BOOL showOnNavigationBar; + +- (void)slideMenuAtProgress:(CGFloat)progress; +- (void)selectItemAtIndex:(NSInteger)index; +- (void)resetFrames; +- (void)reload; +- (void)updateTitle:(NSString *)title atIndex:(NSInteger)index andWidth:(BOOL)update; +- (void)updateAttributeTitle:(NSAttributedString *)title atIndex:(NSInteger)index andWidth:(BOOL)update; +- (WMMenuItem *)itemAtIndex:(NSInteger)index; +/// 立即刷新 menuView 的 contentOffset，使 title 居中 +- (void)refreshContenOffset; +- (void)deselectedItemsIfNeeded; +/** + * 更新角标视图，如要移除，在 -menuView:badgeViewAtIndex: 中返回 nil 即可 + */ +- (void)updateBadgeViewAtIndex:(NSInteger)index; + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.m b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.m new file mode 100755 index 0000000..d2d9a1f --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMMenuView.m @@ -0,0 +1,578 @@ +// +// WMMenuView.m +// WMPageController +// +// Created by Mark on 15/4/26. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import "WMMenuView.h" + +@interface WMMenuView () +@property (nonatomic, weak) WMMenuItem *selItem; +@property (nonatomic, strong) NSMutableArray *frames; +@property (nonatomic, assign) NSInteger selectIndex; +@property (nonatomic, readonly) NSInteger titlesCount; +@end + +static NSInteger const WMMenuItemTagOffset = 6250; +static NSInteger const WMBadgeViewTagOffset = 1212; + +@implementation WMMenuView + +#pragma mark - Setter + +- (void)setLayoutMode:(WMMenuViewLayoutMode)layoutMode { + _layoutMode = layoutMode; + if (!self.superview) { return; } + [self reload]; +} + +- (void)setFrame:(CGRect)frame { + // Adapt iOS 11 if is a titleView + if (@available(iOS 11.0, *)) { + if (self.showOnNavigationBar) { frame.origin.x = 0; } + } + + [super setFrame:frame]; + + if (!self.scrollView) { return; } + + CGFloat leftMargin = self.contentMargin + self.leftView.frame.size.width; + CGFloat rightMargin = self.contentMargin + self.rightView.frame.size.width; + CGFloat contentWidth = self.scrollView.frame.size.width + leftMargin + rightMargin; + CGFloat startX = self.leftView ? self.leftView.frame.origin.x : self.scrollView.frame.origin.x - self.contentMargin; + + // Make the contentView center, because system will change menuView's frame if it's a titleView. + if (startX + contentWidth / 2 != self.bounds.size.width / 2) { + + CGFloat xOffset = (self.bounds.size.width - contentWidth) / 2; + self.leftView.frame = ({ + CGRect frame = self.leftView.frame; + frame.origin.x = xOffset; + frame; + }); + + self.scrollView.frame = ({ + CGRect frame = self.scrollView.frame; + frame.origin.x = self.leftView ? CGRectGetMaxX(self.leftView.frame) + self.contentMargin : xOffset; + frame; + }); + + self.rightView.frame = ({ + CGRect frame = self.rightView.frame; + frame.origin.x = CGRectGetMaxX(self.scrollView.frame) + self.contentMargin; + frame; + }); + } +} + +- (void)setProgressViewCornerRadius:(CGFloat)progressViewCornerRadius { + _progressViewCornerRadius = progressViewCornerRadius; + if (self.progressView) { + self.progressView.cornerRadius = _progressViewCornerRadius; + } +} + +- (void)setSpeedFactor:(CGFloat)speedFactor { + _speedFactor = speedFactor; + if (self.progressView) { + self.progressView.speedFactor = _speedFactor; + } + + [self.scrollView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if ([obj isKindOfClass:[WMMenuItem class]]) { + ((WMMenuItem *)obj).speedFactor = _speedFactor; + } + }]; +} + +- (void)setProgressWidths:(NSArray *)progressWidths { + _progressWidths = progressWidths; + + if (!self.progressView.superview) { return; } + + [self resetFramesFromIndex:0]; +} + +- (void)setLeftView:(UIView *)leftView { + if (self.leftView) { + [self.leftView removeFromSuperview]; + _leftView = nil; + } + if (leftView) { + [self addSubview:leftView]; + _leftView = leftView; + } + [self resetFrames]; +} + +- (void)setRightView:(UIView *)rightView { + if (self.rightView) { + [self.rightView removeFromSuperview]; + _rightView = nil; + } + if (rightView) { + [self addSubview:rightView]; + _rightView = rightView; + } + [self resetFrames]; +} + +- (void)setContentMargin:(CGFloat)contentMargin { + _contentMargin = contentMargin; + if (self.scrollView) { + [self resetFrames]; + } +} + +#pragma mark - Getter + +- (UIColor *)lineColor { + if (!_lineColor) { + _lineColor = [self colorForState:WMMenuItemStateSelected atIndex:0]; + } + return _lineColor; +} + +- (NSMutableArray *)frames { + if (_frames == nil) { + _frames = [NSMutableArray array]; + } + return _frames; +} + +- (UIColor *)colorForState:(WMMenuItemState)state atIndex:(NSInteger)index { + if ([self.delegate respondsToSelector:@selector(menuView:titleColorForState:atIndex:)]) { + return [self.delegate menuView:self titleColorForState:state atIndex:index]; + } + return [UIColor blackColor]; +} + +- (CGFloat)sizeForState:(WMMenuItemState)state atIndex:(NSInteger)index { + if ([self.delegate respondsToSelector:@selector(menuView:titleSizeForState:atIndex:)]) { + return [self.delegate menuView:self titleSizeForState:state atIndex:index]; + } + return 15.0; +} + +- (UIView *)badgeViewAtIndex:(NSInteger)index { + if (![self.dataSource respondsToSelector:@selector(menuView:badgeViewAtIndex:)]) { + return nil; + } + UIView *badgeView = [self.dataSource menuView:self badgeViewAtIndex:index]; + if (!badgeView) { + return nil; + } + badgeView.tag = index + WMBadgeViewTagOffset; + + return badgeView; +} + +#pragma mark - Public Methods + +- (WMMenuItem *)itemAtIndex:(NSInteger)index { + return (WMMenuItem *)[self viewWithTag:(index + WMMenuItemTagOffset)]; +} + +- (void)setProgressViewIsNaughty:(BOOL)progressViewIsNaughty { + _progressViewIsNaughty = progressViewIsNaughty; + if (self.progressView) { + self.progressView.naughty = progressViewIsNaughty; + } +} + +- (void)reload { + [self.frames removeAllObjects]; + [self.progressView removeFromSuperview]; + [self.scrollView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [obj removeFromSuperview]; + }]; + + [self addItems]; + [self makeStyle]; + [self addBadgeViews]; +} + +- (void)slideMenuAtProgress:(CGFloat)progress { + if (self.progressView) { + self.progressView.progress = progress; + } + NSInteger tag = (NSInteger)progress + WMMenuItemTagOffset; + CGFloat rate = progress - tag + WMMenuItemTagOffset; + WMMenuItem *currentItem = (WMMenuItem *)[self viewWithTag:tag]; + WMMenuItem *nextItem = (WMMenuItem *)[self viewWithTag:tag+1]; + if (rate == 0.0) { + [self.selItem setSelected:NO withAnimation:NO]; + self.selItem = currentItem; + [self.selItem setSelected:YES withAnimation:NO]; + [self refreshContenOffset]; + return; + } + currentItem.rate = 1-rate; + nextItem.rate = rate; +} + +- (void)selectItemAtIndex:(NSInteger)index { + NSInteger tag = index + WMMenuItemTagOffset; + NSInteger currentIndex = self.selItem.tag - WMMenuItemTagOffset; + self.selectIndex = index; + if (index == currentIndex || !self.selItem) { return; } + + WMMenuItem *item = (WMMenuItem *)[self viewWithTag:tag]; + [self.selItem setSelected:NO withAnimation:NO]; + self.selItem = item; + [self.selItem setSelected:YES withAnimation:NO]; + [self.progressView setProgressWithOutAnimate:index]; + if ([self.delegate respondsToSelector:@selector(menuView:didSelesctedIndex:currentIndex:)]) { + [self.delegate menuView:self didSelesctedIndex:index currentIndex:currentIndex]; + } + [self refreshContenOffset]; +} + +- (void)updateTitle:(NSString *)title atIndex:(NSInteger)index andWidth:(BOOL)update { + if (index >= self.titlesCount || index < 0) { return; } + + WMMenuItem *item = (WMMenuItem *)[self viewWithTag:(WMMenuItemTagOffset + index)]; + item.text = title; + if (!update) { return; } + [self resetFrames]; +} + +- (void)updateAttributeTitle:(NSAttributedString *)title atIndex:(NSInteger)index andWidth:(BOOL)update { + if (index >= self.titlesCount || index < 0) { return; } + + WMMenuItem *item = (WMMenuItem *)[self viewWithTag:(WMMenuItemTagOffset + index)]; + item.attributedText = title; + if (!update) { return; } + [self resetFrames]; +} + +- (void)updateBadgeViewAtIndex:(NSInteger)index { + UIView *oldBadgeView = [self.scrollView viewWithTag:WMBadgeViewTagOffset + index]; + if (oldBadgeView) { + [oldBadgeView removeFromSuperview]; + } + + [self addBadgeViewAtIndex:index]; + [self resetBadgeFrame:index]; +} + +// 让选中的item位于中间 +- (void)refreshContenOffset { + CGRect frame = self.selItem.frame; + CGFloat itemX = frame.origin.x; + CGFloat width = self.scrollView.frame.size.width; + CGSize contentSize = self.scrollView.contentSize; + if (itemX > width/2) { + CGFloat targetX; + if ((contentSize.width-itemX) <= width/2) { + targetX = contentSize.width - width; + } else { + targetX = frame.origin.x - width/2 + frame.size.width/2; + } + // 应该有更好的解决方法 + if (targetX + width > contentSize.width) { + targetX = contentSize.width - width; + } + [self.scrollView setContentOffset:CGPointMake(targetX, 0) animated:YES]; + } else { + [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES]; + } + +} + +#pragma mark - Data source +- (NSInteger)titlesCount { + return [self.dataSource numbersOfTitlesInMenuView:self]; +} + +#pragma mark - Private Methods + +- (void)willMoveToSuperview:(UIView *)newSuperview { + [super willMoveToSuperview:newSuperview]; + + if (self.scrollView) { return; } + + [self addScrollView]; + [self addItems]; + [self makeStyle]; + [self addBadgeViews]; + [self resetSelectionIfNeeded]; +} + +- (void)resetSelectionIfNeeded { + if (self.selectIndex == 0) { return; } + [self selectItemAtIndex:self.selectIndex]; +} + +- (void)resetFrames { + CGRect frame = self.bounds; + if (self.rightView) { + CGRect rightFrame = self.rightView.frame; + rightFrame.origin.x = frame.size.width - rightFrame.size.width; + self.rightView.frame = rightFrame; + frame.size.width -= rightFrame.size.width; + } + + if (self.leftView) { + CGRect leftFrame = self.leftView.frame; + leftFrame.origin.x = 0; + self.leftView.frame = leftFrame; + frame.origin.x += leftFrame.size.width; + frame.size.width -= leftFrame.size.width; + } + + frame.origin.x += self.contentMargin; + frame.size.width -= self.contentMargin * 2; + self.scrollView.frame = frame; + [self resetFramesFromIndex:0]; +} + +- (void)resetFramesFromIndex:(NSInteger)index { + [self.frames removeAllObjects]; + [self calculateItemFrames]; + for (NSInteger i = index; i < self.titlesCount; i++) { + [self resetItemFrame:i]; + [self resetBadgeFrame:i]; + } + if (!self.progressView.superview) { return; } + CGRect frame = CGRectZero; + if (self.style == WMMenuViewStyleDefault) { return; } + if (self.style == WMMenuViewStyleLine || self.style == WMMenuViewStyleTriangle) { + self.progressHeight = self.progressHeight > 0 ? self.progressHeight : 2.0; + frame = CGRectMake(0, self.frame.size.height - self.progressHeight - self.progressViewBottomSpace, self.scrollView.contentSize.width, self.progressHeight); + } else { + self.progressHeight = self.progressHeight > 0 ? self.progressHeight : self.frame.size.height * 0.8; + frame = CGRectMake(0, (self.frame.size.height - self.progressHeight) / 2, self.scrollView.contentSize.width, self.progressHeight); + self.progressViewCornerRadius = self.progressViewCornerRadius > 0 ? self.progressViewCornerRadius : self.progressHeight / 2.0; + } + frame.size.width = self.scrollView.contentSize.width; + self.progressView.frame = frame; + self.progressView.cornerRadius = self.progressViewCornerRadius; + self.progressView.itemFrames = [self convertProgressWidthsToFrames]; + [self.progressView setNeedsDisplay]; +} + +- (void)resetItemFrame:(NSInteger)index { + WMMenuItem *item = (WMMenuItem *)[self viewWithTag:(WMMenuItemTagOffset + index)]; + CGRect frame = [self.frames[index] CGRectValue]; + item.frame = frame; + if ([self.delegate respondsToSelector:@selector(menuView:didLayoutItemFrame:atIndex:)]) { + [self.delegate menuView:self didLayoutItemFrame:item atIndex:index]; + } +} + +- (void)resetBadgeFrame:(NSInteger)index { + CGRect frame = [self.frames[index] CGRectValue]; + UIView *badgeView = [self.scrollView viewWithTag:(WMBadgeViewTagOffset + index)]; + if (badgeView) { + CGRect badgeFrame = [self badgeViewAtIndex:index].frame; + badgeFrame.origin.x += frame.origin.x; + badgeView.frame = badgeFrame; + } +} + +- (NSArray *)convertProgressWidthsToFrames { + if (!self.frames.count) { NSAssert(NO, @"BUUUUUUUG...SHOULDN'T COME HERE!!"); } + + if (self.progressWidths.count < self.titlesCount) return self.frames; + + NSMutableArray *progressFrames = [NSMutableArray array]; + NSInteger count = (self.frames.count <= self.progressWidths.count) ? self.frames.count : self.progressWidths.count; + for (int i = 0; i < count; i++) { + CGRect itemFrame = [self.frames[i] CGRectValue]; + CGFloat progressWidth = [self.progressWidths[i] floatValue]; + CGFloat x = itemFrame.origin.x + (itemFrame.size.width - progressWidth) / 2; + CGRect progressFrame = CGRectMake(x, itemFrame.origin.y, progressWidth, 0); + [progressFrames addObject:[NSValue valueWithCGRect:progressFrame]]; + } + return progressFrames.copy; +} + +- (void)addBadgeViews { + for (int i = 0; i < self.titlesCount; i++) { + [self addBadgeViewAtIndex:i]; + } +} + +- (void)addBadgeViewAtIndex:(NSInteger)index { + UIView *badgeView = [self badgeViewAtIndex:index]; + if (badgeView) { + [self.scrollView addSubview:badgeView]; + } +} + +- (void)makeStyle { + CGRect frame = CGRectZero; + if (self.style == WMMenuViewStyleDefault) { return; } + if (self.style == WMMenuViewStyleLine) { + self.progressHeight = self.progressHeight > 0 ? self.progressHeight : 2.0; + frame = CGRectMake(0, self.frame.size.height - self.progressHeight - self.progressViewBottomSpace, self.scrollView.contentSize.width, self.progressHeight); + } else { + self.progressHeight = self.progressHeight > 0 ? self.progressHeight : self.frame.size.height * 0.8; + frame = CGRectMake(0, (self.frame.size.height - self.progressHeight) / 2, self.scrollView.contentSize.width, self.progressHeight); + self.progressViewCornerRadius = self.progressViewCornerRadius > 0 ? self.progressViewCornerRadius : self.progressHeight / 2.0; + } + [self addProgressViewWithFrame:frame + isTriangle:(self.style == WMMenuViewStyleTriangle) + hasBorder:(self.style == WMMenuViewStyleSegmented) + hollow:(self.style == WMMenuViewStyleFloodHollow) + cornerRadius:self.progressViewCornerRadius]; +} + +- (void)deselectedItemsIfNeeded { + [self.scrollView.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + if (![obj isKindOfClass:[WMMenuItem class]] || obj == self.selItem) { return; } + [(WMMenuItem *)obj setSelected:NO withAnimation:NO]; + }]; +} + +- (void)addScrollView { + CGFloat width = self.frame.size.width - self.contentMargin * 2; + CGFloat height = self.frame.size.height; + CGRect frame = CGRectMake(self.contentMargin, 0, width, height); + UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:frame]; + scrollView.showsHorizontalScrollIndicator = NO; + scrollView.showsVerticalScrollIndicator = NO; + scrollView.backgroundColor = [UIColor clearColor]; + scrollView.scrollsToTop = NO; + [self addSubview:scrollView]; + self.scrollView = scrollView; +} + +- (void)addItems { + [self calculateItemFrames]; + + for (int i = 0; i < self.titlesCount; i++) { + CGRect frame = [self.frames[i] CGRectValue]; + WMMenuItem *item = [[WMMenuItem alloc] initWithFrame:frame]; + item.tag = (i + WMMenuItemTagOffset); + item.delegate = self; + item.text = [self.dataSource menuView:self titleAtIndex:i]; + item.textAlignment = NSTextAlignmentCenter; + item.userInteractionEnabled = YES; + item.backgroundColor = [UIColor clearColor]; + item.normalSize = [self sizeForState:WMMenuItemStateNormal atIndex:i]; + item.selectedSize = [self sizeForState:WMMenuItemStateSelected atIndex:i]; + item.normalColor = [self colorForState:WMMenuItemStateNormal atIndex:i]; + item.selectedColor = [self colorForState:WMMenuItemStateSelected atIndex:i]; + item.speedFactor = self.speedFactor; + if (self.fontName) { + item.font = [UIFont fontWithName:self.fontName size:item.selectedSize]; + } else { + item.font = [UIFont systemFontOfSize:item.selectedSize]; + } + if ([self.dataSource respondsToSelector:@selector(menuView:initialMenuItem:atIndex:)]) { + item = [self.dataSource menuView:self initialMenuItem:item atIndex:i]; + } + if (i == 0) { + [item setSelected:YES withAnimation:NO]; + self.selItem = item; + } else { + [item setSelected:NO withAnimation:NO]; + } + [self.scrollView addSubview:item]; + } +} + +// 计算所有item的frame值，主要是为了适配所有item的宽度之和小于屏幕宽的情况 +// 这里与后面的 `-addItems` 做了重复的操作，并不是很合理 +- (void)calculateItemFrames { + CGFloat contentWidth = [self itemMarginAtIndex:0]; + for (int i = 0; i < self.titlesCount; i++) { + CGFloat itemW = 60.0; + if ([self.delegate respondsToSelector:@selector(menuView:widthForItemAtIndex:)]) { + itemW = [self.delegate menuView:self widthForItemAtIndex:i]; + } + CGRect frame = CGRectMake(contentWidth, 0, itemW, self.frame.size.height); + // 记录frame + [self.frames addObject:[NSValue valueWithCGRect:frame]]; + contentWidth += itemW + [self itemMarginAtIndex:i+1]; + } + // 如果总宽度小于屏幕宽,重新计算frame,为item间添加间距 + if (contentWidth < self.scrollView.frame.size.width) { + CGFloat distance = self.scrollView.frame.size.width - contentWidth; + CGFloat (^shiftDis)(int); + switch (self.layoutMode) { + case WMMenuViewLayoutModeScatter: { + CGFloat gap = distance / (self.titlesCount + 1); + shiftDis = ^CGFloat(int index) { return gap * (index + 1); }; + break; + } + case WMMenuViewLayoutModeLeft: { + shiftDis = ^CGFloat(int index) { return 0.0; }; + break; + } + case WMMenuViewLayoutModeRight: { + shiftDis = ^CGFloat(int index) { return distance; }; + break; + } + case WMMenuViewLayoutModeCenter: { + shiftDis = ^CGFloat(int index) { return distance / 2; }; + break; + } + } + for (int i = 0; i < self.frames.count; i++) { + CGRect frame = [self.frames[i] CGRectValue]; + frame.origin.x += shiftDis(i); + self.frames[i] = [NSValue valueWithCGRect:frame]; + } + contentWidth = self.scrollView.frame.size.width; + } + self.scrollView.contentSize = CGSizeMake(contentWidth, self.frame.size.height); +} + +- (CGFloat)itemMarginAtIndex:(NSInteger)index { + if ([self.delegate respondsToSelector:@selector(menuView:itemMarginAtIndex:)]) { + return [self.delegate menuView:self itemMarginAtIndex:index]; + } + return 0.0; +} + +// MARK:Progress View +- (void)addProgressViewWithFrame:(CGRect)frame isTriangle:(BOOL)isTriangle hasBorder:(BOOL)hasBorder hollow:(BOOL)isHollow cornerRadius:(CGFloat)cornerRadius { + WMProgressView *pView = [[WMProgressView alloc] initWithFrame:frame]; + pView.itemFrames = [self convertProgressWidthsToFrames]; + pView.color = self.lineColor.CGColor; + pView.isTriangle = isTriangle; + pView.hasBorder = hasBorder; + pView.hollow = isHollow; + pView.cornerRadius = cornerRadius; + pView.naughty = self.progressViewIsNaughty; + pView.speedFactor = self.speedFactor; + pView.backgroundColor = [UIColor clearColor]; + self.progressView = pView; + [self.scrollView insertSubview:self.progressView atIndex:0]; +} + +#pragma mark - Menu item delegate +- (void)didPressedMenuItem:(WMMenuItem *)menuItem { + + if ([self.delegate respondsToSelector:@selector(menuView:shouldSelesctedIndex:)]) { + BOOL should = [self.delegate menuView:self shouldSelesctedIndex:menuItem.tag - WMMenuItemTagOffset]; + if (!should) { + return; + } + } + + CGFloat progress = menuItem.tag - WMMenuItemTagOffset; + [self.progressView moveToPostion:progress]; + + NSInteger currentIndex = self.selItem.tag - WMMenuItemTagOffset; + if ([self.delegate respondsToSelector:@selector(menuView:didSelesctedIndex:currentIndex:)]) { + [self.delegate menuView:self didSelesctedIndex:menuItem.tag-WMMenuItemTagOffset currentIndex:currentIndex]; + } + + [self.selItem setSelected:NO withAnimation:YES]; + [menuItem setSelected:YES withAnimation:YES]; + self.selItem = menuItem; + + NSTimeInterval delay = self.style == WMMenuViewStyleDefault ? 0 : 0.3f; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + // 让选中的item位于中间 + [self refreshContenOffset]; + }); +} + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.h b/Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.h new file mode 100755 index 0000000..f406db6 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.h @@ -0,0 +1,29 @@ +// +// WMProgressView.h +// WMPageController +// +// Created by Mark on 15/6/20. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@interface WMProgressView : UIView +@property (nonatomic, strong) NSArray *itemFrames; +@property (nonatomic, assign) CGColorRef color; +@property (nonatomic, assign) CGFloat progress; +/** 进度条的速度因数，默认为 15，越小越快， 大于 0 */ +@property (nonatomic, assign) CGFloat speedFactor; +@property (nonatomic, assign) CGFloat cornerRadius; +/// 调皮属性，用于实现新腾讯视频效果 +@property (nonatomic, assign) BOOL naughty; +@property (nonatomic, assign) BOOL isTriangle; +@property (nonatomic, assign) BOOL hollow; +@property (nonatomic, assign) BOOL hasBorder; + +- (void)setProgressWithOutAnimate:(CGFloat)progress; +- (void)moveToPostion:(NSInteger)pos; + +@end +NS_ASSUME_NONNULL_END diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.m b/Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.m new file mode 100755 index 0000000..40923fa --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMProgressView.m @@ -0,0 +1,145 @@ +// +// WMProgressView.m +// WMPageController +// +// Created by Mark on 15/6/20. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import "WMProgressView.h" +@implementation WMProgressView { + int _sign; + CGFloat _gap; + CGFloat _step; + __weak CADisplayLink *_link; +} + +- (CGFloat)speedFactor { + if (_speedFactor <= 0) { + _speedFactor = 15.0; + } + return _speedFactor; +} + +- (void)setProgressWithOutAnimate:(CGFloat)progress { + if (self.progress == progress) return; + _progress = progress; + [self setNeedsDisplay]; +} + +- (void)setNaughty:(BOOL)naughty { + _naughty = naughty; + [self setNeedsDisplay]; +} + +- (void)setCornerRadius:(CGFloat)cornerRadius { + _cornerRadius = cornerRadius; + [self setNeedsDisplay]; +} + +- (void)moveToPostion:(NSInteger)pos { + _gap = fabs(self.progress - pos); + _sign = self.progress > pos ? -1 : 1; + _step = _gap / self.speedFactor; + if (_link) { + [_link invalidate]; + } + CADisplayLink *link = [CADisplayLink displayLinkWithTarget:self selector:@selector(progressChanged)]; + [link addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; + _link = link; +} + +- (void)setProgress:(CGFloat)progress { + if (self.progress == progress) return; + _progress = progress; + [self setNeedsDisplay]; +} + +- (void)progressChanged { + if (_gap > 0.000001) { + _gap -= _step; + if (_gap < 0.0) { + self.progress = (int)(self.progress + _sign * _step + 0.5); + return; + } + self.progress += _sign * _step; + } else { + self.progress = (int)(self.progress + 0.5); + [_link invalidate]; + _link = nil; + } +} + +- (void)drawRect:(CGRect)rect { + // Drawing code + [super drawRect:rect]; + CGContextRef ctx = UIGraphicsGetCurrentContext(); + CGFloat height = self.frame.size.height; + int index = (int)self.progress; + index = (index <= self.itemFrames.count - 1) ? index : (int)self.itemFrames.count - 1; + CGFloat rate = self.progress - index; + CGRect currentFrame = [self.itemFrames[index] CGRectValue]; + CGFloat currentWidth = currentFrame.size.width; + int nextIndex = index + 1 < self.itemFrames.count ? index + 1 : index; + CGFloat nextWidth = [self.itemFrames[nextIndex] CGRectValue].size.width; + + CGFloat currentX = currentFrame.origin.x; + CGFloat nextX = [self.itemFrames[nextIndex] CGRectValue].origin.x; + CGFloat startX = currentX + (nextX - currentX) * rate; + CGFloat width = currentWidth + (nextWidth - currentWidth)*rate; + CGFloat endX = startX + width; + + if (self.naughty) { + CGFloat currentMidX = currentX + currentWidth / 2.0; + CGFloat nextMidX = nextX + nextWidth / 2.0; + + if (rate <= 0.5) { + startX = currentX + (currentMidX - currentX) * rate * 2.0; + CGFloat currentMaxX = currentX + currentWidth; + endX = currentMaxX + (nextMidX - currentMaxX) * rate * 2.0; + } else { + startX = currentMidX + (nextX - currentMidX) * (rate - 0.5) * 2.0; + CGFloat nextMaxX = nextX + nextWidth; + endX = nextMidX + (nextMaxX - nextMidX) * (rate - 0.5) * 2.0; + } + width = endX - startX; + } + + CGFloat lineWidth = (self.hollow || self.hasBorder) ? 1.0 : 0.0; + + if (self.isTriangle) { + CGContextMoveToPoint(ctx, startX, height); + CGContextAddLineToPoint(ctx, endX, height); + CGContextAddLineToPoint(ctx, startX + width / 2.0, 0); + CGContextClosePath(ctx); + CGContextSetFillColorWithColor(ctx, self.color); + CGContextFillPath(ctx); + return; + } + + UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(startX, lineWidth / 2.0, width, height - lineWidth) cornerRadius:self.cornerRadius]; + CGContextAddPath(ctx, path.CGPath); + + if (self.hollow) { + CGContextSetStrokeColorWithColor(ctx, self.color); + CGContextStrokePath(ctx); + return; + } + CGContextSetFillColorWithColor(ctx, self.color); + CGContextFillPath(ctx); + + if (self.hasBorder) { + // 计算点 + CGFloat startX = CGRectGetMinX([self.itemFrames.firstObject CGRectValue]); + CGFloat endX = CGRectGetMaxX([self.itemFrames.lastObject CGRectValue]); + UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(startX, lineWidth / 2.0, (endX - startX), height - lineWidth) cornerRadius:self.cornerRadius]; + CGContextSetLineWidth(ctx, lineWidth); + CGContextAddPath(ctx, path.CGPath); + + // 绘制 + CGContextSetStrokeColorWithColor(ctx, self.color); + CGContextStrokePath(ctx); + } +} + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.h b/Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.h new file mode 100644 index 0000000..b4b25b3 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.h @@ -0,0 +1,13 @@ +// +// WMScrollView.h +// WMPageController +// +// Created by lh on 15/11/21. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import + +@interface WMScrollView : UIScrollView + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.m b/Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.m new file mode 100644 index 0000000..8de0ac6 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMMenuView/WMScrollView.m @@ -0,0 +1,23 @@ +// +// WMScrollView.m +// WMPageController +// +// Created by lh on 15/11/21. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import "WMScrollView.h" + +@implementation WMScrollView + +#pragma mark - + +- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer { + //MARK: UITableViewCell 删除手势 + if ([NSStringFromClass(otherGestureRecognizer.view.class) isEqualToString:@"UITableViewWrapperView"] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]) { + return YES; + } + return NO; +} + +@end diff --git a/Thimra/Thirdparty/WMPageController/WMPageController.h b/Thimra/Thirdparty/WMPageController/WMPageController.h new file mode 100755 index 0000000..0836c95 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMPageController.h @@ -0,0 +1,360 @@ +// +// WMPageController.h +// WMPageController +// +// Created by Mark on 15/6/11. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import +#import "WMMenuView.h" +#import "WMScrollView.h" + +@class WMPageController; + +/* + * WMPageController 的缓存设置，默认缓存为无限制，当收到 memoryWarning 时，会自动切换到低缓存模式 (WMPageControllerCachePolicyLowMemory)，并在一段时间后切换到 High . + 收到多次警告后，会停留在到 WMPageControllerCachePolicyLowMemory 不再增长 + * + * The Default cache policy is No Limit, when recieved memory warning, page controller will switch mode to 'LowMemory' + and continue to grow back after a while. + If recieved too much times, the cache policy will stay at 'LowMemory' and don't grow back any more. + */ +typedef NS_ENUM(NSInteger, WMPageControllerCachePolicy) { + WMPageControllerCachePolicyDisabled = -1, // Disable Cache + WMPageControllerCachePolicyNoLimit = 0, // No limit + WMPageControllerCachePolicyLowMemory = 1, // Low Memory but may block when scroll + WMPageControllerCachePolicyBalanced = 3, // Balanced ↑ and ↓ + WMPageControllerCachePolicyHigh = 5 // High +}; + +typedef NS_ENUM(NSUInteger, WMPageControllerPreloadPolicy) { + WMPageControllerPreloadPolicyNever = 0, // Never pre-load controller. + WMPageControllerPreloadPolicyNeighbour = 1, // Pre-load the controller next to the current. + WMPageControllerPreloadPolicyNear = 2 // Pre-load 2 controllers near the current. +}; + +NS_ASSUME_NONNULL_BEGIN +extern NSString *const WMControllerDidAddToSuperViewNotification; +extern NSString *const WMControllerDidFullyDisplayedNotification; +@protocol WMPageControllerDataSource +@optional + +/** + * To inform how many child controllers will in `WMPageController`. + * + * @param pageController The parent controller. + * + * @return The value of child controllers's count. + */ +- (NSInteger)numbersOfChildControllersInPageController:(WMPageController *)pageController; + +/** + * Return a controller that you wanna to display at index. You can set properties easily if you implement this methods. + * + * @param pageController The parent controller. + * @param index The index of child controller. + * + * @return The instance of a `UIViewController`. + */ +- (__kindof UIViewController *)pageController:(WMPageController *)pageController viewControllerAtIndex:(NSInteger)index; + +/** + * Each title you wanna show in the `WMMenuView` + * + * @param pageController The parent controller. + * @param index The index of title. + * + * @return A `NSString` value to show at the top of `WMPageController`. + */ +- (NSString *)pageController:(WMPageController *)pageController titleAtIndex:(NSInteger)index; + +@required +/** + Implement this datasource method, in order to customize your own contentView's frame + + @param pageController The container controller + @param contentView The contentView, each is the superview of the child controllers + @return The frame of the contentView + */ +- (CGRect)pageController:(WMPageController *)pageController preferredFrameForContentView:(WMScrollView *)contentView; + +/** + Implement this datasource method, in order to customize your own menuView's frame + + @param pageController The container controller + @param menuView The menuView + @return The frame of the menuView + */ +- (CGRect)pageController:(WMPageController *)pageController preferredFrameForMenuView:(WMMenuView *)menuView; + +@end + +@protocol WMPageControllerDelegate +@optional + +/** + * If the child controller is heavy, put some work in this method. This method will only be called when the controller is initialized and stop scrolling. (That means if the controller is cached and hasn't released will never call this method.) + * + * @param pageController The parent controller (WMPageController) + * @param viewController The viewController first show up when scroll stop. + * @param info A dictionary that includes some infos, such as: `index` / `title` + */ +- (void)pageController:(WMPageController *)pageController lazyLoadViewController:(__kindof UIViewController *)viewController withInfo:(NSDictionary *)info; + +/** + * Called when a viewController will be cached. You can clear some data if it's not reusable. + * + * @param pageController The parent controller (WMPageController) + * @param viewController The viewController will be cached. + * @param info A dictionary that includes some infos, such as: `index` / `title` + */ +- (void)pageController:(WMPageController *)pageController willCachedViewController:(__kindof UIViewController *)viewController withInfo:(NSDictionary *)info; + +/** + * Called when a viewController will be appear to user's sight. Do some preparatory methods if needed. + * + * @param pageController The parent controller (WMPageController) + * @param viewController The viewController will appear. + * @param info A dictionary that includes some infos, such as: `index` / `title` + */ +- (void)pageController:(WMPageController *)pageController willEnterViewController:(__kindof UIViewController *)viewController withInfo:(NSDictionary *)info; + +/** + * Called when a viewController will fully displayed, that means, scrollView have stopped scrolling and the controller's view have entirely displayed. + * + * @param pageController The parent controller (WMPageController) + * @param viewController The viewController entirely displayed. + * @param info A dictionary that includes some infos, such as: `index` / `title` + */ +- (void)pageController:(WMPageController *)pageController didEnterViewController:(__kindof UIViewController *)viewController withInfo:(NSDictionary *)info; + +@end + +@interface WMPageController : UIViewController + +@property (nonatomic, weak) id delegate; +@property (nonatomic, weak) id dataSource; + +/** + * Values and keys can set properties when initialize child controlelr (it's KVC) + * values keys 属性可以用于初始化控制器的时候为控制器传值(利用 KVC 来设置) + 使用时请确保 key 与控制器的属性名字一致！！(例如：控制器有需要设置的属性 type，那么 keys 所放的就是字符串 @"type") + */ +@property (nonatomic, nullable, strong) NSMutableArray *values; +@property (nonatomic, nullable, strong) NSMutableArray *keys; + +/** + * 各个控制器的 class, 例如:[UITableViewController class] + * Each controller's class, example:[UITableViewController class] + */ +@property (nonatomic, nullable, copy) NSArray *viewControllerClasses; + +/** + * 各个控制器标题 + * Titles of view controllers in page controller. + */ +@property (nonatomic, nullable, copy) NSArray *titles; +@property (nonatomic, strong, readonly) UIViewController *currentViewController; + +/** + * 设置选中几号 item + * To select item at index + */ +@property (nonatomic, assign) int selectIndex; + +/** + * 点击的 MenuItem 是否触发滚动动画 + * Whether to animate when press the MenuItem + */ +@property (nonatomic, assign) BOOL pageAnimatable; + +/** 是否自动通过字符串计算 MenuItem 的宽度，默认为 NO. */ +@property (nonatomic, assign) BOOL automaticallyCalculatesItemWidths; + + +/** Whether the controller can scroll. Default is YES. */ +@property (nonatomic, assign) BOOL scrollEnable; + +/** + * 选中时的标题尺寸 + * The title size when selected (animatable) + */ +@property (nonatomic, assign) CGFloat titleSizeSelected; + +/** + * 非选中时的标题尺寸 + * The normal title size (animatable) + */ +@property (nonatomic, assign) CGFloat titleSizeNormal; + +/** + * 标题选中时的颜色, 颜色是可动画的. + * The title color when selected, the color is animatable. + */ +@property (nonatomic, strong) UIColor *titleColorSelected; + +/** + * 标题非选择时的颜色, 颜色是可动画的. + * The title's normal color, the color is animatable. + */ +@property (nonatomic, strong) UIColor *titleColorNormal; + +/** + * 标题的字体名字 + * The name of title's font + */ +@property (nonatomic, nullable, copy) NSString *titleFontName; + +/** + * 每个 MenuItem 的宽度 + * The item width,when all are same,use this property + */ +@property (nonatomic, assign) CGFloat menuItemWidth; + +/** + * 各个 MenuItem 的宽度，可不等，数组内为 NSNumber. + * Each item's width, when they are not all the same, use this property, Put `NSNumber` in this array. + */ +@property (nonatomic, nullable, copy) NSArray *itemsWidths; + +/** + * Menu view 的样式，默认为无下划线 + * Menu view's style, now has two different styles, 'Line','default' + */ +@property (nonatomic, assign) WMMenuViewStyle menuViewStyle; + +@property (nonatomic, assign) WMMenuViewLayoutMode menuViewLayoutMode; + +/** + * 进度条的颜色，默认和选中颜色一致(如果 style 为 Default，则该属性无用) + * The progress's color,the default color is same with `titleColorSelected`.If you want to have a different color, set this property. + */ +@property (nonatomic, nullable, strong) UIColor *progressColor; + +/** + * 定制进度条在各个 item 下的宽度 + */ +@property (nonatomic, nullable, strong) NSArray *progressViewWidths; + +/// 定制进度条，若每个进度条长度相同，可设置该属性 +@property (nonatomic, assign) CGFloat progressWidth; + +/// 调皮效果，用于实现腾讯视频新效果，请设置一个较小的 progressWidth +@property (nonatomic, assign) BOOL progressViewIsNaughty; + +/** + * 是否发送在创建控制器或者视图完全展现在用户眼前时通知观察者，默认为不开启，如需利用通知请开启 + * Whether notify observer when finish init or fully displayed to user, the default is NO. + * See `WMPageConst.h` for more information. + */ +@property (nonatomic, assign) BOOL postNotification; + +/** + * 是否记录 Controller 的位置，并在下次回来的时候回到相应位置，默认为 NO (若当前缓存中存在不会触发) + * Whether to remember controller's positon if it's a kind of scrollView controller,like UITableViewController,The default value is NO. + * 比如 `UITabelViewController`, 当然你也可以在自己的控制器中自行设置, 如果将 Controller.view 替换为 scrollView 或者在Controller.view 上添加了一个和自身 bounds 一样的 scrollView 也是OK的 + */ +@property (nonatomic, assign) BOOL rememberLocation __deprecated_msg("Because of the cache policy,this property can abondon now."); + +/** 缓存的机制，默认为无限制 (如果收到内存警告, 会自动切换) */ +@property (nonatomic, assign) WMPageControllerCachePolicy cachePolicy; + +/** 预加载机制，在停止滑动的时候预加载 n 页 */ +@property (nonatomic, assign) WMPageControllerPreloadPolicy preloadPolicy; + +/** Whether ContentView bounces */ +@property (nonatomic, assign) BOOL bounces; + +/** + * 是否作为 NavigationBar 的 titleView 展示，默认 NO + * Whether to show on navigation bar, the default value is `NO` + */ +@property (assign, nonatomic) BOOL showOnNavigationBar; + +/** + * 用代码设置 contentView 的 contentOffset 之前，请设置 startDragging = YES + * Set startDragging = YES before set contentView.contentOffset = xxx; + */ +@property (nonatomic, assign) BOOL startDragging; + +/** 下划线进度条的高度 */ +@property (nonatomic, assign) CGFloat progressHeight; + +/** + * Menu view items' margin / make sure it's count is equal to (controllers' count + 1),default is 0 + 顶部菜单栏各个 item 的间隙，因为包括头尾两端，所以确保它的数量等于控制器数量 + 1, 默认间隙为 0 + */ +@property (nonatomic, nullable, copy) NSArray *itemsMargins; + +/** + * set itemMargin if all margins are the same, default is 0 + 如果各个间隙都想同，设置该属性，默认为 0 + */ +@property (nonatomic, assign) CGFloat itemMargin; + +/** progressView 到 menuView 底部的距离 */ +@property (nonatomic, assign) CGFloat progressViewBottomSpace; + +/** progressView's cornerRadius */ +@property (nonatomic, assign) CGFloat progressViewCornerRadius; +/** 顶部导航栏 */ +@property (nonatomic, nullable, weak) WMMenuView *menuView; + +/** 内部容器 */ +@property (nonatomic, nullable, weak) WMScrollView *scrollView; + +/** MenuView 内部视图与左右的间距 */ +@property (nonatomic, assign) CGFloat menuViewContentMargin; + +/** + * 构造方法，请使用该方法创建控制器. 或者实现数据源方法. / + * Init method，recommend to use this instead of `-init`. Or you can implement datasource by yourself. + * + * @param classes 子控制器的 class，确保数量与 titles 的数量相等 + * @param titles 各个子控制器的标题，用 NSString 描述 + * + * @return instancetype + */ +- (instancetype)initWithViewControllerClasses:(NSArray *)classes andTheirTitles:(NSArray *)titles; + +/** + * A method in order to reload MenuView and child view controllers. If you had set `itemsMargins` or `itemsWidths` `values` and `keys` before, make sure you have update them also before you call this method. And most important, PAY ATTENTION TO THE COUNT OF THOSE ARRAY. + 该方法用于重置刷新父控制器，该刷新包括顶部 MenuView 和 childViewControllers.如果之前设置过 `itemsMargins` 和 `itemsWidths` `values` 以及 `keys` 属性，请确保在调用 reload 之前也同时更新了这些属性。并且，最最最重要的，注意数组的个数以防止溢出。 + */ +- (void)reloadData; + +/** + Layout all views in WMPageController + @discussion This method will recall `-pageController:preferredFrameForContentView:` and `-pageContoller:preferredFrameForMenuView:` + */ +- (void)forceLayoutSubviews; +/** + * Update designated item's title + 更新指定序号的控制器的标题 + * + * @param title 新的标题 + * @param index 目标序号 + */ +- (void)updateTitle:(NSString *)title atIndex:(NSInteger)index; + +/** + * Update designated item's title and width + 更新指定序号的控制器的标题以及他的宽度 + * + * @param title 新的标题 + * @param index 目标序号 + * @param width 对应item的新宽度 + */ +- (void)updateTitle:(NSString *)title andWidth:(CGFloat)width atIndex:(NSInteger)index; + +- (void)updateAttributeTitle:(NSAttributedString *)title atIndex:(NSInteger)index; + +/** 当 app 即将进入后台接收到的通知 */ +- (void)willResignActive:(NSNotification *)notification; +/** 当 app 即将回到前台接收到的通知 */ +- (void)willEnterForeground:(NSNotification *)notification; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Thimra/Thirdparty/WMPageController/WMPageController.m b/Thimra/Thirdparty/WMPageController/WMPageController.m new file mode 100755 index 0000000..296cda0 --- /dev/null +++ b/Thimra/Thirdparty/WMPageController/WMPageController.m @@ -0,0 +1,861 @@ +// +// WMPageController.m +// WMPageController +// +// Created by Mark on 15/6/11. +// Copyright (c) 2015年 yq. All rights reserved. +// + +#import "WMPageController.h" + +NSString *const WMControllerDidAddToSuperViewNotification = @"WMControllerDidAddToSuperViewNotification"; +NSString *const WMControllerDidFullyDisplayedNotification = @"WMControllerDidFullyDisplayedNotification"; + +static NSInteger const kWMUndefinedIndex = -1; +static NSInteger const kWMControllerCountUndefined = -1; +@interface WMPageController () { + CGFloat _targetX; + CGRect _contentViewFrame, _menuViewFrame; + BOOL _hasInited, _shouldNotScroll; + NSInteger _initializedIndex, _controllerCount, _markedSelectIndex; +} +@property (nonatomic, strong, readwrite) UIViewController *currentViewController; +// 用于记录子控制器view的frame，用于 scrollView 上的展示的位置 +@property (nonatomic, strong) NSMutableArray *childViewFrames; +// 当前展示在屏幕上的控制器，方便在滚动的时候读取 (避免不必要计算) +@property (nonatomic, strong) NSMutableDictionary *displayVC; +// 用于记录销毁的viewController的位置 (如果它是某一种scrollView的Controller的话) +@property (nonatomic, strong) NSMutableDictionary *posRecords; +// 用于缓存加载过的控制器 +@property (nonatomic, strong) NSCache *memCache; +@property (nonatomic, strong) NSMutableDictionary *backgroundCache; +// 收到内存警告的次数 +@property (nonatomic, assign) int memoryWarningCount; +@property (nonatomic, readonly) NSInteger childControllersCount; +@end + +@implementation WMPageController + +#pragma mark - Lazy Loading +- (NSMutableDictionary *)posRecords { + if (_posRecords == nil) { + _posRecords = [[NSMutableDictionary alloc] init]; + } + return _posRecords; +} + +- (NSMutableDictionary *)displayVC { + if (_displayVC == nil) { + _displayVC = [[NSMutableDictionary alloc] init]; + } + return _displayVC; +} + +- (NSMutableDictionary *)backgroundCache { + if (_backgroundCache == nil) { + _backgroundCache = [[NSMutableDictionary alloc] init]; + } + return _backgroundCache; +} + +#pragma mark - Public Methods +- (instancetype)initWithCoder:(NSCoder *)aDecoder { + if (self = [super initWithCoder:aDecoder]) { + [self wm_setup]; + } + return self; +} + +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + [self wm_setup]; + } + return self; +} + +- (instancetype)initWithViewControllerClasses:(NSArray *)classes andTheirTitles:(NSArray *)titles { + if (self = [self initWithNibName:nil bundle:nil]) { + NSParameterAssert(classes.count == titles.count); + _viewControllerClasses = [NSArray arrayWithArray:classes]; + _titles = [NSArray arrayWithArray:titles]; + } + return self; +} + +- (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(wm_growCachePolicyAfterMemoryWarning) object:nil]; + [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(wm_growCachePolicyToHigh) object:nil]; +} + +- (void)forceLayoutSubviews { + if (!self.childControllersCount) return; + // 计算宽高及子控制器的视图frame + [self wm_calculateSize]; + [self wm_adjustScrollViewFrame]; + [self wm_adjustMenuViewFrame]; + [self wm_adjustDisplayingViewControllersFrame]; +} + +- (void)setScrollEnable:(BOOL)scrollEnable { + _scrollEnable = scrollEnable; + + if (!self.scrollView) return; + self.scrollView.scrollEnabled = scrollEnable; +} + +- (void)setProgressViewCornerRadius:(CGFloat)progressViewCornerRadius { + _progressViewCornerRadius = progressViewCornerRadius; + if (self.menuView) { + self.menuView.progressViewCornerRadius = progressViewCornerRadius; + } +} + +- (void)setMenuViewLayoutMode:(WMMenuViewLayoutMode)menuViewLayoutMode { + _menuViewLayoutMode = menuViewLayoutMode; + if (self.menuView.superview) { + [self wm_resetMenuView]; + } +} + +- (void)setCachePolicy:(WMPageControllerCachePolicy)cachePolicy { + _cachePolicy = cachePolicy; + if (cachePolicy != WMPageControllerCachePolicyDisabled) { + self.memCache.countLimit = _cachePolicy; + } +} + +- (void)setSelectIndex:(int)selectIndex { + _selectIndex = selectIndex; + _markedSelectIndex = kWMUndefinedIndex; + if (self.menuView && _hasInited) { + [self.menuView selectItemAtIndex:selectIndex]; + } else { + _markedSelectIndex = selectIndex; + UIViewController *vc = [self.memCache objectForKey:@(selectIndex)]; + if (!vc) { + vc = [self initializeViewControllerAtIndex:selectIndex]; + [self.memCache setObject:vc forKey:@(selectIndex)]; + } + self.currentViewController = vc; + } +} + +- (void)setProgressViewIsNaughty:(BOOL)progressViewIsNaughty { + _progressViewIsNaughty = progressViewIsNaughty; + if (self.menuView) { + self.menuView.progressViewIsNaughty = progressViewIsNaughty; + } +} + +- (void)setProgressWidth:(CGFloat)progressWidth { + _progressWidth = progressWidth; + self.progressViewWidths = ({ + NSMutableArray *tmp = [NSMutableArray array]; + for (int i = 0; i < self.childControllersCount; i++) { + [tmp addObject:@(progressWidth)]; + } + tmp.copy; + }); +} + +- (void)setProgressViewWidths:(NSArray *)progressViewWidths { + _progressViewWidths = progressViewWidths; + if (self.menuView) { + self.menuView.progressWidths = progressViewWidths; + } +} + +- (void)setMenuViewContentMargin:(CGFloat)menuViewContentMargin { + _menuViewContentMargin = menuViewContentMargin; + if (self.menuView) { + self.menuView.contentMargin = menuViewContentMargin; + } +} + +- (void)reloadData { + [self wm_clearDatas]; + + if (!self.childControllersCount) return; + + [self wm_resetScrollView]; + [self.memCache removeAllObjects]; + [self wm_resetMenuView]; + [self viewDidLayoutSubviews]; + [self didEnterController:self.currentViewController atIndex:self.selectIndex]; +} + +- (void)updateTitle:(NSString *)title atIndex:(NSInteger)index { + [self.menuView updateTitle:title atIndex:index andWidth:NO]; +} + +- (void)updateAttributeTitle:(NSAttributedString * _Nonnull)title atIndex:(NSInteger)index { + [self.menuView updateAttributeTitle:title atIndex:index andWidth:NO]; +} + +- (void)updateTitle:(NSString *)title andWidth:(CGFloat)width atIndex:(NSInteger)index { + if (self.itemsWidths && index < self.itemsWidths.count) { + NSMutableArray *mutableWidths = [NSMutableArray arrayWithArray:self.itemsWidths]; + mutableWidths[index] = @(width); + self.itemsWidths = [mutableWidths copy]; + } else { + NSMutableArray *mutableWidths = [NSMutableArray array]; + for (int i = 0; i < self.childControllersCount; i++) { + CGFloat itemWidth = (i == index) ? width : self.menuItemWidth; + [mutableWidths addObject:@(itemWidth)]; + } + self.itemsWidths = [mutableWidths copy]; + } + [self.menuView updateTitle:title atIndex:index andWidth:YES]; +} + +- (void)setShowOnNavigationBar:(BOOL)showOnNavigationBar { + if (_showOnNavigationBar == showOnNavigationBar) { + return; + } + + _showOnNavigationBar = showOnNavigationBar; + if (self.menuView) { + [self.menuView removeFromSuperview]; + [self wm_addMenuView]; + [self forceLayoutSubviews]; + [self.menuView slideMenuAtProgress:self.selectIndex]; + } +} + +#pragma mark - Notification +- (void)willResignActive:(NSNotification *)notification { + for (int i = 0; i < self.childControllersCount; i++) { + id obj = [self.memCache objectForKey:@(i)]; + if (obj) { + [self.backgroundCache setObject:obj forKey:@(i)]; + } + } +} + +- (void)willEnterForeground:(NSNotification *)notification { + for (NSNumber *key in self.backgroundCache.allKeys) { + if (![self.memCache objectForKey:key]) { + [self.memCache setObject:self.backgroundCache[key] forKey:key]; + } + } + [self.backgroundCache removeAllObjects]; +} + +#pragma mark - Delegate +- (NSDictionary *)infoWithIndex:(NSInteger)index { + NSString *title = [self titleAtIndex:index]; + return @{@"title": title ?: @"", @"index": @(index)}; +} + +- (void)willCachedController:(UIViewController *)vc atIndex:(NSInteger)index { + if (self.childControllersCount && [self.delegate respondsToSelector:@selector(pageController:willCachedViewController:withInfo:)]) { + NSDictionary *info = [self infoWithIndex:index]; + [self.delegate pageController:self willCachedViewController:vc withInfo:info]; + } +} + +- (void)willEnterController:(UIViewController *)vc atIndex:(NSInteger)index { + _selectIndex = (int)index; + if (self.childControllersCount && [self.delegate respondsToSelector:@selector(pageController:willEnterViewController:withInfo:)]) { + NSDictionary *info = [self infoWithIndex:index]; + [self.delegate pageController:self willEnterViewController:vc withInfo:info]; + } +} + +// 完全进入控制器 (即停止滑动后调用) +- (void)didEnterController:(UIViewController *)vc atIndex:(NSInteger)index { + if (!self.childControllersCount) return; + + // Post FullyDisplayedNotification + [self wm_postFullyDisplayedNotificationWithCurrentIndex:self.selectIndex]; + + NSDictionary *info = [self infoWithIndex:index]; + if ([self.delegate respondsToSelector:@selector(pageController:didEnterViewController:withInfo:)]) { + [self.delegate pageController:self didEnterViewController:vc withInfo:info]; + } + + // 当控制器创建时，调用延迟加载的代理方法 + if (_initializedIndex == index && [self.delegate respondsToSelector:@selector(pageController:lazyLoadViewController:withInfo:)]) { + [self.delegate pageController:self lazyLoadViewController:vc withInfo:info]; + _initializedIndex = kWMUndefinedIndex; + } + + // 根据 preloadPolicy 预加载控制器 + if (self.preloadPolicy == WMPageControllerPreloadPolicyNever) return; + int length = (int)self.preloadPolicy; + int start = 0; + int end = (int)self.childControllersCount - 1; + if (index > length) { + start = (int)index - length; + } + if (self.childControllersCount - 1 > length + index) { + end = (int)index + length; + } + for (int i = start; i <= end; i++) { + // 如果已存在，不需要预加载 + if (![self.memCache objectForKey:@(i)] && !self.displayVC[@(i)]) { + [self wm_addViewControllerAtIndex:i]; + [self wm_postAddToSuperViewNotificationWithIndex:i]; + } + } + _selectIndex = (int)index; +} + +#pragma mark - Data source +- (NSInteger)childControllersCount { + if (_controllerCount == kWMControllerCountUndefined) { + if ([self.dataSource respondsToSelector:@selector(numbersOfChildControllersInPageController:)]) { + _controllerCount = [self.dataSource numbersOfChildControllersInPageController:self]; + } else { + _controllerCount = self.viewControllerClasses.count; + } + } + return _controllerCount; +} + +- (UIViewController * _Nonnull)initializeViewControllerAtIndex:(NSInteger)index { + if ([self.dataSource respondsToSelector:@selector(pageController:viewControllerAtIndex:)]) { + return [self.dataSource pageController:self viewControllerAtIndex:index]; + } + return [[self.viewControllerClasses[index] alloc] init]; +} + +- (NSString * _Nonnull)titleAtIndex:(NSInteger)index { + NSString *title = nil; + if ([self.dataSource respondsToSelector:@selector(pageController:titleAtIndex:)]) { + title = [self.dataSource pageController:self titleAtIndex:index]; + } else { + title = self.titles[index]; + } + return (title ?: @""); +} + +#pragma mark - Private Methods + +- (void)wm_resetScrollView { + if (self.scrollView) { + [self.scrollView removeFromSuperview]; + } + [self wm_addScrollView]; + [self wm_addViewControllerAtIndex:self.selectIndex]; + self.currentViewController = self.displayVC[@(self.selectIndex)]; +} + +- (void)wm_clearDatas { + _controllerCount = kWMControllerCountUndefined; + _hasInited = NO; + NSUInteger maxIndex = (self.childControllersCount - 1 > 0) ? (self.childControllersCount - 1) : 0; + _selectIndex = self.selectIndex < self.childControllersCount ? self.selectIndex : (int)maxIndex; + if (self.progressWidth > 0) { self.progressWidth = self.progressWidth; } + + NSArray *displayingViewControllers = self.displayVC.allValues; + for (UIViewController *vc in displayingViewControllers) { + [vc.view removeFromSuperview]; + [vc willMoveToParentViewController:nil]; + [vc removeFromParentViewController]; + } + self.memoryWarningCount = 0; + [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(wm_growCachePolicyAfterMemoryWarning) object:nil]; + [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(wm_growCachePolicyToHigh) object:nil]; + self.currentViewController = nil; + [self.posRecords removeAllObjects]; + [self.displayVC removeAllObjects]; +} + +// 当子控制器init完成时发送通知 +- (void)wm_postAddToSuperViewNotificationWithIndex:(int)index { + if (!self.postNotification) return; + NSDictionary *info = @{ + @"index":@(index), + @"title":[self titleAtIndex:index] + }; + [[NSNotificationCenter defaultCenter] postNotificationName:WMControllerDidAddToSuperViewNotification + object:self + userInfo:info]; +} + +// 当子控制器完全展示在user面前时发送通知 +- (void)wm_postFullyDisplayedNotificationWithCurrentIndex:(int)index { + if (!self.postNotification) return; + NSDictionary *info = @{ + @"index":@(index), + @"title":[self titleAtIndex:index] + }; + [[NSNotificationCenter defaultCenter] postNotificationName:WMControllerDidFullyDisplayedNotification + object:self + userInfo:info]; +} + +// 初始化一些参数，在init中调用 +- (void)wm_setup { + _titleSizeSelected = 18.0f; + _titleSizeNormal = 15.0f; + _titleColorSelected = [UIColor colorWithRed:168.0/255.0 green:20.0/255.0 blue:4/255.0 alpha:1]; + _titleColorNormal = [UIColor colorWithRed:0 green:0 blue:0 alpha:1]; + _menuItemWidth = 65.0f; + + _memCache = [[NSCache alloc] init]; + _initializedIndex = kWMUndefinedIndex; + _markedSelectIndex = kWMUndefinedIndex; + _controllerCount = kWMControllerCountUndefined; + _scrollEnable = YES; + + self.automaticallyCalculatesItemWidths = NO; + self.automaticallyAdjustsScrollViewInsets = NO; + self.preloadPolicy = WMPageControllerPreloadPolicyNever; + self.cachePolicy = WMPageControllerCachePolicyNoLimit; + + self.delegate = self; + self.dataSource = self; + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willResignActive:) name:UIApplicationWillResignActiveNotification object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil]; +} + +// 包括宽高，子控制器视图 frame +- (void)wm_calculateSize { + _menuViewFrame = [self.dataSource pageController:self preferredFrameForMenuView:self.menuView]; + _contentViewFrame = [self.dataSource pageController:self preferredFrameForContentView:self.scrollView]; + _childViewFrames = [NSMutableArray array]; + for (int i = 0; i < self.childControllersCount; i++) { + CGRect frame = CGRectMake(i * _contentViewFrame.size.width, 0, _contentViewFrame.size.width, _contentViewFrame.size.height); + [_childViewFrames addObject:[NSValue valueWithCGRect:frame]]; + } +} + +- (void)wm_addScrollView { + WMScrollView *scrollView = [[WMScrollView alloc] init]; + scrollView.scrollsToTop = NO; + scrollView.pagingEnabled = YES; + scrollView.backgroundColor = [UIColor whiteColor]; + scrollView.delegate = self; + scrollView.showsVerticalScrollIndicator = NO; + scrollView.showsHorizontalScrollIndicator = NO; + scrollView.bounces = self.bounces; + scrollView.scrollEnabled = self.scrollEnable; + if (@available(iOS 11.0, *)) { + scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + [self.view addSubview:scrollView]; + self.scrollView = scrollView; + + if (!self.navigationController) return; + for (UIGestureRecognizer *gestureRecognizer in scrollView.gestureRecognizers) { + [gestureRecognizer requireGestureRecognizerToFail:self.navigationController.interactivePopGestureRecognizer]; + } +} + +- (void)wm_addMenuView { + WMMenuView *menuView = [[WMMenuView alloc] initWithFrame:CGRectZero]; + menuView.delegate = self; + menuView.dataSource = self; + menuView.style = self.menuViewStyle; + menuView.layoutMode = self.menuViewLayoutMode; + menuView.progressHeight = self.progressHeight; + menuView.contentMargin = self.menuViewContentMargin; + menuView.progressViewBottomSpace = self.progressViewBottomSpace; + menuView.progressWidths = self.progressViewWidths; + menuView.progressViewIsNaughty = self.progressViewIsNaughty; + menuView.progressViewCornerRadius = self.progressViewCornerRadius; + menuView.showOnNavigationBar = self.showOnNavigationBar; + if (self.titleFontName) { + menuView.fontName = self.titleFontName; + } + if (self.progressColor) { + menuView.lineColor = self.progressColor; + } + if (self.showOnNavigationBar && self.navigationController.navigationBar) { + self.navigationItem.titleView = menuView; + } else { + [self.view addSubview:menuView]; + } + self.menuView = menuView; +} + +- (void)wm_layoutChildViewControllers { + int currentPage = (int)(self.scrollView.contentOffset.x / _contentViewFrame.size.width); + int length = (int)self.preloadPolicy; + int left = currentPage - length - 1; + int right = currentPage + length + 1; + for (int i = 0; i < self.childControllersCount; i++) { + UIViewController *vc = [self.displayVC objectForKey:@(i)]; + CGRect frame = [self.childViewFrames[i] CGRectValue]; + if (!vc) { + if ([self wm_isInScreen:frame]) { + [self wm_initializedControllerWithIndexIfNeeded:i]; + } + } else if (i <= left || i >= right) { + if (![self wm_isInScreen:frame]) { + [self wm_removeViewController:vc atIndex:i]; + } + } + } +} + +// 创建或从缓存中获取控制器并添加到视图上 +- (void)wm_initializedControllerWithIndexIfNeeded:(NSInteger)index { + // 先从 cache 中取 + UIViewController *vc = [self.memCache objectForKey:@(index)]; + if (vc) { + // cache 中存在，添加到 scrollView 上，并放入display + [self wm_addCachedViewController:vc atIndex:index]; + } else { + // cache 中也不存在，创建并添加到display + [self wm_addViewControllerAtIndex:(int)index]; + } + [self wm_postAddToSuperViewNotificationWithIndex:(int)index]; +} + +- (void)wm_addCachedViewController:(UIViewController *)viewController atIndex:(NSInteger)index { + [self addChildViewController:viewController]; + viewController.view.frame = [self.childViewFrames[index] CGRectValue]; + [viewController didMoveToParentViewController:self]; + [self.scrollView addSubview:viewController.view]; + [self willEnterController:viewController atIndex:index]; + [self.displayVC setObject:viewController forKey:@(index)]; +} + +// 创建并添加子控制器 +- (void)wm_addViewControllerAtIndex:(int)index { + _initializedIndex = index; + UIViewController *viewController = [self initializeViewControllerAtIndex:index]; + if (self.values.count == self.childControllersCount && self.keys.count == self.childControllersCount) { + [viewController setValue:self.values[index] forKey:self.keys[index]]; + } + [self addChildViewController:viewController]; + CGRect frame = self.childViewFrames.count ? [self.childViewFrames[index] CGRectValue] : self.view.frame; + viewController.view.frame = frame; + [viewController didMoveToParentViewController:self]; + [self.scrollView addSubview:viewController.view]; + [self willEnterController:viewController atIndex:index]; + [self.displayVC setObject:viewController forKey:@(index)]; + + [self wm_backToPositionIfNeeded:viewController atIndex:index]; +} + +// 移除控制器，且从display中移除 +- (void)wm_removeViewController:(UIViewController *)viewController atIndex:(NSInteger)index { + [self wm_rememberPositionIfNeeded:viewController atIndex:index]; + [viewController.view removeFromSuperview]; + [viewController willMoveToParentViewController:nil]; + [viewController removeFromParentViewController]; + [self.displayVC removeObjectForKey:@(index)]; + + // 放入缓存 + if (self.cachePolicy == WMPageControllerCachePolicyDisabled) { + return; + } + + if (![self.memCache objectForKey:@(index)]) { + [self willCachedController:viewController atIndex:index]; + [self.memCache setObject:viewController forKey:@(index)]; + } +} + +- (void)wm_backToPositionIfNeeded:(UIViewController *)controller atIndex:(NSInteger)index { +#pragma clang diagnostic push +#pragma clang diagnostic ignored"-Wdeprecated-declarations" + if (!self.rememberLocation) return; +#pragma clang diagnostic pop + if ([self.memCache objectForKey:@(index)]) return; + UIScrollView *scrollView = [self wm_isKindOfScrollViewController:controller]; + if (scrollView) { + NSValue *pointValue = self.posRecords[@(index)]; + if (pointValue) { + CGPoint pos = [pointValue CGPointValue]; + [scrollView setContentOffset:pos]; + } + } +} + +- (void)wm_rememberPositionIfNeeded:(UIViewController *)controller atIndex:(NSInteger)index { +#pragma clang diagnostic push +#pragma clang diagnostic ignored"-Wdeprecated-declarations" + if (!self.rememberLocation) return; +#pragma clang diagnostic pop + UIScrollView *scrollView = [self wm_isKindOfScrollViewController:controller]; + if (scrollView) { + CGPoint pos = scrollView.contentOffset; + self.posRecords[@(index)] = [NSValue valueWithCGPoint:pos]; + } +} + +- (UIScrollView *)wm_isKindOfScrollViewController:(UIViewController *)controller { + UIScrollView *scrollView = nil; + if ([controller.view isKindOfClass:[UIScrollView class]]) { + // Controller的view是scrollView的子类(UITableViewController/UIViewController替换view为scrollView) + scrollView = (UIScrollView *)controller.view; + } else if (controller.view.subviews.count >= 1) { + // Controller的view的subViews[0]存在且是scrollView的子类，并且frame等与view得frame(UICollectionViewController/UIViewController添加UIScrollView) + UIView *view = controller.view.subviews[0]; + if ([view isKindOfClass:[UIScrollView class]]) { + scrollView = (UIScrollView *)view; + } + } + return scrollView; +} + +- (BOOL)wm_isInScreen:(CGRect)frame { + CGFloat x = frame.origin.x; + CGFloat ScreenWidth = self.scrollView.frame.size.width; + + CGFloat contentOffsetX = self.scrollView.contentOffset.x; + if (CGRectGetMaxX(frame) > contentOffsetX && x - contentOffsetX < ScreenWidth) { + return YES; + } else { + return NO; + } +} + +- (void)wm_resetMenuView { + if (!self.menuView) { + [self wm_addMenuView]; + } else { + [self.menuView reload]; + if (self.menuView.userInteractionEnabled == NO) { + self.menuView.userInteractionEnabled = YES; + } + if (self.selectIndex != 0) { + [self.menuView selectItemAtIndex:self.selectIndex]; + } + [self.view bringSubviewToFront:self.menuView]; + } +} + +- (void)wm_growCachePolicyAfterMemoryWarning { + self.cachePolicy = WMPageControllerCachePolicyBalanced; + [self performSelector:@selector(wm_growCachePolicyToHigh) withObject:nil afterDelay:2.0 inModes:@[NSRunLoopCommonModes]]; +} + +- (void)wm_growCachePolicyToHigh { + self.cachePolicy = WMPageControllerCachePolicyHigh; +} + +#pragma mark - Adjust Frame +- (void)wm_adjustScrollViewFrame { + // While rotate at last page, set scroll frame will call `-scrollViewDidScroll:` delegate + // It's not my expectation, so I use `_shouldNotScroll` to lock it. + // Wait for a better solution. + _shouldNotScroll = YES; + CGFloat oldContentOffsetX = self.scrollView.contentOffset.x; + CGFloat contentWidth = self.scrollView.contentSize.width; + self.scrollView.frame = _contentViewFrame; + self.scrollView.contentSize = CGSizeMake(self.childControllersCount * _contentViewFrame.size.width, 0); + CGFloat xContentOffset = contentWidth == 0 ? self.selectIndex * _contentViewFrame.size.width : oldContentOffsetX / contentWidth * self.childControllersCount * _contentViewFrame.size.width; + [self.scrollView setContentOffset:CGPointMake(xContentOffset, 0)]; + _shouldNotScroll = NO; +} + +- (void)wm_adjustDisplayingViewControllersFrame { + [self.displayVC enumerateKeysAndObjectsUsingBlock:^(NSNumber * _Nonnull key, UIViewController * _Nonnull vc, BOOL * _Nonnull stop) { + NSInteger index = key.integerValue; + CGRect frame = [self.childViewFrames[index] CGRectValue]; + vc.view.frame = frame; + }]; +} + +- (void)wm_adjustMenuViewFrame { + CGFloat oriWidth = self.menuView.frame.size.width; + self.menuView.frame = _menuViewFrame; + [self.menuView resetFrames]; + if (oriWidth != self.menuView.frame.size.width) { + [self.menuView refreshContenOffset]; + } +} + +- (CGFloat)wm_calculateItemWithAtIndex:(NSInteger)index { + NSString *title = [self titleAtIndex:index]; + UIFont *titleFont = self.titleFontName ? [UIFont fontWithName:self.titleFontName size:self.titleSizeSelected] : [UIFont systemFontOfSize:self.titleSizeSelected]; + NSDictionary *attrs = @{NSFontAttributeName: titleFont}; + CGFloat itemWidth = [title boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX) options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading) attributes:attrs context:nil].size.width; + return ceil(itemWidth); +} + +- (void)wm_delaySelectIndexIfNeeded { + if (_markedSelectIndex != kWMUndefinedIndex) { + self.selectIndex = (int)_markedSelectIndex; + } +} + +#pragma mark - Life Cycle +- (void)viewDidLoad { + [super viewDidLoad]; + self.view.backgroundColor = [UIColor whiteColor]; + if (!self.childControllersCount) return; + [self wm_calculateSize]; + [self wm_addScrollView]; + [self wm_initializedControllerWithIndexIfNeeded:self.selectIndex]; + self.currentViewController = self.displayVC[@(self.selectIndex)]; + [self wm_addMenuView]; + [self didEnterController:self.currentViewController atIndex:self.selectIndex]; +} + +- (void)viewDidLayoutSubviews { + [super viewDidLayoutSubviews]; + + if (!self.childControllersCount) return; + [self forceLayoutSubviews]; + _hasInited = YES; + [self wm_delaySelectIndexIfNeeded]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. + self.memoryWarningCount++; + self.cachePolicy = WMPageControllerCachePolicyLowMemory; + // 取消正在增长的 cache 操作 + [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(wm_growCachePolicyAfterMemoryWarning) object:nil]; + [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(wm_growCachePolicyToHigh) object:nil]; + + [self.memCache removeAllObjects]; + [self.posRecords removeAllObjects]; + self.posRecords = nil; + + // 如果收到内存警告次数小于 3，一段时间后切换到模式 Balanced + if (self.memoryWarningCount < 3) { + [self performSelector:@selector(wm_growCachePolicyAfterMemoryWarning) withObject:nil afterDelay:3.0 inModes:@[NSRunLoopCommonModes]]; + } +} + +#pragma mark - UIScrollView Delegate +- (void)scrollViewDidScroll:(UIScrollView *)scrollView { + if (![scrollView isKindOfClass:WMScrollView.class]) return; + + if (_shouldNotScroll || !_hasInited) return; + + [self wm_layoutChildViewControllers]; + if (_startDragging) { + CGFloat contentOffsetX = scrollView.contentOffset.x; + if (contentOffsetX < 0) { + contentOffsetX = 0; + } + if (contentOffsetX > scrollView.contentSize.width - _contentViewFrame.size.width) { + contentOffsetX = scrollView.contentSize.width - _contentViewFrame.size.width; + } + CGFloat rate = contentOffsetX / _contentViewFrame.size.width; + [self.menuView slideMenuAtProgress:rate]; + } + + // Fix scrollView.contentOffset.y -> (-20) unexpectedly. + if (scrollView.contentOffset.y == 0) return; + CGPoint contentOffset = scrollView.contentOffset; + contentOffset.y = 0.0; + scrollView.contentOffset = contentOffset; +} + +- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { + if (![scrollView isKindOfClass:WMScrollView.class]) return; + + _startDragging = YES; + self.menuView.userInteractionEnabled = NO; +} + +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView { + if (![scrollView isKindOfClass:WMScrollView.class]) return; + + self.menuView.userInteractionEnabled = YES; + _selectIndex = (int)(scrollView.contentOffset.x / _contentViewFrame.size.width); + self.currentViewController = self.displayVC[@(self.selectIndex)]; + [self didEnterController:self.currentViewController atIndex:self.selectIndex]; + [self.menuView deselectedItemsIfNeeded]; +} + +- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView { + if (![scrollView isKindOfClass:WMScrollView.class]) return; + + self.currentViewController = self.displayVC[@(self.selectIndex)]; + [self didEnterController:self.currentViewController atIndex:self.selectIndex]; + [self.menuView deselectedItemsIfNeeded]; +} + +- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate { + if (![scrollView isKindOfClass:WMScrollView.class]) return; + + if (!decelerate) { + self.menuView.userInteractionEnabled = YES; + CGFloat rate = _targetX / _contentViewFrame.size.width; + [self.menuView slideMenuAtProgress:rate]; + [self.menuView deselectedItemsIfNeeded]; + } +} + +- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset { + if (![scrollView isKindOfClass:WMScrollView.class]) return; + + _targetX = targetContentOffset->x; +} + +#pragma mark - WMMenuView Delegate +- (void)menuView:(WMMenuView *)menu didSelesctedIndex:(NSInteger)index currentIndex:(NSInteger)currentIndex { + if (!_hasInited) return; + _selectIndex = (int)index; + _startDragging = NO; + CGPoint targetP = CGPointMake(_contentViewFrame.size.width * index, 0); + [self.scrollView setContentOffset:targetP animated:self.pageAnimatable]; + if (self.pageAnimatable) return; + // 由于不触发 -scrollViewDidScroll: 手动处理控制器 + UIViewController *currentViewController = self.displayVC[@(currentIndex)]; + if (currentViewController) { + [self wm_removeViewController:currentViewController atIndex:currentIndex]; + } + [self wm_layoutChildViewControllers]; + self.currentViewController = self.displayVC[@(self.selectIndex)]; + + [self didEnterController:self.currentViewController atIndex:index]; +} + +- (CGFloat)menuView:(WMMenuView *)menu widthForItemAtIndex:(NSInteger)index { + if (self.automaticallyCalculatesItemWidths) { + return [self wm_calculateItemWithAtIndex:index]; + } + + if (self.itemsWidths.count == self.childControllersCount) { + return [self.itemsWidths[index] floatValue]; + } + return self.menuItemWidth; +} + +- (CGFloat)menuView:(WMMenuView *)menu itemMarginAtIndex:(NSInteger)index { + if (self.itemsMargins.count == self.childControllersCount + 1) { + return [self.itemsMargins[index] floatValue]; + } + return self.itemMargin; +} + +- (CGFloat)menuView:(WMMenuView *)menu titleSizeForState:(WMMenuItemState)state atIndex:(NSInteger)index { + switch (state) { + case WMMenuItemStateSelected: return self.titleSizeSelected; + case WMMenuItemStateNormal: return self.titleSizeNormal; + } +} + +- (UIColor *)menuView:(WMMenuView *)menu titleColorForState:(WMMenuItemState)state atIndex:(NSInteger)index { + switch (state) { + case WMMenuItemStateSelected: return self.titleColorSelected; + case WMMenuItemStateNormal: return self.titleColorNormal; + } +} + +#pragma mark - WMMenuViewDataSource +- (NSInteger)numbersOfTitlesInMenuView:(WMMenuView *)menu { + return self.childControllersCount; +} + +- (NSString *)menuView:(WMMenuView *)menu titleAtIndex:(NSInteger)index { + return [self titleAtIndex:index]; +} + +#pragma mark - WMPageControllerDataSource +- (CGRect)pageController:(WMPageController *)pageController preferredFrameForMenuView:(WMMenuView *)menuView { + NSAssert(0, @"[%@] MUST IMPLEMENT DATASOURCE METHOD `-pageController:preferredFrameForMenuView:`", [self.dataSource class]); + return CGRectZero; +} + +- (CGRect)pageController:(WMPageController *)pageController preferredFrameForContentView:(WMScrollView *)contentView { + NSAssert(0, @"[%@] MUST IMPLEMENT DATASOURCE METHOD `-pageController:preferredFrameForContentView:`", [self.dataSource class]); + return CGRectZero; +} + +@end