Commit Graph

2892 Commits

Author SHA1 Message Date
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
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
Kevin G Christiano
4577274e08 latest state of the page control 2020-02-07 10:55:06 -05:00
Kevin G Christiano
d02586f613 merge from develop 2020-02-07 09:20:39 -05:00
Pan, Xinlei (Ryan)
c163e963d2 Merge branch 'bugfix/dropdown_issue' into 'develop'
type change to support equatable dictionaries.

See merge request BPHV_MIPS/mvm_core_ui!249
2020-02-07 09:15:24 -05:00
Kevin G Christiano
3eb94fe616 removing print statements. 2020-02-07 09:11:06 -05:00
Prateek Arora
5ae5cfd2d8 WIP: New molecule changes 2020-02-07 17:03:33 +05:30
Prateek Arora
7572bf0214 Fixes as per Review comments 2020-02-07 13:48:35 +05:30
Kevin G Christiano
977bff851e latest and greatest. 2020-02-06 15:51:13 -05:00
Pan, Xinlei (Ryan)
e95fffbe82 Merge branch 'bugfix/misbehaving_entry' into 'develop'
EntryField responder fix.

See merge request BPHV_MIPS/mvm_core_ui!250
2020-02-06 14:16:46 -05:00
Kevin G Christiano
61a5932a88 fixing bug where textfield was not being recognized when resigning responder. 2020-02-06 13:25:52 -05:00
Pfeil, Scott Robert
0dad2aedb1 type fix 2020-02-06 13:00:55 -05:00
Kevin G Christiano
23e87b1cbb removed caveman code. 2020-02-06 12:44:25 -05:00
Pfeil, Scott Robert
00b179d8c2 fix to reuse issue two button view 2020-02-06 12:09:35 -05:00
Pfeil, Scott Robert
f24485c699 fix button order 2020-02-06 11:59:45 -05:00
Kevin G Christiano
1e9b228730 Merge branch 'develop' 2020-02-06 11:19:27 -05:00
Kevin G Christiano
a31d5ccfd8 redundant statement removed. 2020-02-06 11:07:09 -05:00
Kevin G Christiano
b2241e47e1 fixing change 2020-02-06 10:29:52 -05:00
Pfeil, Scott Robert
0d4008dec7 CaretLink 2020-02-06 09:55:18 -05:00
Pfeil, Scott Robert
59707ef781 merge 2020-02-06 09:52:05 -05:00
Prateek Arora
21c749489c Review Comments 2020-02-06 20:20:04 +05:30
Pfeil, Scott Robert
595dc99936 button minimum
caretLink
2020-02-06 09:50:03 -05:00
Kevin G Christiano
15bfb6b481 Bug fix and general shape-up 2020-02-06 09:31:23 -05:00
Kruthika KP
5f2abffba0 Changed TableViewCell to Container in Molecule class and ListItemModelProtocol to MoleculeModelProtocol 2020-02-06 18:43:53 +05:30
Prateek Arora
b6762fc455 Extra space removal 2020-02-06 18:21:28 +05:30
Prateek Arora
8f225dda70 Code clean 2020-02-06 18:19:15 +05:30
Prateek Arora
07d8ef5d13 Progress bar molecule changes 2020-02-06 17:30:29 +05:30
Prateek Arora
d56335d103 Progress bar molecule changes 2020-02-06 16:59:42 +05:30
Kruthika KP
8ca15468f4 changes to image leading space 2020-02-06 16:30:20 +05:30
Prateek Arora
93ba680bb8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-06 12:31:48 +05:30
Kruthika KP
e2d2decc5c Merge branch 'develop' into feature/leftvariableicon_with_rightcaretlist 2020-02-06 10:36:42 +05:30
Pan, Xinlei (Ryan)
4ff660accc Merge branch 'feature/caretbutton' into 'develop'
change CaretButton to MFCaretButton in legacy view/viewcontroller, CaretButton...

See merge request BPHV_MIPS/mvm_core_ui!244
2020-02-05 15:08:00 -05:00
Pan, Xinlei (Ryan)
468a297014 Merge branch 'bugfix/addons_banner_fix' into 'develop'
Add-ons banner fif for defect: CXTDT-54990

See merge request BPHV_MIPS/mvm_core_ui!246
2020-02-05 11:29:18 -05:00
Khan, Arshad
2e37041e7e Add-ons banner fif for defect: CXTDT-54990
verbiage truncation
design 2/3 feedback implemenation
2020-02-05 20:30:01 +05:30
Khan, Arshad
fa1c8bad92 corner label bug fixes: CXTDT-54851 & CXTDT-4571(see comments)
making molecule optional as per one confluence document.
Same has been implemented in Android and Server.
2020-02-05 20:26:34 +05:30
Kruthika KP
4bcfdb96db 18936 - Left Variable Icon - with - Right Caret - initial commit. 2020-02-05 13:17:50 +05:30
Xinlei(Ryan) Pan
2b74531ce1 change CaretButton to MFCaretButton in legacy view/viewcontroller, CaretButton will be only used in molecule 2020-02-04 13:59:14 -05:00
Pfeil, Scott Robert
40da48bc6e Fix stack percent defect 2020-02-04 13:34:39 -05:00
Pfeil, Scott Robert
fe15372437 defect fixes 2020-02-04 12:08:26 -05:00
Pfeil, Scott Robert
2d400b045d Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/two_button_remove_legacy 2020-02-04 10:46:17 -05:00
Chintakrinda, Arun Kumar (Arun)
c83302ec08 Stack model bug fix from molecueStack to stack 2020-02-04 14:37:31 +05:30
Prateek Arora
35e7052abb WIP: LabelsWithCircleProgressBar 2020-02-04 14:10:01 +05:30
Pfeil, Scott Robert
6fa74c11cf Merge branch 'feature/new_color' into 'develop'
Adding color and removing pointless func.

See merge request BPHV_MIPS/mvm_core_ui!239
2020-02-03 15:44:19 -05:00
Xinlei(Ryan) Pan
9110c842a5 fix typo 2020-02-03 09:42:11 -05:00
Kevin G Christiano
be2e9473b3 Removing func as the static dictionary can carry the weight. 2020-02-03 09:00:03 -05:00
Kevin G Christiano
c81f68d66d adding color and removing pointless loop. 2020-02-03 08:54:41 -05:00
Pfeil, Scott Robert
205e9707e6 move legacy 2020-01-31 16:37:24 -05:00
Pfeil, Scott Robert
e2f1da7c27 estimated height 2020-01-31 16:29:46 -05:00
Pfeil, Scott Robert
37228669e0 Two button remove legacy 2020-01-31 16:27:20 -05:00
Pfeil, Scott Robert
365bbad168 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/button_swifty 2020-01-31 16:01:26 -05:00
Pfeil, Scott Robert
487d41b3d9 two button view update 2020-01-31 16:01:06 -05:00
Kevin G Christiano
af54ac2a3c getting ready for an evolution 2020-01-31 15:38:07 -05:00
Pan, Xinlei (Ryan)
ae00d57bd3 Merge branch 'feature/primarybuttonview' into 'develop'
Feature/primarybuttonview

See merge request BPHV_MIPS/mvm_core_ui!237
2020-01-31 15:11:52 -05:00
Kevin G Christiano
8832bbd0b7 shaping up the page control (carouselIndicator) 2020-01-31 14:26:37 -05:00
Pfeil, Scott Robert
a19a06e7b6 Merge branch 'feature/button_swifty' into 'develop'
Feature/button swifty

See merge request BPHV_MIPS/mvm_core_ui!235
2020-01-30 13:55:25 -05:00
Pfeil, Scott Robert
521fc75e59 remove unused 2020-01-30 11:56:57 -05:00
Pfeil, Scott Robert
58a40a7752 fixes and color addition 2020-01-30 11:56:37 -05:00
Pfeil, Scott Robert
f367b03233 Review comments 2020-01-30 11:41:43 -05:00
Xinlei(Ryan) Pan
54dc30a41a update based on Scott's comments 2020-01-29 15:47:37 -05:00
Xinlei(Ryan) Pan
347f054ed1 merge from develop 2020-01-29 15:44:42 -05:00
Xinlei(Ryan) Pan
9ce1e7ec93 add PrimaryButtonView back to prepay legacy view/ view controller 2020-01-29 11:27:24 -05:00
Xinlei(Ryan) Pan
e6ae064c44 add PrimaryButtonView back into legacy view and view controller 2020-01-29 10:30:01 -05:00
Pfeil, Scott Robert
5f40942468 missed CheckboxLabel name change 2020-01-29 10:13:30 -05:00
Pfeil, Scott Robert
ad8d18eabe buttonmodelprotocol 2020-01-29 09:17:36 -05:00
Pfeil, Scott Robert
2ebce1b93b swift button 2020-01-28 14:04:56 -05:00
Pfeil, Scott Robert
c0ca81c568 Pill button 2020-01-28 13:55:55 -05:00
Pfeil, Scott Robert
ba8058cceb button swift 2020-01-28 12:58:51 -05:00
Pfeil, Scott Robert
98d0dc26f6 name update 2020-01-27 12:28:18 -05:00
Pfeil, Scott Robert
41a60d552d link name change 2020-01-27 12:19:52 -05:00
Pfeil, Scott Robert
1f48ad485f update comment 2020-01-27 12:15:14 -05:00
Pfeil, Scott Robert
ecb381e943 switch to toggle 2020-01-27 12:10:48 -05:00
Pan, Xinlei (Ryan)
0438f02a08 Merge branch 'bugfix/graphview' into 'develop'
Bugfix/graphview

