Tyler#9
Open
imnrtst wants to merge 28 commits intohcilabasu:Shangfrom
Open
Conversation
added 27 commits
June 23, 2016 11:39
- changed info.plist to allow arbitrary loads. This is to load other “insecure” web sites, most commonly dictionary.com Changes I’ve made 6/29/16 - minor edit to search keyword function, fixed bug where potential url doesn’t load Changes I’ve made 7/5/16 - commented out necessary NSlogs in book page view controller Changes I’ve made 7/6/16 - added linking url variable to save and load in cmapParser, cmapcontroller, cmapnode, nodecell - changes to drag and drop concept in bookpageviewcontroller - bring view to front and send view to back in show and hide web view bookpageviewcontroller
- Fixed a bug where page turning causes node error in book view and content view controllers - BookPageViewcontroller added a new property loadedcontentview and function viewdidfinishload to maintain highlights - fixed bug where doesn’t respond first time by adding a new gesture and updating pvpoint to web browser view controller
-added another button to cmapview labelled web -turned unused function displaywebview in cmap controller into button action to display web view when button in camp view is pressed -BUG FOUND: Node created from “+” on cmap toolbar does not search concept name (search keyword is empty) -BUG FOUND: Also keyboard doesn’t pop up for “+” button -BUG(?) FOUND: When you edit the name of the node, it doesn’t edit the concept such that when you search keyword it is still the original name. Related to first bug that when “+” created node is made, conceptName is empty, but you edit its appearance later
-Added thumbnails that display where the node was created from, associated log changes and debugging
-Node cell, added another menu item for long click, displays an alert which lists: - Current name of node - original text when created - Source, including linking url if from web browser and page number if from book Bug Found: When you edit the name of the node, edited name is not saved in log files
- NodeCell.m altered textfielddidendediting so that concept name is updated to keyboard input when concept name is null. - NodeCell.m altered such that when internet browser button is pressed, current name of node is put into search keyword, not conceptname
- Node Cell added two properties, popover view pv and string appendednotestring. These two work together to create a note taking option which saves the text the user adds that session. Replaces info button. -CMap Controller added two properties popoverView showingPv and NodeCell noteTakingNode. These allow us to use the class' textviewdidendeditting function to modify the note taker -WebBrowserViewcontroller.xib, just because github hates to load this class, so I'm uploading it to be thorough.
Last commit was incorrectly labelled 6/20/16 - Saved appendedNoteString to log files. - Created new property linkingUrlTitle to implement in the takeNote function and associated log file changes. -Tried to change the font of the popoverview.m but its a work in progress - Changed bookmark button in webbrowserviewcontroller.xib to refresh button and removed the unused addWebMark function.
- added a new picture to buttons in node cell - altered take Note function in Node cell for debugging. Nodes created manually will not be presented like Nodes from the web when loaded.
-Node Cell, changed font of popoverview to something more palatable -PopoverView changed certain variables back to KTextFont so it won't confuse anyone in the future -Cmap and bookpageview controllers commented out some of the show and hide preview functions since it was getting distracting with the preview constantly popping up and dismissing while using the interface.
-Tweaked web browser to adjust size according to orientation. Some minor changes to other controllers to accommodate the feature. -No bugs found really
Made changes to log files such that changing web pages, searching key words, and creating nodes from browser are included in the logs.
-Final fixes to highlighting -removed popup menu when linking nodes, now goes straight to editing
…e page number was inaccurate and fixed where action was incorrect for taking notes.
Most of theses changes were made 8/30/16, but I've made a few minor adjustments since then. Primarily, this update changes the main data type of the node cell from ShangTextField to TylerTextView. As the name suggests, the text box is now a custom uitextview rather than a uitextfield. Some functions have been commented out or replaced to accommodate these changes. The implementation is still a bit flawed here, with the following bugs that I could identify with some cursory testing: 1. Can only drag the node around with sideways movement, vertical causes view to scroll. 2. Color starts white when node is created from source other than book, then adopts color when page is turned. 3. View does not adjust with keyboard, meaning keyboard can block the view.
NodeCell.m - Created offset so keyboard would not block view of node being edited - Since textfielddidendediting is no longer called, moved the function's instructions to textviewdidendediting. This required some work to distinguish between TylerTextView and default textview. See line containing "respondstoSelector:@selector(isTylerTextView) TylerTextView.m -added function isTylerTextView that helps distinguish between this and default TextView
NodeCell.m - Changed behavior of text frame in "Textviewdidchange" to adapt to size of content TylerTextView -Add scrollEnabled = No, though I don't think it works
NodeCell - Adjusted format of textviews in viewwillappear. In updateThumbIcons-->add thumb/note/highlight functions, compensated for changing height of text view.
Node Cell.xib - changed default background color Node Cell.m - formatting the cell frame, see updateviewsize bookPageViewcontroller.m - lengthened character limit from 25 to 35
…rag to select menu items to hold and click, currently met hold and drag, then click, to select menu item NodeCell.m - added a few logs, changed character limit, altered updateViewSize to properly contain the text. Nearly perfect. Cmap Controller.m - added a few logs Book Page View controller.m - added a few logs Book View Controller.m - cosmetic changes to a log Content View Controller.m - added some new logs Summary of logs added: -when whole map is deleted -when orientation changed -when link is deleted, both ways -page turned (update) -when application loads successfully
New/Altered pictures fir menu items. Web browser uses web browser.png, notes take node_small.png. GHContextMenuView.m - Changed from hold, drag and release to select menu to hold and click NodeCell.m - minor changes with format of view
aa.epub -> updated epub file to eliminate custom whitespace characters GHContextMenu.h and m -> added function highlightmenuitemclicked, not fully functional CmapController.m -> minor changes to paging Webbrowserviewcontroller.m -> filtered text to look up to prevent errors
Trying to get the code back to a working version. This is our brute force attempt.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
-Web Browser feature expanded greatly to include other browsing options
-Menu Item in Book Page View Ctlr now works such that both book pages and web browser can create nodes. The menu items in web browser and content view controller have been disabled.
-Node Cell has been altered to handle information from the web browser, mostly to save urls
-cMap controller has some mild alterations to let the web browser create nodes properly