Commit Graph

104 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
adaa9ca1f3 Bug fixes 2020-02-13 10:45:00 -05:00
Xinlei(Ryan) Pan
5e4f976a1c re add entry field container for fixing odd behavior 2020-01-24 10:42:13 -05:00
Xinlei(Ryan) Pan
af20b0a8a4 remove entryfieldcontainer for odd behavior 2020-01-24 10:41:04 -05:00
Pan, Xinlei (Ryan)
b20212ccd4 Merge branch 'feature/checkbox_label_fix' into 'feature/coding'
Checkbox models added

See merge request BPHV_MIPS/mvm_core_ui!231
2020-01-24 10:23:17 -05:00
Xinlei(Ryan) Pan
d6a7e98718 remove conflicts file 2020-01-24 09:25:09 -05:00
Kevin G Christiano
4cc5a15db9 checkbox modeling. Strange issue with EntryFieldContainer. To be observed. 2020-01-23 12:12:45 -05:00
Suresh, Kamlesh
8c9cf025c6 Merge branch 'develop' into feature/coding 2020-01-21 16:41:19 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Pfeil, Scott Robert
42b57dcd5d Cleaning 2020-01-21 12:10:48 -05:00
Xinlei(Ryan) Pan
2de9142969 remove one more line 2020-01-21 12:00:28 -05:00
Xinlei(Ryan) Pan
8816a06fe5 public globalLeftPanel/globalRightPanel 2020-01-21 11:58:08 -05:00
Xinlei(Ryan) Pan
5b92e64507 Merge branch 'develop' into feature/disable_chatbot 2020-01-21 10:04:38 -05:00
Pfeil, Scott Robert
299a519e20 Default alignment fix 2020-01-17 15:56:48 -05:00
Pfeil, Scott Robert
9847ef5302 stack flexibility update
molecule container protocol fix missing functions
update numbered and unordered list to more model approach
2020-01-17 13:51:46 -05:00
Pfeil, Scott Robert
db0d9f4353 Container protocol
Doughnut chart model
Break stack into regular and dynamic components
2020-01-16 14:59:24 -05:00
Pfeil, Scott Robert
7255c0c354 Merge remote-tracking branch 'refs/remotes/origin/feature/coding'
Conflicts:
	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
	MVMCoreUI/Molecules/Items/TableViewCell.swift
	MVMCoreUI/Molecules/ModelMoleculeViewProtocol.swift
	MVMCoreUI/Organisms/MoleculeStackView.swift
2020-01-14 15:58:12 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
panxi
c8fcbeaefd update right panel view controller 2020-01-09 12:47:03 -05:00
Pfeil, Scott Robert
3e8b69a0bc Line and image update 2020-01-09 11:38:32 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Pfeil, Scott Robert
5a8584342a merge 2020-01-02 09:31:58 -05:00
panxi
e36d487d32 change model name to containerModel to avoid compiling error 2019-12-20 15:00:42 -05:00
Kevin G Christiano
3b59e03695 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
#	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
2019-12-19 15:11:48 -05:00
Kevin G Christiano
37ddf23278 Latest changes to make it better. 2019-12-18 16:12:09 -05:00
Pfeil, Scott Robert
03f64b0875 Module Molecule update to Container 2019-12-17 09:38:51 -05:00
Pfeil, Scott Robert
092dfd6ad0 List item updates 2019-12-16 13:40:04 -05:00
Pfeil, Scott Robert
f610264327 alignment updates 2019-12-16 11:19:30 -05:00
Pfeil, Scott Robert
7f01bc286c stack item as container 2019-12-13 17:07:10 -05:00
Kevin G Christiano
44ff5e9d3c Further development of Entry Field. 2019-12-13 12:54:43 -05:00
Kevin G Christiano
59008f87d0 Making further improvements from design specs. 2019-12-12 16:47:07 -05:00
Pfeil, Scott Robert
be1b867a9a testing container ideas 2019-12-12 14:50:52 -05:00
Pfeil, Scott Robert
e5acf63e6f container testing 2019-12-12 10:03:41 -05:00
Kevin G Christiano
420a874711 Making container tappabble to increase actionable surface area. 2019-12-05 14:07:53 -05:00
Hedden, Kyle Matthew
3f9b707d37 Add overtaking indicator to openPanel callback method. 2019-12-04 12:56:38 -05:00
Kevin G Christiano
72553935c2 latestst state. 2019-11-22 12:53:40 -05:00
Kevin G Christiano
8b5fe4a1f4 more changes. 2019-11-21 15:21:32 -05:00
Kevin G Christiano
f19d45b865 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/CaretView.swift
#	MVMCoreUI/Molecules/Items/TableViewCell.swift
2019-11-21 11:55:21 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
Kevin G Christiano
26c73070d9 latestest and greatest. 2019-11-20 09:12:31 -05:00
Kevin G Christiano
c38e3c0712 DigitEntry in decent place. 2019-11-19 09:57:43 -05:00
Kevin G Christiano
ebccc6bd28 The latest state of entry. 2019-11-14 14:59:39 -05:00
Kevin G Christiano
fca540afc2 shaping up to be more responsive. 2019-11-13 16:17:10 -05:00
Kevin G Christiano
926c2c4cf3 resolved drawing prob. 2019-11-12 15:05:23 -05:00
Kevin G Christiano
d6005290db improvements made. 2019-11-12 14:56:22 -05:00
Kevin G Christiano
48bcd87bc1 Refactored UI drawing to new class. Reflected change. 2019-11-12 14:29:37 -05:00
Pfeil, Scott Robert
4b374c4e7e modernizing 2019-11-05 08:50:54 -05:00