See merge request BPHV_MIPS/mvm_core_ui!233
2020-01-27 10:05:01 -05:00
Pfeil, Scott Robert
fe10b40148 reorg 2020-01-24 16:48:28 -05:00
Kevin G Christiano
a932e554d5 timing fix 2020-01-24 15:32:40 -05:00
Xinlei(Ryan) Pan
a3a3d4b66a add file back 2020-01-24 15:14:02 -05:00
Xinlei(Ryan) Pan
085aa62c8b merge from feature/coding 2020-01-24 15:13:04 -05:00
Kevin G Christiano
3eb97d65c9 fixing reuse error in setWithModel 2020-01-24 15:06:45 -05:00
Kevin G Christiano
11aaedfa6b pr fixes 2020-01-24 13:25:59 -05:00
Kevin G Christiano
c250769620 using existing model encoding func 2020-01-24 13:20:02 -05:00
Kevin G Christiano
7b8b2a059f no need for val 2020-01-24 12:43:38 -05:00
Kevin G Christiano
e5948e05e5 pr fixes 2020-01-24 12:33:22 -05:00
Suresh, Kamlesh
9748e38296 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 12:10:58 -05:00
Suresh, Kamlesh
a16a362c03 dash color 2020-01-24 12:10:43 -05:00
Kevin G Christiano
7019bdaa78 no longer needed. 2020-01-24 11:54:23 -05:00
Kevin G Christiano
451e28cdfd removed conflict file 2020-01-24 11:47:25 -05:00
Kevin G Christiano
851d5b57ff remvoe explicit unwrapping 2020-01-24 10:58:03 -05:00
Xinlei(Ryan) Pan
5e4f976a1c re add entry field container for fixing odd behavior 2020-01-24 10:42:13 -05:00
Kevin G Christiano
af7e813e18 model reuse again 2020-01-24 10:41:38 -05:00
Xinlei(Ryan) Pan
af20b0a8a4 remove entryfieldcontainer for odd behavior 2020-01-24 10:41:04 -05:00
Kevin G Christiano
f43e018e21 model reuse 2020-01-24 10:38:38 -05:00
Suresh, Kamlesh
0808d63e24 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 10:34:27 -05:00
Pfeil, Scott Robert
5a1aad63c7 remove axis property wrapper 2020-01-24 10:33:16 -05:00
Pfeil, Scott Robert
ebf089888b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 10:30:50 -05:00
Pfeil, Scott Robert
9384e28eb8 fix on rotate margin issue 2020-01-24 10:29:36 -05:00
Pfeil, Scott Robert
8b8ec937b1 caret link hiding 2020-01-24 10:24:49 -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
Pfeil, Scott Robert
4a194d4e6f fixes for the banner 2020-01-24 10:21:42 -05:00
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Kevin G Christiano
86f60bccf8 adding height override 2020-01-24 10:11:42 -05:00
Kevin G Christiano
304b4cbc4c models encode properly 2020-01-24 09:41:34 -05:00
Pfeil, Scott Robert
d7f955c991 fix to error check 2020-01-24 09:35:38 -05:00
Xinlei(Ryan) Pan
6602ac505a Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 09:26:00 -05:00
Xinlei(Ryan) Pan
d6a7e98718 remove conflicts file 2020-01-24 09:25:09 -05:00
Pfeil, Scott Robert
c0c5eef9e1 dash update 2020-01-24 09:22:45 -05:00
Pfeil, Scott Robert
633bcf9fd0 dash line update 2020-01-24 09:21:03 -05:00
Pfeil, Scott Robert
203b049829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 08:49:13 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Kevin G Christiano
6139f31e54 wring label 2020-01-23 22:42:19 -05:00
Kevin G Christiano
c5e80d602e temp fix for arch issue 2020-01-23 21:04:48 -05:00
Kevin G Christiano
83d5721e68 temp fix for arch issue 2020-01-23 19:59:05 -05:00
Suresh, Kamlesh
f39e483a4e Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-23 17:39:15 -05:00
Suresh, Kamlesh
31c148de97 fixes 2020-01-23 14:46:32 -05:00
Kevin G Christiano
8fb8694b82 merge fix 2020-01-23 14:30:11 -05:00
Kevin G Christiano
0c7a2940d9 Fixing issues for model reuse. 2020-01-23 14:26:04 -05:00
Xinlei(Ryan) Pan
0069f38d4e update toggle alignment 2020-01-23 14:06:25 -05:00
Xinlei(Ryan) Pan
2f68dcb695 update horizontal alignment 2020-01-23 14:05:36 -05:00
Kevin G Christiano
e143c75215 redirect type 2020-01-23 13:10:57 -05:00
Kevin G Christiano
af83a2aa1e alighing with merge. 2020-01-23 13:10:27 -05:00
Kevin G Christiano
ea40da2c90 diabled functionality 2020-01-23 12:55:21 -05:00
Pfeil, Scott Robert
5d23b8329f list item fix 2020-01-23 12:54:34 -05:00
Kevin G Christiano
2100468899 disabled colors 2020-01-23 12:32:33 -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
ac17015a09 container model 2020-01-23 11:10:28 -05:00
Pfeil, Scott Robert
6d81705c2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-23 11:01:49 -05:00
Pfeil, Scott Robert
abc854e152 List template change to molecules not required (for now) 2020-01-23 11:01:36 -05:00
Pfeil, Scott Robert
d3edf62a94 toggle name change 2020-01-23 10:42:39 -05:00
Pfeil, Scott Robert
e0abe4c8cd More opening 2020-01-23 10:40:17 -05:00
Pfeil, Scott Robert
a2b62767bd base classes open ModelMoleculeViewProtocol functions 2020-01-23 10:33:56 -05:00
Pfeil, Scott Robert
b80cd421cf height fixes 2020-01-23 10:24:11 -05:00
Pfeil, Scott Robert
15a943d2e7 Changed stack to use a percent modifier to compensate for spacing. 2020-01-23 09:31:33 -05:00
Suresh, Kamlesh
611246cb14 remove left 2020-01-22 17:14:08 -05:00
Suresh, Kamlesh
822180ec9f code fixes 2020-01-22 16:09:36 -05:00
Kevin G Christiano
ccb8a2cf52 weak change 2020-01-22 15:39:39 -05:00
Suresh, Kamlesh
9e7df20877 left 2020-01-22 15:37:37 -05:00
Suresh, Kamlesh
7c70b0a4a1 remove methods 2020-01-22 15:32:31 -05:00
Suresh, Kamlesh
50f573688f position 2020-01-22 15:15:13 -05:00
Kevin G Christiano
86ce3c9d4f modeling entryField 2020-01-22 14:51:27 -05:00
Suresh, Kamlesh
61edfcc747 fixes 2020-01-22 14:51:17 -05:00
Suresh, Kamlesh
791138c345 private 2020-01-22 14:36:12 -05:00
Suresh, Kamlesh
f438e25556 new registation 2020-01-22 14:34:50 -05:00
Pfeil, Scott Robert
c6ba48397c Add some missing models 2020-01-22 14:31:33 -05:00
Suresh, Kamlesh
a068c0af1b merge 2020-01-22 14:30:00 -05:00
Suresh, Kamlesh
5dafbe6a85 more color 2020-01-22 14:21:48 -05:00
Suresh, Kamlesh
f816081d8e check box 2020-01-22 13:58:56 -05:00
Kevin G Christiano
1eec90e8e1 align model. 2020-01-22 11:57:16 -05:00
Kevin G Christiano
6522472be2 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2020-01-22 11:50:52 -05:00
Kevin G Christiano
f7ce81874e EntryField Models. Updated dropdown for new dropdown. 2020-01-22 11:47:21 -05:00
Pfeil, Scott Robert
d22715585e Eyebrow headline body to link 2020-01-22 11:44:02 -05:00
Xinlei(Ryan) Pan
6a8221ff4d merge from feature/coding 2020-01-22 11:32:25 -05:00
Xinlei(Ryan) Pan
d30f6314a5 remove unneeded property 2020-01-22 11:27:24 -05:00
Chintakrinda, Arun Kumar (Arun)
70c3da70d5 Fixing for comments 2020-01-22 21:53:07 +05:30
Pfeil, Scott Robert
712d18d123 Model organizing 2020-01-22 11:12:07 -05:00
Xinlei(Ryan) Pan
b512db7b92 remove space 2020-01-22 10:52:57 -05:00
Xinlei(Ryan) Pan
ab66cfae3c update method 2020-01-22 10:42:01 -05:00
Xinlei(Ryan) Pan
17983b51f5 merge from feature/coding 2020-01-22 10:29:54 -05:00
Xinlei(Ryan) Pan
85675a1d0e merge feature/coding 2020-01-22 10:24:18 -05:00
Pfeil, Scott Robert
016c6edc06 Cleanup 2020-01-22 10:24:04 -05:00
Xinlei(Ryan) Pan
cd231746cf update link model 2020-01-22 10:16:18 -05:00
Chintakrinda, Arun Kumar (Arun)
5534f6ba58 Checkbox models added
Label action attribute issue fixed
2020-01-22 20:27:14 +05:30
Pfeil, Scott Robert
db0cb77756 Update button to model 2020-01-22 09:22:57 -05:00
Pfeil, Scott Robert
00d1bf7be6 re-organizing 2020-01-22 09:11:56 -05:00
Pfeil, Scott Robert
045cfeb7f9 pull 2020-01-22 09:11:21 -05:00
Suresh, Kamlesh
943799d462 more models 2020-01-21 23:33:24 -05:00
Suresh, Kamlesh
4d155b9f97 ActionModelProtocol 2020-01-21 18:23:32 -05:00
Suresh, Kamlesh
117c112b6b color 2020-01-21 18:13:42 -05:00
Suresh, Kamlesh
8c9cf025c6 Merge branch 'develop' into feature/coding 2020-01-21 16:41:19 -05:00
Pfeil, Scott Robert
74b09fa51d name change 2020-01-21 15:47:02 -05:00
Xinlei(Ryan) Pan
25db4b1e14 update link based on naming change 2020-01-21 15:40:45 -05:00
Xinlei(Ryan) Pan
eb1cc491b3 Merge branch 'feature/coding' into feature/link 2020-01-21 15:38:28 -05:00
Pfeil, Scott Robert
03a907a39b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-21 15:33:37 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Xinlei(Ryan) Pan
01780e708f update link 2020-01-21 15:33:10 -05:00
Xinlei(Ryan) Pan
b24745fd89 merge from feature/coding 2020-01-21 15:22:15 -05:00
Suresh, Kamlesh Jain
be710bfb0e Merge branch 'feature/HeadLineBodyCaretLinkImage_alignment_issues' into 'feature/coding'
Feature/head line body caret link image alignment issues

See merge request BPHV_MIPS/mvm_core_ui!229
2020-01-21 13:55:30 -05:00
Pfeil, Scott Robert
b158e07383 Merge branch 'bugfix/custom_access_internal' into 'develop'
AccessibilityCustomAction requires more than an empty string.

See merge request BPHV_MIPS/mvm_core_ui!228
2020-01-21 13:55:19 -05:00
Pfeil, Scott Robert
747132f72d Merge branch 'bugfix/label_layout_constraint_fix' into 'feature/coding'
Bugfix/label layout constraint fix

See merge request BPHV_MIPS/mvm_core_ui!227
2020-01-21 13:54:30 -05:00
Khan, Arshad
8e28403480 alignment fixes and progressBar mapping change. 2020-01-21 23:44:31 +05:30
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
Murugan, Vimal
4760c10c8d removed comment 2020-01-21 21:51:22 +05:30
Kevin G Christiano
cedcc6b099 AccessibilityCustomAction requires more than an empty string. 2020-01-21 10:24:20 -05:00
Xinlei(Ryan) Pan
5b92e64507 Merge branch 'develop' into feature/disable_chatbot 2020-01-21 10:04:38 -05:00
Murugan, Vimal
fffb04e5e1 avoid negative value 2020-01-21 20:31:02 +05:30
Murugan, Vimal
13cc6bf209 removed padding 2020-01-21 17:11:00 +05:30
Murugan, Vimal
8c373ebfa4 index update 2020-01-21 16:56:30 +05:30
Murugan, Vimal
d3c6448053 fix for separator 2020-01-20 14:50:53 +05:30
Murugan, Vimal
a76fb75200 crash fix 2020-01-20 11:53:22 +05:30
Xinlei(Ryan) Pan
0c7726bcc3 fix caretbutton 2020-01-17 17:32:32 -05:00
Pfeil, Scott Robert
e0ec089c93 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-17 16:32:06 -05:00
Pfeil, Scott Robert
332e05f8a5 fix to wrong model 2020-01-17 16:32:00 -05:00
Pfeil, Scott Robert
299a519e20 Default alignment fix 2020-01-17 15:56:48 -05:00
Pfeil, Scott Robert
20dbbc0829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-17 14:55:07 -05:00
Suresh, Kamlesh
9e066be3fa setDefaultCustom 2020-01-17 14:53:23 -05:00
Suresh, Kamlesh
c2f3a7a2db primary button and top bottom pin 2020-01-17 14:31:32 -05:00
Suresh, Kamlesh
69c86c4479 flip button position 2020-01-17 14:15:37 -05:00
Suresh, Kamlesh
dc19d850c1 setDefaultCustom 2020-01-17 14:12:51 -05:00
Suresh, Kamlesh
9e789e2312 secondary 2020-01-17 14:11:37 -05:00
Suresh, Kamlesh
19d3b960ae button alignment 2020-01-17 14:10:26 -05:00
Pfeil, Scott Robert
d80ae0bd04 more label fix 2020-01-17 14:07:31 -05:00
Pfeil, Scott Robert
6aba575703 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-17 14:01:17 -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
Suresh, Kamlesh
401370f976 toggle action 2020-01-17 12:03:31 -05:00
Suresh, Kamlesh
f1fd5c89fc Merge branch 'feature/doughnutchart_from_coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-17 11:04:46 -05:00
Suresh, Kamlesh
13dbb28357 caret title 2020-01-17 11:04:35 -05:00
Khan, Arshad
017dc1d002 secondary button top alignment fix, which was breaking all BAU secondary buttons. 2020-01-17 21:32:49 +05:30
Pfeil, Scott Robert
d26d3b1e40 merge 2020-01-17 09:32:58 -05:00
Pfeil, Scott Robert
d8a7efde8a undo register change 2020-01-16 20:57:17 -05:00
Suresh, Kamlesh
54cc1f5426 registerModels() 2020-01-16 19:48:14 -05:00
Pfeil, Scott Robert
8209101b73 hot fix 2020-01-16 18:54:01 -05:00
Suresh, Kamlesh
48a8f4aba8 Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-16 17:36:09 -05:00
Suresh, Kamlesh
4dde423d2f button fixes 2020-01-16 17:32:00 -05:00
Suresh, Kamlesh
e326ba9a47 Merge branch 'feature/doughnutchart_from_coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-16 16:48:09 -05:00
Suresh, Kamlesh
3cfe5aa423 StackModel 2020-01-16 16:47:53 -05:00
Xinlei(Ryan) Pan
b1abe0810c put clockwise into method 2020-01-16 16:43:16 -05:00
Xinlei(Ryan) Pan
36cbccd39c update name 2020-01-16 16:30:05 -05:00
Pfeil, Scott Robert
cb89795b4c remove ! 2020-01-16 16:17:36 -05:00
Pfeil, Scott Robert
7d5bee5654 Label fix 2020-01-16 15:51:15 -05:00
Pfeil, Scott Robert
0529c9d357 merge 2020-01-16 15:03:16 -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
Pan, Xinlei (Ryan)
b876d81922 two button view's internal spacing constraint change for a huge height bug 2020-01-16 14:29:30 -05:00
Suresh, Kamlesh
71efaa9026 alignment 2020-01-16 13:51:55 -05:00
Suresh, Kamlesh
9bf9d71195 optional 2020-01-16 13:30:30 -05:00
Xinlei(Ryan) Pan
e3b0b43272 update link method 2020-01-16 10:30:20 -05:00
Xinlei(Ryan) Pan
56b37255c2 merge from feature/coding 2020-01-16 09:59:14 -05:00
Suresh, Kamlesh
de27398c49 leftRightLabelView 2020-01-15 18:59:48 -05:00
Suresh, Kamlesh
ef1215c130 merge 2020-01-15 18:37:36 -05:00
Suresh, Kamlesh
d69dbc41d0 fixes 2020-01-15 18:27:56 -05:00
Xinlei(Ryan) Pan
5d1ef7161d update to cgcolor directly 2020-01-15 17:03:09 -05:00
Suresh, Kamlesh
47ccd681ae merge 2020-01-15 16:49:42 -05:00
Pfeil, Scott Robert
ebd1128ffe Merge branch 'feature/hero_check' into 'feature/coding'
caret fix.

