Skip to content

Commit e46e165

Browse files
VDubberVDubber
authored
App 634 (#1)
* APP-634: Modifications to iOS overlays. * APP-634: Modified back and front overlays for android. Updated back image.
1 parent c85b87c commit e46e165

File tree

5 files changed

+65
-66
lines changed

5 files changed

+65
-66
lines changed

‎src/android/src/main/res/drawable/back.png‎

79.6 KB
Loading

‎src/android/src/main/res/layout/back_dl_viewfinder.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
android:layout_alignParentLeft="true"
5757
android:layout_alignParentStart="true"
5858
android:layout_column="0"
59-
android:layout_marginBottom="10dp"
59+
android:layout_marginBottom="66dp"
6060
android:layout_row="0"
6161
android:gravity="bottom|center_horizontal"
62-
android:text="Scan the barcode on the back of the ID"
62+
android:text="Scan the barcode on the ID"
6363
android:textColor="@android:color/white"
6464
android:textSize="24sp" />
6565
</RelativeLayout>
@@ -78,12 +78,12 @@
7878

7979
<ImageView
8080
android:id="@+id/imageView"
81-
android:layout_width="200dp"
82-
android:layout_height="110dp"
83-
android:layout_alignParentTop="true"
81+
android:layout_width="130dp"
82+
android:layout_height="90dp"
83+
android:layout_alignParentBottom="true"
8484
android:layout_centerHorizontal="true"
85-
android:layout_marginTop="12dp"
86-
android:alpha=".6"
85+
android:layout_marginBottom="45dp"
86+
android:alpha="1"
8787
android:src="@drawable/back" />
8888
</RelativeLayout>
8989
</LinearLayout>
@@ -113,4 +113,4 @@
113113
android:paddingTop="4dp"
114114
android:textSize="14sp" />
115115

116-
</FrameLayout>
116+
</FrameLayout>

‎src/android/src/main/res/layout/front_dl_viewfinder.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<RelativeLayout
4747
android:layout_width="match_parent"
4848
android:layout_height="0dp"
49-
android:layout_weight=".35"
49+
android:layout_weight=".25"
5050
android:background="@color/opaque_background">
5151

5252
<TextView
@@ -57,10 +57,10 @@
5757
android:layout_alignParentLeft="true"
5858
android:layout_alignParentStart="true"
5959
android:layout_column="0"
60-
android:layout_marginBottom="10dp"
60+
android:layout_marginBottom="47dp"
6161
android:layout_row="0"
6262
android:gravity="bottom|center_horizontal"
63-
android:text="Take a picture of the front of the ID"
63+
android:text="Take a picture of the ID"
6464
android:textColor="@android:color/white"
6565
android:textSize="24sp" />
6666
</RelativeLayout>
@@ -79,11 +79,10 @@
7979

8080
<ImageView
8181
android:id="@+id/imageView"
82-
android:layout_width="200dp"
83-
android:layout_height="110dp"
84-
android:layout_alignParentTop="true"
82+
android:layout_width="130dp"
83+
android:layout_height="90dp"
8584
android:layout_centerHorizontal="true"
86-
android:layout_marginTop="12dp"
85+
android:layout_centerVertical="true"
8786
android:alpha=".6"
8887
android:src="@drawable/front" />
8988

@@ -127,4 +126,4 @@
127126
android:paddingTop="4dp"
128127
android:textSize="14sp" />
129128

130-
</FrameLayout>
129+
</FrameLayout>

‎src/ios/BlinkIDReactNative/BlinkIDReactNative/USDLBackOverlay.xib‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina5_9" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
99
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
1010
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1111
</dependencies>
@@ -20,31 +20,31 @@
2020
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
2121
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2222
<subviews>
23-
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x1o-59-4tW">
23+
<view alpha="0.55000000000000004" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x1o-59-4tW">
2424
<rect key="frame" x="0.0" y="466" width="375" height="346"/>
2525
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
2626
<subviews>
27-
<imageView userInteractionEnabled="NO" alpha="0.59999999999999998" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Back" translatesAutoresizingMaskIntoConstraints="NO" id="GZM-tG-rIi">
28-
<rect key="frame" x="72" y="98" width="231" height="162"/>
27+
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Back" translatesAutoresizingMaskIntoConstraints="NO" id="GZM-tG-rIi">
28+
<rect key="frame" x="118" y="167" width="139" height="93"/>
2929
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
3030
</imageView>
3131
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tKo-Ja-VQu">
32-
<rect key="frame" x="8" y="294" width="34" height="30"/>
32+
<rect key="frame" x="31" y="286" width="34" height="32"/>
3333
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
3434
<state key="normal" title="Back"/>
3535
<connections>
3636
<action selector="cancelClicked:" destination="-1" eventType="touchUpInside" id="bLM-xr-eCi"/>
3737
</connections>
3838
</button>
3939
</subviews>
40-
<color key="backgroundColor" white="0.0" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
40+
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
4141
</view>
42-
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i55-JP-hSy">
42+
<view alpha="0.55000000000000004" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i55-JP-hSy">
4343
<rect key="frame" x="0.0" y="0.0" width="375" height="346"/>
4444
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
4545
<subviews>
46-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Scan the barcode on the back of the ID" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SBg-pf-8PZ">
47-
<rect key="frame" x="8" y="102" width="352" height="155"/>
46+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Scan the barcode on the ID" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SBg-pf-8PZ">
47+
<rect key="frame" x="12" y="102" width="348" height="155"/>
4848
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
4949
<fontDescription key="fontDescription" type="system" pointSize="30"/>
5050
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -59,27 +59,27 @@
5959
</connections>
6060
</button>
6161
</subviews>
62-
<color key="backgroundColor" white="0.0" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
62+
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6363
</view>
64-
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="63c-mL-Hug">
65-
<rect key="frame" x="344" y="346" width="31" height="120"/>
66-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
67-
<color key="backgroundColor" white="0.0" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
68-
</view>
69-
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7hl-7V-dNM">
70-
<rect key="frame" x="0.0" y="346" width="31" height="120"/>
64+
<view alpha="0.55000000000000004" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7hl-7V-dNM">
65+
<rect key="frame" x="0.0" y="346" width="25" height="120"/>
7166
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
72-
<color key="backgroundColor" white="0.0" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
67+
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
68+
</view>
69+
<view alpha="0.55000000000000004" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="63c-mL-Hug">
70+
<rect key="frame" x="350" y="346" width="25" height="120"/>
71+
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
72+
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7373
</view>
7474
</subviews>
7575
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
7676
<viewLayoutGuide key="safeArea" id="wEp-g8-NQ8"/>
77-
<point key="canvasLocation" x="33" y="53"/>
77+
<point key="canvasLocation" x="32.799999999999997" y="52.463054187192121"/>
7878
</view>
7979
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
8080
</objects>
8181
<resources>
82-
<image name="Back" width="150" height="97"/>
82+
<image name="Back" width="150" height="100"/>
8383
<image name="torchsun" width="24" height="24"/>
8484
</resources>
8585
</document>

0 commit comments

Comments
 (0)