Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
FrPellissier committed Dec 14, 2021
2 parents f0d1edc + fa829b3 commit 3eefa68
Show file tree
Hide file tree
Showing 36 changed files with 2,827 additions and 291 deletions.
1 change: 1 addition & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def sharedPods
pod 'Firebase/Analytics', '~> 8.0.0'
pod 'Firebase/Messaging', '~> 8.0.0'
pod 'Firebase/Crashlytics', '~> 8.0.0'
pod 'Firebase/RemoteConfig', '~> 8.0.0'
pod 'SnapKit', '~> 4.0.0'
pod 'GooglePlaces', '~> 4.2.0'
pod 'TTTAttributedLabel'
Expand Down
20 changes: 18 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ PODS:
- Firebase/Messaging (8.0.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 8.0.0)
- Firebase/RemoteConfig (8.0.0):
- Firebase/CoreOnly
- FirebaseRemoteConfig (~> 8.0.0)
- FirebaseABTesting (8.8.0):
- FirebaseCore (~> 8.0)
- FirebaseAnalytics (8.0.0):
- FirebaseAnalytics/AdIdSupport (= 8.0.0)
- FirebaseCore (~> 8.0)
Expand Down Expand Up @@ -84,6 +89,12 @@ PODS:
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Reachability (~> 7.4)
- GoogleUtilities/UserDefaults (~> 7.4)
- FirebaseRemoteConfig (8.0.0):
- FirebaseABTesting (~> 8.0)
- FirebaseCore (~> 8.0)
- FirebaseInstallations (~> 8.0)
- GoogleUtilities/Environment (~> 7.4)
- "GoogleUtilities/NSData+zlib (~> 7.4)"
- GoogleAppMeasurement (8.0.0):
- GoogleAppMeasurement/AdIdSupport (= 8.0.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
Expand Down Expand Up @@ -142,6 +153,7 @@ DEPENDENCIES:
- Firebase/Analytics (~> 8.0.0)
- Firebase/Crashlytics (~> 8.0.0)
- Firebase/Messaging (~> 8.0.0)
- Firebase/RemoteConfig (~> 8.0.0)
- GooglePlaces (~> 4.2.0)
- IQKeyboardManager (~> 6.5)
- kingpin (= 0.3.1)
Expand All @@ -156,12 +168,14 @@ SPEC REPOS:
- AWSCore
- AWSS3
- Firebase
- FirebaseABTesting
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseCrashlytics
- FirebaseInstallations
- FirebaseMessaging
- FirebaseRemoteConfig
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleMaps
Expand All @@ -181,12 +195,14 @@ SPEC CHECKSUMS:
AWSCore: 55c154ae27efc5c98bdc30a0eeea5a35d10a2ab5
AWSS3: 2272253b098d07803af8dd20ce6ce7302bcffb47
Firebase: 73c3e3b216ec1ecbc54d2ffdd4670c65c749edb1
FirebaseABTesting: 981336dd14d84787e33466e4247f77ec2343f8d9
FirebaseAnalytics: dcb92c7c9ef4fa7ffac276e8f87bd4fc8c97f1b8
FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
FirebaseCrashlytics: 69cddb6bfa7656c5346e603bc85b029392252ee6
FirebaseInstallations: c4aab1005d6547b00a7529777fe52f5d4d45165b
FirebaseMessaging: 1a33b4af3c8042ed6ddacb6c031894af2064bfab
FirebaseRemoteConfig: 055f6b5ba1751547596ded5032c4d5c6054ca501
GoogleAppMeasurement: c6bbc9753d046b5456dd4f940057fbad2c28419e
GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
GoogleMaps: eb03e327edfd70b06de1e6e321653f73712df7ad
Expand All @@ -201,6 +217,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656

PODFILE CHECKSUM: a5bfdb803a8493719dc693c14e83e0feab207a69
PODFILE CHECKSUM: e1e3407446476639377a5dedc009a2b48fbc77d1

COCOAPODS: 1.10.1
COCOAPODS: 1.11.2
165 changes: 165 additions & 0 deletions Shared/Cells Xib/CellHomeExpertActionA.xib

Large diffs are not rendered by default.

136 changes: 136 additions & 0 deletions Shared/Cells Xib/CellHomeExpertActionB.xib
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
<capability name="collection view cell content view" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="cellCollActionB" id="dCo-If-9QY" customClass="OTHomeCollectionViewCell" customModule="Ent_Beta" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="200" height="185"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<collectionViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="VEF-fU-45I">
<rect key="frame" x="0.0" y="0.0" width="200" height="185"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Titre" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8n5-y7-vrz">
<rect key="frame" x="46" y="75" width="146" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ask_for_help_event" translatesAutoresizingMaskIntoConstraints="NO" id="C02-Xk-3ko">
<rect key="frame" x="16" y="72.5" width="22" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="22" id="0vz-v5-Ym3"/>
<constraint firstAttribute="height" constant="22" id="puq-sf-hFl"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Titre" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="POs-rC-h62">
<rect key="frame" x="48" y="100" width="144" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_location_new" translatesAutoresizingMaskIntoConstraints="NO" id="a3N-9m-M1F">
<rect key="frame" x="16" y="98.5" width="24" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="1P1-ag-78J"/>
<constraint firstAttribute="height" constant="20" id="Dow-KS-hSU"/>
</constraints>
</imageView>
<button opaque="NO" clipsSubviews="YES" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w4i-mX-P8N">
<rect key="frame" x="16" y="133" width="36" height="36"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="36" id="Wh3-nd-xrX"/>
<constraint firstAttribute="height" constant="36" id="rnt-I6-qgl"/>
</constraints>
<state key="normal" image="userSmall"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="17"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="action_show_profile:" destination="dCo-If-9QY" eventType="touchUpInside" id="bTU-g4-VGG"/>
</connections>
</button>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="99" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="HFK-Kl-r8N">
<rect key="frame" x="32" y="149" width="20" height="20"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="DQS-7A-y7f"/>
<constraint firstAttribute="height" constant="20" id="NWE-5C-9Vl"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="20" id="qif-TL-Kme"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="wsa-e1-7eL"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="10"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Titre" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6WZ-4b-bHg">
<rect key="frame" x="60" y="142.5" width="31" height="17"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yK1-EK-i1g">
<rect key="frame" x="16" y="16" width="176" height="43"/>
<string key="text">Titre
L2</string>
<fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="8n5-y7-vrz" firstAttribute="leading" secondItem="C02-Xk-3ko" secondAttribute="trailing" constant="8" id="2DO-bw-VP2"/>
<constraint firstItem="6WZ-4b-bHg" firstAttribute="centerY" secondItem="w4i-mX-P8N" secondAttribute="centerY" id="6uO-1H-lql"/>
<constraint firstAttribute="trailing" secondItem="8n5-y7-vrz" secondAttribute="trailing" constant="8" id="Bjv-ZO-fnn"/>
<constraint firstAttribute="trailing" secondItem="yK1-EK-i1g" secondAttribute="trailing" constant="8" id="Ekt-fB-ozB"/>
<constraint firstItem="HFK-Kl-r8N" firstAttribute="trailing" secondItem="w4i-mX-P8N" secondAttribute="trailing" id="J5e-bU-YXT"/>
<constraint firstItem="POs-rC-h62" firstAttribute="centerY" secondItem="a3N-9m-M1F" secondAttribute="centerY" id="KYW-17-ijf"/>
<constraint firstItem="HFK-Kl-r8N" firstAttribute="bottom" secondItem="w4i-mX-P8N" secondAttribute="bottom" id="R7j-B6-YIN"/>
<constraint firstAttribute="trailing" secondItem="POs-rC-h62" secondAttribute="trailing" constant="8" id="Rq0-fk-BhI"/>
<constraint firstItem="w4i-mX-P8N" firstAttribute="leading" secondItem="VEF-fU-45I" secondAttribute="leading" constant="16" id="XdC-BQ-htM"/>
<constraint firstItem="8n5-y7-vrz" firstAttribute="centerY" secondItem="C02-Xk-3ko" secondAttribute="centerY" id="ZbY-Sz-CqG"/>
<constraint firstItem="6WZ-4b-bHg" firstAttribute="leading" secondItem="w4i-mX-P8N" secondAttribute="trailing" constant="8" id="aZ4-em-T8i"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6WZ-4b-bHg" secondAttribute="trailing" constant="8" id="e4w-JI-nFY"/>
<constraint firstItem="POs-rC-h62" firstAttribute="leading" secondItem="a3N-9m-M1F" secondAttribute="trailing" constant="8" id="eSX-kV-VkO"/>
<constraint firstItem="C02-Xk-3ko" firstAttribute="leading" secondItem="VEF-fU-45I" secondAttribute="leading" constant="16" id="ekD-U8-5Tv"/>
<constraint firstItem="yK1-EK-i1g" firstAttribute="leading" secondItem="VEF-fU-45I" secondAttribute="leading" constant="16" id="f2M-G4-kdL"/>
<constraint firstItem="a3N-9m-M1F" firstAttribute="top" secondItem="C02-Xk-3ko" secondAttribute="bottom" constant="4" id="gEd-Sj-TbH"/>
<constraint firstItem="w4i-mX-P8N" firstAttribute="top" secondItem="POs-rC-h62" secondAttribute="bottom" constant="16" id="mzp-PI-eF8"/>
<constraint firstItem="yK1-EK-i1g" firstAttribute="top" secondItem="VEF-fU-45I" secondAttribute="top" constant="16" id="uWA-Xx-eiu"/>
<constraint firstAttribute="bottom" secondItem="w4i-mX-P8N" secondAttribute="bottom" constant="16" id="x61-cE-lK8"/>
<constraint firstItem="a3N-9m-M1F" firstAttribute="leading" secondItem="VEF-fU-45I" secondAttribute="leading" constant="16" id="yK6-0g-lWL"/>
</constraints>
</collectionViewCellContentView>
<size key="customSize" width="200" height="232"/>
<connections>
<outlet property="ui_button_profile" destination="w4i-mX-P8N" id="BhI-bT-jC8"/>
<outlet property="ui_picto_action" destination="C02-Xk-3ko" id="1Xe-9Y-eYp"/>
<outlet property="ui_picto_check_profile" destination="HFK-Kl-r8N" id="THI-Z5-XqR"/>
<outlet property="ui_picto_location" destination="a3N-9m-M1F" id="nVz-Os-jud"/>
<outlet property="ui_title_action" destination="8n5-y7-vrz" id="Zpj-3I-DAD"/>
<outlet property="ui_title_description" destination="yK1-EK-i1g" id="TrD-Kq-MVD"/>
<outlet property="ui_title_location" destination="POs-rC-h62" id="XqT-Hp-Q0I"/>
<outlet property="ui_title_profile" destination="6WZ-4b-bHg" id="fOo-iQ-YAe"/>
</connections>
<point key="canvasLocation" x="132" y="54"/>
</collectionViewCell>
</objects>
<resources>
<image name="ask_for_help_event" width="24" height="24"/>
<image name="ic_location_new" width="14" height="20"/>
<image name="userSmall" width="35" height="35"/>
</resources>
</document>
Loading

0 comments on commit 3eefa68

Please sign in to comment.