rollback onboarding + margin/font reduced

ooni · Jan 10, 2019 · b4b1f00 · b4b1f00
1 parent 901fb1f
commit b4b1f00
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 31 deletions.
diff --git a/app/src/main/res/layout/fragment_onboarding_1.xml b/app/src/main/res/layout/fragment_onboarding_1.xml
@@ -5,18 +5,17 @@
 	android:layout_height="match_parent"
 	android:background="#002B54">
 
-	<ImageView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:src="@drawable/onboarding_1" />
-
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
 		android:orientation="vertical">
 
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:adjustViewBounds="true"
+			android:src="@drawable/onboarding_1" />
+
 		<TextView
 			style="@style/TextAppearance.MaterialComponents.Headline6"
 			android:layout_width="match_parent"
@@ -26,13 +25,21 @@
 			android:textColor="@color/color_white" />
 
 		<TextView
-			style="@style/TextAppearance.MaterialComponents.Body1"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
+			android:layout_marginHorizontal="16dp"
+			android:layout_marginTop="8dp"
 			android:text="@string/Onboarding_WhatIsOONIProbe_Paragraph"
 			android:textColor="@color/color_white" />
 
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
+
 		<Button
 			android:id="@+id/master"
 			style="@style/TextAppearance.MaterialComponents.Body1"

diff --git a/app/src/main/res/layout/fragment_onboarding_2.xml b/app/src/main/res/layout/fragment_onboarding_2.xml
@@ -5,20 +5,19 @@
 	android:layout_height="match_parent"
 	android:background="#0F3E74">
 
-	<ImageView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:src="@drawable/onboarding_2" />
-
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
 		android:orientation="vertical">
 
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:adjustViewBounds="true"
+			android:src="@drawable/onboarding_2" />
+
 		<TextView
-			style="@style/TextAppearance.MaterialComponents.Headline4"
+			style="@style/TextAppearance.MaterialComponents.Headline6"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
@@ -30,7 +29,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="16dp"
-			android:layout_marginTop="16dp"
+			android:layout_marginTop="8dp"
 			android:text="@string/Onboarding_ThingsToKnow_Bullet_1"
 			android:textColor="@color/color_white" />
 
@@ -47,9 +46,15 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="16dp"
-			android:layout_marginBottom="16dp"
 			android:text="@string/Onboarding_ThingsToKnow_Bullet_3"
 			android:textColor="@color/color_white" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
 
 		<Button
 			android:id="@+id/master"

diff --git a/app/src/main/res/layout/fragment_onboarding_3.xml b/app/src/main/res/layout/fragment_onboarding_3.xml
@@ -5,33 +5,31 @@
 	android:layout_height="match_parent"
 	android:background="#001A33">
 
-	<ImageView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:background="#002B54"
-		android:src="@drawable/onboarding_3" />
-
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
 		android:orientation="vertical">
 
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:adjustViewBounds="true"
+			android:background="#002B54"
+			android:src="@drawable/onboarding_3" />
+
 		<TextView
-			style="@style/TextAppearance.MaterialComponents.Headline4"
+			style="@style/TextAppearance.MaterialComponents.Headline6"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
 			android:text="@string/Onboarding_DefaultSettings_Title"
 			android:textColor="@color/color_white" />
 
 		<TextView
-			style="@style/TextAppearance.MaterialComponents.Body1"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="16dp"
-			android:layout_marginTop="16dp"
+			android:layout_marginTop="8dp"
 			android:text="@string/Onboarding_DefaultSettings_Header"
 			android:textColor="@color/color_white"
 			android:textStyle="bold" />
@@ -65,9 +63,15 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="16dp"
-			android:layout_marginBottom="16dp"
 			android:text="@string/Onboarding_DefaultSettings_Paragraph"
 			android:textColor="@color/color_white" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
 
 		<Button
 			android:id="@+id/master"