keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Design enhancements, part of #577

Browse Source 
- Settings iconography.
- Close buttons.
- Add gesture recognizers on navigation bar label, not the entire bar.
- Group view and conversation view back buttons.
pull/1/head
Frederic Jacobs 10 years ago
parent d70a9403b6
commit 3112bd9a15
12 changed files with 945 additions and 66 deletions
Show Stats Download Patch File Download Diff File

8
Signal.xcodeproj/project.pbxproj
Unescape Escape View File

@ -332,7 +332,6 @@
B633C5CE1A1D190B0059AC12 /* quit@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54C1A1D190B0059AC12 /* quit@2x.png */; };
B633C5D01A1D190B0059AC12 /* red-delete@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54E1A1D190B0059AC12 /* red-delete@2x.png */; };
B633C5D21A1D190B0059AC12 /* savephoto@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5501A1D190B0059AC12 /* savephoto@2x.png */; };
B633C5DA1A1D190B0059AC12 /* settings_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5581A1D190B0059AC12 /* settings_dark@2x.png */; };
B633C5DB1A1D190B0059AC12 /* share@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5591A1D190B0059AC12 /* share@2x.png */; };
B633C5DC1A1D190B0059AC12 /* shred@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C55A1A1D190B0059AC12 /* shred@2x.png */; };
B633C5DF1A1D190B0059AC12 /* signal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C55E1A1D190B0059AC12 /* signal@2x.png */; };
@ -493,7 +492,6 @@
F995AC2FFD6D4442B012604A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8313AE91B4954215858A5662 /* libPods.a */; };
FC15B7BF1A1F80F200F59801 /* defaultConctact_light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC15B7BE1A1F80F200F59801 /* defaultConctact_light@2x.png */; };
FC1F90C01A22342B004F8253 /* group_photo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC1F90BF1A22342B004F8253 /* group_photo@2x.png */; };
FC1F90C61A223991004F8253 /* settings_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC1F90C41A223991004F8253 /* settings_tab@2x.png */; };
FC1F90C71A223991004F8253 /* signals_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC1F90C51A223991004F8253 /* signals_tab@2x.png */; };
FC31962A1A067D8F0094C78E /* MessageComposeTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */; };
FC31962D1A06A2190094C78E /* FingerprintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962C1A06A2190094C78E /* FingerprintViewController.m */; };
@ -940,7 +938,6 @@
B633C54C1A1D190B0059AC12 /* quit@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "quit@2x.png"; sourceTree = "<group>"; };
B633C54E1A1D190B0059AC12 /* red-delete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red-delete@2x.png"; sourceTree = "<group>"; };
B633C5501A1D190B0059AC12 /* savephoto@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "savephoto@2x.png"; sourceTree = "<group>"; };
B633C5581A1D190B0059AC12 /* settings_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings_dark@2x.png"; sourceTree = "<group>"; };
B633C5591A1D190B0059AC12 /* share@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share@2x.png"; sourceTree = "<group>"; };
B633C55A1A1D190B0059AC12 /* shred@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shred@2x.png"; sourceTree = "<group>"; };
B633C55E1A1D190B0059AC12 /* signal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "signal@2x.png"; sourceTree = "<group>"; };
@ -1199,7 +1196,6 @@
E1CD329518BCFF9900B1A496 /* SoundInstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoundInstance.m; sourceTree = "<group>"; };
FC15B7BE1A1F80F200F59801 /* defaultConctact_light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "defaultConctact_light@2x.png"; sourceTree = "<group>"; };
FC1F90BF1A22342B004F8253 /* group_photo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "group_photo@2x.png"; sourceTree = "<group>"; };
FC1F90C41A223991004F8253 /* settings_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings_tab@2x.png"; sourceTree = "<group>"; };
FC1F90C51A223991004F8253 /* signals_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "signals_tab@2x.png"; sourceTree = "<group>"; };
FC3196281A067D8F0094C78E /* MessageComposeTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageComposeTableViewController.h; sourceTree = "<group>"; };
FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageComposeTableViewController.m; sourceTree = "<group>"; };
@ -2204,8 +2200,6 @@
B633C54C1A1D190B0059AC12 /* quit@2x.png */,
B633C54E1A1D190B0059AC12 /* red-delete@2x.png */,
B633C5501A1D190B0059AC12 /* savephoto@2x.png */,
B633C5581A1D190B0059AC12 /* settings_dark@2x.png */,
FC1F90C41A223991004F8253 /* settings_tab@2x.png */,
B633C5591A1D190B0059AC12 /* share@2x.png */,
B633C55A1A1D190B0059AC12 /* shred@2x.png */,
FC3BD97A1A2CD385005B96BB /* signal_dotted@2x.png */,
@ -2939,7 +2933,6 @@
AD41D7B51A6F6F0600241130 /* play_button.png in Resources */,
B633C59D1A1D190B0059AC12 /* endcall@2x.png in Resources */,
B633C5B41A1D190B0059AC12 /* keypad@2x.png in Resources */,
B633C5DA1A1D190B0059AC12 /* settings_dark@2x.png in Resources */,
B6C6AE561A305ED1006BAF8F /* textsecure.cer in Resources */,
B633C5BC1A1D190B0059AC12 /* message_bubble@2x.png in Resources */,
FC15B7BF1A1F80F200F59801 /* defaultConctact_light@2x.png in Resources */,
@ -2962,7 +2955,6 @@
B633C5C31A1D190B0059AC12 /* mute_off@2x.png in Resources */,
AD83FF411A73426500B5C81A /* audio_play_button_blue@2x.png in Resources */,
FCB626B71A3B067900FDB504 /* ArrowTop@3x.png in Resources */,
FC1F90C61A223991004F8253 /* settings_tab@2x.png in Resources */,
FCB626B61A3B067900FDB504 /* ArrowBottom@3x.png in Resources */,
B633C5B61A1D190B0059AC12 /* lock_white@2x.png in Resources */,
FC5CDF3A1A3393DD00B47253 /* warning_white@2x.png in Resources */,

