Skip to content

Commit

Permalink
Fix logo missing in "About screen" (#2755)
Browse files Browse the repository at this point in the history 
<!-- Thank you for submitting a Pull Request and helping to improve Home
Assistant. Please complete the following sections to help the processing
and review of your changes. Please do not delete anything from this
template. -->

## Summary
<!-- Provide a brief summary of the changes you have made and most
importantly what they aim to achieve -->

## Screenshots
<!-- If this is a user-facing change not in the frontend, please include
screenshots in light and dark mode. -->
![Simulator Screenshot - iPhone 15 Pro - 2024-05-01 at 13 34
49](https://github.com/home-assistant/iOS/assets/5808343/57b27483-02c8-48a0-bb05-31ec2b4659fa)

## Link to pull request in Documentation repository
<!-- Pull requests that add, change or remove functionality must have a
corresponding pull request in the Companion App Documentation repository
(https://github.com/home-assistant/companion.home-assistant). Please add
the number of this pull request after the "#" -->
Documentation: home-assistant/companion.home-assistant#

## Any other notes
<!-- If there is any other information of note, like if this Pull
Request is part of a bigger change, please include it here. -->
  • Loading branch information
@bgoncal
bgoncal committed May 6, 2024
1 parent 56d0e90 commit 9901262
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
12 changes: 6 additions & 6 deletions HomeAssistant.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
42F9589C2BB4691D00497981 /* WidgetAssistProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F9589A2BB468F400497981 /* WidgetAssistProvider.swift */; };
42F9589F2BB4707F00497981 /* WidgetAssistView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F9589D2BB4705E00497981 /* WidgetAssistView.swift */; };
42FCCFA82B9A05400057783F /* View+RoundedCorner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FCCFA72B9A05400057783F /* View+RoundedCorner.swift */; };
42FCCFD62B9B195D0057783F /* UIImage+SharedAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FCCFD52B9B195D0057783F /* UIImage+SharedAssets.swift */; };
42FCCFD62B9B195D0057783F /* Image+SharedAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FCCFD52B9B195D0057783F /* Image+SharedAssets.swift */; };
42FCCFDA2B9B19F70057783F /* ThreadClientService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FCCFD72B9B19F70057783F /* ThreadClientService.swift */; };
42FCCFDB2B9B19F70057783F /* ThreadCredential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FCCFD82B9B19F70057783F /* ThreadCredential.swift */; };
42FCCFE12B9B1B610057783F /* BarcodeScannerDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42FCCFDE2B9B1B600057783F /* BarcodeScannerDataModel.swift */; };
Expand Down Expand Up @@ -1795,7 +1795,7 @@
42F9589A2BB468F400497981 /* WidgetAssistProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetAssistProvider.swift; sourceTree = "<group>"; };
42F9589D2BB4705E00497981 /* WidgetAssistView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetAssistView.swift; sourceTree = "<group>"; };
42FCCFA72B9A05400057783F /* View+RoundedCorner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+RoundedCorner.swift"; sourceTree = "<group>"; };
42FCCFD52B9B195D0057783F /* UIImage+SharedAssets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+SharedAssets.swift"; sourceTree = "<group>"; };
42FCCFD52B9B195D0057783F /* Image+SharedAssets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Image+SharedAssets.swift"; sourceTree = "<group>"; };
42FCCFD72B9B19F70057783F /* ThreadClientService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreadClientService.swift; sourceTree = "<group>"; };
42FCCFD82B9B19F70057783F /* ThreadCredential.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreadCredential.swift; sourceTree = "<group>"; };
42FCCFDE2B9B1B600057783F /* BarcodeScannerDataModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarcodeScannerDataModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3246,7 +3246,7 @@
426740A62B1738F900C1DD73 /* Extensions */ = {
isa = PBXGroup;
children = (
42FCCFD52B9B195D0057783F /* UIImage+SharedAssets.swift */,
42FCCFD52B9B195D0057783F /* Image+SharedAssets.swift */,
426740A72B17390A00C1DD73 /* Data+Hexadecimal.swift */,
42C3737E2BC415AC00898990 /* UIViewController+Extensions.swift */,
42FCCFA72B9A05400057783F /* View+RoundedCorner.swift */,
Expand Down Expand Up @@ -5003,7 +5003,7 @@
);
mainGroup = B657A8DD1CA646EB00121384;
packageReferences = (
427692E12B98B82500F24321 /* XCLocalSwiftPackageReference "SharedPush" */,
427692E12B98B82500F24321 /* XCLocalSwiftPackageReference "Sources/PushServer/SharedPush" */,
);
productRefGroup = B657A8E71CA646EB00121384 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -6516,7 +6516,7 @@
111D295624F30E2400C8A7D1 /* Updater.swift in Sources */,
11B38EE5275C54A200205C7B /* SendLocationIntentHandler.swift in Sources */,
1120C57F274638330046C38B /* PerServerContainer.swift in Sources */,
42FCCFD62B9B195D0057783F /* UIImage+SharedAssets.swift in Sources */,
42FCCFD62B9B195D0057783F /* Image+SharedAssets.swift in Sources */,
42F5CAE82B10CDC900409816 /* HAButton.swift in Sources */,
B672334D225DE1490031D629 /* SubscribeEvents.swift in Sources */,
1168BF302718070400DD4D15 /* NSMutableAttributedString+Additions.swift in Sources */,
Expand Down Expand Up @@ -8365,7 +8365,7 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
427692E12B98B82500F24321 /* XCLocalSwiftPackageReference "SharedPush" */ = {
427692E12B98B82500F24321 /* XCLocalSwiftPackageReference "Sources/PushServer/SharedPush" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = Sources/PushServer/SharedPush;
};
Expand Down
1 change: 1 addition & 0 deletions Sources/App/Settings/AboutViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class AboutViewController: HAFormViewController {
view.AppTitle.text = L10n.About.Logo.appTitle
view.Version.text = HomeAssistantAPI.clientVersionDescription
view.Tagline.text = L10n.About.Logo.tagline
view.Image.image = Asset.SharedAssets.logo.image
view.addGestureRecognizer(UITapGestureRecognizer(
target: self,
action: #selector(self.tapAbout(_:))
Expand Down
11 changes: 4 additions & 7 deletions Sources/App/Settings/HomeAssistantLogoView.xib
View file
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.XIB" version="3.0" toolsVersion="17154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17124"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -13,7 +13,7 @@
<rect key="frame" x="0.0" y="0.0" width="242" height="228"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo" translatesAutoresizingMaskIntoConstraints="NO" id="SvT-RD-CiP">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="SvT-RD-CiP">
<rect key="frame" x="38.5" y="20" width="165" height="132"/>
<constraints>
<constraint firstAttribute="width" constant="165" id="RkU-Cs-IDh"/>
Expand All @@ -33,7 +33,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" ambiguous="YES" text="Home Assistant Comapion" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bd2-me-S0Q">
<rect key="frame" x="20" y="147" width="201.5" height="21"/>
<rect key="frame" x="20.5" y="147" width="201.5" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -69,7 +69,4 @@
<point key="canvasLocation" x="-19.53125" y="-228.51562499999997"/>
</view>
</objects>
<resources>
<image name="Logo" width="512" height="512"/>
</resources>
</document>
0 ...red/Extensions/UIImage+SharedAssets.swift → ...hared/Extensions/Image+SharedAssets.swift
View file
File renamed without changes.

0 comments on commit 9901262

Please sign in to comment.