Commit Graph

309 Commits

Author SHA1 Message Date
Kevin G Christiano
0f04ebe177 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-12-02 09:04:17 -05:00
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Suresh, Kamlesh
7a09e4b830 merge 2019-11-27 14:38:01 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -05:00
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00
panxi
437138007f merge 2019-11-26 13:54:00 -05:00
panxi
8422362e77 merge from develop 2019-11-26 11:30:43 -05:00
Pfeil, Scott Robert
cc2e4751f5 merge 2019-11-25 09:09:45 -05:00
Pfeil, Scott Robert
d884602d87 tweaks 2019-11-25 09:06:09 -05:00
Pfeil, Scott Robert
dd85a134ac merge 2019-11-25 09:05:32 -05:00
panxi
9ec661ae3b add label model 2019-11-22 14:31:17 -05:00
Kevin G Christiano
72553935c2 latestst state. 2019-11-22 12:53:40 -05:00
panxi
6303c3f92d update label model 2019-11-21 13:15:27 -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
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Hedden, Kyle Matthew
3944e02863 Remote Scott's missing test controller. 2019-11-20 17:30:52 -05:00
panxi
715b5f0167 add image, move label model next to label 2019-11-20 15:48:14 -05:00
panxi
28a04218f9 create image model 2019-11-20 15:43:26 -05:00
panxi
dde5f1d1a4 add caret view model and dash line model 2019-11-20 15:30:42 -05:00
panxi
5fd74b695f create model for progress bar, using ModelMoleculeViewProtocol 2019-11-20 14:58:58 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
Pfeil, Scott Robert
d29e8ea3bd small changes 2019-11-19 09:18:15 -05:00
Kevin G Christiano
588f801322 Adding Base TextField. More improvements. 2019-11-18 14:18:36 -05:00
Kevin G Christiano
80c700ba55 Further improvements made to dropdaown. 2019-11-14 11:41:02 -05:00
panxi
1a3d3eb36f update with new code, move core code to mvmcore 2019-11-12 17:36:00 -05:00
panxi
4111080497 Merge branch 'develop' into feature/models 2019-11-12 15:28:38 -05:00
Pfeil, Scott Robert
716dcff566 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-12 14:45:48 -05:00
Kevin G Christiano
48bcd87bc1 Refactored UI drawing to new class. Reflected change. 2019-11-12 14:29:37 -05:00
Kevin G Christiano
30a56923c0 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-11-12 11:08:55 -05:00
Kevin G Christiano
df1a2a0da0 latest changes for entry. 2019-11-12 11:06:43 -05:00
Pfeil, Scott Robert
4a1a196854 typos 2019-11-05 12:32:32 -05:00
Pfeil, Scott Robert
5b8fce36e6 merge develop 2019-11-05 09:14:19 -05:00
Pfeil, Scott Robert
4b374c4e7e modernizing 2019-11-05 08:50:54 -05:00
Pfeil, Scott Robert
0a45d61eb7 merge 2019-11-05 08:50:17 -05:00
Kevin G Christiano
5e96653d4b undo. 2019-11-01 10:17:20 -04:00
Kevin G Christiano
6e8a8a78cc getting ready to try another refactor. 2019-11-01 10:08:13 -04:00
panxi
7870a116c6 create circle progress view 2019-10-31 16:15:47 -04:00
Kevin G Christiano
ba602c1c86 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-30 09:35:39 -04:00
Pfeil, Scott Robert
77a11a69d5 Fix for project file 2019-10-29 12:12:58 -04:00
Pfeil, Scott Robert
d4cacec310 list item separation 2019-10-29 12:05:37 -04:00
Suresh, Kamlesh
205c83c097 intial draft 2019-10-28 14:47:42 -04:00
Pfeil, Scott Robert
b5a97de183 swiftify 2019-10-28 14:03:47 -04:00
Kevin G Christiano
d15d8b2636 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-24 11:20:26 -04:00
Kevin G Christiano
393b3f355b lztest greatest. 2019-10-24 09:08:53 -04:00
Pfeil, Scott Robert
909fe9ae75 Merge branch 'feature/molecule_radio_button' into 'develop'
Feature/molecule radio button

