Commit Graph

1759 Commits

Author SHA1 Message Date
Subhankar Acharya
5cdc33ff3a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_fourcolumn_datausage_divider
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-26 15:20:03 +05:30
Subhankar Acharya
ba51d7f3c2 Change in reference file, indentation and removal of extra spaces. 2020-02-26 11:44:17 +05:30
Subhankar Acharya
4d6a3b273c Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_progressbar_data
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-02-26 11:37:56 +05:30
Pfeil, Scott Robert
7be08fe9be Stack fixes 2020-02-25 14:20:46 -05:00
Xinlei(Ryan) Pan
455507626c add new fonts method,
change font from nullable to non null for better swift typing
2020-02-25 13:59:24 -05:00
Xinlei(Ryan) Pan
4ad4eb7f46 add new font 2020-02-25 11:49:26 -05:00
Subhankar Acharya
2ec429974a removing updateView. 2020-02-25 21:24:04 +05:30
Subhankar Acharya
54782b1871 Changes in init method and spacing 2020-02-25 20:11:22 +05:30
Kruthika KP
cc7ee029ef Change in molecule name 2020-02-25 14:56:17 +05:30
Kruthika KP
fea1c2e997 added subHeadline and changed the files order 2020-02-25 13:33:40 +05:30
Kruthika KP
5dd1c229f9 Merge branch 'develop' into feature/list_onecolumn_fullwidthtext_bodytextonly
* develop:
  header updates
  undoing removal
  mild updates
  hero is working. commenting done.
  rolled back change.
  moved hero is setWithModel. Was not being set. Mild changes.
  undo commented code
  Caret fix in table view cell code condensing extra init functions
2020-02-25 09:37:28 +05:30
Pfeil, Scott Robert
b255b1acac header updates 2020-02-24 16:53:42 -05:00
Subhankar Acharya
9a8c510b7f minor change 2020-02-24 22:06:31 +05:30
Subhankar Acharya
2f94f3435a Code changes as per condensed code feature branch. 2020-02-24 22:04:28 +05:30
Kevin G Christiano
9b53796266 undoing removal 2020-02-24 10:13:45 -05:00
Kevin G Christiano
e33fe346c6 mild updates 2020-02-24 09:58:47 -05:00
Kevin G Christiano
f889515709 hero is working. commenting done. 2020-02-23 13:34:20 -05:00
Kevin G Christiano
0c11ded577 rolled back change. 2020-02-21 14:41:53 -05:00
Kevin G Christiano
f7058e0a3f Merge branch 'feature/code_condensing' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/code_condensing 2020-02-21 14:32:07 -05:00
Kevin G Christiano
17583c107c moved hero is setWithModel. Was not being set. Mild changes. 2020-02-21 14:31:46 -05:00
Pfeil, Scott Robert
dedcd9de12 undo commented code 2020-02-21 10:16:00 -05:00
Pfeil, Scott Robert
ee66dbe8d5 Caret fix in table view cell
code condensing
extra init functions
2020-02-21 09:27:30 -05:00
Subhankar Acharya
47603e7a59 Added ListOneColumnFullWidthTextAllTextAndLinks molecule class and model files. 2020-02-21 16:58:16 +05:30
Pfeil, Scott Robert
cc5536a8d1 Minor fixes 2020-02-20 19:07:54 -05:00
Pfeil, Scott Robert
d8a5dd336b Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret 2020-02-20 18:34:50 -05:00
Pfeil, Scott Robert
ae62d161fd code improvements 2020-02-20 18:33:03 -05:00
Kevin G Christiano
b96b48787c beginning arrow molecule 2020-02-20 14:49:25 -05:00
Kevin G Christiano
7d8f850e63 providing new molecule 2020-02-20 14:35:35 -05:00
Prateek Arora
3f1e37c878 Using stack as per review comments 2020-02-20 20:45:20 +05:30
Prateek Arora
22285dda62 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-20 18:02:42 +05:30
Subhankar Acharya
eacaff5a10 changing eybrow variable as per contract 2020-02-20 17:58:50 +05:30
Subhankar Acharya
d7a13704f2 Reference files 2020-02-20 15:56:02 +05:30
Subhankar Acharya
4803e20363 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-20 14:52:57 +05:30
Subhankar Acharya
576ce2ff56 renamed model 2020-02-20 14:41:01 +05:30
Subhankar Acharya
dc3178815c Renaming of molecule file, class and model 2020-02-20 14:08:47 +05:30
Prateek Arora
8093568559 Review comment fixes 2020-02-20 13:42:17 +05:30
Pfeil, Scott Robert
0947ba93ef paypal image 2020-02-19 17:31:47 -05:00
Pfeil, Scott Robert
6563a14ff7 moleculeName coddle 2020-02-19 17:19:36 -05:00
Pfeil, Scott Robert
51732b72a9 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 17:14:08 -05:00
Pfeil, Scott Robert
50d1d1a13a Fixes to allow bundle improvements 2020-02-19 17:12:50 -05:00
Xinlei(Ryan) Pan
6b1a02c369 fix typo 2020-02-19 14:48:31 -05:00
Xinlei(Ryan) Pan
5c42c4bf28 remove typo 2020-02-19 14:45:51 -05:00
Pan, Xinlei (Ryan)
7d5ddfe523 Merge branch 'feature/parse' into 'develop'
moleculeName

