Fix activity indicator style of the progress item

tschob · Mar 7, 2021 · 604f0b1 · 604f0b1
1 parent 7357ddb
commit 604f0b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/Sources/QAMenuUIKit/Internal/UI/ItemViews/ProgressItemView/ProgressItemView.swift b/Sources/QAMenuUIKit/Internal/UI/ItemViews/ProgressItemView/ProgressItemView.swift
@@ -96,6 +96,11 @@ internal final class ProgressItemView: NibView, ItemView {
     private func applyStyle() {
         self.label.numberOfLines = 0
         self.label.font = .preferredFont(forTextStyle: .body)
+        if #available(iOS 13.0, *) {
+            self.activityIndicator.style = .medium
+        } else {
+            self.activityIndicator.style = .gray
+        }
     }
 
     private func reload() {

diff --git a/Sources/QAMenuUIKit/Resources/ButtonItemView.xib b/Sources/QAMenuUIKit/Resources/ButtonItemView.xib
@@ -37,7 +37,7 @@
                                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="SJw-yc-EBD">
+                                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="SJw-yc-EBD">
                                             <rect key="frame" x="394" y="40" width="20" height="20"/>
                                         </activityIndicatorView>
                                     </subviews>

diff --git a/Sources/QAMenuUIKit/Resources/PickableStringItemView.xib b/Sources/QAMenuUIKit/Resources/PickableStringItemView.xib
@@ -12,7 +12,6 @@
                 <outlet property="checkboxView" destination="LF6-Ua-gTE" id="tTI-ab-5MZ"/>
                 <outlet property="stackView" destination="rQ8-Be-LmF" id="HSQ-TC-ySL"/>
                 <outlet property="titleLabel" destination="suP-sd-BSz" id="pST-P8-z3L"/>
-                <outlet property="valueLabel" destination="9Ny-Uq-gXa" id="Kla-zP-A7R"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -24,23 +23,14 @@
                     <rect key="frame" x="0.0" y="0.0" width="393" height="100"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="suP-sd-BSz">
-                            <rect key="frame" x="0.0" y="0.0" width="393" height="20.5"/>
+                            <rect key="frame" x="0.0" y="0.0" width="393" height="100"/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="cL0-9R-XTQ"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ny-Uq-gXa">
-                            <rect key="frame" x="0.0" y="79.5" width="393" height="20.5"/>
-                            <constraints>
-                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="Rkz-Gf-C15"/>
-                            </constraints>
-                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                            <nil key="textColor"/>
-                            <nil key="highlightedColor"/>
-                        </label>
                     </subviews>
                 </stackView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LF6-Ua-gTE" customClass="CheckboxView" customModule="QAMenuUIKit">