See merge request BPHV_MIPS/mvm_core_ui!70
2019-10-23 17:30:00 -04:00
Kevin G Christiano
a5ffae9edd Latest state. 2019-10-23 15:15:23 -04:00
Kevin G Christiano
74abef0c30 saving state. 2019-10-23 13:59:10 -04:00
Suresh, Kamlesh
d398a45054 code review 2019-10-23 13:53:58 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00
Kevin G Christiano
2ce41ad74b moar texht. 2019-10-22 09:52:12 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
Kevin G Christiano
8d11e28f4e promising state. 2019-10-21 12:11:58 -04:00
Kevin G Christiano
6c8ced47c9 trying out a new subclass. 2019-10-21 11:47:13 -04:00
Kevin G Christiano
929b825e11 more to uopdate. 2019-10-18 10:26:47 -04:00
panxi
034610af5e fixing merging issue 2019-10-17 15:50:25 -04:00
Kevin G Christiano
720d17d751 revisions made. 2019-10-17 15:35:14 -04:00
panxi
22eb114635 merge from develop 2019-10-17 15:32:03 -04:00
Kevin G Christiano
3178fa0223 Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-10-17 14:40:51 -04:00
Kevin G Christiano
d2fddaf769 latest textfield development. 2019-10-17 11:42:34 -04:00
Kevin G Christiano
4a833abc31 mase public. 2019-10-16 10:44:16 -04:00
Kevin G Christiano
e92616a7f5 latest state. 2019-10-15 13:46:50 -04:00
Kevin G Christiano
ef2e177b33 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-11 12:38:20 -04:00
panxi
93733fb7b6 add framework back 2019-10-10 12:48:27 -04:00
panxi
db583609ac change to 8.0 2019-10-10 06:49:31 -04:00
Pfeil, Scott Robert
f37ee3c9ba os version 2019-10-09 13:04:04 -04:00
panxi
0f6a243e7b change back to animaitonframework 2019-10-09 10:10:57 -04:00
panxi
cfdf44379d update framework relate to group 2019-10-08 13:44:02 -04:00
panxi
473ec08b07 remove testing scheme 2019-10-07 17:02:06 -04:00
panxi
1d93f0b452 add new mvmanimation xc framework 2019-10-07 16:58:21 -04:00
Kevin G Christiano
65672b1f04 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-04 08:56:47 -04:00
Kevin G Christiano
4915bda4b9 Beginning stages of swiftification. 2019-10-03 10:44:56 -04:00
Kevin G Christiano
77a3eb8827 Added a new extension file for CATransaction. Implementation of Checkbox and CheckboxWithLabel. 2019-10-02 15:22:12 -04:00
Suresh, Kamlesh
727c02a966 Merge branch 'develop' into feature/models 2019-09-26 11:34:59 -04:00
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Kevin G Christiano
7722dc5619 Merge branch 'develop' into feature/check_box_mole_revision
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-23 14:30:04 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Kevin G Christiano
8238a42177 Added the new classes. 2019-09-13 12:28:34 -04:00
Kevin G Christiano
bedd05daa6 Creation and inclusion of HeadlineBodyButton molecule. 2019-09-12 14:42:10 -04:00
Kevin G Christiano
9ae91ca84a Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-12 10:28:45 -04:00
Pan, Xinlei (Ryan)
0e27266b85 Merge branch 'feature/multiprogress' into 'develop'
Feature/multiprogress