See merge request BPHV_MIPS/mvm_core_ui!269
2020-02-19 14:29:14 -05:00
Xinlei(Ryan) Pan
f38b577321 add missing moleculeName 2020-02-19 14:26:52 -05:00
Suresh, Kamlesh
b5ac3b0b76 fixes 2020-02-19 14:09:34 -05:00
Suresh, Kamlesh
08cf275ba4 space 2020-02-19 13:59:28 -05:00
Pfeil, Scott Robert
d96ceb0063 Merge branch 'feature/copy_link_text' into 'develop'
New Action share

See merge request BPHV_MIPS/mvm_core_ui!267
2020-02-19 12:39:02 -05:00
Kevin G Christiano
23fa0c5bad reverting 2020-02-19 12:36:28 -05:00
Suresh, Kamlesh
cbe01463d9 moleculeName 2020-02-19 11:26:24 -05:00
Pfeil, Scott Robert
a845c37f17 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 09:40:43 -05:00
Pfeil, Scott Robert
fa0ec8ab45 minor fixes 2020-02-19 09:40:17 -05:00
Pfeil, Scott Robert
520b31f28a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-19 09:38:23 -05:00
Kruthika KP
3fbbe00761 19096 - List - Progress Bar - Data - Initial commit 2020-02-19 15:28:51 +05:30
Pfeil, Scott Robert
29f89154f8 small model fix for images 2020-02-18 16:55:56 -05:00
Kevin G Christiano
8b309c928f conflict resolution 2020-02-18 15:56:21 -05:00
Kevin G Christiano
633eb4ec21 adding a new action type. updated action map flow. 2020-02-18 15:19:28 -05:00
Pfeil, Scott Robert
a620dd2401 some fixes for catching and remove file 2020-02-18 14:59:17 -05:00
Pfeil, Scott Robert
db8a27ec2f update to label attributes 2020-02-18 14:29:35 -05:00
Suresh, Kamlesh
ff0758106e init 2020-02-18 12:31:55 -05:00
Suresh, Kamlesh
4378a6f132 Merge branch 'develop' into feature/parse 2020-02-18 11:15:41 -05:00
Hedden, Kyle Matthew
a29b4b17a0 add toggle for server s7 params 2020-02-18 09:48:58 -05:00
Prateek Arora
c97c3fe734 Code changes and cleaning 2020-02-18 19:22:17 +05:30
Prateek Arora
a7ebc798d2 Removing hardcoded constraints replacing with multiplier 2020-02-18 19:01:08 +05:30
Lekshmi S
72d0a24061 Modified code as image is optional. 2020-02-18 16:50:03 +05:30
Lekshmi S
43a809aba0 Modified code as labels are optional. 2020-02-18 16:33:28 +05:30
Subhankar Acharya
5646c27adf Merge branch 'feature/rightVariable_payments_list' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-18 16:09:45 +05:30
Subhankar Acharya
c43a3da712 Code commit after adding a createPayPal function. 2020-02-18 16:06:30 +05:30
Lekshmi S
77476e1355 19162- List - Four Column - Data Usage - Divider story initial commit.
Added molecule class, model class.
2020-02-18 14:31:26 +05:30
Prateek Arora
f8fea032b5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-18 13:42:31 +05:30
Suresh, Kamlesh
e2860efaf6 fixes 2020-02-17 22:28:09 -05:00
Lekshmi S
391cd9ae2c Merge branch 'develop' into feature/rightVariable_payments_list
# Conflicts:
#	MVMCoreUI/Atoms/Views/ImageViewModel.swift
2020-02-18 08:29:39 +05:30
Suresh, Kamlesh
a2700e81b4 remove file 2020-02-17 21:54:47 -05:00
Suresh, Kamlesh
d8acbec046 fixes 2020-02-17 19:07:23 -05:00
Pfeil, Scott Robert
d40d15e344 Merge branch 'feature/moar_colors' into 'develop'
changing pumpkin to orange for design update.

See merge request BPHV_MIPS/mvm_core_ui!263
2020-02-17 17:48:11 -05:00
Suresh, Kamlesh Jain
6d819897bd Merge branch 'feature/model_fixes' into 'develop'
fixes

