Skip to content

Commit 7bbd13e

Browse files
denysdanyliukboostersdenysdanyliukboosters
authored
Merge pull request #16 from AppSci/task/PRMV-2398
[PRMV-2398] Task: Remove NVActivityIndicator
2 parents 526fefa + 048ee82 commit 7bbd13e

File tree

6 files changed

+28
-87
lines changed

6 files changed

+28
-87
lines changed

‎UpstraUIKit/UpstraUIKit/AmityUIKit.swift‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public final class AmityUIKitManager {
3636
cancelString: String,
3737
loadingTitle: String,
3838
startTrackingFeedLoading: @escaping (()->()),
39-
stopTrackingFeedLoading: @escaping (()->())) {
39+
stopTrackingFeedLoading: @escaping (()->()),
40+
startLoading: @escaping (()->()),
41+
stopLoading: @escaping (()->())) {
4042
AmityUIKitManagerInternal.shared.setup(apiKey,
4143
region: region,
4244
cameraPermissionDeniedText: cameraPermissionDeniedText,
@@ -45,7 +47,9 @@ public final class AmityUIKitManager {
4547
cancelString: cancelString,
4648
loadingTitle: loadingTitle,
4749
startTrackingFeedLoading: startTrackingFeedLoading,
48-
stopTrackingFeedLoading: stopTrackingFeedLoading)
50+
stopTrackingFeedLoading: stopTrackingFeedLoading,
51+
startLoading: startLoading,
52+
stopLoading: stopLoading)
4953
}
5054