See merge request BPHV_MIPS/mvm_core_ui!132
2019-09-11 16:49:31 -04:00
Suresh, Kamlesh
eb3b1a0e81 initial 2019-09-11 11:05:57 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
panxi
dcd87fb924 add MultiProgress 2019-09-09 16:42:38 -04:00
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00
Kevin G Christiano
9ca6ba50da New class. 2019-08-29 10:50:38 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Kevin G Christiano
096c95f6e0 Setting up new molecule. 2019-08-28 12:16:07 -04:00
Suresh, Kamlesh
0f1ea89623 merge 2019-08-27 12:13:48 -04:00
Pfeil, Scott Robert
4bc22dbb8e switches 2019-08-26 12:35:04 -04:00
Pfeil, Scott Robert
d5e49d0e5a progress bar fixes 2019-08-15 10:50:29 -04:00
Kevin G Christiano
669d087a57 moved file. 2019-08-13 09:38:05 -04:00
Kevin G Christiano
519542d3e5 Renamed class. 2019-08-05 10:09:11 -04:00
Kevin G Christiano
eea2560e15 Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-08-05 09:11:44 -04:00
Pfeil, Scott Robert
e0afa92c79 carousel bug fix.
imageHeadlineBody
2019-08-02 10:26:16 -04:00
Pfeil, Scott Robert
708b947b02 Revert "Merge branch 'feature/molecule_multiLabelListItem' into 'develop'"
This reverts merge request !99
2019-08-01 11:57:57 -04:00
Kevin G Christiano
c6d445034b Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-07-27 18:17:29 -04:00
vasavk
eeae9a7c70 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/molecule_multiLabelListItem
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m

Signed-off-by: vasavk <vasavi.kanamarlapudi@verizon.com>
2019-07-26 19:19:00 +05:30
Pfeil, Scott Robert
f2db8528a7 threeLayer template
scroller molecule
border color.
remove default height
fix missing update view
2019-07-24 12:44:45 -04:00
Kevin G Christiano
1ec4f271ff Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 10:07:35 -04:00
Suresh, Kamlesh
ceae7e4f80 merge develop 2019-07-22 16:10:46 -04:00
vasavk
ecf34bb34d Added multiLabelListItem - iOS as per MOBFIRST-17824
Signed-off-by: vasavk <vasavi.kanamarlapudi@verizon.com>
2019-07-18 15:45:52 +05:30
Pfeil, Scott Robert
33020844dc carousel 2019-07-11 11:54:14 -04:00
Kevin G Christiano
55f20e0633 Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-07-08 11:00:33 -04:00
Kevin G Christiano
ce1a8c3598 Renamed to comply with MFAtom design doc. 2019-07-08 10:36:34 -04:00
Pfeil, Scott Robert
033cf878a6 carousel 2019-07-03 13:18:27 -04:00
Pfeil, Scott Robert
f6021bb382 header footer as containers 2019-07-02 10:23:58 -04:00
Kevin G Christiano
d79dc3e8ab Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-07-01 09:38:09 -04:00
Pfeil, Scott Robert
0db0f91b3b ModuleMolecule is now a self contained view.
Fixed priority defect in view constraining view.
Change the way names are set for reuse
improve current margin logic
2019-06-26 12:01:47 -04:00
Kevin G Christiano
ba84d2780d Added standardlistitem. 2019-06-24 10:48:28 -04:00
Suresh, Kamlesh
9316343c0e merge 2019-06-21 16:58:47 -04:00
Pfeil, Scott Robert
cd577288c3 Merge branch 'feature/kevin' into 'develop'
Label Multi-Action

See merge request BPHV_MIPS/mvm_core_ui!62
2019-06-21 12:33:56 -04:00
Panth Patel
65af40f7c7 json changes updated 2019-06-14 10:41:22 -04:00
Christiano, Kevin
53bdf0fcc5 Merge branch 'develop' into feature/kevin 2019-06-12 10:59:30 -04:00
Suresh, Kamlesh
b216f7da43 merge 2019-06-10 11:44:08 -04:00
Suresh, Kamlesh
3671843ecf Merge branch 'feature/molecule_progressbar' into 'develop'
ProgressBar molecule