See merge request BPHV_MIPS/mvm_core_ui!262
2020-02-17 17:46:42 -05:00
Suresh, Kamlesh
9211d6c86d public 2020-02-17 17:44:12 -05:00
Suresh, Kamlesh
3e14e39542 public 2020-02-17 17:37:46 -05:00
Suresh, Kamlesh
68bf45f583 content mode 2020-02-17 17:35:20 -05:00
Suresh, Kamlesh
347928a9b6 remove files 2020-02-17 16:48:42 -05:00
Kevin G Christiano
3fc4184349 general working order 2020-02-17 15:31:10 -05:00
Suresh, Kamlesh
79eceb693e moleculeName 2020-02-17 15:06:33 -05:00
Suresh, Kamlesh
438661dfe1 moleculeName 2020-02-17 15:05:02 -05:00
Kevin G Christiano
db74add496 merging from develop 2020-02-17 14:20:17 -05:00
Suresh, Kamlesh
6de4fc4864 fill color 2020-02-17 14:19:17 -05:00
Kevin G Christiano
1bf1d02216 latest carousel state 2020-02-17 14:18:29 -05:00
Suresh, Kamlesh
cf4832bca7 fixes 2020-02-17 13:39:13 -05:00
Kevin G Christiano
faa9c94f90 latest carousel state 2020-02-17 13:33:25 -05:00
Kevin G Christiano
06fe32f37b changing pumpkin to orange for design update. 2020-02-17 12:21:32 -05:00
Subhankar Acharya
273b131714 Code commit - changes has to be done to model. 2020-02-17 22:50:43 +05:30
Suresh, Kamlesh
87dcde3317 WIP 2020-02-17 12:11:57 -05:00
Suresh, Kamlesh
e431ea2de9 fixes 2020-02-14 15:56:36 -05:00
Kevin G Christiano
7708678fec Merge branch 'develop' 2020-02-14 09:18:26 -05:00
Kevin G Christiano
ee85a8972e relaigning key name with legacy name. 2020-02-14 08:58:32 -05:00
Subhankar Acharya
5da415d0fc removed line break. 2020-02-14 18:17:10 +05:30
Subhankar Acharya
21fc9c1802 Adding up the percentages for stacks. 2020-02-14 17:46:56 +05:30
Lekshmi S
0d6322b693 Removed percent for stackitems. 2020-02-14 16:02:05 +05:30
Lekshmi S
6cbf4a53bc Restructured file group. 2020-02-14 14:09:03 +05:30
Lekshmi S
69919f5beb Added percent for stack items.
Removed conformance to ContainerModel and ListItemModelProtocol.
2020-02-14 14:05:54 +05:30
Lekshmi S
23b2df3c82 Code commit - Conforming to ListItemModel and MoleculeModelProtocol based on review comments. 2020-02-14 12:35:43 +05:30
Lekshmi S
194c004f17 Merge branch 'develop' into feature/ListLeftVar_Checkbox-_Right_Caret 2020-02-14 10:37:14 +05:30
Lekshmi S
f5b537084f Merge branch 'develop' into feature/rightVariable_payments_list 2020-02-14 10:31:56 +05:30
Lekshmi S
5b1b29c10d Removed container and added stackmodel code changes. 2020-02-14 10:17:54 +05:30
Pfeil, Scott Robert
c4c96dc4d4 x color fix 2020-02-13 15:43:59 -05:00
Kevin G Christiano
5558cc8324 adding new base class. improving carousel logic. 2020-02-13 15:33:55 -05:00
Pfeil, Scott Robert
8d3dea90a8 top alert content color update 2020-02-13 13:26:59 -05:00
Kevin G Christiano
6ede310cd0 bar indicator add 2020-02-13 12:47:07 -05:00
Kevin G Christiano
664b4fd230 merging from develop 2020-02-13 12:44:31 -05:00
Kevin G Christiano
fd72f5ff95 work in progress 2020-02-13 12:42:38 -05:00
Pfeil, Scott Robert
5bc5739e8c merge develop 2020-02-13 11:37:10 -05:00
Pfeil, Scott Robert
5d578b0eea remove unneeded check 2020-02-13 11:00:18 -05:00
Pfeil, Scott Robert
c6e9c84809 Comments update 2020-02-13 10:55:46 -05:00
Pfeil, Scott Robert
adaa9ca1f3 Bug fixes 2020-02-13 10:45:00 -05:00
Pfeil, Scott Robert
66a06d9815 Clean up and list item convenience 2020-02-13 10:19:22 -05:00
Subhankar Acharya
ca39be5643 Code Fixes after comments. 2020-02-13 19:41:11 +05:30
Pfeil, Scott Robert
6d31cb15d5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-02-13 09:09:29 -05:00
Lekshmi S
5b3e213ed6 Removed constraints and prioritylevel as per review comments. 2020-02-13 12:59:11 +05:30
Lekshmi S
cadf70ce70 Merge branch 'develop' into feature/ListLeftVar_Checkbox-_Right_Caret
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-13 12:28:35 +05:30
Lekshmi S
d0d8fa54ca Code fixes and removed unwanted code. 2020-02-13 12:12:12 +05:30
Lekshmi S
6925d1ed46 Merge branch 'develop' into feature/rightVariable_payments_list 2020-02-13 09:38:09 +05:30
Lekshmi S
c953981406 Removed container and added stackmodel 2020-02-13 09:00:37 +05:30
Pfeil, Scott Robert
f94056bc9a Merge branch 'bugfix/label_model_fix' into 'develop'
Codable Change

