Commit Graph

1822 Commits

Author SHA1 Message Date
Kruthika KP
ff382f0ef8 Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop:
  opening access to prevent error
2020-03-03 14:52:12 +05:30
Lekshmi S
361e1f043f Code cleanup. 2020-03-03 13:27:04 +05:30
Lekshmi S
09af9d6661 Merge branch 'develop' into feature/list_twocolumn_comparechanges 2020-03-03 11:25:19 +05:30
Pfeil, Scott Robert
4b9cd27cab change the base decode functions 2020-03-02 14:54:48 -05:00
Kevin G Christiano
6b93270431 opening access to prevent error 2020-03-02 10:59:24 -05:00
Subhankar Acharya
188277742a Code refactoring. 2020-03-02 16:44:49 +05:30
Subhankar Acharya
2e690a6061 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_twocolumn_comparechanges
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-02 16:32:40 +05:30
Kruthika KP
1d1bcf1b4a 19084 - List Right variable Total Data 2020-03-02 11:43:50 +05:30
Pfeil, Scott Robert
2e99d980e8 open for mobile first 2020-02-28 14:08:38 -05:00
Pfeil, Scott Robert
01a36a0245 remove test file 2020-02-28 13:50:06 -05:00
Pfeil, Scott Robert
201fa2be81 remove file testing 2020-02-28 13:48:23 -05:00
Pfeil, Scott Robert
7345dce4b9 Dropdown filter fix 2020-02-28 13:46:33 -05:00
Kevin G Christiano
2d84b89af9 addressing issue where cell resizes but accessory does not follow. 2020-02-28 13:38:27 -05:00
Pfeil, Scott Robert
cfd6cb1358 Teting 2020-02-28 13:06:11 -05:00
Pfeil, Scott Robert
27e1a97a80 order update 2020-02-28 12:21:13 -05:00
Pfeil, Scott Robert
527cdc684d Small updates 2020-02-28 12:17:44 -05:00
Pfeil, Scott Robert
fea104adc8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_fourcolumn_datausage_divider 2020-02-28 12:12:09 -05:00
Pfeil, Scott Robert
4c25b8a160 merge 2020-02-28 12:11:51 -05:00
Pfeil, Scott Robert
f230291e47 color 2020-02-28 11:36:14 -05:00
Pfeil, Scott Robert
f779478cc5 update 2020-02-28 10:32:27 -05:00
Pfeil, Scott Robert
36e34e1726 fixes 2020-02-28 10:30:57 -05:00
Pfeil, Scott Robert
2b85991bfd merge dev 2020-02-28 09:53:14 -05:00
Pan, Xinlei (Ryan)
1540fb4bed Merge branch 'feature/arrow' into 'develop'
Arrow Icon

See merge request BPHV_MIPS/mvm_core_ui!283
2020-02-28 09:50:16 -05:00
Subhankar Acharya
19ce1087eb Removing percentage. 2020-02-28 19:44:23 +05:30
Lekshmi S
1c8c452fbe Created folder structure 2020-02-28 12:28:49 +05:30
Lekshmi S
1b2f867f5f Merge branch 'feature/cleanup' into feature/list_twocolumn_comparechanges 2020-02-28 12:01:52 +05:30
Pfeil, Scott Robert
6a28585765 merge fix 2020-02-27 13:58:44 -05:00
Pfeil, Scott Robert
757395ad1d merge 2020-02-27 13:58:30 -05:00
Pfeil, Scott Robert
0b6fe7059a Cleanup for names and stack 2020-02-27 13:45:15 -05:00
Kevin G Christiano
e7b7012708 constraint convenience 2020-02-27 13:00:39 -05:00
Kevin G Christiano
435c6cfa55 conflict resolution 2020-02-27 12:04:58 -05:00
Kevin G Christiano
c2baebe483 removed testing code 2020-02-27 12:00:45 -05:00
Kevin G Christiano
1ee8c244cd merging 2020-02-27 11:57:10 -05:00
Kevin G Christiano
411d72a152 Merge branch 'develop' into feature/arrow 2020-02-27 11:56:49 -05:00
Kevin G Christiano
78673b824e removed test code 2020-02-27 11:46:17 -05:00
Kevin G Christiano
5640129cdf working state of arrow 2020-02-27 11:44:24 -05:00
Subhankar Acharya
207d1915d5 Added ListLeftVariableRadioButtonAndPaymentMethod molecule. 2020-02-27 21:37:02 +05:30
Subhankar Acharya
bf2438d112 Merge branch 'feature/radio_model' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_leftvariable_radiobutton_paymentmethod 2020-02-27 21:20:55 +05:30
Kevin G Christiano
b6af3ced00 latest state 2020-02-27 10:12:43 -05:00
Subhankar Acharya
ff0fb6b7cd Added files to LockUps and constraint changes. 2020-02-27 20:38:57 +05:30
Pan, Xinlei (Ryan)
830a93be2c Merge branch 'feature/external_link' into 'develop'
External link