See merge request BPHV_MIPS/mvm_core_ui!66
2019-06-07 11:47:24 -04:00
Christiano, Kevin
8ebcef3a60 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-06-04 16:23:06 -04:00
Pfeil, Scott Robert
161f3e9f08 reset function.
standard spacing for cell molecule
MFTextField to view contstraining view
constraining protocol
2019-06-04 12:42:52 -04:00
Panth Patel
458cddb421 progress bar changes 2019-06-04 11:52:56 -04:00
Christiano, Kevin
845036b4ec Changed atom name. making changes to LabelWithIntenralButton. 2019-05-29 21:10:29 -04:00
Suresh, Kamlesh
26611408c5 merge 2019-05-29 11:56:26 -04:00
Christiano, Kevin
b00d439ead Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-05-29 10:51:11 -04:00
Christiano, Kevin
68f27da117 Changed ItemDetailView name to StandardListItem to comply with molecule listing. 2019-05-29 10:23:39 -04:00
Pfeil, Scott Robert
119a9e8c0f merge develop 2019-05-29 09:07:15 -04:00
Christiano, Kevin
3b66bcfdc3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-05-24 09:20:56 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
Priya
344163de49 Switch molecule 2019-05-23 16:22:32 -04:00
Priya
2e99c7baff Switch molecule 2019-05-23 12:31:36 -04:00
Priya
89b1c9a21b Switch molecule 2019-05-23 11:40:21 -04:00
Christiano, Kevin
c4ad3cc881 adding new atom. 2019-05-20 16:34:17 -04:00
Suresh, Kamlesh
132b810a66 refactoring 2019-05-14 21:52:32 -04:00
Suresh, Kamlesh
e90b4c299e enhancements 2019-05-13 13:42:18 -04:00
Panth Patel
faf0ce2607 progress 2019-05-08 17:20:15 -04:00
Priya
14b01d0ae0 switch changes 2019-05-07 12:55:46 -04:00
Suresh, Kamlesh
f1b46cb8bf merge 2019-04-30 16:31:40 -04:00
Suresh, Kamlesh
382a4c5d3b improvments 2019-04-26 16:45:13 -04:00
Suresh, Kamlesh
da0159f526 merge 2019-04-24 16:13:17 -04:00
Pfeil, Scott Robert
dc1372ca40 merge 2019-04-24 15:38:35 -04:00
Pfeil, Scott Robert
90d2290843 remove extra view I created 2019-04-24 14:30:16 -04:00
Christiano, Kevin
8ae77df354 Removed labelwithoutaccessibilitytraints. 2019-04-23 13:34:51 -04:00
Pfeil, Scott Robert
b00b43eab0 Helper functions
Molecule List.
Back to view instead of margins for stack due to background color issues.
Standard Header View to margin for internal use.
2019-04-22 13:14:22 -04:00
Suresh, Kamlesh
65c3f0427a radiobuttons 2019-04-18 11:07:00 -04:00
Christiano, Kevin
83dda81d55 Removed MFLabel. Reflected delegate paradigm. 2019-04-18 10:01:35 -04:00
Christiano, Kevin
17decc6602 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/MFLabel.h
#	MVMCoreUI/Atoms/Views/MFLabel.m
2019-04-18 09:32:31 -04:00
Christiano, Kevin
da1f5a5703 Converted MFLabel (objc) to Label (Swift). Pulled LabelWithoutAccessibilityTraits from Mobilefirst module and converted it. Altered imports where needed. 2019-04-15 16:50:35 -04:00
Pfeil, Scott Robert
5ebcba15fa molecule delegate object 2019-04-15 12:59:27 -04:00
Pfeil, Scott Robert
f1d80adf57 delegate object and simple deprecation 2019-04-12 15:32:43 -04:00
Christiano, Kevin
b88052ed9b Merge branch 'develop' into feature/label_conversion
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-04-10 16:19:07 -04:00