See merge request BPHV_MIPS/mvm_core_ui!222
2020-01-15 16:37:34 -05:00
Pan, Xinlei (Ryan)
e95afdc249 update color 2020-01-15 16:36:13 -05:00
Xinlei(Ryan) Pan
e5accc7611 update height 2020-01-15 13:54:31 -05:00
Xinlei(Ryan) Pan
00d78cfded update label frame 2020-01-15 13:53:54 -05:00
Xinlei(Ryan) Pan
9329f0ca15 update left and right padding 2020-01-15 13:28:40 -05:00
Kevin G Christiano
388d88b47c autorResiszing exception. 2020-01-15 13:13:15 -05:00
Kevin G Christiano
703e0cd32b Convenience to access cgColor. 2020-01-15 12:38:31 -05:00
Pfeil, Scott Robert
a318b19410 Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-15 10:41:53 -05:00
Pfeil, Scott Robert
74eea1ac2d Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 21:10:40 -05:00
Pfeil, Scott Robert
9a01d9de5b merge 2020-01-14 21:09:55 -05:00
Pfeil, Scott Robert
952c3bdb53 Toggle model temporary 2020-01-14 21:08:48 -05:00
Pfeil, Scott Robert
8936f510b2 temporary change to match 2020-01-14 20:35:53 -05:00
Pfeil, Scott Robert
a737b3b94c Remove adding view constraining view 2020-01-14 20:23:14 -05:00
Pfeil, Scott Robert
76b14f6e8e fix typo 2020-01-14 20:20:02 -05:00
Suresh, Kamlesh
c3433c2f80 merge 2020-01-14 19:29:37 -05:00
Pfeil, Scott Robert
f87ddf3448 name update 2020-01-14 18:41:54 -05:00
Pfeil, Scott Robert
9477218d78 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 18:35:35 -05:00
Pfeil, Scott Robert
e85270d038 new molecules to model 2020-01-14 18:33:34 -05:00
Pfeil, Scott Robert
7723ffb260 verbose errors 2020-01-14 17:40:51 -05:00
Pfeil, Scott Robert
fc2326e9a8 button size 2020-01-14 16:32:42 -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
Pfeil, Scott Robert
27793931f5 fix for static functions 2020-01-14 15:55:18 -05:00
Suresh, Kamlesh
5560084c1d Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 15:52:16 -05:00
Suresh, Kamlesh
147ce53c90 name for class 2020-01-14 15:50:46 -05:00
Pfeil, Scott Robert
3d2fd02ac5 undo view constraining removal code
fix molecule table cell
fix corner labels
2020-01-14 13:58:18 -05:00
Pfeil, Scott Robert
a204603616 temp corner labels fix 2020-01-14 12:19:26 -05:00
Pfeil, Scott Robert
979718d4b8 Defaults, percent fix 2020-01-14 11:56:50 -05:00
Murugan, Vimal
31aabef3ae Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 21:57:12 +05:30
Pfeil, Scott Robert
7790a20ad3 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 11:18:31 -05:00
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Suresh, Kamlesh
0090b686a5 default stryle and spacing 2020-01-14 11:11:28 -05:00
Murugan, Vimal
46b37a5f56 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 20:50:24 +05:30
Murugan, Vimal
7e38657b63 review comments updated
models updated
2020-01-14 20:48:15 +05:30
Pfeil, Scott Robert
9c0bea033c actionType fix 2020-01-14 10:13:19 -05:00
Pfeil, Scott Robert
77af932f5d update old key 2020-01-14 09:26:04 -05:00
Murugan, Vimal
36a469ab6b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 19:42:33 +05:30
Pfeil, Scott Robert
447df655df make the error throwable 2020-01-14 09:12:09 -05:00
Kevin G Christiano
874addef63 Changed name. New disabled KV. mild updates. 2020-01-14 09:06:39 -05:00
Pfeil, Scott Robert
198ebe722b missed name change 2020-01-14 08:59:58 -05:00
Pfeil, Scott Robert
461a51d880 stack item change decoding 2020-01-13 22:18:40 -05:00
Pfeil, Scott Robert
96d533780f update multi progress to match color 2020-01-13 21:25:24 -05:00
Pfeil, Scott Robert
145b9d5423 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 21:16:03 -05:00
Pfeil, Scott Robert
6b7bb180fc corner labels temporary 2020-01-13 21:15:21 -05:00
panxi
cd3555466f remove duplicate 2020-01-13 17:18:49 -05:00
panxi
a6dc16889c fix error from merging 2020-01-13 17:07:16 -05:00
panxi
53e00a7654 Merge branch 'feature/coding' into feature/unordered_numbered_list_from_coding 2020-01-13 17:03:00 -05:00
Kevin G Christiano
32f85dfbf1 renamed func. changed location of action. 2020-01-13 16:30:29 -05:00
Kevin G Christiano
3d2137fc11 Now subclassing Button. 2020-01-13 16:19:49 -05:00
Kevin G Christiano
aea8bc5f7b Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 16:02:18 -05:00
Kevin G Christiano
d7844d607e space. 2020-01-13 16:00:00 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Kevin G Christiano
8490ef3572 enabled/disabled colors. 2020-01-13 15:46:50 -05:00
Pfeil, Scott Robert
4437338620 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:29:07 -05:00
Pfeil, Scott Robert
5c2f93e06f move register to init for now
dash line update temporary for legacy
2020-01-13 15:28:53 -05:00
Pfeil, Scott Robert
f64424a2c5 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:27:27 -05:00
Pfeil, Scott Robert
57753f6697 Change keys 2020-01-13 15:26:51 -05:00
Kevin G Christiano
edddac84a8 Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:59:46 -05:00
Pfeil, Scott Robert
9a18346fca Merge branch 'feature/button' into 'develop'
Translates MFCustomButton to Button

See merge request BPHV_MIPS/mvm_core_ui!205
2020-01-13 14:51:05 -05:00
Kevin G Christiano
ad4eddb450 some class is using a xib. 2020-01-13 14:43:16 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Kevin G Christiano
8ff92b5cc0 one line, truncation. 2020-01-13 14:31:04 -05:00
Ryan
595cc04ec0 merge from feature/coding 2020-01-13 14:18:47 -05:00
Ryan
a2d5474b10 merge feature/coding 2020-01-13 14:12:16 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Murugan, Vimal
e6079eab55 updated model 2020-01-14 00:11:41 +05:30
Murugan, Vimal
ec451d1f2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 00:04:39 +05:30
Kevin G Christiano
0b87ff254b Merge branch 'develop' into feature/link 2020-01-13 13:32:21 -05:00
Kevin G Christiano
5ce8446be2 Updating Link class. adding identifier to molecule mapping. 2020-01-13 13:31:25 -05:00
Kevin G Christiano
9882528b9e Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 12:50:08 -05:00
Kevin G Christiano
b79ddf7346 additions for accessibility. 2020-01-13 12:45:49 -05:00
Pfeil, Scott Robert
788145332f Two button view temporary model fix
primary button model
2020-01-13 12:44:05 -05:00
Murugan, Vimal
be094b3cf9 review comments updated 2020-01-13 22:49:51 +05:30
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00
Pfeil, Scott Robert
73c19383b6 Scroller update 2020-01-13 11:08:58 -05:00
Kevin G Christiano
f81b50d077 Merge branch 'develop' into feature/swiftified_textField 2020-01-13 11:05:31 -05:00
Pfeil, Scott Robert
3edb1a583f module molecule update 2020-01-13 10:53:52 -05:00
Pfeil, Scott Robert
1feee6aa9a three layer model fix 2020-01-13 10:48:35 -05:00
Pfeil, Scott Robert
824e077097 stack model fixes 2020-01-13 10:46:18 -05:00
Pfeil, Scott Robert
f9620e4bc7 List template fix 2020-01-13 10:40:53 -05:00
Pfeil, Scott Robert
fe9131f3c6 update json func 2020-01-13 10:22:04 -05:00
Pfeil, Scott Robert
1b06d7007b circle progress 2020-01-13 10:20:11 -05:00
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
Murugan, Vimal
b4859988c2 set with json removed 2020-01-13 19:52:04 +05:30
Kevin G Christiano
85f210abe8 Accessibility fixes. 2020-01-13 08:49:51 -05:00
Murugan, Vimal
396c22f243 doughnut chart model added
doughnut chart view added
doughnut chart added
2020-01-11 16:06:25 +05:30
Murugan, Vimal
30d864749a unordered list added
numbered list added
2020-01-11 10:30:40 +05:30
Pan, Xinlei (Ryan)
a2ef7e026f Merge branch 'feature/headline_body_caret_link_image_molecule' into 'develop'
Feature/headline body caret link image molecule

See merge request BPHV_MIPS/mvm_core_ui!212
2020-01-10 11:38:32 -05:00
panxi
c4112665d9 add bottom padding 2020-01-10 11:35:29 -05:00
Khan, Arshad
7a48633cce Implemented Ryan's feedback, as Prateek is out of office for next week. 2020-01-10 10:59:13 -05:00
Pfeil, Scott Robert
90d7b188d1 each template must parse themselves... 2020-01-10 09:55:42 -05:00
Pfeil, Scott Robert
99a258c0f8 Template associated type testing 2020-01-10 08:57:56 -05:00
Arora, Prateek
61d36b25a7 Code changes 2020-01-10 11:04:07 +05:30
Pfeil, Scott Robert
629f30e073 container updates 2020-01-09 16:38:14 -05:00
Pfeil, Scott Robert
c098914309 pull 2020-01-09 16:37:54 -05:00
Pfeil, Scott Robert
826cb7f284 container change footer 2020-01-09 16:28:00 -05:00
Pfeil, Scott Robert
7fb22648c0 Container updates 2020-01-09 16:27:02 -05:00
panxi
83b0a55404 merge from feature/coding 2020-01-09 16:22:47 -05:00
panxi
99b97fd934 merge from develop 2020-01-09 16:17:29 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Suresh, Kamlesh
49a7df70e1 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 16:00:09 -05:00
Suresh, Kamlesh
8d2348fe63 swiftify MoleculeDelegateProtocol 2020-01-09 15:59:56 -05:00
Pfeil, Scott Robert
0e6a2202ea Remove old file 2020-01-09 15:51:42 -05:00
Kevin G Christiano
0b9f641d87 reset super. 2020-01-09 15:43:10 -05:00
Kevin G Christiano
47b82f7e87 date formatting exposure. 2020-01-09 15:32:35 -05:00
Suresh, Kamlesh
c8f8f8136d model changes 2020-01-09 15:11:03 -05:00
Pfeil, Scott Robert
40def6e19b control default 2020-01-09 14:30:25 -05:00
Pfeil, Scott Robert
b3b37db848 remove deprecated 2020-01-09 14:26:26 -05:00
Suresh, Kamlesh
e310a2b74e Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 14:22:03 -05:00
Pfeil, Scott Robert
f6c3a02f0e remove old extension 2020-01-09 14:20:58 -05:00
Kevin G Christiano
6b983d2f69 Moved out. 2020-01-09 14:11:50 -05:00
Pfeil, Scott Robert
78461d0557 CaretLink 2020-01-09 13:48:35 -05:00
Suresh, Kamlesh
dba412c7d9 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 13:45:27 -05:00
Suresh, Kamlesh
2365a2fab4 fixes 2020-01-09 13:45:17 -05:00
Kevin G Christiano
4c078d607c access didits. 2020-01-09 13:34:37 -05:00
panxi
c8fcbeaefd update right panel view controller 2020-01-09 12:47:03 -05:00
Kevin G Christiano
371fb148d1 altered constraint. 2020-01-09 12:09:33 -05:00
Arora, Prateek
b037d23adb Code changes 2020-01-09 22:25:53 +05:30
Pfeil, Scott Robert
3e8b69a0bc Line and image update 2020-01-09 11:38:32 -05:00
Pfeil, Scott Robert
d651fb5783 Dash line color require for model, optional for server 2020-01-09 11:00:00 -05:00
Pfeil, Scott Robert
f40335ce19 progress, multi progress, caret 2020-01-09 10:46:00 -05:00
Arora, Prateek
20f62ce4c5 Code clean 2020-01-09 20:10:39 +05:30
Arora, Prateek
b8a162da54 Code cleaning removing duplicate constraint 2020-01-09 20:10:17 +05:30
Chintakrinda, Arun Kumar (Arun)
0ca77eadc2 Chatbot disable to BD users 2020-01-09 18:24:18 +05:30
Arora, Prateek
7b49224abd Caret link bottom spacing 2020-01-09 18:19:52 +05:30
Arora, Prateek
03aeb1fc63 headline body width 85% having max as 350px 2020-01-09 16:35:56 +05:30
Arora, Prateek
67304b7657 Changes as suggested by Ryan 2020-01-09 13:26:09 +05:30
Suresh, Kamlesh
54d0ea3e5c ModuleMolecule fixes 2020-01-08 16:50:47 -05:00
Pfeil, Scott Robert
b97416e7d6 Multip progress 2020-01-08 16:45:42 -05:00
Pfeil, Scott Robert
b3f10ec1c6 Fix stack 2020-01-08 16:25:35 -05:00
Kevin G Christiano
efc163ab38 no com 2020-01-08 15:08:31 -05:00
Kevin G Christiano
a99dd7f0a6 removed isSelected. 2020-01-08 14:46:40 -05:00
Kevin G Christiano
62c637f02b Merge branch 'develop' into feature/swiftify_switch 2020-01-08 14:39:49 -05:00
Pfeil, Scott Robert
d4c9753041 Percent 2020-01-08 14:27:10 -05:00
Kevin G Christiano
e674fe4d94 Adding protocols, comments, and mild reworks. 2020-01-08 14:19:37 -05:00
Kevin G Christiano
468f58b88e Merge branch 'develop' into feature/button 2020-01-08 13:34:31 -05:00
Pfeil, Scott Robert
2e514a7de5 Colors 2020-01-08 13:22:45 -05:00
Kevin G Christiano
e8f52cd75a execute if no text. 2020-01-08 13:13:17 -05:00
Kevin G Christiano
b6cb83a146 Merge branch 'develop' into feature/swiftified_textField 2020-01-08 13:08:46 -05:00
Suresh, Kamlesh Jain
f0c7fbcb9e Merge branch 'feature/textfield_list_update_drop_down' into 'develop'
Feature/textfield list update drop down

