mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/polling_top_alert

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-10-21 11:45:47 -04:00
commit 2a5cdc1fd2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift
View File

@ -81,7 +81,9 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
guard !pickerData.isEmpty else { return } guard !pickerData.isEmpty else { return }
if setInitialValueInTextField, let pickerIndex = pickerView?.selectedRow(inComponent: 0) { if setInitialValueInTextField, let pickerIndex = pickerView?.selectedRow(inComponent: 0) {
observeDropdownChange?(text ?? "", pickerData[pickerIndex])
text = pickerData[pickerIndex] text = pickerData[pickerIndex]
itemDropdownEntryFieldModel?.selectedIndex = pickerIndex
} }
} }

2
MVMCoreUI/Containers/SplitViewController/MVMCoreUIPanelProtocol.h
View File

@ -17,7 +17,7 @@
- (BOOL)panelAvailable; - (BOOL)panelAvailable;
// Notified when it is appearing and disappearing. Called by the container. // Notified when it is appearing and disappearing. Called by the container.
- (void)willOpenWithActionInformation:(nullable NSDictionary *)actionInformation; - (void)willOpenWithActionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData;
- (void)willAppear:(BOOL)animated; - (void)willAppear:(BOOL)animated;
- (void)didAppear:(BOOL)animated; - (void)didAppear:(BOOL)animated;
- (void)willDisappear:(BOOL)animated; - (void)willDisappear:(BOOL)animated;

2
MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
View File

@ -878,7 +878,7 @@ CGFloat const PanelAnimationDuration = 0.2;
// Create bottom progress bar // Create bottom progress bar
UIProgressView *progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault]; UIProgressView *progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
progressView.translatesAutoresizingMaskIntoConstraints = NO; progressView.translatesAutoresizingMaskIntoConstraints = NO;
progressView.tintColor = [UIColor mfTomatoRed]; progressView.progressTintColor = [UIColor mfTomatoRed];
[self.view addSubview:progressView]; [self.view addSubview:progressView];
self.bottomProgressBar = progressView; self.bottomProgressBar = progressView;
[NSLayoutConstraint constraintWithItem:progressView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:mainView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0].active = YES; [NSLayoutConstraint constraintWithItem:progressView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:mainView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0].active = YES;