Skip to content

Commit 75a3e5b

Browse files
ksclamksclam
committed
Fixed UI issues for iOS 15+ devices
- Release version S3.7 Build 329
1 parent e0fe40c commit 75a3e5b

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

‎CS108iOSClient.xcodeproj/project.pbxproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,6 @@
640640
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
641641
CLANG_ENABLE_MODULES = YES;
642642
CODE_SIGN_STYLE = Automatic;
643-
CURRENT_PROJECT_VERSION = 320;
644643
DEVELOPMENT_TEAM = ZDHT9HGJF7;
645644
FRAMEWORK_SEARCH_PATHS = (
646645
"$(inherited)",
@@ -652,7 +651,7 @@
652651
"$(inherited)",
653652
"@executable_path/Frameworks",
654653
);
655-
MARKETING_VERSION = S3.6;
654+
MARKETING_VERSION = S3.7;
656655
PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
657656
PRODUCT_NAME = CS108Swift;
658657
SWIFT_OBJC_BRIDGING_HEADER = "CS108iOSClient/ViewControllers/CS108iOSClient-Bridging-Header.h";
@@ -669,7 +668,6 @@
669668
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
670669
CLANG_ENABLE_MODULES = YES;
671670
CODE_SIGN_STYLE = Automatic;
672-
CURRENT_PROJECT_VERSION = 320;
673671
DEVELOPMENT_TEAM = ZDHT9HGJF7;
674672
FRAMEWORK_SEARCH_PATHS = (
675673
"$(inherited)",
@@ -681,7 +679,7 @@
681679
"$(inherited)",
682680
"@executable_path/Frameworks",
683681
);
684-
MARKETING_VERSION = S3.6;
682+
MARKETING_VERSION = S3.7;
685683
PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
686684
PRODUCT_NAME = CS108Swift;
687685
SWIFT_OBJC_BRIDGING_HEADER = "CS108iOSClient/ViewControllers/CS108iOSClient-Bridging-Header.h";

‎CS108iOSClient.xcworkspace/xcuserdata/TurtleMac01.xcuserdatad/UserInterfaceState.xcuserstate

2.2 KB
Binary file not shown.

‎CS108iOSClient/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>323</string>
22+
<string>329</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>NSBluetoothAlwaysUsageDescription</key>

‎CS108iOSClient/ViewControllers/AppDelegate.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@
2020

2121
CSLRfidAppEngine.shared()
2222

23+
//override default transparent background after iOS 15
24+
if #available(iOS 13.0, *) {
25+
let appearance = UINavigationBarAppearance()
26+
appearance.configureWithOpaqueBackground()
27+
appearance.backgroundColor = UIColorFromRGB(0x1f4788)
28+
appearance.titleTextAttributes = [.foregroundColor : UIColor.white]
29+
30+
UINavigationBar.appearance().standardAppearance = appearance
31+
UINavigationBar.appearance().scrollEdgeAppearance = UINavigationBar.appearance().standardAppearance
32+
}
33+
2334
UIBarButtonItem.appearance().tintColor = UIColorFromRGB(0xffffff)
2435

2536
UINavigationBar.appearance().barTintColor = UIColorFromRGB(0x1f4788)

‎CS108iOSClient/ViewControllers/CSLTemperatureTagListCell.xib

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina4_0" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<customFonts key="customFonts">
@@ -46,10 +46,10 @@
4646
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QUh-bF-8Jw" userLabel="rssi">
4747
<rect key="frame" x="25" y="28" width="23" height="17"/>
4848
<fontDescription key="fontDescription" name="Lato-Bold" family="Lato" pointSize="13"/>
49-
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
49+
<nil key="textColor"/>
5050
<nil key="highlightedColor"/>
5151
</label>
52-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vZb-Bp-cet">
52+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vZb-Bp-cet">
5353
<rect key="frame" x="50" y="25.5" width="55" height="20"/>
5454
<color key="backgroundColor" red="0.14901960784313725" green="0.65098039215686276" blue="0.35686274509803922" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
5555
<constraints>
@@ -63,17 +63,16 @@
6363
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="060-EK-ul9">
6464
<rect key="frame" x="110" y="32.5" width="22" height="12"/>
6565
<fontDescription key="fontDescription" name="Lato-Regular" family="Lato" pointSize="10"/>
66-
<color key="textColor" red="0.63921568627450975" green="0.63921568627450975" blue="0.63921568627450975" alpha="1" colorSpace="calibratedRGB"/>
66+
<nil key="textColor"/>
6767
<nil key="highlightedColor"/>
6868
</label>
6969
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port 1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ycr-Z1-WDf">
7070
<rect key="frame" x="190.5" y="18.5" width="35.5" height="16"/>
7171
<fontDescription key="fontDescription" name="Lato-Regular" family="Lato" pointSize="13"/>
72-
<color key="textColor" red="0.63921568627450975" green="0.63921568627450975" blue="0.63921568627450975" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
72+
<nil key="textColor"/>
7373
<nil key="highlightedColor"/>
7474
</label>
7575
</subviews>
76-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7776
<constraints>
7877
<constraint firstItem="yjn-1u-Y5e" firstAttribute="leading" secondItem="FCs-Fm-y9n" secondAttribute="leading" id="0v7-p1-ub6"/>
7978
<constraint firstItem="ycr-Z1-WDf" firstAttribute="top" secondItem="FCs-Fm-y9n" secondAttribute="bottom" id="CyP-p2-nJ0"/>
@@ -104,7 +103,6 @@
104103
<nil key="highlightedColor"/>
105104
</label>
106105
</subviews>
107-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
108106
<constraints>
109107
<constraint firstAttribute="bottom" secondItem="pfh-bu-VRo" secondAttribute="bottom" constant="2" id="5NL-QV-CyX"/>
110108
<constraint firstItem="pfh-bu-VRo" firstAttribute="leading" secondItem="jl5-rf-OqC" secondAttribute="leading" id="Eke-mN-yZK"/>
@@ -125,7 +123,6 @@
125123
<state key="normal" image="arrow"/>
126124
</button>
127125
</subviews>
128-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
129126
<constraints>
130127
<constraint firstItem="6oJ-53-cdh" firstAttribute="leading" secondItem="Xck-NV-hez" secondAttribute="leading" constant="11" id="TMd-zN-zHe"/>
131128
<constraint firstItem="6oJ-53-cdh" firstAttribute="centerY" secondItem="Xck-NV-hez" secondAttribute="centerY" id="h0L-vw-8t6"/>

0 commit comments

Comments
 (0)