See merge request BPHV_MIPS/mvm_core_ui!211
2020-01-08 11:58:08 -05:00
Kevin G Christiano
55b38e48ef Remove asynchronous statement which was preventing proper redrawing. 2020-01-08 11:42:17 -05:00
Pfeil, Scott Robert
b620a533d5 Color
CaretLink model change name
2020-01-08 11:22:34 -05:00
Kevin G Christiano
dfa2fa3343 Ensure that isEnabled only triggers when false. Preventing isEnabled from changing isON. 2020-01-08 11:03:44 -05:00
Kevin G Christiano
14f49882b1 Big Self. 2020-01-08 10:44:36 -05:00
Kevin G Christiano
4a49c40b19 Using pointInside from Control. 2020-01-08 10:28:37 -05:00
Kevin G Christiano
a88bb1e0ff Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI/BaseClasses/Control.swift
2020-01-08 10:19:01 -05:00
Kevin G Christiano
84462a197e changed comment. 2020-01-08 09:37:47 -05:00
Kevin G Christiano
2d0377acfc small format. 2020-01-08 09:30:55 -05:00
Kevin G Christiano
7d2770356b Merge branch 'develop' into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-08 09:29:52 -05:00
Kevin G Christiano
2abd6a866a Explaining use case of Color. 2020-01-08 09:28:54 -05:00
Arora, Prateek
203484b288 Code clean 2020-01-08 18:49:36 +05:30
Arora, Prateek
0226eb2cac Review comments : added default padding 2020-01-08 18:46:02 +05:30
Arora, Prateek
4c60ea2f1f Review comment changes 2020-01-08 14:53:59 +05:30
Arora, Prateek
c908606b79 Review Comment Changes 2020-01-08 13:08:09 +05:30
Arora, Prateek
f32cc7d05c Code cleaning 2020-01-08 12:21:28 +05:30
Kevin G Christiano
916f63240b Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-07 16:14:42 -05:00
Kevin G Christiano
2ec963e2b6 latest changes of pr. 2020-01-07 16:08:53 -05:00
Pfeil, Scott Robert
90f388ffa7 Merge branch 'feature/appleguidelinesprotocol' into 'develop'
Created Protocol to centralize tap detection logic.

See merge request BPHV_MIPS/mvm_core_ui!207
2020-01-07 15:56:12 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Kevin G Christiano
30bb405b3f Merge branch 'develop' into feature/swiftified_textField 2020-01-07 11:36:38 -05:00
Kevin G Christiano
05b3f78853 dropping extraneous top and bottom constraints. 2020-01-07 11:36:14 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Arora, Prateek
d891d7ba1a Code cleaning 2020-01-07 19:29:26 +05:30
Arora, Prateek
129a0e9241 New molecule -> headLineBodyCaretLinkImage 2020-01-07 12:34:29 +05:30
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Khan, Arshad
bf0b2ecb79 changed separator style to thin 2020-01-06 16:49:03 +05:30
Murugan, Vimal
f1f34b2893 textfield list view and textfield list form controller been moved to mobilefirstframework 2020-01-04 14:26:09 +05:30
Kevin G Christiano
dc201022ea changed comment. 2020-01-03 14:15:22 -05:00
Murugan, Vimal
709277362f updated constraints 2020-01-03 20:20:23 +05:30
Murugan, Vimal
dd49c43946 code cleanup 2020-01-03 20:18:30 +05:30
Khan, Arshad
c4fbf57890 MOBFIRST-19249 : List Item Style Updates
Adding shortDivider and tallDivider style.
Removing header style.
2020-01-03 19:52:10 +05:30
Murugan, Vimal
e5ca7b5c9e bullet list molecule added 2020-01-02 21:33:31 +05:30
Pfeil, Scott Robert
58c4a7fd8d merge 2020-01-02 09:34:29 -05:00
Pfeil, Scott Robert
5a8584342a merge 2020-01-02 09:31:58 -05:00
Murugan, Vimal
ccc535360c protocol implementation 2019-12-27 13:02:13 +05:30
Murugan, Vimal
1d843ae29a main thread update
access modifier update
2019-12-26 19:33:37 +05:30
panxi
e36d487d32 change model name to containerModel to avoid compiling error 2019-12-20 15:00:42 -05:00
panxi
ca1a6f8c83 merge from develop 2019-12-20 14:59:44 -05:00
Kevin G Christiano
fbc6e83038 Created Protocol to centralize tap detection logic. 2019-12-20 13:27:22 -05:00
Suresh, Kamlesh
7b0e423759 conflict 2019-12-20 12:07:59 -05:00
Suresh, Kamlesh
ba76fedff4 fixes 2019-12-20 10:24:36 -05:00
Kevin G Christiano
d2162cb9b6 removed override to conform. 2019-12-20 08:43:13 -05:00
Kevin G Christiano
cf41609210 correcting alignment func. 2019-12-19 16:09:41 -05:00
Kevin G Christiano
a04399516d Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Views/Checkbox.swift
2019-12-19 15:32:57 -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
panxi
bf27d19ae1 change float to cgfloat for nslayoutconstraint 2019-12-19 14:25:26 -05:00
panxi
d17ab73d34 update encode decode method 2019-12-19 14:02:52 -05:00
Robinson, Blake
e11f64f0a4 Changed to optionalStringForKey 2019-12-19 13:41:27 -05:00
Robinson, Blake
87613fb375 Used guard instead of if let because some code after the if let was removed 2019-12-19 13:38:51 -05:00
Robinson, Blake
8d417068a9 Removed heightConstraint-related logic because the heightConstraint was added to increase the tappable area of Link's predecessor, MFTextButton. 2019-12-19 13:13:57 -05:00
Robinson, Blake
6e233e9bab Removes self where unnecessary 2019-12-19 12:23:18 -05:00
Robinson, Blake
7c17889b57 Changed to MVMCoreUIUtility.getWidth() as per pr comments 2019-12-19 12:23:01 -05:00
Kevin G Christiano
f56b08fa0c Merge branch 'develop' into feature/checkboxView_constraints
# Conflicts:
#	MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
2019-12-19 11:21:44 -05:00
Kevin G Christiano
6c9fede0b9 improved reset. 2019-12-19 11:12:59 -05:00
Kevin G Christiano
9e5ccb01a7 removed unused func. 2019-12-19 11:09:18 -05:00
Pan, Xinlei (Ryan)
21da4f960d Merge branch 'feature/container' into 'develop'
Feature/container

See merge request BPHV_MIPS/mvm_core_ui!202
2019-12-19 11:05:58 -05:00
Robinson, Blake
82c76c6084 Removed self where unnecessary 2019-12-19 10:37:57 -05:00
Robinson, Blake
1de7618e5c Changed to MVMCoreUIDelegateObject 2019-12-19 10:36:57 -05:00
Robinson, Blake
6cf4ba0594 Improved swifty-ness of these lines 2019-12-19 10:30:14 -05:00
Robinson, Blake
8f23dd391c Removes disabled logic from Button because it won't be in the actionMap going forward 2019-12-19 10:19:42 -05:00
Pfeil, Scott Robert
dcd0268c5b fix 2019-12-19 10:14:57 -05:00
Pan, Xinlei (Ryan)
2a5219f5b6 Merge branch 'bugfix/progress_bar_double_issue' into 'develop'
progress bar percentage type fix from Float to Double

