From 4e39f53f18c8b603c51ae34ae03efdbccd47c9c8 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 11 Sep 2018 17:59:11 -0400 Subject: [PATCH 1/2] Update reblog icon --- Artwork/Icons/Reblog.svg | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Artwork/Icons/Reblog.svg b/Artwork/Icons/Reblog.svg index 3935d931..bce41aad 100644 --- a/Artwork/Icons/Reblog.svg +++ b/Artwork/Icons/Reblog.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="793.70081" @@ -102,22 +101,15 @@ inkscape:groupmode="layer" id="layer1" style="opacity:0.92000002;filter:url(#filter2010)"> - - - - + + From 9e6b24688a53953eb0f8e4a0f4477ba044bd7f57 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Tue, 11 Sep 2018 18:17:48 -0400 Subject: [PATCH 2/2] Add more button to status --- Artwork/Icons/More.svg | 84 ++++++++++++++++++ .../More.imageset/Contents.json | 1 + Tusker/Assets.xcassets/More.imageset/More.pdf | Bin 1077 -> 1070 bytes .../UIViewController+Delegates.swift | 15 +++- .../ProfileHeaderTableViewCell.xib | 10 +-- .../ConversationMainStatusTableViewCell.swift | 4 + .../ConversationMainStatusTableViewCell.xib | 20 ++++- Tusker/Views/Status/StatusTableViewCell.swift | 6 +- Tusker/Views/Status/StatusTableViewCell.xib | 20 ++++- 9 files changed, 145 insertions(+), 15 deletions(-) create mode 100644 Artwork/Icons/More.svg diff --git a/Artwork/Icons/More.svg b/Artwork/Icons/More.svg new file mode 100644 index 00000000..2c9236d7 --- /dev/null +++ b/Artwork/Icons/More.svg @@ -0,0 +1,84 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/Tusker/Assets.xcassets/More.imageset/Contents.json b/Tusker/Assets.xcassets/More.imageset/Contents.json index 068cb005..7bdf4445 100644 --- a/Tusker/Assets.xcassets/More.imageset/Contents.json +++ b/Tusker/Assets.xcassets/More.imageset/Contents.json @@ -19,6 +19,7 @@ "author" : "xcode" }, "properties" : { + "template-rendering-intent" : "template", "preserves-vector-representation" : true } } \ No newline at end of file diff --git a/Tusker/Assets.xcassets/More.imageset/More.pdf b/Tusker/Assets.xcassets/More.imageset/More.pdf index f1d42118b83a6b1441674b864c41da7495fe79c0..e52037e651393603eb2dc228bef7d1511a381142 100644 GIT binary patch delta 319 zcmdnWv5sScPrYkEG~Zzbp5Ny+i#yu$s-{pyu|8?Y>F2E{2nrYicdJzs*&4hNA>m`}B>WTf8Hz^e$h`{2|+&b~9{| zuoiDfI%71XU^Ug?=mq8L2FDLhxyqCHcHbenD;lrlAVwOe< z1|Xo2r@#ef7#J8Em`<)>R + @@ -121,6 +131,7 @@ + @@ -148,6 +159,7 @@ + diff --git a/Tusker/Views/Status/StatusTableViewCell.swift b/Tusker/Views/Status/StatusTableViewCell.swift index c133e47b..72fdd758 100644 --- a/Tusker/Views/Status/StatusTableViewCell.swift +++ b/Tusker/Views/Status/StatusTableViewCell.swift @@ -25,7 +25,7 @@ protocol StatusTableViewCellDelegate { func showLargeImage(_ image: UIImage, description: String?, animatingFrom originView: UIView) - func updatedStatus(for cell: StatusTableViewCell, status: Status) + func showMoreOptions(status: Status) } @@ -248,6 +248,10 @@ class StatusTableViewCell: UITableViewCell, PreferencesAdaptive { } } + @IBAction func morePressed(_ sender: Any) { + delegate?.showMoreOptions(status: status) + } + } extension StatusTableViewCell: HTMLContentLabelDelegate { diff --git a/Tusker/Views/Status/StatusTableViewCell.xib b/Tusker/Views/Status/StatusTableViewCell.xib index 704abfa2..c473c0d5 100644 --- a/Tusker/Views/Status/StatusTableViewCell.xib +++ b/Tusker/Views/Status/StatusTableViewCell.xib @@ -86,8 +86,8 @@ - - + + + @@ -127,6 +137,7 @@ + @@ -156,6 +167,7 @@ +