Commit Graph

850 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
603652537d remove large text 2019-10-24 09:34:51 -04:00
Pfeil, Scott Robert
0ff661f3c4 revert for legacy 2019-10-24 09:31:01 -04:00
Kevin G Christiano
f0c7f6bce6 unwrap. 2019-10-24 09:19:16 -04:00
Kevin G Christiano
999da709db Merge branch 'develop' into feature/improve_linkability_label
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-10-24 09:18:25 -04:00
Pfeil, Scott Robert
ef2df903e8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-10-24 09:06:38 -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
Suresh, Kamlesh
b8e1389798 review 2019-10-23 17:21:44 -04:00
Suresh, Kamlesh
d2ca3adacf code review 2019-10-23 15:59:03 -04:00
Kevin G Christiano
a4aedaad90 revert. 2019-10-23 15:43:57 -04:00
Kevin G Christiano
8aaa8cb77f centered. 2019-10-23 15:17:01 -04:00
Suresh, Kamlesh
73342e40d1 code optimization 2019-10-23 14:51:35 -04:00
Suresh, Kamlesh
d398a45054 code review 2019-10-23 13:53:58 -04:00
Suresh, Kamlesh
52fca407e3 remove tap and accessibility 2019-10-23 12:37:26 -04:00
Pfeil, Scott Robert
0cc81c3255 default background color 2019-10-23 11:38:15 -04:00
Pfeil, Scott Robert
0b364fa004 Radio button changes 2019-10-23 11:32:34 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00
Pfeil, Scott Robert
5e486ff716 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-10-23 09:09:17 -04:00
Chintakrinda, Arun Kumar (Arun)
b8bdf4829e Fix for label and molecule stack 2019-10-23 18:21:38 +05:30
Khan, Arshad
cd40ebfccd Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-23 16:28:28 +05:30
Suresh, Kamlesh
5ee34fb027 dummy group 2019-10-22 15:11:16 -04:00
Kevin G Christiano
9b86b4449f dcsds 2019-10-22 11:54:13 -04:00
Pfeil, Scott Robert
252beb311a dynamic type 2019-10-22 11:40:50 -04:00
Kevin G Christiano
083b630054 Merge branch 'develop' into feature/improve_linkability_label 2019-10-22 11:36:58 -04:00
Pfeil, Scott Robert
758615bcb7 Merge branch 'feature/healine_body_button_molecule' into 'develop'
HeadlineBodyButton Mole

See merge request BPHV_MIPS/mvm_core_ui!134
2019-10-22 11:13:30 -04:00
Kevin G Christiano
2248b36ccb one less body. 2019-10-22 11:10:06 -04:00
Kevin G Christiano
b79b999910 added secondary. 2019-10-22 11:04:22 -04:00
Suresh, Kamlesh
4ef662d1ca reivew 2019-10-22 09:59:37 -04:00
Suresh, Kamlesh
fcb377df33 space 2019-10-22 09:13:07 -04:00
Khan, Arshad
a9517759ea Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-22 13:50:43 +05:30
Hedden, Kyle Matthew
b3b193e63d Merge branch 'feature/add_current_page_type_prop' into 'develop'
Add current page type to session object.

See merge request BPHV_MIPS/mvm_core_ui!154
2019-10-21 17:41:12 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
Pan, Xinlei (Ryan)
0b1a1b5d73 Merge branch 'release/6_21' into 'develop'
Release/6 21

See merge request BPHV_MIPS/mvm_core_ui!155
2019-10-21 15:34:13 -04:00
Khan, Arshad
03ee7b99c2 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-21 20:58:22 +05:30
Hedden, Kyle Matthew
a3663ee1b5 Add current page type to session object. 2019-10-19 15:14:31 -04:00
Pfeil, Scott Robert
9ef670cfc4 Merge branch 'feature/label_hero_character' into 'develop'
Label Hero

See merge request BPHV_MIPS/mvm_core_ui!136
2019-10-18 12:05:55 -04:00
Kevin G Christiano
0bb1debc77 no comment. 2019-10-18 10:28:22 -04:00
Kevin G Christiano
f067a20ba9 hero stuff. 2019-10-18 08:47:14 -04:00
panxi
4e1a6ca479 update based on scott's comments 2019-10-17 16:52:05 -04:00
panxi
d94bbc1dae check property back to weak, remove unaided switch files which supposed replaced by mvmcoreuiswitch 2019-10-17 16:33:05 -04:00
panxi
ed7329cdcf add progress bar 2019-10-17 15:52:38 -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
6d52663b4f fixed small error in refactor. 2019-10-17 14:06:01 -04:00
Kevin G Christiano
73ac4b932b refacgtorerd. 2019-10-17 12:39:05 -04:00
Kevin G Christiano
11b2ddc4dd Merge branch 'develop' into feature/label_hero_character 2019-10-17 12:17:17 -04:00
Kevin G Christiano
b5dcf68c5d refactoring taxtcontainer. 2019-10-17 12:17:14 -04:00
Kevin G Christiano
2fdc4795f4 correcting type. 2019-10-17 12:00:44 -04:00
Kevin G Christiano
29ffa40cc3 Merge branch 'develop' into feature/checkbox_update 2019-10-17 11:57:34 -04:00
Kevin G Christiano
f267b98438 constraints added. changes made. 2019-10-17 11:57:30 -04:00
Pfeil, Scott Robert
38beb2c7fa typo fix 2019-10-17 11:21:42 -04:00
Pfeil, Scott Robert
bb51fba0e5 remove legacy os code 2019-10-17 10:31:34 -04:00
Suresh, Kamlesh
603ecccf35 Merge branch 'release/6_20' into 'develop'
Release/6 20