See merge request BPHV_MIPS/mvm_core_ui!203
2019-12-19 10:14:30 -05:00
Robinson, Blake
2c5e2286b1 Removed line setting title because title won't be part of actionMap in the future 2019-12-19 10:06:54 -05:00
Robinson, Blake
109ef54479 Rewrote ButtonTapBlock in swift 2019-12-19 09:53:09 -05:00
Robinson, Blake
4b855a1a63 Removes unused property heightConstraint 2019-12-19 09:28:41 -05:00
Khan, Arshad
eec15fc65e added comment as per Scott feedback 2019-12-19 19:21:49 +05:30
Robinson, Blake
39c96849c8 Translates MFCustomButton to Button 2019-12-18 17:58:53 -05:00
Kevin G Christiano
37ddf23278 Latest changes to make it better. 2019-12-18 16:12:09 -05:00
Pfeil, Scott Robert
14c608c4a5 Commenting 2019-12-18 16:10:15 -05:00
Pfeil, Scott Robert
46e76f0b47 Further name changes 2019-12-18 16:07:00 -05:00
Suresh, Kamlesh
1db2a5b058 fixes 2019-12-18 12:06:13 -05:00
Khan, Arshad
aff4b75368 Changing to CGFloat, instead of Double as per feedback provided by Ryan.
Root Cause: Swift was treating it as Double, instead of Float.
2019-12-18 22:28:22 +05:30
Khan, Arshad
09a9a6577d Adding new style sectionFooter for listItem molecule.
There are two places in MVA 3.0, where we need 24 pixel spacing on top, zero spacing on bottom and no separator.
2019-12-18 21:36:50 +05:30
Khan, Arshad
95c528b658 progress bar percentage is been treated as Double for two decimal places(Like 54.17) in iOS JSON object, due to that progress percentage is not shown, where as working on Android.
So, changing Float to Double.
2019-12-18 21:20:58 +05:30
Pfeil, Scott Robert
e41f3039e4 Name changes and cleanup 2019-12-17 14:12:04 -05:00
Kevin G Christiano
d8030b178f removed unneeded statement. 2019-12-17 14:07:59 -05:00
Robinson, Blake
f731b56f2e Revert "Make Link subclass from View instead of MFCustomButton"
This reverts commit 439261e4c4.
2019-12-17 10:23:56 -05:00
Pfeil, Scott Robert
cd9e63b992 carousel to container 2019-12-17 09:51:49 -05:00
Kevin G Christiano
77e2269062 Provided an alternative means to provide Codable StackView.Alignment string. 2019-12-17 09:46:47 -05:00
Pfeil, Scott Robert
03f64b0875 Module Molecule update to Container 2019-12-17 09:38:51 -05:00
Pfeil, Scott Robert
dc8910c61d add height constraint 2019-12-16 13:54:52 -05:00
Suresh, Kamlesh
c6d5775d57 CaretButtonModel 2019-12-16 13:51:37 -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
7926a8579c Comment fixes 2019-12-16 10:50:18 -05:00
Kevin G Christiano
1fec5464af feedback independence. 2019-12-16 10:02:41 -05:00
Kevin G Christiano
bcddc0b311 Adjusted validation logic. 2019-12-16 08:53:45 -05:00
Suresh, Kamlesh
b6ccbecdf5 clean up 2019-12-13 17:32:09 -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
panxi
8612b34ac7 update listitem 2019-12-13 11:26:48 -05:00
Suresh, Kamlesh
58ec1abcfe list model protocol 2019-12-13 11:07:32 -05:00
Suresh, Kamlesh
d0196e6e58 Merge branch 'feature/coding' into feature/model_wip_kamlesh 2019-12-12 17:33:03 -05:00
panxi
ce1559dc15 add decode array method 2019-12-12 17:28:02 -05:00
panxi
52186bf089 add protocol func into view 2019-12-12 17:22:26 -05:00
Kevin G Christiano
59008f87d0 Making further improvements from design specs. 2019-12-12 16:47:07 -05:00
panxi
8d811f229f change from viewconstrainingview to view 2019-12-12 15:28:47 -05:00
Robinson, Blake
439261e4c4 Make Link subclass from View instead of MFCustomButton
The bounds of the Link often extend far beyond the width of the button text, which, if MFCustomButton is used, extend the tappable area far beyond the link.
2019-12-12 15:23:30 -05:00
Robinson, Blake
d3dbfdd997 changes size object to private since it shouldn't be accessed from outside the class 2019-12-12 15:01:54 -05:00
Kevin G Christiano
3dd9decfed Removed height constraint. This class will expect text to function properly. 2019-12-12 14:53:52 -05:00
Pfeil, Scott Robert
be1b867a9a testing container ideas 2019-12-12 14:50:52 -05:00
Kevin G Christiano
8804e21d3c New constant. Updated control to work with Apple's design guidelines with control. Updates made to checkbox and checkboxLabel. 2019-12-12 14:42:32 -05:00
Kevin G Christiano
39b752d01b Included reset function. accounted for isAnimated state when changing isOn without animations. 2019-12-12 13:37:18 -05:00
Suresh, Kamlesh
9a4a5139ed fixes 2019-12-12 11:47:33 -05:00
Robinson, Blake
3fc3b6cb0a Removes convenience init since updateView is called by the framework and so does not need to be part of initialization 2019-12-12 10:39:21 -05:00
Pfeil, Scott Robert
e5acf63e6f container testing 2019-12-12 10:03:41 -05:00
Robinson, Blake
3001f1df78 Remove self where it is not necessary for clarity 2019-12-12 10:00:59 -05:00
Robinson, Blake
b8e0fbff75 Removed line spaces 2019-12-12 09:33:03 -05:00
Robinson, Blake
5135835471 Removed UIColor prefix as per code review comments 2019-12-12 09:32:09 -05:00
Robinson, Blake
fb2cade157 Fixed spacing before colon as per code review comment 2019-12-12 09:30:00 -05:00
Kevin G Christiano
3db8cf2c3b Reversed the array to first check views at the front. 2019-12-12 09:27:13 -05:00
Kevin G Christiano
ed18970625 correcting errors. Improving Control. 2019-12-12 09:23:04 -05:00
Kevin G Christiano
639330ad5b More comments. 2019-12-11 16:03:01 -05:00
Kevin G Christiano
98997bfa80 Comments, logical updates, refactoring. 2019-12-11 15:58:18 -05:00
Kevin G Christiano
eab910011e General working order of the Toggle. 2019-12-11 15:10:26 -05:00
Kevin G Christiano
d1ee242ca7 should did action. 2019-12-11 10:47:52 -05:00
Kevin G Christiano
c32a0d71b0 good working state. 2019-12-10 15:58:59 -05:00
Kevin G Christiano
ab0ff64677 General Working order. 2019-12-10 14:38:32 -05:00
Kevin G Christiano
335649860b constraint adjustments. 2019-12-10 11:15:09 -05:00
Kevin G Christiano
83370956c1 movemt,. 2019-12-10 10:34:08 -05:00
Kevin G Christiano
dd47707064 the latest switch. 2019-12-10 08:54:01 -05:00
Kevin G Christiano
b4994b0351 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2019-12-09 15:37:09 -05:00
Kevin G Christiano
2fa4f71d31 cool icon. 2019-12-09 15:37:00 -05:00
Kevin G Christiano
1668fb8c32 More Switch development. 2019-12-09 15:03:53 -05:00
Suresh, Kamlesh
7c7232fe6a remove PageModel 2019-12-09 14:36:14 -05:00
Robinson, Blake
16cc667b02 Expands tappable area of Link 2019-12-09 14:15:55 -05:00
Kevin G Christiano
cbb016406a WIP, putting Switch together. 2019-12-09 13:37:33 -05:00
Kevin G Christiano
a7989c589f Increased the tappable space of the Checkbox. 2019-12-09 11:03:31 -05:00
Suresh, Kamlesh
3a1e3356bf module molecule 2019-12-06 14:30:19 -05:00
Kevin G Christiano
a00fdbad60 Grooming process in converting objc to swift with Switch. 2019-12-05 15:16:46 -05:00
Kevin G Christiano
420a874711 Making container tappabble to increase actionable surface area. 2019-12-05 14:07:53 -05:00
Suresh, Kamlesh
9676f41633 container model protocol 2019-12-04 16:59:02 -05:00
Kevin G Christiano
aaa8e4132e Brought back resizing to checkbox. 2019-12-04 16:25:31 -05:00
Suresh, Kamlesh
b7ff1354b8 clean up 2019-12-04 16:21:10 -05:00
Kevin G Christiano
6b34b8840d Adding values back. 2019-12-04 16:05:41 -05:00
Kevin G Christiano
8a796467e6 Initial state of Swiftified Switch. 2019-12-04 15:50:08 -05:00
Kevin G Christiano
99952db4b3 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2019-12-04 15:28:30 -05:00
Kevin G Christiano
c627901d74 updates to color model and extension. 2019-12-04 15:28:22 -05:00
Suresh, Kamlesh
0288943746 fixes 2019-12-04 14:27:45 -05:00
Pfeil, Scott Robert
a10c1a6161 merge develop 2019-12-04 13:43:24 -05:00
Pfeil, Scott Robert
27f2b00956 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/label_molecule_fonting 2019-12-04 13:10:18 -05:00
Pfeil, Scott Robert
d95e42330e moving files 2019-12-04 13:09:50 -05:00
Hedden, Kyle Matthew
3f9b707d37 Add overtaking indicator to openPanel callback method. 2019-12-04 12:56:38 -05:00
Kevin G Christiano
7e48670179 Adding Model for UIColor and supporting UIColor Extension. 2019-12-04 12:38:57 -05:00
Robinson, Blake
1d647ec662 Code standard change. Removed legacy-like methods. 2019-12-03 15:21:45 -05:00
Suresh, Kamlesh
d00a04831d fixes 2019-12-03 09:19:55 -05:00
Kevin G Christiano
9b53f4bac0 Paired down constraints. Made variables public. Mild formatting. 2019-12-03 09:07:43 -05:00
Kevin G Christiano
b443c4a389 Reducing constraints. 2019-12-02 17:33:06 -05:00
Robinson, Blake
988e30daa9 Creates Link atom to replace MFTextButton 2019-12-02 11:15:50 -05:00
Kevin G Christiano
65586a7568 Adding another location to execute external code. 2019-12-02 11:05:08 -05:00
Kevin G Christiano
5e28b0bdc5 Merge branch 'develop' into feature/swiftified_textField 2019-12-02 10:43:45 -05:00
Kevin G Christiano
2319c4c70f overrdie applied. 2019-12-02 10:43:08 -05:00
Pfeil, Scott Robert
44fd2dffac Merge branch 'bugfix/label_molecule_fonting' into 'develop'
label font bugfix caused by the dissonance between label and styler setting....

See merge request BPHV_MIPS/mvm_core_ui!192
2019-12-02 10:16:42 -05:00
Pfeil, Scott Robert
3e46438fd0 label font bugfix caused by the dissonance between label and styler setting.... 2019-12-02 10:11:04 -05:00
Kevin G Christiano
530397084b Merge branch 'develop' into feature/swiftified_textField 2019-12-02 09:51:09 -05:00
Kevin G Christiano
6a34370083 returned func. 2019-12-02 09:50:30 -05:00
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
Kevin G Christiano
4d3e5544fb Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-12-02 08:57:08 -05:00
Kevin G Christiano
fc7ef567e3 Revised Superclass. 2019-12-02 08:56:58 -05:00
Khan, Arshad
dc5174cbe4 key name mismatch fix. 2019-11-28 20:48:07 +05:30
Pan, Xinlei (Ryan)
ad8b48b699 Merge branch 'feature/dropdown_line_item_legacy' into 'develop'
Feature/dropdown line item legacy

See merge request BPHV_MIPS/mvm_core_ui!190
2019-11-27 21:49:46 -05:00
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -05:00
Suresh, Kamlesh
7a09e4b830 merge 2019-11-27 14:38:01 -05:00
Suresh, Kamlesh
9195f96a68 fixes 2019-11-27 14:29:20 -05:00
Hedden, Kyle Matthew
f5270ae12e remove navigation bar check for manual inset calculation as it impacts presented controllers 2019-11-27 14:03:51 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -05:00
Khan, Arshad
c999f6f777 opening few properties 2019-11-27 21:43:42 +05:30
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Khan, Arshad
f2f9d5d0d7 Adding open to required functions, which need to override in MF component.
Adding mapping for dropDown.
2019-11-27 21:12:41 +05:30
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00
panxi
876a07650b remove space 2019-11-26 14:16:12 -05:00
panxi
1bbad6ca15 fix merge conflict 2019-11-26 14:14:53 -05:00
panxi
269898f566 fix conflicts 2019-11-26 13:57:24 -05:00
panxi
1a5c819a2a fix conflict 2019-11-26 13:55:29 -05:00
panxi
437138007f merge 2019-11-26 13:54:00 -05:00
panxi
b53f7e7786 update 2019-11-26 13:30:06 -05:00
panxi
8422362e77 merge from develop 2019-11-26 11:30:43 -05:00
panxi
25336b0a16 Merge branch 'develop' into feature/models 2019-11-26 11:20:45 -05:00
Pfeil, Scott Robert
1ec603e969 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/dropdown_line_item_legacy 2019-11-26 08:54:47 -05:00
Kevin G Christiano
3654b05773 removed unneeded method. mild changes. 2019-11-25 16:35:28 -05:00
Pfeil, Scott Robert
392ab144ac small fixes 2019-11-25 16:01:43 -05:00
Kevin G Christiano
499b938d56 Merge branch 'develop' into feature/swiftified_textField 2019-11-25 12:28:01 -05:00
Kevin G Christiano
cfffbabe58 identity and callback. 2019-11-25 12:27:32 -05:00
Pfeil, Scott Robert
664d3195bb line fix in header 2019-11-25 09:20:05 -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
ea69ba67ea update array decoding method 2019-11-24 23:14:25 -05:00
Kevin G Christiano
dc8293b08b more refinement of errors. 2019-11-22 14:33:46 -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
Kevin G Christiano
21166bc5f0 Better functioning selection. 2019-11-22 09:20:35 -05:00
Kevin G Christiano
64bda3cb1d wip. 2019-11-21 16:40:34 -05:00
Kevin G Christiano
8b5fe4a1f4 more changes. 2019-11-21 15:21:32 -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
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
095b1d7a86 Merge branch 'feature/modernize' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 13:29:41 -05:00
Pfeil, Scott Robert
e32b9cfdda PR comments 2019-11-20 13:29:16 -05:00
Pfeil, Scott Robert
947af9b3c7 why? 2019-11-20 11:08:30 -05:00
Pfeil, Scott Robert
654be26b2c remove test file 2019-11-20 11:06:47 -05:00
Pfeil, Scott Robert
279dbd9b08 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 10:59:35 -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
Hedden, Kyle Matthew
a714100b73 Merge branch 'release/7_1_0' into 'develop'
Release/7 1 0

See merge request BPHV_MIPS/mvm_core_ui!179
2019-11-19 17:02:45 -05:00
Suresh, Kamlesh
bf20fb3104 fixes 2019-11-19 15:32:35 -05:00
panxi
a409b331c5 revert 2019-11-19 12:56:07 -05:00
panxi
3851ad036a change to equal 2019-11-19 12:53:48 -05:00
panxi
3cb075499e make checkbox expandable 2019-11-19 10:39:30 -05:00
Kevin G Christiano
c38e3c0712 DigitEntry in decent place. 2019-11-19 09:57:43 -05:00
Pfeil, Scott Robert
d29e8ea3bd small changes 2019-11-19 09:18:15 -05:00
Kevin G Christiano
b9850bed81 Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-11-18 17:04:26 -05:00
Kevin G Christiano
df34e1574c latest, updating. 2019-11-18 17:04:16 -05:00
Kevin G Christiano
0cbaf38644 date picker. 2019-11-18 17:03:59 -05:00
Kevin G Christiano
871ca090a0 Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-11-18 15:41:10 -05:00
Kevin G Christiano
1af47ab98d wip. 2019-11-18 15:40:27 -05:00
Kevin G Christiano
1d08842d47 wip. 2019-11-18 15:40:11 -05:00
Kevin G Christiano
9b581a6132 no line. 2019-11-18 14:30:42 -05:00
Kevin G Christiano
588f801322 Adding Base TextField. More improvements. 2019-11-18 14:18:36 -05:00
Suresh, Kamlesh Jain
8376e5c79e Revert "Merge branch 'feature/top_accessory' into 'develop'"
This reverts merge request !175
2019-11-15 16:53:18 -05:00
Suresh, Kamlesh
a865664cff add top accessory view 2019-11-15 16:52:13 -05:00
Suresh, Kamlesh
89cbfe00ba clean up 2019-11-15 12:09:20 -05:00
Suresh, Kamlesh
cd5f66875d Merge branch 'feature/top_accessory' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/top_accessory 2019-11-15 11:42:34 -05:00
Suresh, Kamlesh
84f50f3b80 optimize 2019-11-15 11:42:29 -05:00
Murugan, Vimal
76cd37d121 code cleanup 2019-11-15 21:10:37 +05:30
Kevin G Christiano
92b988d9fb setting up dropdown. 2019-11-15 08:52:29 -05:00
Suresh, Kamlesh
627114ded8 top accessory in tableview controller 2019-11-14 19:27:56 -05:00
Suresh, Kamlesh
f1b8a61e04 top accessory view 2019-11-14 18:15:22 -05:00
Kevin G Christiano
ebccc6bd28 The latest state of entry. 2019-11-14 14:59:39 -05:00
Kevin G Christiano
80c700ba55 Further improvements made to dropdaown. 2019-11-14 11:41:02 -05:00
panxi
478498a9b6 Separate action and molecule name 2019-11-13 18:02:40 -05:00
Kevin G Christiano
fca540afc2 shaping up to be more responsive. 2019-11-13 16:17:10 -05:00
Kevin G Christiano
87b0316d47 save. 2019-11-13 09:23:58 -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
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
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
f9cecb9a5d small code updates 2019-11-11 15:24:10 -05:00
Khan, Arshad
11e549bc50 Feedback implementation impact changes. 2019-11-11 22:47:49 +05:30
Khan, Arshad
f6c2935115 Implemented Scott feedback. 2019-11-11 22:41:24 +05:30
Khan, Arshad
a5186973ae Adding support for secondaryButton, if server dynamically sends only secondary button in TwoButtonView molecule. 2019-11-11 21:27:08 +05:30
Pfeil, Scott Robert
273da70f55 Merge branch 'feature/PPVB_653' into 'develop'
moved top and bottom pin to scrolling view controller

