mirror of
https://github.com/bitwarden/android.git
synced 2024-12-19 07:41:52 +03:00
Fixed issues with storyboard with xamarin studio
This commit is contained in:
parent
186bbddff6
commit
f7ac5e08f2
3 changed files with 33 additions and 34 deletions
|
@ -125,8 +125,8 @@ namespace Bit.iOS.Extension
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
partial void DoneClicked(NSObject sender)
|
partial void DoneClicked(Foundation.NSObject sender)
|
||||||
{
|
{
|
||||||
NSDictionary itemData = null;
|
NSDictionary itemData = null;
|
||||||
if(ProviderType == UTType.PropertyList)
|
if(ProviderType == UTType.PropertyList)
|
||||||
{
|
{
|
||||||
|
@ -324,7 +324,7 @@ namespace Bit.iOS.Extension
|
||||||
return default(T);
|
return default(T);
|
||||||
}
|
}
|
||||||
|
|
||||||
private T DeserializeString<T>(NSString jsonString)
|
private T DeserializeString<T>(NSString jsonString)
|
||||||
{
|
{
|
||||||
if(jsonString != null)
|
if(jsonString != null)
|
||||||
{
|
{
|
||||||
|
|
27
src/iOS.Extension/ActionViewController.designer.cs
generated
27
src/iOS.Extension/ActionViewController.designer.cs
generated
|
@ -11,17 +11,22 @@ using UIKit;
|
||||||
|
|
||||||
namespace Bit.iOS.Extension
|
namespace Bit.iOS.Extension
|
||||||
{
|
{
|
||||||
[Register("ActionViewController")]
|
[Register ("ActionViewController")]
|
||||||
partial class ActionViewController
|
partial class ActionViewController
|
||||||
{
|
{
|
||||||
[Outlet]
|
[Outlet]
|
||||||
UIImageView imageView { get; set; }
|
[GeneratedCode ("iOS Designer", "1.0")]
|
||||||
|
UIImageView logo { get; set; }
|
||||||
|
|
||||||
[Action("DoneClicked:")]
|
[Action ("DoneClicked:")]
|
||||||
partial void DoneClicked(NSObject sender);
|
partial void DoneClicked (Foundation.NSObject sender);
|
||||||
|
|
||||||
void ReleaseDesignerOutlets()
|
void ReleaseDesignerOutlets ()
|
||||||
{
|
{
|
||||||
}
|
if (logo != null) {
|
||||||
}
|
logo.Dispose ();
|
||||||
|
logo = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6154.17" systemVersion="13D65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="ObA-dk-sSI">
|
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="ObA-dk-sSI">
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6153.11"/>
|
<deployment identifier="iOS"/>
|
||||||
|
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<scenes>
|
<scenes>
|
||||||
<!--Action View Controller - Image-->
|
<!--Image-->
|
||||||
<scene sceneID="7MM-of-jgj">
|
<scene sceneID="7MM-of-jgj">
|
||||||
<objects>
|
<objects>
|
||||||
<viewController title="Image" id="ObA-dk-sSI" customClass="ActionViewController" sceneMemberID="viewController">
|
<viewController title="Selection" id="ObA-dk-sSI" customClass="ActionViewController" sceneMemberID="viewController">
|
||||||
<layoutGuides>
|
<layoutGuides>
|
||||||
<viewControllerLayoutGuide type="top" id="qkL-Od-lgU"/>
|
<viewControllerLayoutGuide type="top" id="qkL-Od-lgU"/>
|
||||||
<viewControllerLayoutGuide type="bottom" id="n38-gi-rB5"/>
|
<viewControllerLayoutGuide type="bottom" id="n38-gi-rB5"/>
|
||||||
|
@ -16,38 +17,33 @@
|
||||||
<rect key="frame" x="0.0" y="0.0" width="320" height="528"/>
|
<rect key="frame" x="0.0" y="0.0" width="320" height="528"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9ga-4F-77Z">
|
|
||||||
<rect key="frame" x="0.0" y="64" width="320" height="464"/>
|
|
||||||
</imageView>
|
|
||||||
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NOA-Dm-cuz">
|
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NOA-Dm-cuz">
|
||||||
<rect key="frame" x="0.0" y="20" width="320" height="44"/>
|
<rect key="frame" x="0.0" y="20" width="320" height="44"/>
|
||||||
<items>
|
<items>
|
||||||
<navigationItem id="3HJ-uW-3hn">
|
<navigationItem id="3HJ-uW-3hn">
|
||||||
<barButtonItem key="leftBarButtonItem" title="Done" style="done" id="WYi-yp-eM6">
|
<barButtonItem key="leftBarButtonItem" title="Done" style="done" id="WYi-yp-eM6">
|
||||||
<connections>
|
<connections>
|
||||||
<action selector="DoneClicked" destination="ObA-dk-sSI" id="Qdu-qn-U6V"/>
|
<action selector="DoneClicked:" destination="ObA-dk-sSI" id="eDL-XE-zg5"/>
|
||||||
</connections>
|
</connections>
|
||||||
</barButtonItem>
|
</barButtonItem>
|
||||||
</navigationItem>
|
</navigationItem>
|
||||||
</items>
|
</items>
|
||||||
</navigationBar>
|
</navigationBar>
|
||||||
|
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="3" translatesAutoresizingMaskIntoConstraints="NO" fixedFrame="YES" image="Icon.png">
|
||||||
|
<rect key="frame" x="71" y="143" width="178" height="153"/>
|
||||||
|
</imageView>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstAttribute="trailing" secondItem="NOA-Dm-cuz" secondAttribute="trailing" id="A05-Pj-hrr"/>
|
<constraint firstAttribute="trailing" secondItem="NOA-Dm-cuz" secondAttribute="trailing" id="A05-Pj-hrr"/>
|
||||||
<constraint firstItem="9ga-4F-77Z" firstAttribute="top" secondItem="NOA-Dm-cuz" secondAttribute="bottom" id="Fps-3D-QQW"/>
|
|
||||||
<constraint firstItem="NOA-Dm-cuz" firstAttribute="leading" secondItem="zMn-AG-sqS" secondAttribute="leading" id="HxO-8t-aoh"/>
|
<constraint firstItem="NOA-Dm-cuz" firstAttribute="leading" secondItem="zMn-AG-sqS" secondAttribute="leading" id="HxO-8t-aoh"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="9ga-4F-77Z" secondAttribute="trailing" id="Ozw-Hg-0yh"/>
|
|
||||||
<constraint firstItem="9ga-4F-77Z" firstAttribute="leading" secondItem="zMn-AG-sqS" secondAttribute="leading" id="XH5-ld-ONA"/>
|
|
||||||
<constraint firstItem="n38-gi-rB5" firstAttribute="top" secondItem="9ga-4F-77Z" secondAttribute="bottom" id="eQg-nn-Zy4"/>
|
|
||||||
<constraint firstItem="NOA-Dm-cuz" firstAttribute="top" secondItem="qkL-Od-lgU" secondAttribute="bottom" id="we0-1t-bgp"/>
|
<constraint firstItem="NOA-Dm-cuz" firstAttribute="top" secondItem="qkL-Od-lgU" secondAttribute="bottom" id="we0-1t-bgp"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
</view>
|
</view>
|
||||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||||
<size key="freeformSize" width="320" height="528"/>
|
<size key="freeformSize" width="320" height="528"/>
|
||||||
<connections>
|
<connections>
|
||||||
<outlet property="imageView" destination="9ga-4F-77Z" id="5y6-5w-9QO"/>
|
<outlet property="logo" destination="3" id="name-outlet-3"/>
|
||||||
<outlet property="view" destination="zMn-AG-sqS" id="Qma-de-2ek"/>
|
|
||||||
</connections>
|
</connections>
|
||||||
</viewController>
|
</viewController>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="X47-rx-isc" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="X47-rx-isc" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
|
@ -55,9 +51,7 @@
|
||||||
<point key="canvasLocation" x="252" y="-124"/>
|
<point key="canvasLocation" x="252" y="-124"/>
|
||||||
</scene>
|
</scene>
|
||||||
</scenes>
|
</scenes>
|
||||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
<resources>
|
||||||
<simulatedStatusBarMetrics key="statusBar"/>
|
<image name="Icon.png" width="57" height="57"/>
|
||||||
<simulatedOrientationMetrics key="orientation"/>
|
</resources>
|
||||||
<simulatedScreenMetrics key="destination" type="retina4"/>
|
|
||||||
</simulatedMetricsContainer>
|
|
||||||
</document>
|
</document>
|
Loading…
Reference in a new issue