See merge request BPHV_MIPS/mvm_core_ui!254
2020-02-12 22:06:34 -05:00
Pfeil, Scott Robert
24f44e5829 Small cleaning 2020-02-12 22:03:46 -05:00
Lekshmi S
8ca1ebc6ad Merge branch 'develop' into feature/rightVariable_payments_list
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-13 08:33:30 +05:30
Pfeil, Scott Robert
54e012d699 name fix 2020-02-12 21:55:27 -05:00
Pfeil, Scott Robert
eae3653b65 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-02-12 20:57:04 -05:00
Pfeil, Scott Robert
04e1e44343 merge 2020-02-12 20:55:46 -05:00
Pfeil, Scott Robert
02166c8b52 Merge branch 'feature/leftvariableicon_with_rightcaretlist' into 'develop'
Feature/leftvariableicon with rightcaretlist

See merge request BPHV_MIPS/mvm_core_ui!253
2020-02-12 20:36:46 -05:00
Pfeil, Scott Robert
5cecd5f031 Minor fixes 2020-02-12 20:36:05 -05:00
Xinlei(Ryan) Pan
e1d56bcc0c update image method 2020-02-12 15:32:33 -05:00
Xinlei(Ryan) Pan
0113387f00 add new image method 2020-02-12 15:31:45 -05:00
Pfeil, Scott Robert
05bda7076d Layout constraint helpers 2020-02-12 14:39:38 -05:00
Subhankar Acharya
692689a900 Code clean up for stack and removed line break. 2020-02-13 00:34:41 +05:30
Subhankar Acharya
c30a001239 Code Changes after reimplementing the molecule class. 2020-02-12 23:01:02 +05:30
Kevin G Christiano
e0bb0e45dc integrating changes to make fan out instance models into categories due to name conflicts 2020-02-12 11:25:37 -05:00
Subhankar Acharya
394a5aba18 Code fixes for alignment and StackItemModel conformance change. 2020-02-12 21:34:47 +05:30
Lekshmi S
3dbbc1a876 Code fix 2020-02-12 16:50:46 +05:30
Kruthika KP
fed9b8ff92 added default horizontal padding 2020-02-12 16:45:09 +05:30
Lekshmi S
63201a8fa6 19042 - List - Left Variable - Checkbox - With Right Caret - All Text & Links story commit.
Added Molecule class, Model class
2020-02-12 15:11:41 +05:30
Subhankar Acharya
d92c5b5679 Code changes using the StackModel 2020-02-11 22:21:07 +05:30
Subhankar Acharya
d5ac7e3e6d removed line break 2020-02-11 17:33:12 +05:30
Subhankar Acharya
fb65f9e976 Deleted the files after changing naming convention. 2020-02-11 17:31:28 +05:30
Subhankar Acharya
05aaac573d Code checkin after changing way of implementation. 2020-02-11 17:30:34 +05:30
Lekshmi S
d683d420c8 Code changes based on review:
Modified class name according to Confluence
Removed Initializers
Removed extra spaces.
2020-02-11 12:22:50 +05:30
Kruthika KP
965dcf538b Class naming convention changed and removed init methods where not required. 2020-02-11 12:18:45 +05:30
Lekshmi S
66f0cf6b8e Modified code based on review comments
Molecule class conforming to TableViewCell instead of Container.
Model class conforming to ListItemModelProtocol instead of MoleculeModelProtocol
Removed extra spaces and added comments
2020-02-11 08:39:09 +05:30
Lekshmi S
5686fea2c8 Merge branch 'develop' into feature/leftvariableicon_with_rightcaretlist 2020-02-10 15:43:56 +05:30
Lekshmi S
a87926a810 Story - 19072: List - Right Variable - Payments Initial Commit
Added Molecule Class, Model Class
2020-02-10 15:41:12 +05:30
Subhankar Acharya
bc1cc9b1d2 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/three_column_plan_data_list
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-02-10 11:50:47 +05:30
Subhankar Acharya
593bae7820 Molecule-ThreeColumnPlanDataDividerList 2020-02-10 11:49:03 +05:30
Pfeil, Scott Robert
bf8ea963b0 bring back view controller 2020-02-07 15:29:58 -05:00