Skip to content

Commit

Permalink
update custom dialog for simple pop up on privacy page
Browse files Browse the repository at this point in the history
  • Loading branch information
@macsleven
macsleven committed Jan 10, 2021
1 parent 40dd039 commit 4e7ca60
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions Decred Wallet/Features/Custom Dialogs/CustomDialogs.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9mB-bz-qSS" customClass="RoundedView" customModule="Decred_Wallet" customModuleProvider="target">
<rect key="frame" x="40" y="392.5" width="334" height="121.5"/>
<rect key="frame" x="40" y="395" width="334" height="116.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remember to back up your wallets as soon as possible." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rr3-ou-obW">
<rect key="frame" x="24" y="24" width="286" height="40.5"/>
<rect key="frame" x="24" y="24" width="286" height="37.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
<color key="textColor" red="0.23921568630000001" green="0.34509803919999998" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -511,7 +511,7 @@
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XPc-hQ-3RI">
<rect key="frame" x="247" y="80.5" width="79" height="33"/>
<rect key="frame" x="247" y="77.5" width="79" height="31"/>
<constraints>
<constraint firstAttribute="width" constant="79" id="PaO-bL-cec"/>
</constraints>
Expand Down
16 changes: 8 additions & 8 deletions Decred Wallet/Features/Privacy/Privacy.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hR2-rF-Y9z">
<rect key="frame" x="52.5" y="60" width="345.5" height="44"/>
<rect key="frame" x="52.5" y="60" width="345.5" height="47.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Privacy" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X3w-9x-ZBp">
<rect key="frame" x="0.0" y="0.0" width="345.5" height="23.5"/>
<rect key="frame" x="0.0" y="0.0" width="345.5" height="25.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="20"/>
<color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="mywallet" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WsD-vo-weA">
<rect key="frame" x="0.0" y="27.5" width="345.5" height="16.5"/>
<rect key="frame" x="0.0" y="29.5" width="345.5" height="18"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
<color key="textColor" red="0.34901960780000002" green="0.42745098040000001" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -94,25 +94,25 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Using mixed DCRs protects you from exposing your financial activities to the public (e.g. how much you own, who pays you)." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r99-Th-V8r">
<rect key="frame" x="24" y="396.5" width="366" height="56"/>
<rect key="frame" x="24" y="406.5" width="366" height="60.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
<color key="textColor" red="0.23921568630000001" green="0.34509803919999998" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoinShuffle++ mixer can mix your DCRs through CoinJoin transactions." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VKM-Zr-NfH">
<rect key="frame" x="24" y="343" width="366" height="37.5"/>
<rect key="frame" x="24" y="350" width="366" height="40.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
<color key="textColor" red="0.23921568630000001" green="0.34509803919999998" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="How does CoinShuffle++ mixer enhance your privacy?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GdO-Vh-lbu">
<rect key="frame" x="24" y="280" width="366" height="47"/>
<rect key="frame" x="24" y="283.5" width="366" height="50.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="20"/>
<color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_mixer_setup" translatesAutoresizingMaskIntoConstraints="NO" id="9CY-qv-AB2">
<rect key="frame" x="40" y="128" width="334" height="128"/>
<rect key="frame" x="40" y="131.5" width="334" height="128"/>
<constraints>
<constraint firstAttribute="height" constant="128" id="beD-Pd-bZq"/>
</constraints>
Expand Down Expand Up @@ -817,7 +817,7 @@
</scenes>
<designables>
<designable name="ayu-ew-FJN">
<size key="intrinsicContentSize" width="215" height="33"/>
<size key="intrinsicContentSize" width="200" height="35"/>
</designable>
</designables>
<resources>
Expand Down
28 changes: 14 additions & 14 deletions Decred Wallet/Features/Wallets/WalletInfoTableViewCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,31 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YI3-dZ-TVN" customClass="RoundedView" customModule="Decred_Wallet" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="354.5"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="351.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="p4H-85-xXK">
<rect key="frame" x="0.0" y="0.0" width="414" height="354.5"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="351.5"/>
<subviews>
<stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="4OU-1s-YCs">
<rect key="frame" x="0.0" y="0.0" width="414" height="70.5"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="67.5"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_expand_fill" translatesAutoresizingMaskIntoConstraints="NO" id="dbg-cF-htv">
<rect key="frame" x="16" y="16" width="24" height="38.5"/>
<rect key="frame" x="16" y="16" width="24" height="35.5"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_menu/ic_wallet" translatesAutoresizingMaskIntoConstraints="NO" id="Y78-w0-8zd">
<rect key="frame" x="48" y="16" width="24" height="38.5"/>
<rect key="frame" x="48" y="16" width="24" height="35.5"/>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="BOt-b0-4q7">
<rect key="frame" x="80" y="16" width="85" height="38.5"/>
<rect key="frame" x="80" y="16" width="93" height="35.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wallet 1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uPf-yg-DII">
<rect key="frame" x="0.0" y="0.0" width="85" height="20.5"/>
<rect key="frame" x="0.0" y="0.0" width="93" height="19"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
<color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not backed up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="QMr-qk-cAa">
<rect key="frame" x="0.0" y="20.5" width="85" height="18"/>
<rect key="frame" x="0.0" y="19" width="93" height="16.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
<color key="textColor" red="0.92941176469999998" green="0.42745098040000001" blue="0.2784313725" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -58,13 +58,13 @@
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="0.00 DCR" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tdl-Ng-y9r">
<rect key="frame" x="173" y="16" width="193" height="38.5"/>
<rect key="frame" x="181" y="16" width="185" height="35.5"/>
<fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
<color key="textColor" red="0.34901960784313724" green="0.42745098039215684" blue="0.50588235294117645" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dha-hr-I4A">
<rect key="frame" x="374" y="16" width="24" height="38.5"/>
<rect key="frame" x="374" y="16" width="24" height="35.5"/>
<state key="normal" image="ic_more"/>
<connections>
<action selector="walletMenuButtonTapped:" destination="d8O-gb-pZU" eventType="touchUpInside" id="Lvp-AP-VSi"/>
Expand All @@ -74,14 +74,14 @@
<edgeInsets key="layoutMargins" top="16" left="16" bottom="16" right="16"/>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cTJ-ay-uAp">
<rect key="frame" x="16" y="70.5" width="398" height="1"/>
<rect key="frame" x="16" y="67.5" width="398" height="1"/>
<color key="backgroundColor" red="0.90196078430000004" green="0.91764705879999997" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="kUw-qM-YjG"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OnS-85-hCg">
<rect key="frame" x="0.0" y="71.5" width="414" height="157"/>
<rect key="frame" x="0.0" y="68.5" width="414" height="157"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AO5-VU-vlo">
<rect key="frame" x="44" y="0.0" width="354" height="1"/>
Expand Down Expand Up @@ -131,7 +131,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hvj-xX-0DC">
<rect key="frame" x="0.0" y="228.5" width="414" height="34"/>
<rect key="frame" x="0.0" y="225.5" width="414" height="34"/>
<subviews>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qBN-LL-oGQ">
<rect key="frame" x="0.0" y="0.0" width="398" height="34"/>
Expand All @@ -157,7 +157,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UZs-m8-ULO">
<rect key="frame" x="0.0" y="262.5" width="414" height="92"/>
<rect key="frame" x="0.0" y="259.5" width="414" height="92"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_wallet_alert" translatesAutoresizingMaskIntoConstraints="NO" id="fn0-3O-GPl">
<rect key="frame" x="16" y="16" width="24" height="24"/>
Expand Down

0 comments on commit 4e7ca60

Please sign in to comment.