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.

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

Updates-Khalid #148

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 16 additions & 12 deletions Snikket.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
3759638626F7317D00831F4C /* Account.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3759638826F7317D00831F4C /* Account.storyboard */; };
3759638D26F7320F00831F4C /* MIX.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3759638F26F7320F00831F4C /* MIX.storyboard */; };
3759A58C26F8C7CC002987B2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3759A58E26F8C7CC002987B2 /* Localizable.strings */; };
3763450E272C6CEF000BC01F /* CallsSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3763450D272C6CEF000BC01F /* CallsSettingsViewController.swift */; };
3776C43526EDC5F00047750B /* MessageStyling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776C43426EDC5F00047750B /* MessageStyling.swift */; };
3795F92426FB69370067361A /* BartyCrouch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3795F92326FB69370067361A /* BartyCrouch.swift */; };
3797D5BD26E9E42E0091DAF8 /* AvatarColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3797D5BC26E9E42E0091DAF8 /* AvatarColors.swift */; };
Expand Down Expand Up @@ -334,6 +335,7 @@
3759639426F7481200831F4C /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = "<group>"; };
3759A58D26F8C7CC002987B2 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
3759A58F26F8C7CF002987B2 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
3763450D272C6CEF000BC01F /* CallsSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallsSettingsViewController.swift; sourceTree = "<group>"; };
3776C43426EDC5F00047750B /* MessageStyling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageStyling.swift; sourceTree = "<group>"; };
3795F92326FB69370067361A /* BartyCrouch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BartyCrouch.swift; sourceTree = "<group>"; };
3797D5BC26E9E42E0091DAF8 /* AvatarColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarColors.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -767,26 +769,27 @@
FE507A0A1CDB7B3B001A015C /* settings */ = {
isa = PBXGroup;
children = (
FE6545611E9E7FDE006A14AC /* AccountDomainTableViewCell.swift */,
FE17808C23EB4C7F00A1EA76 /* AccountQRCodeController.swift */,
FEF80DB11CDBBBFE005645A7 /* AccountSettingsViewController.swift */,
FE507A0B1CDB7B3B001A015C /* AccountTableViewCell.swift */,
FE507A0C1CDB7B3B001A015C /* AddAccountController.swift */,
FE507A0D1CDB7B3B001A015C /* SettingsViewController.swift */,
FEF80DB11CDBBBFE005645A7 /* AccountSettingsViewController.swift */,
FE80BDAA1D953FC4001914B0 /* SetupViewController.swift */,
FE65455F1E9E7B85006A14AC /* RegisterAccountController.swift */,
FE6545611E9E7FDE006A14AC /* AccountDomainTableViewCell.swift */,
FE6545631E9E8B67006A14AC /* ServerSelectorTableViewCell.swift */,
FEDC678F238B05E4005C0FAB /* BlockedContactsController.swift */,
FE9E136C1F25F5F7005C0EE5 /* ChatSettingsViewController.swift */,
FE9E136E1F26049A005C0EE5 /* NotificationSettingsViewController.swift */,
FE9E13701F2606E9005C0EE5 /* ContactsSettingsViewController.swift */,
FE00157E2019090300490340 /* ExperimentalSettingsViewController.swift */,
FE2809802167CE18002F5BD0 /* server_features_list.xml */,
FE2809822167CF1B002F5BD0 /* ServerFeaturesViewController.swift */,
FE719E7D2274D20D007CEEC9 /* OMEMOFingerprintsController.swift */,
FEDC678F238B05E4005C0FAB /* BlockedContactsController.swift */,
FE17808C23EB4C7F00A1EA76 /* AccountQRCodeController.swift */,
FE0E31112537288A0030F8C5 /* MediaSettingsVIewController.swift */,
FE9E136E1F26049A005C0EE5 /* NotificationSettingsViewController.swift */,
FE719E7D2274D20D007CEEC9 /* OMEMOFingerprintsController.swift */,
E963721126D79D3A00332482 /* PrivacyPolicyTableViewCell.swift */,
FE65455F1E9E7B85006A14AC /* RegisterAccountController.swift */,
FE2809802167CE18002F5BD0 /* server_features_list.xml */,
FE2809822167CF1B002F5BD0 /* ServerFeaturesViewController.swift */,
FE6545631E9E8B67006A14AC /* ServerSelectorTableViewCell.swift */,
FE507A0D1CDB7B3B001A015C /* SettingsViewController.swift */,
FE80BDAA1D953FC4001914B0 /* SetupViewController.swift */,
373A801F271063E1000E50FE /* TelephonyProviderViewController.swift */,
3763450D272C6CEF000BC01F /* CallsSettingsViewController.swift */,
);
path = settings;
sourceTree = "<group>";
Expand Down Expand Up @@ -1448,6 +1451,7 @@
373A8020271063E1000E50FE /* TelephonyProviderViewController.swift in Sources */,
FE3E38862428C21100D3A8E8 /* OSLog.swift in Sources */,
FECEF29423B7933A007EC323 /* MetadataCache.swift in Sources */,
3763450E272C6CEF000BC01F /* CallsSettingsViewController.swift in Sources */,
E9D384B426CA95FF009BEAF3 /* UIDeviceExtension.swift in Sources */,
FEB62C501DA80956001500D5 /* AvatarStore.swift in Sources */,
FE7D293423B919FF001A877D /* DownloadManager.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"repositoryURL": "https://github.com/tigase/tigase-swift",
"state": {
"branch": null,
"revision": "028e297fa4de25ac552b9947a8ccd29ade7001e7",
"version": "2.1.2"
"revision": "d3953dcea80010ad433fa96d7ca6b989bf58850c",
"version": "2.1.3"
}
},
{
Expand Down
44 changes: 38 additions & 6 deletions Snikket/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -776,14 +776,14 @@
<scene sceneID="7R8-sh-AnU">
<objects>
<tableViewController id="WDE-Vb-oKK" customClass="RosterItemEditViewController" customModule="Snikket" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ock-Af-3IY">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ock-Af-3IY">
<rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
<sections>
<tableViewSection headerTitle="Account" id="Mfv-HJ-QDO">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="mk1-zp-AU3">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="mk1-zp-AU3">
<rect key="frame" x="0.0" y="49" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mk1-zp-AU3" id="Da1-kS-KYt">
Expand All @@ -808,7 +808,7 @@
</tableViewSection>
<tableViewSection headerTitle="JID" id="Qgj-eQ-geg">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="ubC-3x-1ej">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="ubC-3x-1ej">
<rect key="frame" x="0.0" y="142.66666603088379" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ubC-3x-1ej" id="6FY-Rq-hWY">
Expand All @@ -833,7 +833,7 @@
</tableViewSection>
<tableViewSection headerTitle="Name" id="Kfl-J5-hdD">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="bnU-C3-Ei1">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="bnU-C3-Ei1">
<rect key="frame" x="0.0" y="236.33333206176758" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bnU-C3-Ei1" id="sWs-wY-Vy8">
Expand All @@ -858,7 +858,7 @@
</tableViewSection>
<tableViewSection headerTitle="PRESENCE" id="Q28-Ig-9NP">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="yky-H4-cbk">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="yky-H4-cbk">
<rect key="frame" x="0.0" y="329.99999809265137" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yky-H4-cbk" id="Qga-yz-bXa">
Expand All @@ -884,7 +884,7 @@
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="GLY-Pk-gl9">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="GLY-Pk-gl9">
<rect key="frame" x="0.0" y="373.99999809265137" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="GLY-Pk-gl9" id="P7U-6w-pcx">
Expand Down Expand Up @@ -912,6 +912,37 @@
</tableViewCell>
</cells>
</tableViewSection>
<tableViewSection headerTitle="Invite" id="dib-YA-Eiz">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="pth-Xm-NXb">
<rect key="frame" x="0.0" y="467.66666412353516" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pth-Xm-NXb" id="EmN-0E-Hpp">
<rect key="frame" x="0.0" y="0.0" width="428" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Send Invitation Link" placeholder="Enter contact name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Rg7-YE-y8H">
<rect key="frame" x="20" y="0.0" width="388" height="44"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
</textField>
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="FPK-6B-DCN">
<rect key="frame" x="378" y="12" width="20" height="20"/>
<color key="color" name="AddToContactsBar"/>
</activityIndicatorView>
</subviews>
<constraints>
<constraint firstItem="FPK-6B-DCN" firstAttribute="centerY" secondItem="EmN-0E-Hpp" secondAttribute="centerY" id="HlI-Sf-kPN"/>
<constraint firstItem="Rg7-YE-y8H" firstAttribute="leading" secondItem="EmN-0E-Hpp" secondAttribute="leadingMargin" id="Yid-O7-fNs"/>
<constraint firstItem="Rg7-YE-y8H" firstAttribute="top" secondItem="EmN-0E-Hpp" secondAttribute="top" id="hll-jG-K6h"/>
<constraint firstAttribute="trailingMargin" secondItem="Rg7-YE-y8H" secondAttribute="trailing" id="iO2-ER-q2P"/>
<constraint firstAttribute="trailingMargin" secondItem="FPK-6B-DCN" secondAttribute="trailing" constant="10" id="jQD-5E-6Ad"/>
<constraint firstAttribute="bottom" secondItem="Rg7-YE-y8H" secondAttribute="bottom" id="rnb-WT-t71"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
</cells>
</tableViewSection>
</sections>
<connections>
<outlet property="dataSource" destination="WDE-Vb-oKK" id="52x-2u-5zh"/>
Expand All @@ -932,6 +963,7 @@
</navigationItem>
<connections>
<outlet property="accountTextField" destination="gXY-yq-Y2K" id="HAo-5R-FQQ"/>
<outlet property="invitationLinkIndicator" destination="FPK-6B-DCN" id="zl9-LQ-OPw"/>
<outlet property="jidTextField" destination="BM3-28-huR" id="rnA-hS-bcu"/>
<outlet property="nameTextField" destination="OGf-mX-8z3" id="tdd-eS-Ybc"/>
<outlet property="receivePresenceUpdatesSwitch" destination="QIs-qT-dLK" id="y20-Tc-yVK"/>
Expand Down
Loading