See merge request BPHV_MIPS/mvm_core_ui!169
2019-11-11 09:13:39 -05:00
Khan, Arshad
068c702143 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/make_molecules_info_public 2019-11-11 14:56:38 +05:30
Khan, Arshad
32c04e05ba Making moleculesInfo public for providing flexibility in sub classes.
As of now required for Settings template in MF code.
2019-11-08 23:26:07 +05:30
Murugan, Vimal
14f6861493 moved top and bottom pin to scrolling view controller 2019-11-08 22:11:56 +05:30
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Pfeil, Scott Robert
347ebbed8c typo fixes 2019-11-07 10:05:17 -05:00
Kevin G Christiano
ce0ffeda29 more changes. 2019-11-06 16:06:16 -05:00
Kevin G Christiano
6d7c1df7cc more. 2019-11-06 09:12:18 -05:00
Pfeil, Scott Robert
4a1a196854 typos 2019-11-05 12:32:32 -05:00
Kevin G Christiano
88eec2bf9d carrots and windows. 2019-11-05 09:25:27 -05:00
Pfeil, Scott Robert
5b8fce36e6 merge develop 2019-11-05 09:14:19 -05:00
Pfeil, Scott Robert
a7473e2079 Minor fixes for MFViewController 2019-11-05 09:02:49 -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
Suresh, Kamlesh
37e1cb9e36 changes 2019-11-04 17:24:04 -05:00
Pfeil, Scott Robert
52f31eff42 header changes 2019-11-04 15:34:32 -05:00
Kevin G Christiano
ae5a1c0c02 la. 2019-11-04 14:44:22 -05:00
Kevin G Christiano
bb3277e1ba latest and greatest. 2019-11-04 11:39:32 -05:00
Kevin G Christiano
475d08296b Reworked bezier logic for CaretView. It was not optimal. 2019-11-01 16:15:19 -04: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
5c1d7b4a38 Keeping up appearance. 2019-10-30 16:02:18 -04:00
Kevin G Christiano
9d043edb29 comm. 2019-10-30 12:33:40 -04:00
Kevin G Christiano
8266b3b650 fixed display issues. 2019-10-30 11:36:59 -04:00
Kevin G Christiano
c9b41c9bc1 Latest revision. 2019-10-30 11:23:03 -04:00
Kevin G Christiano
a455511809 reconfig. 2019-10-30 09:58:20 -04:00
Kevin G Christiano
3163e9bb40 Merge branch 'feature/swiftified_textField' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/swiftified_textField 2019-10-30 09:36:15 -04:00
Kevin G Christiano
494df94d3a correction. 2019-10-30 09:35:54 -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
80c277f4e8 Merge branch 'revert-fdaab402' into 'develop'
Revert "Merge branch 'feature/mva_3_0' into 'develop'"

See merge request BPHV_MIPS/mvm_core_ui!163
2019-10-29 16:45:03 -04:00
Pfeil, Scott Robert
2fab14d946 kevin comment 2019-10-29 15:26:43 -04:00
Pfeil, Scott Robert
e98a0ce76b update pr comments 2019-10-29 15:23:44 -04:00
Pfeil, Scott Robert
d901ded4c1 open view up! 2019-10-29 13:56:19 -04:00
Pfeil, Scott Robert
59be22c0e0 enum clean 2019-10-29 13:47:49 -04:00
Kevin G Christiano
d2d4e3d42c hold for now. 2019-10-29 13:40:25 -04:00
Kevin G Christiano
3d98c91e73 better, muchbetter. 2019-10-29 13:26:41 -04:00
Pfeil, Scott Robert
7e810ec334 undo undo 2019-10-29 13:17:40 -04:00
Pfeil, Scott Robert
26dac186dc undo undo 2019-10-29 13:13:35 -04:00
Pfeil, Scott Robert
e5c0191b18 fix to check 2019-10-29 12:30:45 -04:00
Kevin G Christiano
134ba463b9 Merge branch 'develop' into feature/swiftified_textField 2019-10-29 12:21:37 -04:00
Kevin G Christiano
4a5fd4f539 ok. 2019-10-29 12:21:19 -04:00
Pfeil, Scott Robert
75ea4d60f0 commit missed protocol 2019-10-29 12:18:20 -04:00
Pfeil, Scott Robert
d4cacec310 list item separation 2019-10-29 12:05:37 -04:00
Pfeil, Scott Robert
48a940f160 fix to typos 2019-10-29 10:12:59 -04:00
Pfeil, Scott Robert
d196aa3cef Design defects fix 2019-10-29 09:03:19 -04:00
Suresh, Kamlesh
3a32d78004 form validation fixes 2019-10-28 16:25:25 -04:00
Kevin G Christiano
9a578fc6b1 the latest. 2019-10-28 15:51:03 -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
bf073d15e2 com. 2019-10-28 09:50:19 -04:00
Pfeil, Scott Robert
a454d0e3bd Revert "Merge branch 'feature/mva_3_0' into 'develop'"
This reverts merge request !162
2019-10-28 09:31:20 -04:00
Kevin G Christiano
8d1ac1e94a form engtry. 2019-10-28 09:12:38 -04:00
Hedden, Kyle Matthew
a188de84cb Bugfix/gray safe area for fixed buttons 2019-10-28 08:55:44 -04:00
Kevin G Christiano
f14614514d dcdcdd 2019-10-25 15:17:38 -04:00
Khan, Arshad
8ea52a21f7 Rename method name to removeListItem 2019-10-25 23:07:42 +05:30
Khan, Arshad
45b0b01646 implemented feedback 2019-10-25 21:04:53 +05:30
Khan, Arshad
2c622750fb Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-25 13:27:04 +05:30
Khan, Arshad
da8dded2e1 opening HeadlineBodySwitch to reuse in MF 2019-10-25 04:10:24 +05:30
Hedden, Kyle Matthew
ab5bb26c1a fix checkbox crash 2019-10-24 18:00:29 -04:00
Khan, Arshad
355f670bd0 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/mva_3_0 2019-10-25 01:19:33 +05:30
Khan, Arshad
c1adbe2f2e Crash fixes in Label
update molecule name from progressBar to progressbar as per oneconfluence mapping name and Android mapping name.
2019-10-25 01:17:54 +05:30
Kevin G Christiano
5bc78e594e getting ready for the next phase. 2019-10-24 15:43:06 -04:00
Kevin G Christiano
70a3ad2804 latest. no errs. 2019-10-24 13:51:19 -04:00
Kevin G Christiano
15c2050c4e Merge branch 'develop' into feature/swiftified_textField 2019-10-24 11:20:49 -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
Pfeil, Scott Robert
5f6c583094 Merge branch 'bugfix/legacy_view_constraining' into 'develop'
Bugfix/legacy view constraining

See merge request BPHV_MIPS/mvm_core_ui!159
2019-10-24 09:36:36 -04:00
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
Kevin G Christiano
393b3f355b lztest greatest. 2019-10-24 09:08:53 -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
Kevin G Christiano
a5ffae9edd Latest state. 2019-10-23 15:15:23 -04:00
Suresh, Kamlesh
73342e40d1 code optimization 2019-10-23 14:51:35 -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
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
Kevin G Christiano
64f4356a74 Merge branch 'develop' into feature/swiftified_textField 2019-10-22 09:52:47 -04:00
Kevin G Christiano
2ce41ad74b moar texht. 2019-10-22 09:52:12 -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
Kevin G Christiano
4742eace6b Merge branch 'develop' into feature/swiftified_textField 2019-10-21 12:12:19 -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
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
929b825e11 more to uopdate. 2019-10-18 10:26:47 -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
Kevin G Christiano
d2fddaf769 latest textfield development. 2019-10-17 11:42:34 -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
Kevin G Christiano
d0264d45eb funcational, 2019-10-16 16:27:27 -04:00
Kevin G Christiano
19310bff89 generally functioning. some loose ends with TextField. 2019-10-16 13:51:55 -04:00
Kevin G Christiano
7e1d23db3d latest text. 2019-10-16 10:43:45 -04:00
Kevin G Christiano
e92616a7f5 latest state. 2019-10-15 13:46:50 -04:00
Kevin G Christiano
208577b0a1 small stuff. 2019-10-14 15:36:30 -04:00
Kevin G Christiano
7f6181c1bd Merge branch 'develop' into feature/swiftified_textField 2019-10-14 15:31:57 -04:00
Kevin G Christiano
d4154ab0d2 removed view. renamed. 2019-10-14 15:31:28 -04:00
Kevin G Christiano
403f0b261b Major swiftification of MFTextField to TextField. 2019-10-14 15:24:48 -04:00
Kevin G Christiano
10692ee21e more changes. 2019-10-13 12:00:36 -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
Kevin G Christiano
d4df5745f4 Further swiftification. 2019-10-11 13:23:49 -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
ef2e177b33 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-11 12:38:20 -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
d54c63b019 beginning to convert the code. 2019-10-04 11:39:37 -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
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
4915bda4b9 Beginning stages of swiftification. 2019-10-03 10:44:56 -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
Kevin G Christiano
52387fe9c9 Merge branch 'develop' into feature/label_hero_character 2019-09-17 16:37:50 -04:00
Kevin G Christiano
fc4fcc25f6 Current take on hero. Needs to be refactored and placed into a protocol. 2019-09-17 16:37:27 -04:00
Kevin G Christiano
b9e80398c1 Decent palce. 2019-09-17 09:41:14 -04:00
Murugan, Vimal
44ebfb9294 fix for cxtdt_28106 2019-09-17 16:25:00 +05:30
Kevin G Christiano
6f4db10d33 beginning work on hero. 2019-09-16 10:24:18 -04:00
Kevin G Christiano
bbdb0301eb Further checkbox setups. 2019-09-16 09:50:35 -04:00
Khan, Arshad
b51f1b82f5 adding action block, which should only call after user interaction, but not at the time of initial loading.
Fixing apple crash, where even after deletion, apple not updating number of rows, which is leading to index out of bounds crash.
Adding remove list item method which has specific molecule inside.
2019-09-14 04:55:40 +05:30
Suresh, Kamlesh
daed451c7a improvements 2019-09-13 15:25:13 -04:00
Kevin G Christiano
8238a42177 Added the new classes. 2019-09-13 12:28:34 -04:00
Kevin G Christiano
cdc7ae2f1e added layoutMarginsGuide. 2019-09-13 09:08:33 -04:00
Kevin G Christiano
ad1def8ddc changed default state name. 2019-09-12 16:38:18 -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)
52679e95f3 Merge branch 'bugfix/constraining_molecules' into 'develop'
alignment fix issues.

See merge request BPHV_MIPS/mvm_core_ui!133
2019-09-12 09:51:14 -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
eac6bf3aa3 impreovements 2019-09-11 15:56:24 -04:00
Suresh, Kamlesh
eb3b1a0e81 initial 2019-09-11 11:05:57 -04:00
panxi
f69fe85d83 update based on Scott's comment 2019-09-11 10:19:03 -04:00
panxi
358842e433 update based on Scott's comment 2019-09-11 10:04:19 -04:00
panxi
d52e204721 update multiprogressbar 2019-09-10 15:57:00 -04:00
Pfeil, Scott Robert
4050b784ed alignment fix issues. 2019-09-10 14:11:09 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
panxi
595a3b1e38 fix typo 2019-09-09 16:49:12 -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
814d470775 Merge branch 'feature/label_accessibility' into 'develop'
Label Accessibility

See merge request BPHV_MIPS/mvm_core_ui!96
2019-09-05 13:53:56 -04:00
Pfeil, Scott Robert
7a85b46ff0 Merge branch 'bugfix/cxtdt-25160' into 'develop'
Adds nil check on contentColor to account for future possibility of...

See merge request BPHV_MIPS/mvm_core_ui!127
2019-09-05 12:50:34 -04:00
Kevin G Christiano
36595efb90 Merge branch 'develop' into feature/label_accessibility 2019-09-05 11:22:13 -04:00
Kevin G Christiano
33754802bb Latest changes. Now including clause changes. 2019-09-05 11:20:55 -04:00
Robinson, Blake
5adce50053 Removed comment and used ternary operator based on code review 2019-09-05 10:28:50 -04:00
Murugan, Vimal
63322a7d24 updated the file 2019-09-05 19:00:07 +05:30
Murugan, Vimal
11db27de88 space updated 2019-09-05 18:54:35 +05:30
Murugan, Vimal
a3e60ef4ac controller reference updated for getting correct width 2019-09-05 18:53:18 +05:30
Murugan, Vimal
e5a66dc1a3 width update for calculate correct height 2019-09-05 14:53:42 +05:30
Pfeil, Scott Robert
0faabb8f17 Merge branch 'feature/styles' into 'develop'
Style

