mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
373 Commits 64 Branches 0 Tags 46 MiB
f1474ca74c
Commit Graph

204 Commits

Author SHA1 Message Date
Christiano, Kevin
f1474ca74c removed comment. 2019-05-06 12:03:54 -04:00
Christiano, Kevin
b7e99e9e5b LabelWithInternalButton now properly relies on Label for its actions. Reworked makeWholeViewClickable. 2019-05-04 16:34:08 -04:00
Christiano, Kevin
51820794db remove test val. 2019-05-03 14:27:51 -04:00
Christiano, Kevin
fa10cb8e58 Merge branch 'develop' into feature/kevin 2019-05-03 14:20:43 -04:00
Christiano, Kevin
2f69b07bf5 Removed unneeded parameter. 2019-05-03 14:20:23 -04:00
Suresh, Kamlesh
d7069129d7 remove from subview not needed 2019-05-03 14:01:35 -04:00
Suresh, Kamlesh
c210ad80e4 clear color 2019-05-03 12:33:42 -04:00
Christiano, Kevin
211d9f6c3b More functionality for label. 2019-05-03 11:28:25 -04:00
Murugan, Vimal
d2c489811b setupview added to initialiser method 2019-05-03 20:03:48 +05:30
Christiano, Kevin
18f8f7d9f3 Two means to set actionable text in code. 2019-05-02 15:37:12 -04:00
Christiano, Kevin
d1153d4bf8 Added button delegate checks for labelWithInternalButton. WIP with multi-action label. 2019-05-02 14:12:41 -04:00
Christiano, Kevin
9c6ddc2470 Small changes. 2019-05-01 16:30:24 -04:00
Christiano, Kevin
2ec2c2b0b8 Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-05-01 15:47:46 -04:00
Christiano, Kevin
f64c793aeb Multi-action-text label WIP. 2019-05-01 15:42:49 -04:00
Pfeil, Scott Robert
cc940d1ab2 Merge branch 'bugfix/match_recent_merge' into 'develop' 
matching change from release.

See merge request BPHV_MIPS/mvm_core_ui!53
 2019-05-01 09:20:03 -04:00
Suresh, Kamlesh
175fe574c7 typo 2019-04-30 16:04:51 -04:00
Suresh, Kamlesh
8282e9a617 fixes with constaints 2019-04-30 15:14:38 -04:00
Suresh, Kamlesh
25156195a2 merge 2019-04-30 13:32:12 -04:00
Christiano, Kevin
14f65b0cd3 Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-04-30 13:00:03 -04:00
Christiano, Kevin
2a05328f1a LabelWithInternalButton is in a functional place. Further work required for Label. 2019-04-30 12:11:36 -04:00
Suresh, Kamlesh
770f952904 Merge branch 'feature/molecule_list' into 'develop' 
Feature/molecule list

See merge request BPHV_MIPS/mvm_core_ui!52
 2019-04-30 11:16:17 -04:00
Christiano, Kevin
2fafde090e matching change from release. 2019-04-29 16:55:22 -04:00
Suresh, Kamlesh
d2d4c30cf6 labelMap 2019-04-29 16:20:27 -04:00
Christiano, Kevin
f6f2cd2068 Carry over caret fixes. 2019-04-29 16:14:13 -04:00
Suresh, Kamlesh
9709c7195d use molecule label 2019-04-29 15:00:29 -04:00
Pfeil, Scott Robert
302a2f887f thickness. molecule alignment 2019-04-29 13:36:36 -04:00
Suresh, Kamlesh
668d42176a merge 2019-04-29 13:29:33 -04:00
Christiano, Kevin
1ab359e360 merge from release/6_14_merge 2019-04-26 14:23:11 -04:00
panxi
2f0a727d03 copy from Kevin's commit: aac5093c37 2019-04-26 13:41:54 -04:00
panxi
d380328913 copy from Kevin commis: d373a3f7be 2019-04-26 13:41:26 -04:00
Christiano, Kevin
8da88c4c87 Moving interaction functionality to label. 2019-04-25 11:41:06 -04:00
Pfeil, Scott Robert
8a349ae16f constraining for stack 2019-04-24 16:14:22 -04:00
Pfeil, Scott Robert
1573e57f2c constraining 2019-04-24 15:38:59 -04:00
Pfeil, Scott Robert
dc1372ca40 merge 2019-04-24 15:38:35 -04:00
Christiano, Kevin
07f8921a4f minor. 2019-04-24 14:32:43 -04:00
Pfeil, Scott Robert
90d2290843 remove extra view I created 2019-04-24 14:30:16 -04:00
Christiano, Kevin
d767890017 Mild fix to caretButton. Fixed dictionary and attributed text issues with Label. 2019-04-24 13:32:13 -04:00
Christiano, Kevin
7d12e70d46 conflict change resolution. 2019-04-23 16:32:04 -04:00
Christiano, Kevin
92c3f22ffe Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-04-23 15:35:25 -04:00
Christiano, Kevin
959d570113 Merge branch 'develop' into feature/delegate_object 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-04-23 15:33:48 -04:00
Pan, Xinlei (Ryan)
e3fd47d9e2 Merge branch 'feature/delegate_object' into 'develop' 
LabelWithInternalButton updated with DelegateObject

See merge request BPHV_MIPS/mvm_core_ui!36
 2019-04-23 14:09:17 -04:00
Christiano, Kevin
8ae77df354 Removed labelwithoutaccessibilitytraints. 2019-04-23 13:34:51 -04:00
Christiano, Kevin
4e6bd61ae6 Merge branch 'develop' into feature/kevin 2019-04-23 11:44:36 -04:00
Christiano, Kevin
3d2059754c Unnecessary import. Simplified code. Fixed font optional. 2019-04-23 11:20:05 -04:00
Pfeil, Scott Robert
3f6fcdbe16 Merge branch 'develop' into feature/molecule_list 2019-04-22 13:17:13 -04:00
Pfeil, Scott Robert
b00b43eab0 Helper functions 
Molecule List.
Back to view instead of margins for stack due to background color issues.
Standard Header View to margin for internal use.
 2019-04-22 13:14:22 -04:00
panxi
32bd4c9d07 bugfix for caretbutton 2019-04-19 15:22:54 -04:00
Pfeil, Scott Robert
52f36aa8e8 merge develop 2019-04-19 10:07:57 -04:00
Christiano, Kevin
52d909797e adding further checks for safety. 2019-04-18 16:31:11 -04:00
Christiano, Kevin
83dda81d55 Removed MFLabel. Reflected delegate paradigm. 2019-04-18 10:01:35 -04:00