12
Signal/Images.xcassets/btnSettings--blue.imageset/Contents.json vendored
Unescape Escape View File

@ -1,12 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "btnSettings--blue.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Signal/Images.xcassets/btnSettings--blue.imageset/btnSettings--blue.pdf vendored
View File

Binary file not shown.

2
Signal/Images.xcassets/settings-icon@1x.imageset/Contents.json vendored
Unescape Escape View File

@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "btnSettings--white.pdf"
"filename" : "settings.pdf"
}
],
"info" : {

BIN
Signal/Images.xcassets/settings-icon@1x.imageset/btnSettings--white.pdf vendored
View File

Binary file not shown.

890
Signal/Images.xcassets/settings-icon@1x.imageset/settings.pdf vendored
Unescape Escape View File

@ -0,0 +1,890 @@
%PDF-1.5 %âãÏÓ
1 0 obj <</Metadata 2 0 R/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <</Length 34723/Subtype/XML/Type/Metadata>>stream
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:format>application/pdf</dc:format>
<dc:title>
<rdf:Alt>
<rdf:li xml:lang="x-default">settings</rdf:li>
</rdf:Alt>
</dc:title>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xmp="http://ns.adobe.com/xap/1.0/"
xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
<xmp:CreatorTool>Adobe Illustrator CS6 (Macintosh)</xmp:CreatorTool>
<xmp:CreateDate>2015-02-07T00:52:57-05:00</xmp:CreateDate>
<xmp:ModifyDate>2015-02-07T00:52:57-05:00</xmp:ModifyDate>
<xmp:MetadataDate>2015-02-07T00:52:57-05:00</xmp:MetadataDate>
<xmp:Thumbnails>
<rdf:Alt>
<rdf:li rdf:parseType="Resource">
<xmpGImg:width>256</xmpGImg:width>
<xmpGImg:height>256</xmpGImg:height>
<xmpGImg:format>JPEG</xmpGImg:format>
<xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX//2Q==</xmpGImg:image>
</rdf:li>
</rdf:Alt>
</xmp:Thumbnails>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#">
<xmpMM:OriginalDocumentID>uuid:C1BCCE1871B8DB11993190FCD52B4E9F</xmpMM:OriginalDocumentID>
<xmpMM:DocumentID>xmp.did:FB7F117407206811822AE763568782DB</xmpMM:DocumentID>
<xmpMM:InstanceID>uuid:a2aa5533-75af-8544-b26a-dfbc5328f448</xmpMM:InstanceID>
<xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
<xmpMM:DerivedFrom rdf:parseType="Resource">
<stRef:instanceID>uuid:6ea8efe9-b23e-1444-ac85-a5f9c9c8cb70</stRef:instanceID>
<stRef:documentID>xmp.did:0180117407206811822AE1909D884414</stRef:documentID>
<stRef:originalDocumentID>uuid:C1BCCE1871B8DB11993190FCD52B4E9F</stRef:originalDocumentID>
<stRef:renditionClass>proof:pdf</stRef:renditionClass>
</xmpMM:DerivedFrom>
<xmpMM:History>
<rdf:Seq>
<rdf:li rdf:parseType="Resource">
<stEvt:action>saved</stEvt:action>
<stEvt:instanceID>xmp.iid:FB7F117407206811822AE763568782DB</stEvt:instanceID>
<stEvt:when>2015-02-07T00:52:39-05:00</stEvt:when>
<stEvt:softwareAgent>Adobe Illustrator CS6 (Macintosh)</stEvt:softwareAgent>
<stEvt:changed>/</stEvt:changed>
</rdf:li>
</rdf:Seq>
</xmpMM:History>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/">
<illustrator:StartupProfile>Mobile</illustrator:StartupProfile>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
<xmpTPg:NPages>1</xmpTPg:NPages>
<xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
<xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
<xmpTPg:MaxPageSize rdf:parseType="Resource">
<stDim:w>44.000000</stDim:w>
<stDim:h>44.000000</stDim:h>
<stDim:unit>Points</stDim:unit>
</xmpTPg:MaxPageSize>
<xmpTPg:SwatchGroups>
<rdf:Seq>
<rdf:li rdf:parseType="Resource">
<xmpG:groupName>Default Swatch Group</xmpG:groupName>
<xmpG:groupType>0</xmpG:groupType>
<xmpG:Colorants>
<rdf:Seq>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>White</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>255</xmpG:red>
<xmpG:green>255</xmpG:green>
<xmpG:blue>255</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>Black</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>0</xmpG:green>
<xmpG:blue>0</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>RGB Red</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>255</xmpG:red>
<xmpG:green>0</xmpG:green>
<xmpG:blue>0</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>RGB Yellow</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>255</xmpG:red>
<xmpG:green>255</xmpG:green>
<xmpG:blue>0</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>RGB Green</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>255</xmpG:green>
<xmpG:blue>0</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>RGB Cyan</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>255</xmpG:green>
<xmpG:blue>255</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>RGB Blue</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>0</xmpG:green>
<xmpG:blue>255</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>RGB Magenta</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>255</xmpG:red>
<xmpG:green>0</xmpG:green>
<xmpG:blue>255</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=193 G=39 B=45</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>193</xmpG:red>
<xmpG:green>39</xmpG:green>
<xmpG:blue>45</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=237 G=28 B=36</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>237</xmpG:red>
<xmpG:green>28</xmpG:green>
<xmpG:blue>36</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=241 G=90 B=36</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>241</xmpG:red>
<xmpG:green>90</xmpG:green>
<xmpG:blue>36</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=247 G=147 B=30</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>247</xmpG:red>
<xmpG:green>147</xmpG:green>
<xmpG:blue>30</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=251 G=176 B=59</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>251</xmpG:red>
<xmpG:green>176</xmpG:green>
<xmpG:blue>59</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=252 G=238 B=33</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>252</xmpG:red>
<xmpG:green>238</xmpG:green>
<xmpG:blue>33</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=217 G=224 B=33</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>217</xmpG:red>
<xmpG:green>224</xmpG:green>
<xmpG:blue>33</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=140 G=198 B=63</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>140</xmpG:red>
<xmpG:green>198</xmpG:green>
<xmpG:blue>63</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=57 G=181 B=74</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>57</xmpG:red>
<xmpG:green>181</xmpG:green>
<xmpG:blue>74</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=0 G=146 B=69</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>146</xmpG:green>
<xmpG:blue>69</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=0 G=104 B=55</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>104</xmpG:green>
<xmpG:blue>55</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=34 G=181 B=115</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>34</xmpG:red>
<xmpG:green>181</xmpG:green>
<xmpG:blue>115</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=0 G=169 B=157</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>169</xmpG:green>
<xmpG:blue>157</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=41 G=171 B=226</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>41</xmpG:red>
<xmpG:green>171</xmpG:green>
<xmpG:blue>226</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=0 G=113 B=188</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>113</xmpG:green>
<xmpG:blue>188</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=46 G=49 B=146</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>46</xmpG:red>
<xmpG:green>49</xmpG:green>
<xmpG:blue>146</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=27 G=20 B=100</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>27</xmpG:red>
<xmpG:green>20</xmpG:green>
<xmpG:blue>100</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=102 G=45 B=145</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>102</xmpG:red>
<xmpG:green>45</xmpG:green>
<xmpG:blue>145</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=147 G=39 B=143</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>147</xmpG:red>
<xmpG:green>39</xmpG:green>
<xmpG:blue>143</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=158 G=0 B=93</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>158</xmpG:red>
<xmpG:green>0</xmpG:green>
<xmpG:blue>93</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=212 G=20 B=90</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>212</xmpG:red>
<xmpG:green>20</xmpG:green>
<xmpG:blue>90</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=237 G=30 B=121</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>237</xmpG:red>
<xmpG:green>30</xmpG:green>
<xmpG:blue>121</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=199 G=178 B=153</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>199</xmpG:red>
<xmpG:green>178</xmpG:green>
<xmpG:blue>153</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=153 G=134 B=117</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>153</xmpG:red>
<xmpG:green>134</xmpG:green>
<xmpG:blue>117</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=115 G=99 B=87</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>115</xmpG:red>
<xmpG:green>99</xmpG:green>
<xmpG:blue>87</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=83 G=71 B=65</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>83</xmpG:red>
<xmpG:green>71</xmpG:green>
<xmpG:blue>65</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=198 G=156 B=109</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>198</xmpG:red>
<xmpG:green>156</xmpG:green>
<xmpG:blue>109</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=166 G=124 B=82</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>166</xmpG:red>
<xmpG:green>124</xmpG:green>
<xmpG:blue>82</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=140 G=98 B=57</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>140</xmpG:red>
<xmpG:green>98</xmpG:green>
<xmpG:blue>57</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=117 G=76 B=36</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>117</xmpG:red>
<xmpG:green>76</xmpG:green>
<xmpG:blue>36</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=96 G=56 B=19</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>96</xmpG:red>
<xmpG:green>56</xmpG:green>
<xmpG:blue>19</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=66 G=33 B=11</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>66</xmpG:red>
<xmpG:green>33</xmpG:green>
<xmpG:blue>11</xmpG:blue>
</rdf:li>
</rdf:Seq>
</xmpG:Colorants>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:groupName>Grays</xmpG:groupName>
<xmpG:groupType>1</xmpG:groupType>
<xmpG:Colorants>
<rdf:Seq>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=0 G=0 B=0</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>0</xmpG:red>
<xmpG:green>0</xmpG:green>
<xmpG:blue>0</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=26 G=26 B=26</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>26</xmpG:red>
<xmpG:green>26</xmpG:green>
<xmpG:blue>26</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=51 G=51 B=51</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>51</xmpG:red>
<xmpG:green>51</xmpG:green>
<xmpG:blue>51</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=77 G=77 B=77</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>77</xmpG:red>
<xmpG:green>77</xmpG:green>
<xmpG:blue>77</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=102 G=102 B=102</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>102</xmpG:red>
<xmpG:green>102</xmpG:green>
<xmpG:blue>102</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=128 G=128 B=128</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>128</xmpG:red>
<xmpG:green>128</xmpG:green>
<xmpG:blue>128</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=153 G=153 B=153</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>153</xmpG:red>
<xmpG:green>153</xmpG:green>
<xmpG:blue>153</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=179 G=179 B=179</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>179</xmpG:red>
<xmpG:green>179</xmpG:green>
<xmpG:blue>179</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=204 G=204 B=204</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>204</xmpG:red>
<xmpG:green>204</xmpG:green>
<xmpG:blue>204</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=230 G=230 B=230</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>230</xmpG:red>
<xmpG:green>230</xmpG:green>
<xmpG:blue>230</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=242 G=242 B=242</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>242</xmpG:red>
<xmpG:green>242</xmpG:green>
<xmpG:blue>242</xmpG:blue>
</rdf:li>
</rdf:Seq>
</xmpG:Colorants>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:groupName>Mobile Color Group</xmpG:groupName>
<xmpG:groupType>1</xmpG:groupType>
<xmpG:Colorants>
<rdf:Seq>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=136 G=168 B=13</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>136</xmpG:red>
<xmpG:green>168</xmpG:green>
<xmpG:blue>13</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=127 G=71 B=221</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>127</xmpG:red>
<xmpG:green>71</xmpG:green>
<xmpG:blue>221</xmpG:blue>
</rdf:li>
<rdf:li rdf:parseType="Resource">
<xmpG:swatchName>R=251 G=174 B=23</xmpG:swatchName>
<xmpG:mode>RGB</xmpG:mode>
<xmpG:type>PROCESS</xmpG:type>
<xmpG:red>251</xmpG:red>
<xmpG:green>174</xmpG:green>
<xmpG:blue>23</xmpG:blue>
</rdf:li>
</rdf:Seq>
</xmpG:Colorants>
</rdf:li>
</rdf:Seq>
</xmpTPg:SwatchGroups>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
<pdf:Producer>Adobe PDF library 10.01</pdf:Producer>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?> endstream endobj 3 0 obj <</Count 1/Kids[5 0 R]/Type/Pages>> endobj 5 0 obj <</ArtBox[8.00049 8.0 36.0 36.0]/BleedBox[0.0 0.0 44.0 44.0]/Contents 6 0 R/MediaBox[0.0 0.0 44.0 44.0]/Parent 3 0 R/Resources<</ExtGState<</GS0 7 0 R>>/Properties<</MC0 8 0 R/MC1 9 0 R/MC10 10 0 R/MC11 11 0 R/MC12 12 0 R/MC2 13 0 R/MC3 14 0 R/MC4 15 0 R/MC5 16 0 R/MC6 17 0 R/MC7 18 0 R/MC8 19 0 R/MC9 20 0 R>>>>/TrimBox[0.0 0.0 44.0 44.0]/Type/Page>> endobj 6 0 obj <</Filter/FlateDecode/Length 755>>stream
H‰|T=oT1ì߯p<C2AF>t>ï‡íuBH¤ˆ(¨QÒ¤þ=3ëEºäNû<»;;;~çŸÞ>–óÕe+¯ß\–ã|ñõÇÅûàÙOÞ^ýþ:ÿë3°½ ögàþ2x<Ï—Áñ ¼^Ë?&üψò4ãÃÑŠ;ÿNø¼=>•o‡~ïŽó»<C3B3>­Ü}?6|¤¨VéjE¬NVnîÜ'¯Ú¢œZm Åf<C385>æŪOËÀˬsörs0š³
5E×jÀK¯c
³ÅVFƒX¯"O!òû2¦µPn,Ù°Y} 4먋4& MÊ7Rl¬Õd‚(˜«„<>jŽj½,´Ñ)¢H«ÞóÀ~¡»€¸°qÁh„ä<E2809E>ò;¡(`NˆuVK}b8+OàF5ݸnHžUQqÕ¥HŠÚ,<2C>µ˜…<1F>9Ñjh½ \ǘj(¦Õ7qN<71>”õ<E2809D>7…LÁ€òb=E2…£€v'JvÇ"M)¸b:<a.ÏåÌÅ4Y<34>ÑZYÓ”¢Ÿ´F,¶ Ü£¦Xã¨XH<0E>½qwá3`^RÆô.º)ÇŽ™ía€ÔD0%Ncå@u,Zº$Õ¨{kÓyê{JWÑ]žûéžu¹ôž»Äs†Ë2ôN4LÃSˆ¡+áp%Ô\ ñ 8(²ðtºÇ ï&lB?¶N‰à»¾J¯”íÁØÒÄBrŒ#ÙʲҸ4y"Ü›Á·klP»í Ñ=K‘!×%‘} šµ±õÅ-iÐ [1LŒE4nÙêØHÄÁ]u(G(® ~´ñúðù°Ïd@‰‚ñ¢bû.äiÖk$çàÛ5Â\M9¬·2°ô¤Ï,N¹0²fG+ÈÚ²á ö<>kŒ\.²©9Ô IÒ3¥<33>Éf6OX'uÜØà5‘Á›¿ï3µTáKD(êvzÞ[:ÒyºEzÉŽ»E(ÿtäïûÖ÷ÈM6Ík<„T$Ò4ôó@R¾$þ¾jnŽ/¯Žëýâ½>~ 0œJI) endstream endobj 8 0 obj <</Color[20224 32768 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(Layer 1)/Visible false>> endobj 9 0 obj <</AIType/HiddenLayer/Contents 21 0 R/Resources<</ExtGState<</GS0 22 0 R>>>>>> endobj 10 0 obj <</Color[65535 20224 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(call)/Visible false>> endobj 11 0 obj <</AIType/HiddenLayer/Contents 23 0 R/Resources<</ExtGState<</GS0 24 0 R>>>>>> endobj 12 0 obj <</Color[20224 65535 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(settings)/Visible true>> endobj 13 0 obj <</Color[65535 20224 20224]/Dimmed false/Editable true/Preview true/Printed true/Title(cancel)/Visible false>> endobj 14 0 obj <</AIType/HiddenLayer/Contents 25 0 R/Resources<</ExtGState<</GS0 26 0 R>>>>>> endobj 15 0 obj <</Color[20224 65535 20224]/Dimmed false/Editable true/Preview true/Printed true/Title(add_conversation)/Visible false>> endobj 16 0 obj <</AIType/HiddenLayer/Contents 27 0 R/Resources<</ExtGState<</GS0 28 0 R>>>>>> endobj 17 0 obj <</Color[20224 20224 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(add_group)/Visible false>> endobj 18 0 obj <</AIType/HiddenLayer/Contents 29 0 R/Resources<</ExtGState<</GS0 30 0 R>>>>>> endobj 19 0 obj <</Color[65535 65535 20224]/Dimmed false/Editable true/Preview true/Printed true/Title(group_options)/Visible false>> endobj 20 0 obj <</AIType/HiddenLayer/Contents 31 0 R/Resources<</ExtGState<</GS0 32 0 R>>>>>> endobj 31 0 obj <</Length 1241>>stream
q
0 44 44 -44 re
W n
1 1 1 rg
/GS0 gs
q 1 0 0 1 10.999 17.5 cm
0 0 m
-1.93 0 -3.5 1.57 -3.5 3.5 c
-3.5 5.43 -1.93 7 0 7 c
1.931 7 3.501 5.43 3.501 3.5 c
3.501 1.57 1.931 0 0 0 c
f
Q
q 1 0 0 1 10.999 25 cm
0 0 m
-2.209 0 -4 -1.792 -4 -4 c
-4 -6.209 -2.209 -8 0 -8 c
2.21 -8 4.001 -6.209 4.001 -4 c
4.001 -1.792 2.21 0 0 0 c
0 -1 m
1.655 -1 3.001 -2.346 3.001 -4 c
3.001 -5.654 1.655 -7 0 -7 c
-1.654 -7 -3 -5.654 -3 -4 c
-3 -2.346 -1.654 -1 0 -1 c
f
Q
q 1 0 0 1 22 17.5 cm
0 0 m
-1.93 0 -3.5 1.57 -3.5 3.5 c
-3.5 5.43 -1.93 7 0 7 c
1.93 7 3.5 5.43 3.5 3.5 c
3.5 1.57 1.93 0 0 0 c
f
Q
q 1 0 0 1 22 25 cm
0 0 m
-2.211 0 -4 -1.792 -4 -4 c
-4 -6.209 -2.211 -8 0 -8 c
2.211 -8 4 -6.209 4 -4 c
4 -1.792 2.211 0 0 0 c
0 -1 m
1.654 -1 3 -2.346 3 -4 c
3 -5.654 1.654 -7 0 -7 c
-1.654 -7 -3 -5.654 -3 -4 c
-3 -2.346 -1.654 -1 0 -1 c
f
Q
q 1 0 0 1 33.001 17.5 cm
0 0 m
-1.931 0 -3.501 1.57 -3.501 3.5 c
-3.501 5.43 -1.931 7 0 7 c
1.93 7 3.5 5.43 3.5 3.5 c
3.5 1.57 1.93 0 0 0 c
f
Q
q 1 0 0 1 33.001 25 cm
0 0 m
-2.21 0 -4.001 -1.792 -4.001 -4 c
-4.001 -6.209 -2.21 -8 0 -8 c
2.209 -8 4 -6.209 4 -4 c
4 -1.792 2.209 0 0 0 c
0 -1 m
1.654 -1 3 -2.346 3 -4 c
3 -5.654 1.654 -7 0 -7 c
-1.654 -7 -3.001 -5.654 -3.001 -4 c
-3.001 -2.346 -1.654 -1 0 -1 c
f
Q
Q
endstream endobj 32 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 29 0 obj <</Length 2029>>stream
q
0 44 44 -44 re
W n
1 1 1 rg
/GS0 gs
q 1 0 0 1 13 23 cm
0 0 m
-2.761 0 -5 -2.91 -5 -6.501 c
-5 -6.669 -4.991 -6.834 -4.979 -7 c
4.979 -7 l
4.988 -6.834 5 -6.669 5 -6.501 c
5 -2.91 2.762 0 0 0 c
f
Q
q 1 0 0 1 24 23 cm
0 0 m
-2.761 0 -5 -2.91 -5 -6.501 c
-5 -6.669 -4.991 -6.834 -4.979 -7 c
4.979 -7 l
4.988 -6.834 5 -6.669 5 -6.501 c
5 -2.91 2.762 0 0 0 c
f
Q
q 1 0 0 1 18.5 15 cm
0 0 m
-3.037 0 -5.5 -3.326 -5.5 -7.43 c
-5.5 -7.621 -5.49 -7.811 -5.478 -8 c
5.478 -8 l
5.487 -7.811 5.5 -7.621 5.5 -7.43 c
5.5 -3.326 3.038 0 0 0 c
f
Q
q 1 0 0 1 13 21.5 cm
0 0 m
-2.481 0 -4.5 2.019 -4.5 4.5 c
-4.5 6.981 -2.481 9 0 9 c
2.481 9 4.5 6.981 4.5 4.5 c
4.5 2.019 2.481 0 0 0 c
f
Q
0.125 0.565 0.918 rg
q 1 0 0 1 13 31 cm
0 0 m
-2.757 0 -5 -2.243 -5 -5 c
-5 -7.757 -2.757 -10 0 -10 c
2.757 -10 5 -7.757 5 -5 c
5 -2.243 2.757 0 0 0 c
0 -1 m
2.21 -1 4 -2.791 4 -5 c
4 -7.208 2.21 -9 0 -9 c
-2.209 -9 -4 -7.208 -4 -5 c
-4 -2.791 -2.209 -1 0 -1 c
f
Q
1 1 1 rg
q 1 0 0 1 24.001 21.5 cm
0 0 m
-2.482 0 -4.501 2.019 -4.501 4.5 c
-4.501 6.981 -2.482 9 0 9 c
2.48 9 4.499 6.981 4.499 4.5 c
4.499 2.019 2.48 0 0 0 c
f
Q
0.125 0.565 0.918 rg
q 1 0 0 1 24.001 31 cm
0 0 m
-2.757 0 -5.001 -2.243 -5.001 -5 c
-5.001 -7.757 -2.757 -10 0 -10 c
2.757 -10 4.999 -7.757 4.999 -5 c
4.999 -2.243 2.757 0 0 0 c
0 -1 m
2.21 -1 3.999 -2.791 3.999 -5 c
3.999 -7.208 2.21 -9 0 -9 c
-2.209 -9 -4.001 -7.208 -4.001 -5 c
-4.001 -2.791 -2.209 -1 0 -1 c
f
Q
1 1 1 rg
q 1 0 0 1 18.498 12.5 cm
0 0 m
-2.756 0 -4.998 2.243 -4.998 5 c
-4.998 7.757 -2.756 10 0 10 c
2.758 10 5.002 7.757 5.002 5 c
5.002 2.243 2.758 0 0 0 c
f
Q
0.125 0.565 0.918 rg
q 1 0 0 1 18.498 23 cm
0 0 m
-3.032 0 -5.498 -2.468 -5.498 -5.5 c
-5.498 -8.532 -3.032 -11 0 -11 c
3.034 -11 5.502 -8.532 5.502 -5.5 c
5.502 -2.468 3.034 0 0 0 c
0 -1 m
2.485 -1 4.502 -3.016 4.502 -5.5 c
4.502 -7.984 2.485 -10 0 -10 c
-2.484 -10 -4.498 -7.984 -4.498 -5.5 c
-4.498 -3.016 -2.484 -1 0 -1 c
f
Q
1 1 1 rg
q 1 0 0 1 33 31 cm
0 0 m
0 -3 l
-2 -3 l
-2 0 l
-5 0 l
-5 2 l
-2 2 l
-2 5 l
0 5 l
0 2 l
3 2 l
3 0 l
h
f
Q
Q
endstream endobj 30 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 27 0 obj <</Length 130>>stream
1 1 1 rg
/GS0 gs
q 1 0 0 1 25 18 cm
0 0 m
0 -10 l
-6 -10 l
-6 0 l
-16 0 l
-16 6 l
-6 6 l
-6 16 l
0 16 l
0 6 l
10 6 l
10 0 l
h
f
Q
endstream endobj 28 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 25 0 obj <</Length 219>>stream
1 1 1 rg
/GS0 gs
q 1 0 0 1 22.5005 16.1885 cm
0 0 m
-7.188 -7.188 l
-11.5 -2.876 l
-4.313 4.312 l
-11.5 11.499 l
-7.187 15.812 l
0 8.624 l
7.187 15.812 l
11.499 11.499 l
4.312 4.312 l
11.5 -2.876 l
7.187 -7.188 l
h
f
Q
endstream endobj 26 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 23 0 obj <</Length 943>>stream
q
0 44 44 -44 re
W n
1 1 1 rg
/GS0 gs
q 1 0 0 1 17.0674 7.5 cm
0 0 m
-1.416 0 -2.567 1.146 -2.567 2.553 c
-2.567 25.448 l
-2.567 26.855 -1.416 28 0 28 c
8.866 28 l
10.281 28 11.433 26.855 11.433 25.448 c
11.433 2.553 l
11.433 1.146 10.281 0 8.866 0 c
h
f
Q
q 1 0 0 1 25.9336 36 cm
0 0 m
-8.866 0 l
-10.561 0 -11.934 -1.367 -11.934 -3.052 c
-11.934 -25.947 l
-11.934 -27.633 -10.561 -29 -8.866 -29 c
0 -29 l
1.693 -29 3.066 -27.633 3.066 -25.947 c
3.066 -3.052 l
3.066 -1.367 1.693 0 0 0 c
0 -1 m
1.14 -1 2.066 -1.92 2.066 -3.052 c
2.066 -25.947 l
2.066 -27.079 1.14 -28 0 -28 c
-8.866 -28 l
-10.006 -28 -10.934 -27.079 -10.934 -25.947 c
-10.934 -3.052 l
-10.934 -1.92 -10.006 -1 -8.866 -1 c
0 -1 l
f
Q
0.125 0.565 0.918 rg
27.994 12 -13 19 re
f
q 1 0 0 1 23 10 cm
0 0 m
0 -0.553 -0.447 -1 -1 -1 c
-1.552 -1 -2 -0.553 -2 0 c
-2 0.553 -1.552 1 -1 1 c
-0.447 1 0 0.553 0 0 c
f
Q
0.125 0.565 0.918 RG
1 J
q 1 0 0 1 18.5 32.5 cm
0 0 m
6 0 l
S
Q
Q
endstream endobj 24 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 21 0 obj <</Length 44>>stream
0.125 0.565 0.918 rg
/GS0 gs
0 0 44 44 re
f
endstream endobj 22 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 7 0 obj <</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>> endobj 33 0 obj <</CreationDate(D:20150207005257-05'00')/Creator(Adobe Illustrator CS6 \(Macintosh\))/ModDate(D:20150207005257-05'00')/Producer(Adobe PDF library 10.01)/Title(settings)>> endobj xref 0 34 0000000000 65535 f
0000000016 00000 n
0000000076 00000 n
0000034876 00000 n
0000000000 00000 f
0000034927 00000 n
0000035295 00000 n
0000043180 00000 n
0000036118 00000 n
0000036245 00000 n
0000036339 00000 n
0000036464 00000 n
0000036559 00000 n
0000036687 00000 n
0000036814 00000 n
0000036909 00000 n
0000037046 00000 n
0000037141 00000 n
0000037271 00000 n
0000037366 00000 n
0000037500 00000 n
0000042974 00000 n
0000043067 00000 n
0000041868 00000 n
0000042861 00000 n
0000041486 00000 n
0000041755 00000 n
0000041193 00000 n
0000041373 00000 n
0000039000 00000 n
0000041080 00000 n
0000037595 00000 n
0000038887 00000 n
0000043292 00000 n
trailer <</Size 34/Root 1 0 R/Info 33 0 R/ID[<0627BA9571B64C45B11390DDF44397FD><D01A4F7FD8124209A4770E332814833D>]>> startxref 43479 %%EOF

BIN
Signal/Images/settings_dark@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
Signal/Images/settings_tab@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

34
Signal/src/Storyboard/Storyboard.storyboard
Unescape Escape View File

@ -7,7 +7,7 @@
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
<!--Signals View Controller-->
<!--Conversations-->
<scene sceneID="82U-Xj-21R">
<objects>
<viewController id="MY2-bB-USa" customClass="SignalsViewController" sceneMemberID="viewController">
@ -430,21 +430,14 @@
</mask>
</variation>
</view>
<navigationItem key="navigationItem" id="Um0-0y-8lr">
<nil key="title"/>
<barButtonItem key="leftBarButtonItem" image="settings-icon@1x" width="120" id="PYj-7F-J24">
<navigationItem key="navigationItem" title="Conversations" id="Um0-0y-8lr">
<barButtonItem key="backBarButtonItem" title=" " id="a19-h1-1ZS"/>
<barButtonItem key="leftBarButtonItem" image="settings-icon@1x" width="100" style="plain" id="PYj-7F-J24">
<color key="tintColor" red="0.99989169836044312" green="1" blue="0.99988096952438354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<segue destination="hxR-Pc-Gxm" kind="showDetail" id="dB4-oM-uSL"/>
</connections>
</barButtonItem>
<button key="titleView" opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="ktT-AR-smT">
<rect key="frame" x="277" y="7" width="46" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" image="btnSignalLogo--white">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
</button>
<barButtonItem key="rightBarButtonItem" image="add-conversation" width="51" id="Oft-fU-tf5">
<color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<connections>
@ -481,12 +474,6 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" title="Title" id="mLN-DG-4IU">
<barButtonItem key="leftBarButtonItem" image="btnSignalLogo--white" id="L4I-fY-NfP">
<color key="tintColor" red="0.99989169836044312" green="1" blue="0.99988096952438354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<segue destination="imi-Ms-CTi" kind="unwind" unwindAction="unwindMessagesView:" id="Ntb-xe-Zdr"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="contact-options-action" id="662-pN-RLf">
<inset key="imageInsets" minX="10" minY="10" maxX="5" maxY="5"/>
<color key="tintColor" red="0.99989169836044312" green="1" blue="0.99988096952438354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -502,7 +489,6 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="yXZ-iE-5va" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="imi-Ms-CTi" userLabel="Exit" sceneMemberID="exit"/>
</objects>
<point key="canvasLocation" x="-4462.5" y="-1624.5"/>
</scene>
@ -5024,7 +5010,7 @@ A0 09 9A FF A8 8A 09 99</string>
</connections>
</tableView>
<navigationItem key="navigationItem" title="Settings" id="Yrv-vP-ZVP" userLabel="_7.0a - Navigation Bar">
<barButtonItem key="rightBarButtonItem" image="btnSignalLogo--white" id="fL4-BJ-gHP">
<barButtonItem key="rightBarButtonItem" title="Close" id="fL4-BJ-gHP">
<color key="tintColor" red="0.99989169840000003" green="1" blue="0.99988096950000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<segue destination="0Ge-H7-b9J" kind="unwind" unwindAction="unwindSettingsDone:" id="na1-9P-hTS"/>
@ -5219,6 +5205,7 @@ A0 09 9A FF A8 8A 09 99</string>
</connections>
</tableView>
<navigationItem key="navigationItem" title="New Message" id="D6A-aV-gEq">
<barButtonItem key="backBarButtonItem" title=" " id="rvF-0w-DNd"/>
<barButtonItem key="leftBarButtonItem" image="btnCancel--white" id="bP2-Tc-byJ">
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
@ -5247,7 +5234,7 @@ A0 09 9A FF A8 8A 09 99</string>
<viewControllerLayoutGuide type="bottom" id="kH6-9L-pzh"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="P0X-AM-Yjw">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="536"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukg-om-VX3">
@ -5508,7 +5495,6 @@ A0 09 9A FF A8 8A 09 99</string>
<image name="btnPhone--blue" width="45" height="44"/>
<image name="btnQRShow--white" width="66" height="66"/>
<image name="btnQRShow--white-1" width="66" height="66"/>
<image name="btnSignalLogo--white" width="32" height="32"/>
<image name="call.png" width="100" height="100"/>
<image name="call_dark.png" width="50" height="50"/>
<image name="contact-options-action" width="44" height="44"/>
@ -5520,7 +5506,7 @@ A0 09 9A FF A8 8A 09 99</string>
<image name="mute-active" width="80" height="80"/>
<image name="mute-inactive" width="80" height="80"/>
<image name="quit.png" width="50" height="50"/>
<image name="settings-icon@1x" width="25" height="24"/>
<image name="settings-icon@1x" width="44" height="44"/>
<image name="settings_tab.png" width="24" height="24"/>
<image name="signal.png" width="50" height="50"/>
<image name="signals_tab.png" width="24" height="24"/>
@ -5529,8 +5515,8 @@ A0 09 9A FF A8 8A 09 99</string>
<image name="uiEmptyInbox" width="227" height="227"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="DR8-fx-0PD"/>
<segue reference="D0d-4f-lcI"/>
<segue reference="ZcV-Ck-baL"/>
<segue reference="xo7-5J-BJb"/>
<segue reference="gZ1-lh-srF"/>
</inferredMetricsTieBreakers>
</document>

42
Signal/src/view controllers/MessagesViewController.m
Unescape Escape View File

@ -222,6 +222,7 @@ typedef enum : NSUInteger {
-(void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[self initializeToolbars];
[self.collectionView reloadData];
NSInteger numberOfMessages = (NSInteger)[self.messageMappings numberOfItemsInGroup:self.thread.uniqueId];
@ -230,7 +231,6 @@ typedef enum : NSUInteger {
NSIndexPath * lastCellIndexPath = [NSIndexPath indexPathForRow:numberOfMessages-1 inSection:0];
[self.collectionView scrollToItemAtIndexPath:lastCellIndexPath atScrollPosition:UICollectionViewScrollPositionBottom animated:NO];
}
[self initializeToolbars];
}
- (void)startReadTimer{
@ -245,6 +245,7 @@ typedef enum : NSUInteger {
[super viewDidAppear:animated];
[self startReadTimer];
_isVisible = YES;
[self initializeTitleLabelGestureRecognizer];
}
- (void)viewWillDisappear:(BOOL)animated{
@ -275,11 +276,6 @@ typedef enum : NSUInteger {
}
[self cancelReadTimer];
[[self.navController.navigationBar.subviews objectAtIndex:0] removeGestureRecognizer:_showFingerprintDisplay];
[[self.navController.navigationBar.subviews objectAtIndex:0] removeGestureRecognizer:_toggleContactPhoneDisplay];
[[self.navController.navigationBar.subviews objectAtIndex:0] setUserInteractionEnabled:NO];
}
- (void)viewDidDisappear:(BOOL)animated{
@ -373,18 +369,36 @@ typedef enum : NSUInteger {
self.navController = (APNavigationController*)self.navigationController;
if(!isGroupConversation) {
self.navigationItem.rightBarButtonItem = nil;
[[ self.navController.navigationBar.subviews objectAtIndex:0] setUserInteractionEnabled:YES];
[[ self.navController.navigationBar.subviews objectAtIndex:0] addGestureRecognizer:_showFingerprintDisplay];
[[ self.navController.navigationBar.subviews objectAtIndex:0] addGestureRecognizer:_toggleContactPhoneDisplay];
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"btnPhone--white"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStylePlain target:self action:@selector(callAction)];
}
[self setNavigationTitle];
[self hideInputIfNeeded];
[self setNavigationTitle];
}
- (void)initializeTitleLabelGestureRecognizer {
if(isGroupConversation) {
return;
}
[self hideInputIfNeeded];
UIView *navItemView;
for (UIView *view in self.navigationController.navigationBar.subviews) {
if ([view isKindOfClass:NSClassFromString(@"UINavigationItemView")]) {
navItemView = view;
for (UIView *aView in navItemView.subviews) {
if ([aView isKindOfClass:[UILabel class]]) {
[aView.superview.superview setUserInteractionEnabled:YES];
[aView.superview setUserInteractionEnabled:YES];
[aView setUserInteractionEnabled:YES];
[view bringSubviewToFront:aView];
[aView addGestureRecognizer:_showFingerprintDisplay];
[aView addGestureRecognizer:_toggleContactPhoneDisplay];
}
return;
}
}
}
}
-(void)initializeBubbles

2
Signal/src/view controllers/SettingsTableViewController.m
Unescape Escape View File

@ -248,6 +248,4 @@ typedef enum {
}
@end

21
Signal/src/view controllers/UITests/SignalsViewController.m
Unescape Escape View File

@ -203,11 +203,20 @@ static NSString* const kShowSignupFlowSegue = @"showSignupFlow";
-(void) updateInboxCountLabel {
_inboxCount = (self.viewingThreadsIn == kInboxState) ? (long)[self tableView:self.tableView numberOfRowsInSection:0] : _inboxCount;
self.inboxCountLabel.text = [NSString stringWithFormat:@"%ld",_inboxCount];
self.inboxCountLabel.hidden = (_inboxCount == 0);
__block NSUInteger numberOfItems;
[_editingDbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
numberOfItems = [[transaction ext:TSUnreadDatabaseViewExtensionName] numberOfItemsInAllGroups];
}];
NSNumber *badgeNumber = [NSNumber numberWithUnsignedInteger:numberOfItems];
NSString *badgeValue = nil;
if (![badgeNumber isEqualToNumber:@0]) {
badgeValue = [badgeNumber stringValue];
}
self.inboxCountLabel.text = badgeValue;
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath*)indexPath{
@ -302,6 +311,8 @@ static NSString* const kShowSignupFlowSegue = @"showSignupFlow";
return;
}
[self updateInboxCountLabel];
[self.tableView beginUpdates];
for (YapDatabaseViewSectionChange *sectionChange in sectionChanges)

Write Preview
Loading…
Cancel
Save