See merge request BPHV_MIPS/mvm_core_ui!129
2019-09-04 15:15:00 -04:00
Suresh, Kamlesh
c8611ca83a fixes 2019-09-04 14:39:19 -04:00
Kevin G Christiano
a6e732afa9 Merge branch 'develop' into feature/label_accessibility
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-09-04 14:08:10 -04:00
Pfeil, Scott Robert
3ff48cf700 Style 2019-09-04 13:45:41 -04:00
Kevin G Christiano
556e70db2f Merge branch 'develop' into feature/label_export_box 2019-09-04 13:05:04 -04:00
Kevin G Christiano
880b3fbd3c Merge branch 'feature/label_accessibility' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/label_accessibility 2019-09-04 13:04:51 -04:00
Kevin G Christiano
11b92ac428 Merge branch 'develop' into feature/label_accessibility 2019-09-04 13:04:41 -04:00
Robinson, Blake
a3757adacd Adds nil check on contentColor to account for future possibility of contentColor having a value in this situation, which would a different tintColor on the button. 2019-09-04 11:25:23 -04:00
Thirukamu, Ravivarma
1a23ca6e27 Adding outlet view in h file for global access. 2019-09-04 11:17:04 -04:00
Thirukamu, Ravivarma
6883f1a61c Revert "changing mftextfield background to clear color."
This reverts commit 1bf69cb505.
2019-09-04 11:07:18 -04:00
Thirukamu, Ravivarma
1bf69cb505 changing mftextfield background to clear color. 2019-09-04 10:59:03 -04:00
Kevin G Christiano
8a74886928 fixed commed. 2019-09-04 09:58:46 -04:00
Kevin G Christiano
9b5b256594 Fixes Alert view color issue. 2019-09-04 09:55:05 -04:00
Kevin G Christiano
81490ae3cf Moved line. 2019-09-04 09:04:02 -04:00
Kevin G Christiano
b7d76eb015 Merge branch 'develop' into feature/label_export_box 2019-09-04 09:00:45 -04:00
Pan, Xinlei (Ryan)
a80b68dc14 Merge branch 'bugfix/secondary_button_color' into 'develop'
border the button

See merge request BPHV_MIPS/mvm_core_ui!124
2019-09-03 17:31:31 -04:00
Pan, Xinlei (Ryan)
81f6a36ec6 Merge branch 'feature/accordion_list_item' into 'develop'
Feature/accordion list item

See merge request BPHV_MIPS/mvm_core_ui!123
2019-09-03 17:16:03 -04:00
Pfeil, Scott Robert
2fd55f0aff border the button 2019-09-03 17:12:17 -04:00
Pfeil, Scott Robert
ea13603b7d font update 2019-09-03 16:52:10 -04:00
Kevin G Christiano
b32cbd8566 objc. 2019-09-03 16:09:55 -04:00
Kevin G Christiano
9b336dc2ec remove unneeded method call and set default tint as black. 2019-09-03 16:09:01 -04:00
Pfeil, Scott Robert
32b2ab825b hide separator flag 2019-09-03 15:52:23 -04:00
Kevin G Christiano
e75b0d6d9a Set UIImageRenderingModeAlwaysTemplate to allow the tint change. 2019-09-03 15:49:43 -04:00
Pfeil, Scott Robert
aeaf7ecc5e Merge remote-tracking branch 'refs/remotes/origin/develop' 2019-09-03 15:14:21 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00
Kevin G Christiano
255cde58e6 Aligning with text to image change. 2019-09-03 14:56:48 -04:00
Kevin G Christiano
87cc0842de removed programmatic space insert. 2019-09-03 10:36:16 -04:00
Kevin G Christiano
890c1221d3 Merge branch 'develop' into feature/label_export_box 2019-09-03 10:07:38 -04:00
Kevin G Christiano
62418f5132 Moved hasAttachmentImage to a function. 2019-09-03 10:07:15 -04:00
Suresh, Kamlesh
062edc5d41 refactoring for validation based on group 2019-08-30 15:33:05 -04:00
Kevin G Christiano
38912a4f85 some changes made. More to come. 2019-08-29 16:21:30 -04:00
Kevin G Christiano
c2a432fd25 Updated localizable strings to include spanish. Renamed the variable to be more in line with its generic purpose. 2019-08-29 14:58:02 -04:00
Kevin G Christiano
2792808c9e Further changes made. 2019-08-29 14:20:42 -04:00
Kevin G Christiano
8e216f8b90 Corrections made. 2019-08-29 14:13:44 -04:00
Kevin G Christiano
0a97774098 Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 13:29:16 -04:00
Kevin G Christiano
40b771f2da Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 10:52:45 -04:00
Kevin G Christiano
4f47aa9ad5 changed key. 2019-08-29 10:52:20 -04:00
Kevin G Christiano
9ca6ba50da New class. 2019-08-29 10:50:38 -04:00
Pfeil, Scott Robert
3e426cb80b Fix to two button view 2019-08-29 10:19:28 -04:00
Kevin G Christiano
1c5b2e448e Merge branch 'develop' into feature/label_accessibility 2019-08-29 09:39:37 -04:00
Kevin G Christiano
5351c31b1c latest from develop. 2019-08-29 09:39:22 -04:00
Pfeil, Scott Robert
3234a6ee7e estimated heights update 2019-08-29 08:35:27 -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
Kevin G Christiano
e0643d834e adding dimension ratio. 2019-08-28 10:40:43 -04:00
Suresh, Kamlesh
6b71115eb0 fixes 2019-08-27 20:25:07 -04:00
Kevin G Christiano
c7501f9cd6 Added asychronous behavior to adding image. 2019-08-27 16:28:19 -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
Kevin G Christiano
f73d5e73a5 altered comments. 2019-08-22 11:37:50 -04:00
Pfeil, Scott Robert
a9539c6c89 Fix competition 2019-08-20 10:44:15 -04:00
Pfeil, Scott Robert
6a2405989d Fixes to ambiguity 2019-08-20 10:00:07 -04:00
Pfeil, Scott Robert
11669c173e typo fix 2019-08-19 16:18:27 -04:00
Pfeil, Scott Robert
021036d88c fix to use margins 2019-08-19 16:16:50 -04:00
Pfeil, Scott Robert
84ecaa9a81 height changes minor 2019-08-19 13:30:50 -04:00
Kevin G Christiano
b21664288d Allows JSON to set wholeViewIsClickable. 2019-08-19 13:13:27 -04:00
Kevin G Christiano
a4bec1d956 mild changes. 2019-08-19 12:11:55 -04:00
Pfeil, Scott Robert
10755d888f change vertical 2019-08-15 15:24:37 -04:00
Pfeil, Scott Robert
d810667473 Fixes! 2019-08-15 12:08:44 -04:00
Pfeil, Scott Robert
f3f8d57a0b timing fix... 2019-08-15 10:59:25 -04:00
Pfeil, Scott Robert
d5e49d0e5a progress bar fixes 2019-08-15 10:50:29 -04:00
Kevin G Christiano
abde89f06f Latest changes to account for variable icon locations and text alignments. 2019-08-14 12:58:46 -04:00
Kevin G Christiano
7c93506d87 Merge branch 'develop' into feature/label_export_box 2019-08-14 10:35:52 -04:00
Kevin G Christiano
248ee9a0d4 Changed code to align with Android. 2019-08-14 10:05:44 -04:00
Pan, Xinlei (Ryan)
b65cb3ed5c Merge branch 'bugfix/insets' into 'develop'
fix inset defect for safe area

See merge request BPHV_MIPS/mvm_core_ui!114
2019-08-13 16:24:18 -04:00
Pfeil, Scott Robert
ab08845708 fix inset defect for safe area 2019-08-13 15:38:06 -04:00
Pfeil, Scott Robert
8983f3b642 Merge branch 'feature/standardlistitemwithimage' into 'develop'
Moved File.

See merge request BPHV_MIPS/mvm_core_ui!113
2019-08-13 09:59:26 -04:00
Kevin G Christiano
669d087a57 moved file. 2019-08-13 09:38:05 -04:00
Pfeil, Scott Robert
18c916eba0 Merge branch 'bugfix/size_calculation' into 'develop'
Calculation of size fix

See merge request BPHV_MIPS/mvm_core_ui!112
2019-08-13 09:35:04 -04:00
Kevin G Christiano
dd18fd2517 Merge branch 'develop' into feature/standardlistitemwithimage 2019-08-13 09:32:02 -04:00
Kevin G Christiano
324b132051 padding change. 2019-08-13 09:27:38 -04:00
Pfeil, Scott Robert
2424176131 Calculation of size fix 2019-08-13 09:14:56 -04:00
Pfeil, Scott Robert
d754944fcd text alignment and mark fix 2019-08-12 15:28:06 -04:00
Kevin G Christiano
444fbc65f5 padding correction. 2019-08-12 13:28:20 -04:00
Kevin G Christiano
fd8b8fb7b7 updates made to padding and reset/module functionality. 2019-08-12 12:47:21 -04:00
Kevin G Christiano
57f82aa60a Call super reset in vcv. Further adjustments to atom. 2019-08-12 09:40:15 -04:00
Kevin G Christiano
4fc5ff9313 adjustments made. 2019-08-12 09:04:18 -04:00
Kevin G Christiano
7085137210 Merge branch 'develop' into feature/standardlistitemwithimage 2019-08-09 15:23:12 -04:00
Kevin G Christiano
f78a952905 space. 2019-08-09 15:22:49 -04:00
Kevin G Christiano
d4a19d9086 Removed unneeded line. 2019-08-09 09:45:44 -04:00
Kevin G Christiano
55f4fec029 Merge branch 'develop' into feature/customeragreement_support 2019-08-08 16:21:33 -04:00
Kevin G Christiano
93ed26820d Latest State 2019-08-05 16:37:27 -04:00
Kevin G Christiano
cbe572b8ba Merge branch 'develop' into feature/support_colorpicker 2019-08-05 11:50:42 -04:00
Kevin G Christiano
1ec98eb29a Needed to expose a few properties of the class in order to have adapt it to slight changes for use in support class. 2019-08-05 11:50:15 -04:00
Kevin G Christiano
7176155dfc Merge branch 'develop' into feature/label_export_box 2019-08-05 10:16:54 -04:00
Kevin G Christiano
519542d3e5 Renamed class. 2019-08-05 10:09:11 -04:00
Kevin G Christiano
f2d5570989 layoutMarginsGuide. 2019-08-05 09:58:43 -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
Kevin G Christiano
dd05284b95 latest updates. 2019-08-05 09:09:57 -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
Pfeil, Scott Robert
85675b8637 separator color fix for list item 2019-08-01 11:49:17 -04:00
Pfeil, Scott Robert
4d905bb17d fix to bool typo 2019-08-01 11:45:10 -04:00
Pfeil, Scott Robert
ee2fbbecfe Merge branch 'develop' into bugfix/paging_crash 2019-08-01 09:24:00 -04:00
Pfeil, Scott Robert
7bb6e5ba8d check before use 2019-08-01 09:23:10 -04:00
Kevin G Christiano
b35df4c07b Merge branch 'develop' into feature/customeragreement_support 2019-07-31 12:09:22 -04:00
Kevin G Christiano
00f3152472 reversed trailing anchor constraints. 2019-07-31 12:03:54 -04:00
Kevin G Christiano
ae92c9bbf8 composition. 2019-07-29 09:41:42 -04:00
Kevin G Christiano
905a2b948e Added some sugar to typealias definition. 2019-07-29 09:40:33 -04:00
Kevin G Christiano
f6cd3aad18 Improved functioning of tap when adding icon before action. Appears to have separate behavior when done as a molecule than from source. 2019-07-29 09:35:00 -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
Kevin G Christiano
a2d4984822 Currently investigate separate treatment for label image attachments in molecular structure. 2019-07-27 18:11:57 -04:00
Kevin G Christiano
45689c7c51 Made fix to TopLabelBottomButtomVC. Added close X image to replace 'X' char. 2019-07-27 17:31:19 -04:00
Kevin G Christiano
ddb4ba39d0 Reworked mutable insert logic. Revised comments. 2019-07-27 17:00:27 -04:00
Kevin G Christiano
5a7acf6a33 Merge branch 'feature/label_export_box' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/label_export_box 2019-07-26 15:21:40 -04:00
Kevin G Christiano
64e6b8bbfe preventing space if 0. 2019-07-26 15:21:27 -04:00
Kevin G Christiano
a21774b390 comment & preventing leading text image due to problem. 2019-07-26 15:21:01 -04:00
Kevin G Christiano
6dd7cab8f4 Comments added. Further logic added for adding image attachments. 2019-07-26 14:46:29 -04:00
Kevin G Christiano
3a31441bc8 Merge branch 'develop' into feature/label_export_box 2019-07-26 13:39:46 -04:00
Kevin G Christiano
81ccaa5bbd Restructuring the tappable text feature. Must account of the offset incurred by adding an extra space and image attachment to the overall length of the label. Included a sorting feature to ensure clauses array is always in ascending order by location. 2019-07-26 13:39:28 -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
Kevin G Christiano
849a4d761a Merge branch 'develop' into feature/label_export_box 2019-07-25 16:48:03 -04:00
Kevin G Christiano
a47e8d4313 Adding check to look for attachments and scale the accordingly. 2019-07-25 16:47:14 -04:00
Kevin G Christiano
7a86febc7c corrected logic error. 2019-07-25 15:15:32 -04:00
Kevin G Christiano
8e6087f86e Merge branch 'develop' into feature/label_export_box 2019-07-25 14:45:27 -04:00
Pfeil, Scott Robert
245d7d93d6 efficiency commit 2019-07-25 10:44:14 -04:00
Pfeil, Scott Robert
5ebc4b0e31 strikethrough fix
warning fix.
2019-07-24 15:38:13 -04:00
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
bc516ff74c removed statement causing loop. 2019-07-23 12:14:18 -04:00
Kevin G Christiano
c9c3ef1ade Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 11:58:54 -04:00
Pfeil, Scott Robert
6537523373 different way to update 2019-07-23 11:57:03 -04:00
Kevin G Christiano
7472533bc1 fixes error alert. 2019-07-23 10:13:44 -04:00
Kevin G Christiano
1ec4f271ff Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 10:07:35 -04:00
Pfeil, Scott Robert
482c6c4fab auto looks better 2019-07-23 09:56:49 -04:00
Pfeil, Scott Robert
dace6a6374 update table cell 2019-07-23 09:55:43 -04:00
Suresh, Kamlesh
ceae7e4f80 merge develop 2019-07-22 16:10:46 -04:00
Pfeil, Scott Robert
f12805ba2a update comment 2019-07-22 09:53:22 -04:00
Pfeil, Scott Robert
c5f8d27636 fix prod break defect 2019-07-19 11:34:22 -04:00
Pfeil, Scott Robert
8842ca8113 Merge branch 'develop' into 'feature/molecule_carousel'
# Conflicts:
#   MVMCoreUI/Molecules/StandardFooterView.swift
#   MVMCoreUI/Molecules/StandardHeaderView.swift
2019-07-19 10:54:43 -04:00
Pfeil, Scott Robert
8400c0eae8 name change 2019-07-19 10:53:16 -04:00
Pfeil, Scott Robert
5c619aa843 remove preserves 2019-07-19 10:48:01 -04:00
Pfeil, Scott Robert
5b1fab39a7 alignment defaults change 2019-07-19 10:14:51 -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
Kevin G Christiano
da1ce6718b Merge branch 'develop' into feature/standardlistitemwithimage 2019-07-16 10:26:26 -04:00
Kevin G Christiano
9444df4d7c latest take on listitemwithimage. 2019-07-16 10:25:53 -04:00
Hedden, Kyle Matthew
b8b1e0ddba Expose status bar color setting. 2019-07-15 11:43:42 -04:00
Pfeil, Scott Robert
3fefff2d51 still need to workout how to know when to use margins... 2019-07-15 10:41:41 -04:00
Pfeil, Scott Robert
5e2d009313 accessibility 2019-07-12 14:49:16 -04:00
Pfeil, Scott Robert
39cb930263 accessibility and page control fixes 2019-07-12 10:25:42 -04:00
Pfeil, Scott Robert
8866e91caa add peaking logic 2019-07-11 16:11:58 -04:00
Kevin G Christiano
80c6e7e74f Removed text from ActionableClause; unneeded. 2019-07-11 12:00:49 -04:00
Pfeil, Scott Robert
33020844dc carousel 2019-07-11 11:54:14 -04:00
Kevin G Christiano
6775467606 Accessibility update for Label and LabelWithInternalButton. 2019-07-11 11:43:33 -04:00
Kevin G Christiano
244e3c0df3 Generally functioning. A ways to go. 2019-07-10 13:15:35 -04:00
Kevin G Christiano
f67392eb69 Beginning stages of accessibility. 2019-07-10 09:04:29 -04:00
Kevin G Christiano
ae7d757dbc Updated variable name. removed padding if image is not there. 2019-07-09 13:53:49 -04:00
Kevin G Christiano
c06a15c91b Added insert external link functionality. Refactored code. 2019-07-09 10:53:29 -04:00
Kevin G Christiano
540439709b Updated Label to account for situations where the text will have an image attachment. There is some bug that affects how the TextContainer looks at multiline text. 2019-07-08 16:35:28 -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
1bfbe95b68 updated file name. 2019-07-08 10:36:56 -04:00
Kevin G Christiano
ce1a8c3598 Renamed to comply with MFAtom design doc. 2019-07-08 10:36:34 -04:00
Pan, Xinlei (Ryan)
cfcf73634a Merge branch 'feature/header_footer_containers' into 'develop'
header footer as containers