5155
/// Setup AmityUIKit instance. Internally it creates AmityClient instance from AmitySDK.
@@ -183,6 +187,9 @@ final class AmityUIKitManagerInternal: NSObject {
183187
var startTrackingFeedLoading: (()->())?
184188
var stopTrackingFeedLoading: (()->())?
185189

190+
var startLoading: (() -> Void)?
191+
var stopLoading: (() -> Void)?
192+
186193
// MARK: - Initializer
187194

188195
private override init() { }
@@ -197,7 +204,9 @@ final class AmityUIKitManagerInternal: NSObject {
197204
cancelString: String,
198205
loadingTitle: String,
199206
startTrackingFeedLoading: @escaping (()->()),
200-
stopTrackingFeedLoading: @escaping (()->())) {
207+
stopTrackingFeedLoading: @escaping (()->()),
208+
startLoading: @escaping (()->()),
209+
stopLoading: @escaping (()->())) {
201210
guard let client = try? AmityClient(apiKey: apiKey, region: region) else { return }
202211

203212
self.cameraPermissionDeniedText = cameraPermissionDeniedText
@@ -207,6 +216,8 @@ final class AmityUIKitManagerInternal: NSObject {
207216
self.loadingTitle = loadingTitle
208217
self.startTrackingFeedLoading = startTrackingFeedLoading
209218
self.stopTrackingFeedLoading = stopTrackingFeedLoading
219+
self.startLoading = startLoading
220+
self.stopLoading = stopLoading
210221
_client = client
211222
_client?.clientErrorDelegate = self
212223
}

‎UpstraUIKit/UpstraUIKit/Modules/Comunity/Feed Posts/Scenes/Feed/ViewController/AmityFeedViewController.swift‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import UIKit
10-
import NVActivityIndicatorView
1110

1211
public protocol FeedHeaderPresentable {
1312
var headerView: UIView { get }
@@ -22,8 +21,6 @@ public final class AmityFeedViewController: AmityViewController, AmityRefreshabl
2221
// MARK: - IBOutlet Properties
2322
@IBOutlet private var tableView: AmityPostTableView!
2423

25-
@IBOutlet weak var activitybackgroundView: UIView!
26-
@IBOutlet weak var activityView: NVActivityIndicatorView!
2724
// MARK: - Properties
2825
private var screenViewModel: AmityFeedScreenViewModelType!
2926
private let createPostButton: AmityFloatingButton = AmityFloatingButton()
@@ -75,15 +72,12 @@ public final class AmityFeedViewController: AmityViewController, AmityRefreshabl
7572
onViewDidLoad?()
7673
setupScreenViewModel()
7774
// setupPostButton()
78-
79-
self.activitybackgroundView.alpha = 0
80-
75+
8176
let feedType = self.screenViewModel.dataSource.getFeedType()
8277
switch feedType {
8378
case .communityFeed(let communityId):
8479
if communityId.contains("aca52dd") {
85-
self.activitybackgroundView.alpha = 0.3
86-
self.activityView.startAnimating()
80+
AmityUIKitManagerInternal.shared.startLoading?()
8781
AmityUIKitManagerInternal.shared.startTrackingFeedLoading?()
8882
}
8983
default: ()
@@ -172,7 +166,6 @@ public final class AmityFeedViewController: AmityViewController, AmityRefreshabl
172166
private func setupView() {
173167
setupTableView()
174168
setupRefreshControl()
175-
self.activitybackgroundView.layer.cornerRadius = 10
176169
}
177170

178171
private func setupPostButton() {
@@ -214,8 +207,7 @@ public final class AmityFeedViewController: AmityViewController, AmityRefreshabl
214207
switch feedType {
215208
case .communityFeed(let communityId):
216209
if communityId.contains("aca52dd") {
217-
self.activitybackgroundView.alpha = 0
218-
self.activityView.stopAnimating()
210+
AmityUIKitManagerInternal.shared.stopLoading?()
219211
AmityUIKitManagerInternal.shared.stopTrackingFeedLoading?()
220212
}
221213
default: break

‎UpstraUIKit/UpstraUIKit/Modules/Comunity/Feed Posts/Scenes/Feed/ViewController/AmityFeedViewController.xib‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
1111
<objects>
1212
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AmityFeedViewController" customModule="AmityUIKit" customModuleProvider="target">
1313
<connections>
14-
<outlet property="activityView" destination="Zvq-y5-g1l" id="64H-vr-OBl"/>
15-
<outlet property="activitybackgroundView" destination="aiW-0g-V3g" id="hvF-ke-D96"/>
1614
<outlet property="tableView" destination="XOB-JW-neK" id="31c-5v-s8A"/>
1715
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
1816
</connections>
@@ -23,42 +21,17 @@
2321
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2422
<subviews>
2523
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="XOB-JW-neK" customClass="AmityPostTableView" customModule="AmityUIKit" customModuleProvider="target">
26-
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
24+
<rect key="frame" x="0.0" y="48" width="414" height="814"/>
2725
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
2826
</tableView>
29-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aiW-0g-V3g">
30-
<rect key="frame" x="147" y="388" width="120" height="120"/>
31-
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
32-
<constraints>
33-
<constraint firstAttribute="height" constant="120" id="e3v-dU-kjO"/>
34-
<constraint firstAttribute="width" constant="120" id="rqQ-NR-t07"/>
35-
</constraints>
36-
</view>
37-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zvq-y5-g1l" customClass="NVActivityIndicatorView" customModule="NVActivityIndicatorView">
38-
<rect key="frame" x="167" y="408" width="80" height="80"/>
39-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
40-
<constraints>
41-
<constraint firstAttribute="height" constant="80" id="EEP-Rz-BQ5"/>
42-
<constraint firstAttribute="width" constant="80" id="Pn9-3N-jP8"/>
43-
</constraints>
44-
<userDefinedRuntimeAttributes>
45-
<userDefinedRuntimeAttribute type="color" keyPath="color">
46-
<color key="value" red="0.82352941176470584" green="0.94901960784313721" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
47-
</userDefinedRuntimeAttribute>
48-
</userDefinedRuntimeAttributes>
49-
</view>
5027
</subviews>
5128
<viewLayoutGuide key="safeArea" id="zN9-du-z87"/>
5229
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
5330
<constraints>
54-
<constraint firstItem="aiW-0g-V3g" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="3an-Bo-ihI"/>
55-
<constraint firstItem="Zvq-y5-g1l" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="8dY-sq-akT"/>
5631
<constraint firstItem="zN9-du-z87" firstAttribute="trailing" secondItem="XOB-JW-neK" secondAttribute="trailing" id="CT5-az-UeL"/>
5732
<constraint firstItem="XOB-JW-neK" firstAttribute="top" secondItem="zN9-du-z87" secondAttribute="top" id="JZk-Ub-NDv"/>
58-
<constraint firstItem="aiW-0g-V3g" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="Jzo-Sm-VLs"/>
5933
<constraint firstItem="XOB-JW-neK" firstAttribute="leading" secondItem="zN9-du-z87" secondAttribute="leading" id="QJx-zR-Kpl"/>
6034
<constraint firstItem="zN9-du-z87" firstAttribute="bottom" secondItem="XOB-JW-neK" secondAttribute="bottom" id="kuJ-nN-JHT"/>
61-
<constraint firstItem="Zvq-y5-g1l" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="yaY-30-7i9"/>
6235
</constraints>
6336
<point key="canvasLocation" x="137.68115942028987" y="104.46428571428571"/>
6437
</view>

‎UpstraUIKit/UpstraUIKit/Modules/Comunity/Feed Posts/Scenes/Post Detail/ViewController/AmityPostDetailViewController.swift‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
//
88

99
import UIKit
10-
import NVActivityIndicatorView
1110
import AmitySDK
1211

1312
/// A view controller for providing post and relevant comments.
14-
open class AmityPostDetailViewController: AmityViewController {
15-
16-
@IBOutlet private var activityBackgroundView: UIView!
17-
@IBOutlet private var activityView: NVActivityIndicatorView!
13+
open class AmityPostDetailViewController: AmityViewController {
1814
// MARK: - IBOutlet Properties
1915
@IBOutlet private var tableView: AmityPostTableView!
2016
@IBOutlet private var commentComposeBarView: AmityPostDetailCompostView!
@@ -69,13 +65,13 @@ open class AmityPostDetailViewController: AmityViewController {
6965
public override func viewDidLoad() {
7066
super.viewDidLoad()
7167
setupView()
68+
startAnimation()
7269
setupNavigationBar()
7370
setupTableView()
7471
setupComposeBarView()
7572
setupProtocolHandler()
7673
setupScreenViewModel()
7774
setupMentionTableView()
78-
startAnimation()
7975
}
8076

8177
public override func viewWillAppear(_ animated: Bool) {
@@ -112,23 +108,19 @@ open class AmityPostDetailViewController: AmityViewController {
112108
screenViewModel.delegate = self
113109
screenViewModel.action.fetchPost()
114110
screenViewModel.action.fetchComments()
115-
self.startAnimation()
116111
}
117112

118113
func startAnimation() {
119-
self.activityBackgroundView.alpha = 0.3
120-
self.activityView.startAnimating()
114+
AmityUIKitManagerInternal.shared.startLoading?()
121115
}
122116

123117
func stopAnimation() {
124-
self.activityBackgroundView.alpha = 0
125-
self.activityView.stopAnimating()
118+
AmityUIKitManagerInternal.shared.stopLoading?()
126119
}
127120

128121
// MARK: Setup views
129122
private func setupView() {
130123
view.backgroundColor = AmityColorSet.backgroundColor
131-
self.activityBackgroundView.layer.cornerRadius = 10
132124
}
133125

134126
private func setupNavigationBar() {

‎UpstraUIKit/UpstraUIKit/Modules/Comunity/Feed Posts/Scenes/Post Detail/ViewController/AmityPostDetailViewController.xib‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="System colors in document resources" minToolsVersion="11.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
1111
<objects>
1212
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AmityPostDetailViewController" customModule="AmityUIKit" customModuleProvider="target">
1313
<connections>
14-
<outlet property="activityBackgroundView" destination="uko-Xg-HrR" id="Wbl-aU-Ad3"/>
15-
<outlet property="activityView" destination="g4y-hU-0Ey" id="80T-Ln-2IL"/>
1614
<outlet property="commentComposeBarBottomConstraint" destination="UKz-Zi-AVg" id="cUz-oX-7ad"/>
1715
<outlet property="commentComposeBarView" destination="gMP-ip-qOd" id="4qr-Wq-oNn"/>
1816
<outlet property="mentionTableView" destination="0s6-hY-oze" id="1WK-3k-nWw"/>
@@ -41,42 +39,18 @@
4139
<constraint firstAttribute="height" constant="240" id="Fxt-Kx-jBd"/>
4240
</constraints>
4341
</tableView>
44-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uko-Xg-HrR">
45-
<rect key="frame" x="147" y="388" width="120" height="120"/>
46-
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
47-
<constraints>
48-
<constraint firstAttribute="height" constant="120" id="imp-zd-grM"/>
49-
<constraint firstAttribute="width" constant="120" id="qtV-YG-nmh"/>
50-
</constraints>
51-
</view>
52-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g4y-hU-0Ey" customClass="NVActivityIndicatorView" customModule="NVActivityIndicatorView">
53-
<rect key="frame" x="167" y="408" width="80" height="80"/>
54-
<constraints>
55-
<constraint firstAttribute="width" constant="80" id="GVF-WT-nGV"/>
56-
<constraint firstAttribute="height" constant="80" id="KwH-U1-uB4"/>
57-
</constraints>
58-
<userDefinedRuntimeAttributes>
59-
<userDefinedRuntimeAttribute type="color" keyPath="color">
60-
<color key="value" red="0.82352941180000006" green="0.94901960780000005" blue="0.96470588239999999" alpha="1" colorSpace="calibratedRGB"/>
61-
</userDefinedRuntimeAttribute>
62-
</userDefinedRuntimeAttributes>
63-
</view>
6442
</subviews>
6543
<viewLayoutGuide key="safeArea" id="Wb0-7q-vLN"/>
6644
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
6745
<constraints>
68-
<constraint firstItem="uko-Xg-HrR" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="2hz-tk-mpC"/>
6946
<constraint firstItem="nxX-G7-dP4" firstAttribute="leading" secondItem="Wb0-7q-vLN" secondAttribute="leading" id="FUa-U5-VBJ"/>
70-
<constraint firstItem="g4y-hU-0Ey" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="GV4-Yi-mif"/>
7147
<constraint firstItem="gMP-ip-qOd" firstAttribute="trailing" secondItem="Wb0-7q-vLN" secondAttribute="trailing" id="T46-Hg-UVd"/>
7248
<constraint firstItem="gMP-ip-qOd" firstAttribute="bottom" secondItem="Wb0-7q-vLN" secondAttribute="bottom" id="UKz-Zi-AVg"/>
7349
<constraint firstItem="gMP-ip-qOd" firstAttribute="top" secondItem="0s6-hY-oze" secondAttribute="bottom" id="Y4o-3s-n8p"/>
74-
<constraint firstItem="g4y-hU-0Ey" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="cpG-J9-g30"/>
7550
<constraint firstItem="0s6-hY-oze" firstAttribute="leading" secondItem="Wb0-7q-vLN" secondAttribute="leading" id="fdG-02-kLl"/>
7651
<constraint firstItem="gMP-ip-qOd" firstAttribute="leading" secondItem="Wb0-7q-vLN" secondAttribute="leading" id="k2S-06-qGU"/>
7752
<constraint firstItem="Wb0-7q-vLN" firstAttribute="trailing" secondItem="0s6-hY-oze" secondAttribute="trailing" id="k9l-qe-gzs"/>
7853
<constraint firstItem="nxX-G7-dP4" firstAttribute="top" secondItem="Wb0-7q-vLN" secondAttribute="top" id="qQI-fA-KRR"/>
79-
<constraint firstItem="uko-Xg-HrR" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="qt2-8v-DMu"/>
8054
<constraint firstItem="gMP-ip-qOd" firstAttribute="top" secondItem="nxX-G7-dP4" secondAttribute="bottom" id="vB3-bY-uTZ"/>
8155
<constraint firstItem="nxX-G7-dP4" firstAttribute="trailing" secondItem="Wb0-7q-vLN" secondAttribute="trailing" id="yLf-Co-uxc"/>
8256
</constraints>

‎WBAmityUIKit.podspec‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ TODO: Add long description of the pod here.
2828
s.source = { :git => 'https://github.com/AppSci/Amity-Social-Cloud-UIKit-iOS-OpenSource.git', :tag => s.version.to_s }
2929
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
3030

31-
s.ios.deployment_target = '13.0'
31+
s.ios.deployment_target = '15.0'
3232

3333
s.source_files = 'UpstraUIKit/UpstraUIKit/**/**.{h,hpp,m,swift,xib,storyboard,modulemap,plist,plist,xcconfig,strings}'
3434
s.resource = 'UpstraUIKit/UpstraUIKit/Assets.xcassets'
3535

36-
s.dependency 'AmitySDK', '5.32.0'
36+
s.dependency 'AmitySDK', '5.33.8'
3737
s.dependency 'RealmSwift'
38-
s.dependency 'NVActivityIndicatorView'
3938
end

0 commit comments

Comments
 (0)