fix experience upgrade versioning

Closes #4169
// FREEBIE
This commit is contained in:
Jake McGinty
2015-10-01 15:21:21 -07:00
committed by Moxie Marlinspike
parent ff1f190110
commit d071625326
5 changed files with 25 additions and 12 deletions

View File

@@ -11,19 +11,19 @@
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/blurb"
android:textSize="34sp"
android:textSize="@dimen/onboarding_title_size"
android:textIsSelectable="false"
android:gravity="center_horizontal|bottom"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:fontFamily="sans-serif-light"
tools:text="@string/ExperienceUpgradeActivity_welcome_to_signal"
tools:text="@string/ExperienceUpgradeActivity_welcome_to_signal_dgaf"
android:textColor="@android:color/white" />
<ImageView android:id="@+id/watermark"
android:layout_width="@dimen/onboarding_watermark_size"
android:layout_height="0dp"
android:layout_weight="2"
android:layout_weight="1"
android:maxHeight="@dimen/onboarding_watermark_size"
android:scaleType="fitCenter"
tools:src="@drawable/splash_logo"
@@ -34,9 +34,9 @@
<TextView android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:layout_weight="2"
android:id="@+id/subblurb"
android:textSize="20sp"
android:textSize="@dimen/onboarding_subtitle_size"
android:textIsSelectable="false"
android:gravity="center_horizontal"
android:layout_marginTop="20dp"

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="onboarding_watermark_size">120dp</dimen>
<dimen name="onboarding_title_size">32sp</dimen>
<dimen name="onboarding_subtitle_size">18sp</dimen>
</resources>

View File

@@ -59,4 +59,6 @@
<dimen name="onboarding_margin_vert">35dp</dimen>
<dimen name="onboarding_margin_land">20dp</dimen>
<dimen name="onboarding_watermark_size">140dp</dimen>
<dimen name="onboarding_title_size">34sp</dimen>
<dimen name="onboarding_subtitle_size">20sp</dimen>
</resources>