From d343ae20177cfe6c2902a12d4861f140f4ed2fed Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Thu, 22 Aug 2019 11:18:50 -0400 Subject: [PATCH] New stuff. --- .../alternate.imageset/Contents.json | 22 +++++++++++ .../icons8-flip-vertical-100.png | Bin 0 -> 947 bytes .../icons8-flip-vertical-50.png | Bin 0 -> 539 bytes .../JSONCreator/DetailViewController.swift | 35 +++++++++++------- .../JSONCreator/MasterViewController.swift | 9 ++--- 5 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/Contents.json create mode 100644 JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/icons8-flip-vertical-100.png create mode 100644 JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/icons8-flip-vertical-50.png diff --git a/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/Contents.json b/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/Contents.json new file mode 100644 index 0000000..cfef8eb --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "icons8-flip-vertical-50.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "icons8-flip-vertical-100.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/icons8-flip-vertical-100.png b/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/icons8-flip-vertical-100.png new file mode 100644 index 0000000000000000000000000000000000000000..aefe956475e532a04a8df6e4d4b4e8f0448464f6 GIT binary patch literal 947 zcmV;k15EshP)*@t^i0y+}kz5J3zZ+&t$zZ~y1z!1H%f(EEI@-g}<& zd=ZEfCr+F=apJ@g&j1=|pg;5Z1~zfCYK(4dgMp!*e5DQshHZ3L3o;JIKU&lJ{C<@f zhw-TpvW277fs7@~-V0&4R~1GVe?1gIHgTvLkkQPd^B@d&tH3ybk3z^g4u%gIXa2Y|8L>t zkQbpbdXuGHQi3pC4GXf&m$kTO;UdWMkQkSfWnEE*WWUGzEag1A@{q+)7#FdV^Y<aX=3Wz2AgybU*O@E0N~=Ixy8(|=L$hGtqz2jDpLv{_!kw%d zWOv8xZO-CP;k|__q=}k8$aKlwo+^Z4$`|8wa%Y}*|E&)BjWd2Alcgsj>JWyfJ{TwQ zqx6hQ2l5lA+(VuSP7QS+43AwiPT-s199IwW9X)O#kAx@ddJu+(E*Z!0Mc6uYAzyLa z9b`hHKIuXj9=Kv0!Inf1)Q5a_6->va9#9|RD43?9v;0rM1mYx^j!C{KO&|_}X&O33 zZ%nwX`od)fu^dd(&?(+Zm_n=u(-DQuohig(Fik_J%y!!xVl9~7R=NQ)hgb@x z+0Y3`5G%oSNb!(>0%9SUwuer45b|I;sC zh;lHUG(O3&15pg7qR{CRq7+O;q0=WsA()Cor(cM4FcpVRzYxh_Dib<=L!^S~1nEQC zfk*|@^-4fKh#_^-2TcFPb%XThu8AT2XplWz_MeV#5K`7~4RPYci4!MIoH%iu%|F2d VsbA%HbyffX002ovPDHLkV1k|wq{sjO literal 0 HcmV?d00001 diff --git a/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/icons8-flip-vertical-50.png b/JSONCreator_iOS/JSONCreator/Assets.xcassets/alternate.imageset/icons8-flip-vertical-50.png new file mode 100644 index 0000000000000000000000000000000000000000..80305ac2a65197eefc90b98ef30bf1b8a0c26259 GIT binary patch literal 539 zcmV+$0_6RPP)2Y*PnatIq&;E?tSlef73m;bDqyV=f3BCpBHk;#gPJz*aslS zE(O^^1`z}RK^V*ik;hp8IVaygGJpgSq2E7p5<*VN^Goz0T&EyHuV3U4VJw6k`y_f0 zZYd2RLbpF;4`JfFcn~@CMRXzDQyz&3oqmuQ!qji^RAk2o(T?y)r4bQ2GDo%%X1+g1 zBU_mgt$gxKwG|QCGD9{I=6;V%$VMhaGatNC>qI_jNgr89SV%fHA;Ma^L?iFSsaGNI zG^K~EA}j^IF(blCIz&Bj;xwp{)N@r?j`(#pB=xQpspBo;Iopxo|EI`e zwbLL!tEeSq+*#Ib9g^q=ESa=+AUY(`*%(v8jkTB3BDa*9k#R>?s6~V^Q;A}(9sR8y zxuGPw#Hh1V*CWD6RDnV+oqLY|AXgNH3k)lEPya!Lp>Tl<<)wP$JdEtCE==rx4^-#w dl1naG&ljB7YC3SS*=qm*002ovPDHLkV1fqC=P>{P literal 0 HcmV?d00001 diff --git a/JSONCreator_iOS/JSONCreator/DetailViewController.swift b/JSONCreator_iOS/JSONCreator/DetailViewController.swift index f75cba8..3355551 100644 --- a/JSONCreator_iOS/JSONCreator/DetailViewController.swift +++ b/JSONCreator_iOS/JSONCreator/DetailViewController.swift @@ -27,27 +27,31 @@ class DetailViewController: UIViewController { guard textView.superview == nil else { return } textView.textDropDelegate = self - - view.addSubview(textView) - if UIDevice.current.userInterfaceIdiom == .pad { - textView.font = UIFont.systemFont(ofSize: 20) - } else { - textView.font = UIFont.systemFont(ofSize: 14) - } - textView.translatesAutoresizingMaskIntoConstraints = false - textView.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true - textView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor).isActive = true - view.trailingAnchor.constraint(equalTo: textView.trailingAnchor).isActive = true - view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: textView.bottomAnchor).isActive = true textView.delegate = self textView.smartDashesType = .no textView.smartQuotesType = .no textView.smartInsertDeleteType = .no + view.addSubview(textView) + + if UIDevice.current.userInterfaceIdiom == .pad { + textView.font = UIFont.systemFont(ofSize: 20) + } else { + textView.font = UIFont.systemFont(ofSize: 14) + } + + textView.translatesAutoresizingMaskIntoConstraints = false + textView.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true + textView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor).isActive = true + view.trailingAnchor.constraint(equalTo: textView.trailingAnchor).isActive = true + view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: textView.bottomAnchor).isActive = true + let shareButton = UIBarButtonItem(barButtonSystemItem: .action, target: self, action: #selector(shareButtonPressed)) let buildButton = UIBarButtonItem(barButtonSystemItem: .play, target: self, action: #selector(play)) let clearButton = UIBarButtonItem(barButtonSystemItem: .trash, target: self, action: #selector(clearTextView)) - navigationItem.setRightBarButtonItems([clearButton, shareButton, buildButton], animated: true) + let altButton = UIBarButtonItem(barButtonSystemItem: .bookmarks, target: self, action: #selector(clearTextView)) + + navigationItem.setRightBarButtonItems([altButton, clearButton, shareButton, buildButton], animated: true) } //-------------------------------------------------- @@ -61,6 +65,10 @@ class DetailViewController: UIViewController { present(alert, animated: true, completion: nil) } + //-------------------------------------------------- + // MARK: - Actions + //-------------------------------------------------- + @objc func shareButtonPressed() { if let text = textView.text { @@ -71,6 +79,7 @@ class DetailViewController: UIViewController { } @objc func clearTextView() { + textView.text = "" } diff --git a/JSONCreator_iOS/JSONCreator/MasterViewController.swift b/JSONCreator_iOS/JSONCreator/MasterViewController.swift index 57de0fe..9eff061 100644 --- a/JSONCreator_iOS/JSONCreator/MasterViewController.swift +++ b/JSONCreator_iOS/JSONCreator/MasterViewController.swift @@ -6,7 +6,6 @@ // Copyright © 2019 Verizon Wireless. All rights reserved. // -import UIKit import MVMCore @@ -69,10 +68,10 @@ class MasterViewController: UIViewController, UITableViewDelegate, UITableViewDa func getData(for indexPath: IndexPath) -> String? { - let subDictionary = molecularModels[indexPath.section].molecules[indexPath.row] as! [String: Any] - - let bb = subDictionary.keys.first! - let val = subDictionary[bb] + guard let subDictionary = molecularModels[indexPath.section].molecules[indexPath.row] as? [String: Any], + let bb = subDictionary.keys.first, + let val = subDictionary[bb] + else { return nil } var json: String = "" do {