Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release #23

Merged
merged 3 commits into from
Feb 20, 2024
Merged

Release #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d864c55
Fixed launch screen issue
Feb 19, 2024
29360cf
Updated version number
Feb 19, 2024
ac83879
Fixed display names
Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions wxm-ios.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3177,15 +3177,15 @@
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "wxm-ios/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "WeatherXM-DB";
INFOPLIST_KEY_CFBundleDisplayName = "WeatherXM-MOCK";
INFOPLIST_KEY_LSApplicationCategoryType = "";
INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "WeatherXM uses Bluetooth to connect to your Helium device and allow you to claim it automatically.";
INFOPLIST_KEY_NSCameraUsageDescription = "Need access to camera for scanning the QR";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "WeatherXM uses your location to provide relevant weather data, and verify station installation.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "WeatherXM uses your location to provide relevant weather data, and verify station installation.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen";
INFOPLIST_KEY_UIRequiresFullScreen = NO;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
Expand All @@ -3195,7 +3195,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.13.0;
MARKETING_VERSION = 1.14.0;
OTHER_SWIFT_FLAGS = "-DMAIN_APP";
PRODUCT_BUNDLE_IDENTIFIER = com.weatherxm.app.mock;
PRODUCT_NAME = WeatherXM;
Expand Down Expand Up @@ -3353,7 +3353,7 @@
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "WeatherXM uses your location to provide relevant weather data, and verify station installation.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen";
INFOPLIST_KEY_UIRequiresFullScreen = NO;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
Expand All @@ -3363,7 +3363,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.13.0;
MARKETING_VERSION = 1.14.0;
OTHER_SWIFT_FLAGS = "-DMAIN_APP";
PRODUCT_BUNDLE_IDENTIFIER = com.weatherxm.app.debug;
PRODUCT_NAME = WeatherXM;
Expand Down Expand Up @@ -3394,15 +3394,15 @@
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "wxm-ios/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "WeatherXM-DB";
INFOPLIST_KEY_CFBundleDisplayName = WeatherXM;
INFOPLIST_KEY_LSApplicationCategoryType = "";
INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "WeatherXM uses Bluetooth to connect to your Helium device and allow you to claim it automatically.";
INFOPLIST_KEY_NSCameraUsageDescription = "Need access to camera for scanning the QR";
INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "WeatherXM uses your location to provide relevant weather data, and verify station installation.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "WeatherXM uses your location to provide relevant weather data, and verify station installation.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen";
INFOPLIST_KEY_UIRequiresFullScreen = NO;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
Expand All @@ -3412,7 +3412,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.13.0;
MARKETING_VERSION = 1.14.0;
OTHER_SWIFT_FLAGS = "-DMAIN_APP";
PRODUCT_BUNDLE_IDENTIFIER = com.weatherxm.app;
PRODUCT_NAME = WeatherXM;
Expand Down
4 changes: 2 additions & 2 deletions wxm-ios/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
</array>
<key>ClaimTokenUrl</key>
<string>$(ClaimTokenUrl)</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<string>NO</string>
<key>FirebaseAutomaticScreenReportingEnabled</key>
<false/>
<key>ITSAppUsesNonExemptEncryption</key>
Expand Down Expand Up @@ -78,7 +80,5 @@
<string>$(UserRefreshTokenService)</string>
<key>Username</key>
<string>$(Username)</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<string>NO</string>
</dict>
</plist>
10 changes: 5 additions & 5 deletions wxm-ios/Resources/Launch Screen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_72" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="ipad12_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand All @@ -14,11 +14,11 @@
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weatherXMLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Xpw-zT-19n">
<rect key="frame" x="0.0" y="322.66666666666663" width="430" height="286.66666666666663"/>
<rect key="frame" x="0.0" y="341.5" width="1024" height="683"/>
<constraints>
<constraint firstAttribute="width" secondItem="Xpw-zT-19n" secondAttribute="height" multiplier="3:2" id="d8t-YX-o0u"/>
</constraints>
Expand Down
Loading