[Nouveau salon] Fix icons for salon type (#565)

tchapgouv · Jun 22, 2022 · 36ff46d · 36ff46d
1 parent 1a88555
commit 36ff46d
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 77 deletions.
diff --git a/...rum_avatar_icon_hr.imageset/Contents.json → ...s/Room/Types/forum.imageset/Contents.json b/...rum_avatar_icon_hr.imageset/Contents.json → ...s/Room/Types/forum.imageset/Contents.json
@@ -1,23 +1,26 @@
 {
   "images" : [
     {
-      "filename" : "forum_avatar_icon_hr.png",
+      "filename" : "forum.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "forum_avatar_icon_hr@2x.png",
+      "filename" : "forum@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "forum_avatar_icon_hr@3x.png",
+      "filename" : "forum@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum.imageset/forum.png b/Tchap/Assets/Images.xcassets/Room/Types/forum.imageset/forum.png
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum.imageset/[email protected] b/Tchap/Assets/Images.xcassets/Room/Types/forum.imageset/[email protected]
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum.imageset/[email protected] b/Tchap/Assets/Images.xcassets/Room/Types/forum.imageset/[email protected]
diff --git a/...ages.xcassets/Room/Types/forum_avatar_icon_hr.imageset/forum_avatar_icon_hr.png b/...ages.xcassets/Room/Types/forum_avatar_icon_hr.imageset/forum_avatar_icon_hr.png
diff --git a/...s.xcassets/Room/Types/forum_avatar_icon_hr.imageset/[email protected] b/...s.xcassets/Room/Types/forum_avatar_icon_hr.imageset/[email protected]
diff --git a/...s.xcassets/Room/Types/forum_avatar_icon_hr.imageset/[email protected] b/...s.xcassets/Room/Types/forum_avatar_icon_hr.imageset/[email protected]
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/Contents.json b/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/Contents.json
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/forum_room.png b/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/forum_room.png
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/[email protected] b/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/[email protected]
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/[email protected] b/Tchap/Assets/Images.xcassets/Room/Types/forum_room.imageset/[email protected]
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/private_avatar_icon_hr.imageset/Contents.json b/Tchap/Assets/Images.xcassets/Room/Types/private_avatar_icon_hr.imageset/Contents.json
diff --git a/....xcassets/Room/Types/private_avatar_icon_hr.imageset/private_avatar_icon_hr.png b/....xcassets/Room/Types/private_avatar_icon_hr.imageset/private_avatar_icon_hr.png
diff --git a/...assets/Room/Types/private_avatar_icon_hr.imageset/[email protected] b/...assets/Room/Types/private_avatar_icon_hr.imageset/[email protected]
diff --git a/...assets/Room/Types/private_avatar_icon_hr.imageset/[email protected] b/...assets/Room/Types/private_avatar_icon_hr.imageset/[email protected]
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/private_room.imageset/private_room.png b/Tchap/Assets/Images.xcassets/Room/Types/private_room.imageset/private_room.png
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/private_room.imageset/[email protected] b/Tchap/Assets/Images.xcassets/Room/Types/private_room.imageset/[email protected]
diff --git a/Tchap/Assets/Images.xcassets/Room/Types/private_room.imageset/[email protected] b/Tchap/Assets/Images.xcassets/Room/Types/private_room.imageset/[email protected]
diff --git a/Tchap/Generated/Images.swift b/Tchap/Generated/Images.swift
@@ -44,9 +44,7 @@ internal class Asset_tchap: NSObject {
     internal static let roomHeaderHistory = ImageAsset(name: "room_header_history")
     internal static let roomHeaderMembers = ImageAsset(name: "room_header_members")
     internal static let sendIcon = ImageAsset(name: "send_icon")
-    internal static let forumAvatarIconHr = ImageAsset(name: "forum_avatar_icon_hr")
-    internal static let forumRoom = ImageAsset(name: "forum_room")
-    internal static let privateAvatarIconHr = ImageAsset(name: "private_avatar_icon_hr")
+    internal static let forum = ImageAsset(name: "forum")
     internal static let privateRoom = ImageAsset(name: "private_room")
     internal static let roomTypeForum = ImageAsset(name: "room_type_forum")
     internal static let roomTypePrivate = ImageAsset(name: "room_type_private")

diff --git a/Tchap/Modules/RoomCreation/RoomCreationViewController.storyboard b/Tchap/Modules/RoomCreation/RoomCreationViewController.storyboard
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="55i-A4-2Rr">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="55i-A4-2Rr">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Room Creation View Controller-->
         <scene sceneID="r9G-oz-HFh">
             <objects>
-                <viewController id="55i-A4-2Rr" customClass="RoomCreationViewController" customModule="Tchap" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="55i-A4-2Rr" customClass="RoomCreationViewController" customModule="Btchap" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Bvg-qF-mDc">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -30,7 +30,7 @@
                                                     <constraint firstAttribute="width" constant="100" id="FRc-wg-CD7"/>
                                                 </constraints>
                                             </view>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2AX-mv-koP" customClass="FormTextField" customModule="Tchap" customModuleProvider="target">
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2AX-mv-koP" customClass="FormTextField" customModule="Btchap" customModuleProvider="target">
                                                 <rect key="frame" x="140" y="65" width="215" height="30"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
@@ -57,14 +57,14 @@
                                                                         <rect key="frame" x="0.0" y="0.0" width="295" height="57"/>
                                                                         <subviews>
                                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="private_room" translatesAutoresizingMaskIntoConstraints="NO" id="BiS-0m-BKx">
-                                                                                <rect key="frame" x="0.0" y="20" width="12" height="17"/>
+                                                                                <rect key="frame" x="0.0" y="21" width="15" height="15"/>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="height" constant="17" id="ARL-Pr-Hf1"/>
-                                                                                    <constraint firstAttribute="width" constant="12" id="vYU-6E-iMe"/>
+                                                                                    <constraint firstAttribute="height" constant="15" id="ARL-Pr-Hf1"/>
+                                                                                    <constraint firstAttribute="width" constant="15" id="vYU-6E-iMe"/>
                                                                                 </constraints>
                                                                             </imageView>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8rL-tQ-qPw" userLabel="Private Room Title Label">
-                                                                                <rect key="frame" x="22" y="19" width="273" height="19.5"/>
+                                                                                <rect key="frame" x="25" y="19" width="270" height="19.5"/>
                                                                                 <string key="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce pharetra leo ipsum, vitae sagittis nulla gravida eu. Morbi at est lacinia risus interdum facilisis commodo ut libero.</string>
                                                                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                                                                 <nil key="textColor"/>
@@ -109,14 +109,14 @@
                                                                         <rect key="frame" x="0.0" y="0.0" width="295" height="57"/>
                                                                         <subviews>
                                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="private_room" translatesAutoresizingMaskIntoConstraints="NO" id="ZfR-6F-3NZ">
-                                                                                <rect key="frame" x="0.0" y="20" width="12" height="17"/>
+                                                                                <rect key="frame" x="0.0" y="21" width="15" height="15"/>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="height" constant="17" id="2ME-fT-irK"/>
-                                                                                    <constraint firstAttribute="width" constant="12" id="JSY-j6-074"/>
+                                                                                    <constraint firstAttribute="height" constant="15" id="2ME-fT-irK"/>
+                                                                                    <constraint firstAttribute="width" constant="15" id="JSY-j6-074"/>
                                                                                 </constraints>
                                                                             </imageView>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5AY-hy-Lro" userLabel="Private Room Title Label">
-                                                                                <rect key="frame" x="22" y="19" width="273" height="19.5"/>
+                                                                                <rect key="frame" x="25" y="19" width="270" height="19.5"/>
                                                                                 <string key="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce pharetra leo ipsum, vitae sagittis nulla gravida eu. Morbi at est lacinia risus interdum facilisis commodo ut libero.</string>
                                                                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                                                                 <nil key="textColor"/>
@@ -160,15 +160,15 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="H7Q-Kl-NqC">
                                                                         <rect key="frame" x="0.0" y="0.0" width="295" height="253.5"/>
                                                                         <subviews>
-                                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="forum_room" translatesAutoresizingMaskIntoConstraints="NO" id="fSH-Pc-GpS">
-                                                                                <rect key="frame" x="0.0" y="118.5" width="12" height="17"/>
+                                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="forum" translatesAutoresizingMaskIntoConstraints="NO" id="fSH-Pc-GpS">
+                                                                                <rect key="frame" x="0.0" y="117.5" width="18" height="19"/>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="height" constant="17" id="bHC-Zu-GD1"/>
-                                                                                    <constraint firstAttribute="width" constant="12" id="zRu-NP-VgD"/>
+                                                                                    <constraint firstAttribute="height" constant="19" id="bHC-Zu-GD1"/>
+                                                                                    <constraint firstAttribute="width" constant="18" id="zRu-NP-VgD"/>
                                                                                 </constraints>
                                                                             </imageView>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pBt-bd-ew9" userLabel="Private Room Title Label">
-                                                                                <rect key="frame" x="22" y="117" width="273" height="19.5"/>
+                                                                                <rect key="frame" x="28" y="117" width="267" height="19.5"/>
                                                                                 <string key="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce pharetra leo ipsum, vitae sagittis nulla gravida eu. Morbi at est lacinia risus interdum facilisis commodo ut libero.</string>
                                                                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                                                                                 <nil key="textColor"/>
@@ -230,8 +230,12 @@
                                                     </view>
                                                 </subviews>
                                             </stackView>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="private_avatar_icon_hr" translatesAutoresizingMaskIntoConstraints="NO" id="Cqe-MQ-M9u">
-                                                <rect key="frame" x="105" y="35" width="20" height="23.5"/>
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="forum" translatesAutoresizingMaskIntoConstraints="NO" id="Cqe-MQ-M9u">
+                                                <rect key="frame" x="105" y="35" width="18" height="19"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="18" id="CQA-34-JhC"/>
+                                                    <constraint firstAttribute="height" constant="19" id="PYU-ca-qqn"/>
+                                                </constraints>
                                             </imageView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -275,6 +279,7 @@
                         <outlet property="externRoomInfoLabel" destination="0N4-3y-tLP" id="kNy-VX-Tyy"/>
                         <outlet property="externRoomTitleLabel" destination="5AY-hy-Lro" id="jqO-jL-61s"/>
                         <outlet property="externRoomView" destination="qiU-3a-NRz" id="xQ4-gU-Qac"/>
+                        <outlet property="forumRoomImage" destination="fSH-Pc-GpS" id="mSK-GW-b2v"/>
                         <outlet property="forumRoomInfoLabel" destination="GRh-AX-jVf" id="9gU-YB-dyK"/>
                         <outlet property="forumRoomTitleLabel" destination="pBt-bd-ew9" id="nfY-ye-rQN"/>
                         <outlet property="forumRoomView" destination="Y1X-Wx-xN6" id="2ri-kS-E20"/>
@@ -297,8 +302,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="forum_room" width="16.5" height="17"/>
-        <image name="private_avatar_icon_hr" width="20" height="23.5"/>
-        <image name="private_room" width="14.5" height="17"/>
+        <image name="forum" width="15" height="16"/>
+        <image name="private_room" width="15" height="15"/>
     </resources>
 </document>
diff --git a/Tchap/Modules/RoomCreation/RoomCreationViewController.swift b/Tchap/Modules/RoomCreation/RoomCreationViewController.swift
@@ -66,6 +66,7 @@ final class RoomCreationViewController: UIViewController {
     @IBOutlet private weak var externRoomInfoLabel: UILabel!
 
     @IBOutlet private weak var forumRoomView: UIView!
+    @IBOutlet private weak var forumRoomImage: UIImageView!
     @IBOutlet private weak var forumRoomTitleLabel: UILabel!
     @IBOutlet private weak var forumRoomInfoLabel: UILabel!
 
@@ -268,7 +269,7 @@ final class RoomCreationViewController: UIViewController {
     private func enablePrivateRoom() {
         self.privateRoomView.layer.borderWidth = Constants.borderWidth
         self.privateRoomView.layer.borderColor = ThemeService.shared().theme.roomTypeRestricted.withAlphaComponent(Constants.borderColorAlpha).cgColor
-        self.roomTypeImage.image = Asset_tchap.Images.privateAvatarIconHr.image
+        self.roomTypeImage.image = nil
     }
 
     private func disablePrivateRoom() {
@@ -278,7 +279,7 @@ final class RoomCreationViewController: UIViewController {
     private func enableExternRoom() {
         self.externRoomView.layer.borderWidth = Constants.borderWidth
         self.externRoomView.layer.borderColor = ThemeService.shared().theme.roomTypeUnrestricted.withAlphaComponent(Constants.borderColorAlpha).cgColor
-        self.roomTypeImage.image = Asset_tchap.Images.privateAvatarIconHr.image
+        self.roomTypeImage.image = nil
     }
 
     private func disableExternRoom() {
@@ -288,7 +289,7 @@ final class RoomCreationViewController: UIViewController {
     private func enableForumRoom(_ isFederated: Bool) {
         self.forumRoomView.layer.borderWidth = Constants.borderWidth
         self.forumRoomView.layer.borderColor = ThemeService.shared().theme.roomTypePublic.withAlphaComponent(Constants.borderColorAlpha).cgColor
-        self.roomTypeImage.image = Asset_tchap.Images.forumAvatarIconHr.image
+        self.roomTypeImage.image = Asset_tchap.Images.forum.image.vc_tintedImage(usingColor: ThemeService.shared().theme.roomTypePublic)
 
         self.publicVisibilityInfoLabel.isHidden = false
         self.publicRoomFederationStackView.isHidden = self.viewModel.homeServerDomain == self.agentServerDomain
@@ -362,6 +363,7 @@ private extension RoomCreationViewController {
         self.externRoomInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
 
         self.forumRoomView.backgroundColor = ThemeService.shared().theme.backgroundSecondary
+        self.forumRoomImage.tintColor = ThemeService.shared().theme.roomTypePublic
         self.forumRoomTitleLabel.textColor = ThemeService.shared().theme.roomTypePublic
         self.forumRoomInfoLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor
         self.roomTypeTitleLabel.textColor = ThemeService.shared().theme.headerTextPrimaryColor

diff --git a/changelog.d/565.change b/changelog.d/565.change
@@ -0,0 +1 @@
+[Nouveau salon] Fix icons for salon type