See merge request BPHV_MIPS/mvm_core_ui!280
2020-02-27 10:08:42 -05:00
Pan, Xinlei (Ryan)
b14fe5db30 Merge branch 'feature/newfont' into 'develop'
Feature/newfont

See merge request BPHV_MIPS/mvm_core_ui!276
2020-02-27 09:49:10 -05:00
Suresh, Kamlesh
4d209d8869 optinal 2020-02-27 09:28:00 -05:00
Subhankar Acharya
d507e66d13 Added ListTwoCloumnPriceDetails molecule 2020-02-27 19:06:49 +05:30
Subhankar Acharya
7c4401f4ac referencing error 2020-02-27 14:30:56 +05:30
Lekshmi S
ec91076669 Code cleanup 2020-02-27 14:19:15 +05:30
Subhankar Acharya
2a354d2a53 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_twocolumn_price_details
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-27 14:08:01 +05:30
Lekshmi S
991bd7a78e Merge branch 'develop' into feature/list_twocolumn_comparechanges
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-27 12:23:43 +05:30
Lekshmi S
4fe9dc836b Merge branch 'develop' into feature/list_fourcolumn_datausage_divider 2020-02-27 12:14:23 +05:30
Kruthika KP
2a2ae1931b Merge branch 'develop' into feature/list_progressbar_data
* develop:
  Top Alert Fixes for top color and status bar color
2020-02-27 08:18:24 +05:30
Suresh, Kamlesh
a9bec2df9c radio model 2020-02-26 17:45:02 -05:00
Xinlei(Ryan) Pan
6efbd196a8 add error log 2020-02-26 14:02:26 -05:00
Kevin G Christiano
10e4711c90 wipppp 2020-02-26 13:44:17 -05:00
Kevin G Christiano
1fa8cfd16a opening up funcs 2020-02-26 13:39:44 -05:00
Kevin G Christiano
f8608e7252 resolving merge 2020-02-26 13:37:46 -05:00
Xinlei(Ryan) Pan
a96427b793 add comment 2020-02-26 13:36:20 -05:00
Kevin G Christiano
73bd5ebafc wipppp 2020-02-26 13:36:02 -05:00
Xinlei(Ryan) Pan
fcc21ebf28 fix typo 2020-02-26 13:34:01 -05:00
Xinlei(Ryan) Pan
80b2513feb fix semi colon paste in m file 2020-02-26 13:28:23 -05:00
Kevin G Christiano
8ff8f9aa3a external icon convenience 2020-02-26 13:21:43 -05:00
Xinlei(Ryan) Pan
4b31b19174 update font 2020-02-26 13:00:40 -05:00
Xinlei(Ryan) Pan
1d7fb0d219 change font of top navigation from 14 to 13 for new design 2020-02-26 12:45:06 -05:00
Xinlei(Ryan) Pan
16f49329f7 update create label method name 2020-02-26 12:35:44 -05:00
Pfeil, Scott Robert
b1c87f2e14 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-26 11:50:06 -05:00
Pfeil, Scott Robert
cfcff1aa6e Top Alert Fixes for top color and status bar color 2020-02-26 11:49:31 -05:00
Xinlei(Ryan) Pan
e54c87becf update font 2020-02-26 11:06:34 -05:00
Subhankar Acharya
3734cae058 Code improvement. 2020-02-26 21:24:43 +05:30
Subhankar Acharya
224148d36f Code improvement. 2020-02-26 19:03:42 +05:30
Kruthika KP
62e1d28305 Constraints added 2020-02-26 16:33:18 +05:30
Subhankar Acharya
e31918c051 Error in referencing. 2020-02-26 16:19:51 +05:30
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
Lekshmi S
758279f30a 18979 - List - Two Column - Compare Changes story initial commit.
Added molecule and model class.
2020-02-24 15:55:46 +05:30
Lekshmi S
b08db78d09 Added constraints. 2020-02-24 11:46:44 +05:30
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
Subhankar Acharya
607959bd1b Constraint changes. 2020-02-20 19:35:45 +05:30
Subhankar Acharya
e07571f628 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_twocolumn_price_details
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-02-20 18:36:26 +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
Lekshmi S
daeece0bbe Added contenthuggingpriority to avoid overlapping of labels. 2020-02-19 16:39:45 +05:30
Kruthika KP
3fbbe00761 19096 - List - Progress Bar - Data - Initial commit 2020-02-19 15:28:51 +05:30
Lekshmi S
7702b24d4a 19036 - List - Two Column - Price - Details initial commit.
Added molecule and model class.
2020-02-19 12:27:16 +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