Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/res/drawable/rectangle.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+
+    <solid android:color="@color/kaki" />
+
+</shape>

app/src/main/res/layout/fragment_subscription.xml

@@ -6,26 +6,39 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/title"
-        style="@style/PokerAnalyticsTheme.TextView.SubscriptionTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginRight="16dp"
-        android:gravity="center"
-        android:text="@string/pro_upgrade"
-        app:autoSizeMaxTextSize="36sp"
-        app:autoSizeMinTextSize="24sp"
-        app:autoSizeStepGranularity="2sp"
-        app:autoSizeTextType="uniform" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <View
+            android:id="@+id/rectangle"
+            android:layout_width="match_parent"
+            android:layout_height="130dp"
+            android:background="@drawable/rectangle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/container"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/PokerAnalyticsTheme.TextView.SubscriptionTitle"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginRight="16dp"
+            android:gravity="center"
+            android:text="@string/pro_upgrade"
+            app:autoSizeMaxTextSize="36sp"
+            app:autoSizeMinTextSize="24sp"
+            app:autoSizeStepGranularity="2sp"
+            app:autoSizeTextType="uniform" />
+
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/freetrial"
             style="@style/PokerAnalyticsTheme.TextView.SubscriptionSubTitle"
@@ -34,7 +47,7 @@
             android:gravity="center"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/container"
+            app:layout_constraintTop_toBottomOf="@id/title"
             tools:text="30 day free trial" />
 
         <androidx.viewpager.widget.ViewPager
@@ -46,9 +59,9 @@
             app:layout_constraintBottom_toTopOf="@+id/price"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHeight_percent="0.6"
-            app:layout_constraintVertical_bias="0.4"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/freetrial" />
+            app:layout_constraintTop_toBottomOf="@id/freetrial"
+            app:layout_constraintVertical_bias="0.4" />
 
         <LinearLayout
             android:id="@+id/pageIndicator"
@@ -59,9 +72,9 @@
             app:layout_constraintBottom_toTopOf="@+id/price"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintVertical_bias="0.6"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/pager" />
+            app:layout_constraintTop_toBottomOf="@id/pager"
+            app:layout_constraintVertical_bias="0.6" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/price"