See merge request BPHV_MIPS/mvm_core_ui!141
2019-10-11 16:55:19 -04:00
Hedden, Kyle Matthew
eaad6469bb Move self.presentingViewController access onto the main thread. 2019-10-11 13:03:41 -04:00
Kevin G Christiano
5ef9754e2c defaulting to clear. 2019-10-09 12:45:18 -04:00
Kevin G Christiano
960d9e0e7c removed comment. 2019-10-09 10:18:18 -04:00
Khan, Arshad
3606ce4c82 VQA bug fix for bottom spacing below tableview. 2019-10-09 13:53:10 +05:30
Kevin G Christiano
9922ef4674 added enabled molecule logic. 2019-10-08 16:45:34 -04:00
Kevin G Christiano
1618583acc corrected comment. 2019-10-08 15:19:12 -04:00
Kevin G Christiano
03f12b8a7a added isEnabled func. 2019-10-08 13:15:10 -04:00
Kevin G Christiano
ec190a28bd Further updates made. 2019-10-08 11:47:08 -04:00
Kevin G Christiano
bbdb2181f2 aligning with invision. 2019-10-08 11:30:25 -04:00
Kevin G Christiano
66e45378f4 shapelayer . 2019-10-07 16:33:39 -04:00
Kevin G Christiano
7d6289463d Improved molecular logic of checkbox. 2019-10-07 16:30:14 -04:00
Kevin G Christiano
5043964c29 revised alignment for case when no label. 2019-10-03 16:43:58 -04:00
Kevin G Christiano
44e420218d Constraints mended. more commenting. 2019-10-03 13:22:15 -04:00
Kevin G Christiano
5d1c87819d making changes to align with comments. 2019-10-03 11:14:16 -04:00
Kevin G Christiano
61fcd981c1 setting up the rest. 2019-10-02 15:27:32 -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
Khan, Arshad
fe7fb2db03 changing separator to line mapping as per server and Android confirmation. 2019-09-30 22:01:11 +05:30
Kevin G Christiano
5f8780614f borders. 2019-09-27 14:28:16 -04:00
Kevin G Christiano
b032e40400 Checkbox in good place. 2019-09-27 14:23:46 -04:00
Kevin G Christiano
f5f994648a Decent working state with animation and touch. 2019-09-27 13:43:02 -04:00
Kevin G Christiano
afcf8d535b updates. 2019-09-26 13:56:02 -04:00
Kevin G Christiano
c75337bfdf Getting closer to testing phase. 2019-09-26 11:42:16 -04:00
Suresh, Kamlesh
727c02a966 Merge branch 'develop' into feature/models 2019-09-26 11:34:59 -04:00
Kevin G Christiano
38c74acc6e moar. 2019-09-25 14:43:29 -04:00
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Suresh, Kamlesh
0f5a9be82e CXTDT-25210 2019-09-25 11:23:18 -04:00
Khan, Arshad
c7978c52c9 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-24 15:20:08 +05:30
Kevin G Christiano
bceb915496 Merge branch 'develop' into feature/improve_linkability_label 2019-09-23 14:30:32 -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
Kevin G Christiano
96e5f47dd0 Merge branch 'develop' into feature/label_hero_character 2019-09-23 14:28:42 -04:00
Kevin G Christiano
7b6f3d6b88 spelling. 2019-09-23 14:23:37 -04:00
Pfeil, Scott Robert
5b5a03b869 condensing 2019-09-23 13:30:35 -04:00
Kevin G Christiano
d0797a4825 mild updates. 2019-09-23 12:43:52 -04:00
Kevin G Christiano
4770aa6e6b Label Improvements. Conveniences added. Greater accuracy to tap detection provided. 2019-09-23 12:35:51 -04:00
Pfeil, Scott Robert
a0f9470c27 model driven gone 2019-09-23 12:25:49 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Kevin G Christiano
b3cc938a9e Improved accuracy of link label detection. 2019-09-20 16:11:46 -04:00
Kevin G Christiano
efbb68b4cd latest. not perfect. 2019-09-19 14:09:51 -04:00
Khan, Arshad
07db61f035 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-19 22:27:28 +05:30
Kevin G Christiano
0d6b904a7f current state. 2019-09-19 10:54:28 -04:00
Pfeil, Scott Robert
6cdde756e5 bug fixes 2019-09-19 09:06:14 -04:00
Kevin G Christiano
1c416b5653 revised. 2019-09-18 14:15:56 -04:00
Kevin G Christiano
4ea916bbcd commenting. 2019-09-18 14:14:37 -04:00
Kevin G Christiano
5bc420ac05 accessoryVIew can now center itself in relation to the hero character. 2019-09-18 14:13:33 -04:00
Khan, Arshad
decf0bf9e6 adding settingsList template 2019-09-18 21:58:30 +05:30
Khan, Arshad
b4aa985c63 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-09-18 14:13:13 +05:30