See merge request BPHV_MIPS/mvm_core_ui!94
2019-07-03 13:23:18 -04:00
Pfeil, Scott Robert
436e9035d2 resolve discussions 2019-07-03 13:21:52 -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
8bf4befd02 link icon now scales in size with the text. 2019-07-01 14:23:44 -04:00
Kevin G Christiano
ada34f6f13 condensed constraint command. 2019-07-01 13:16:14 -04:00
Kevin G Christiano
b821250042 improvements made. 2019-07-01 12:28:28 -04:00
Kevin G Christiano
ce681db033 Merge branch 'develop' into feature/label_export_box 2019-07-01 09:40:44 -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
94c6f2f088 Merge branch 'feature/digit_text_field' into 'develop'
Feature/digit text field

See merge request BPHV_MIPS/mvm_core_ui!91
2019-07-01 09:14:53 -04:00
Pfeil, Scott Robert
7fa0943a42 Merge branch 'feature/estimated_heights' into 'develop'
Feature/estimated heights

See merge request BPHV_MIPS/mvm_core_ui!93
2019-07-01 09:14:34 -04:00
Pfeil, Scott Robert
311ffa8a46 comment clarification 2019-06-28 15:04:43 -04:00
Pfeil, Scott Robert
6fde7bc8b4 two typo fix
list and stack template required molecules
2019-06-28 13:34:15 -04:00
Pfeil, Scott Robert
98a5e33caf Moved required module checking to the view controller where it belongs.
Broke down the update with response into two separate functions.
Only update loadObject.pageJSON if pageType is the same check....
2019-06-28 11:26:45 -04:00
Pfeil, Scott Robert
93f7aae529 estimated heights 2019-06-27 16:18:32 -04:00
Kevin G Christiano
8813646852 Added exportIcon images. Added convenience function which adds the new images to attributed string. 2019-06-27 15:29:33 -04:00
Pfeil, Scott Robert
d742ef9b6a Digit text box molecule 2019-06-27 13:24:32 -04:00
Pfeil, Scott Robert
93dfde6fc6 fix to load timing issue for list 2019-06-27 10:42:22 -04:00
Pfeil, Scott Robert
5a9e1a9a93 remove debug 2019-06-27 10:24:35 -04:00
Pfeil, Scott Robert
868593aabe move module from page to mfviewcontroller 2019-06-27 10:03:24 -04:00
Kevin G Christiano
dbeb5156c5 StandardListItemWithImage assembled. 2019-06-26 14:49:01 -04:00
Pfeil, Scott Robert
bd365d60d2 background color for constrained views optional 2019-06-26 13:09:31 -04:00
Pfeil, Scott Robert
01803e90d6 background color consolidation 2019-06-26 12:58:43 -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
Suresh, Kamlesh
dcd782903e constraints 2019-06-25 09:49:05 -04:00
Suresh, Kamlesh
73e6f7f513 spelling 2019-06-25 09:20:27 -04:00
Kevin G Christiano
569ae1481c latest iteration. 2019-06-24 16:04:06 -04:00
Pfeil, Scott Robert
ab33ceebde name change 2019-06-24 10:55:07 -04:00
Kevin G Christiano
ba84d2780d Added standardlistitem. 2019-06-24 10:48:28 -04:00
Suresh, Kamlesh
8eae881bf1 code review 2019-06-24 10:47:43 -04:00
Suresh, Kamlesh
9316343c0e merge 2019-06-21 16:58:47 -04:00
Pfeil, Scott Robert
fe09ce04dc add setter to label 2019-06-21 13:48:29 -04:00
Pfeil, Scott Robert
cb8ad83149 fix label overriding itself 2019-06-21 13:34:02 -04:00
Pfeil, Scott Robert
9f038467a9 key fix 2019-06-21 13:14:25 -04:00
Pfeil, Scott Robert
cb03232a13 missing comma 2019-06-21 13:04:39 -04:00
Pfeil, Scott Robert
e8b9de6d35 merge 2019-06-21 13:04:11 -04:00
Pfeil, Scott Robert
ed87bd2cfc Button json to have style and size.
Separator alone in stack fix.
remove view constraining view auto background color
fix padding for stack in stack
2019-06-21 12:52:30 -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
Suresh, Kamlesh
897a7a9bbd Merge branch 'feature/molecule_progressbar' into 'develop'
ProgressBar changes

See merge request BPHV_MIPS/mvm_core_ui!87
2019-06-21 11:40:18 -04:00
Pfeil, Scott Robert
dc62e16c07 image view name change, allow view override of width and height 2019-06-21 09:28:51 -04:00
Pfeil, Scott Robert
086378608d small logic cleaning 2019-06-21 08:56:57 -04:00
Pfeil, Scott Robert
a7f9104bd8 re-molecule image view 2019-06-20 16:04:59 -04:00
Christiano, Kevin
9cfa00c533 Further improved label dynamic sizing. 2019-06-20 09:20:45 -04:00
Christiano, Kevin
353f8cd301 VCV updated to account for directionalLayoutMargins. LRLabel improved. Needs slight adjustment for iPhone SE. 2019-06-19 16:49:07 -04:00
Christiano, Kevin
f23cee6ba9 further attention paid to the preferredMaxLayout. 2019-06-19 16:17:22 -04:00
Christiano, Kevin
52bfb1a8d1 Updated constraints. Dried up code. Address rightLabel issues when using preferredMaxLayout. 2019-06-19 13:07:12 -04:00
Christiano, Kevin
80dc8ea1fd Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-06-19 09:12:40 -04:00
Pfeil, Scott Robert
7e83e0fba9 Merge branch 'feature/align_in_view' into 'develop'
Feature/align in view

See merge request BPHV_MIPS/mvm_core_ui!86
2019-06-18 16:43:47 -04:00
Pfeil, Scott Robert
bbb1901be4 remove space 2019-06-18 13:35:48 -04:00
Pfeil, Scott Robert
400a51f0b5 remove spaces 2019-06-18 13:31:51 -04:00
Pfeil, Scott Robert
710fbfefba remove extra space 2019-06-18 13:31:07 -04:00
Christiano, Kevin
986dc46296 removed unnecessay. 2019-06-18 12:46:07 -04:00
Christiano, Kevin
4b8b73c5e5 Removed uneeded constraint. 2019-06-18 11:06:21 -04:00
Christiano, Kevin
a6f82e6077 Compositional changes. 2019-06-18 10:59:19 -04:00
Christiano, Kevin
77655b5f61 fixed constraints. Added comment. 2019-06-18 10:53:22 -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
Pfeil, Scott Robert
c8faae7a5a Merge branch 'feature/DOPMO-49460' into 'develop'
DOPMO-49460

See merge request BPHV_MIPS/mvm_core_ui!83
2019-06-12 10:21:08 -04:00
Pfeil, Scott Robert
b8f7e9e993 Merge branch 'bugfix/textfiled_is_valid' into 'develop'
isvalid

See merge request BPHV_MIPS/mvm_core_ui!84
2019-06-12 10:19:48 -04:00
Pfeil, Scott Robert
486cbfdc31 clean up of stack 2019-06-11 17:13:05 -04:00
Pfeil, Scott Robert
2221ab6672 update defaults. 2019-06-11 15:16:20 -04:00
Christiano, Kevin
f3f645894d Adding class to mappingObject. 2019-06-11 14:47:52 -04:00
panxi
0d9f49c937 update padding for close button 2019-06-11 13:46:26 -04:00
Pfeil, Scott Robert
4bd5006e5e name reuse for molecules
arrow change for molecule cell
2019-06-11 13:44:53 -04:00
Suresh, Kamlesh
f73c25cb61 isvalid 2019-06-11 12:09:19 -04:00
Pfeil, Scott Robert
00252ebd69 font style
separator default fix
reset added

foot in list fix
2019-06-11 11:56:06 -04:00
Christiano, Kevin
9fb4c099b2 Updated Deprecated LabelWithInternalButton message. Improved layout of LeftRightLabelView. 2019-06-11 09:52:25 -04:00
Pfeil, Scott Robert
36d223e0de stack fixing. work in progress 2019-06-11 09:41:44 -04:00
Christiano, Kevin
e8ab746351 Latest state of LeftRightLabel. Requires fine tuning. 2019-06-10 14:02:07 -04:00
Pfeil, Scott Robert
74fddc40ad alignment and stack changes 2019-06-10 11:47:29 -04:00
Suresh, Kamlesh
b216f7da43 merge 2019-06-10 11:44:08 -04:00
moscopa
423d28ede6 DOPMO-49460
Making text fields public for Security Code Autofill.
2019-06-10 11:12:17 -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