1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-30 12:58:29 +03:00

Moved static table view into container view for password manager page

This commit is contained in:
Kyle Spearrin 2016-07-13 00:56:07 -04:00
parent ba63bf18ec
commit 5b339c63f4
2 changed files with 30 additions and 18 deletions

View file

@ -235,20 +235,22 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="4822" translatesAutoresizingMaskIntoConstraints="NO"> <containerView contentMode="scaleToFill" id="4900" translatesAutoresizingMaskIntoConstraints="NO">
<rect key="frame" x="0.0" y="109.5" width="600" height="490.5"/> <rect key="frame" x="0.0" y="109.5" width="600" height="490.5"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<sections/> <connections>
</tableView> <segue id="5421" destination="4912" kind="embed"/>
</connections>
</containerView>
</subviews> </subviews>
<constraints> <constraints>
<constraint id="4850" firstItem="4822" firstAttribute="leading" secondItem="4581" secondAttribute="leading"/>
<constraint id="4851" firstItem="4581" firstAttribute="trailing" secondItem="4822" secondAttribute="trailing"/>
<constraint id="4852" firstItem="4572" firstAttribute="top" secondItem="4822" secondAttribute="bottom"/>
<constraint id="4853" firstItem="4811" firstAttribute="leading" secondItem="4581" secondAttribute="leading" constant="15"/> <constraint id="4853" firstItem="4811" firstAttribute="leading" secondItem="4581" secondAttribute="leading" constant="15"/>
<constraint id="4864" firstItem="4581" firstAttribute="trailing" secondItem="4811" secondAttribute="trailing" constant="15"/> <constraint id="4864" firstItem="4581" firstAttribute="trailing" secondItem="4811" secondAttribute="trailing" constant="15"/>
<constraint id="4875" firstItem="4811" firstAttribute="top" secondItem="4571" secondAttribute="bottom" constant="15"/> <constraint id="4875" firstItem="4811" firstAttribute="top" secondItem="4571" secondAttribute="bottom" constant="15"/>
<constraint id="4876" firstItem="4822" firstAttribute="top" secondItem="4811" secondAttribute="bottom" constant="10"/> <constraint id="4907" firstItem="4900" firstAttribute="leading" secondItem="4581" secondAttribute="leading"/>
<constraint id="4908" firstItem="4581" firstAttribute="trailing" secondItem="4900" secondAttribute="trailing"/>
<constraint id="4909" firstItem="4900" firstAttribute="top" secondItem="4811" secondAttribute="bottom" constant="10"/>
<constraint id="4910" firstItem="4572" firstAttribute="top" secondItem="4900" secondAttribute="bottom"/>
</constraints> </constraints>
</view> </view>
<navigationItem key="navigationItem" title="Generate Password" id="4580"> <navigationItem key="navigationItem" title="Generate Password" id="4580">
@ -269,7 +271,6 @@
<outlet property="CancelBarButton" destination="4807" id="name-outlet-4807"/> <outlet property="CancelBarButton" destination="4807" id="name-outlet-4807"/>
<outlet property="SelectBarButton" destination="4808" id="name-outlet-4808"/> <outlet property="SelectBarButton" destination="4808" id="name-outlet-4808"/>
<outlet property="BaseView" destination="4581" id="name-outlet-4581"/> <outlet property="BaseView" destination="4581" id="name-outlet-4581"/>
<outlet property="Table" destination="4822" id="name-outlet-4822"/>
<outlet property="PasswordLabel" destination="4811" id="name-outlet-4811"/> <outlet property="PasswordLabel" destination="4811" id="name-outlet-4811"/>
</connections> </connections>
</viewController> </viewController>
@ -277,6 +278,26 @@
</objects> </objects>
<point key="canvasLocation" x="4045" y="558"/> <point key="canvasLocation" x="4045" y="558"/>
</scene> </scene>
<scene sceneID="4911">
<objects>
<tableViewController id="4912" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="4913">
<rect key="frame" x="0.0" y="0.0" width="600" height="490.5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections>
<outlet property="dataSource" destination="4912" id="4914"/>
<outlet property="delegate" destination="4912" id="4915"/>
</connections>
</tableView>
<connections>
<outlet property="Table" destination="4913" id="name-outlet-4913"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4918" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4678" y="661"/>
</scene>
</scenes> </scenes>
<resources> <resources>
<image name="logo.png" width="282" height="44"/> <image name="logo.png" width="282" height="44"/>

View file

@ -30,10 +30,6 @@ namespace Bit.iOS.Extension
[GeneratedCode ("iOS Designer", "1.0")] [GeneratedCode ("iOS Designer", "1.0")]
UIKit.UIBarButtonItem SelectBarButton { get; set; } UIKit.UIBarButtonItem SelectBarButton { get; set; }
[Outlet]
[GeneratedCode ("iOS Designer", "1.0")]
UIKit.UITableView Table { get; set; }
[Action ("CancelBarButton_Activated:")] [Action ("CancelBarButton_Activated:")]
[GeneratedCode ("iOS Designer", "1.0")] [GeneratedCode ("iOS Designer", "1.0")]
partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender); partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender);
@ -63,11 +59,6 @@ namespace Bit.iOS.Extension
SelectBarButton.Dispose (); SelectBarButton.Dispose ();
SelectBarButton = null; SelectBarButton = null;
} }
if (Table != null) {
Table.Dispose ();
Table = null;
}
} }
} }
} }