From a173650020f11079897b2807ef7f2ee6fd5b29c2 Mon Sep 17 00:00:00 2001
From: Aaron Huttner <Double@Aarons-MacBook-Pro.local>
Date: Wed, 24 Aug 2016 17:22:33 -0400
Subject: [PATCH] hotfix for voter declaration dialog bug

---
 app/build.gradle                              |  2 +-
 .../DisclosureAgreementDialogFragment.java    |  3 ++
 .../RegistrationCompleteDialogFragment.java   |  1 +
 .../ReviewAndConfirmFragment.java             |  2 -
 .../layout/dialog_disclosure_agreement.xml    | 54 +++++++++++--------
 .../layout/dialog_registration_complete.xml   | 31 -----------
 app/src/main/res/values/styles.xml            |  6 +++
 7 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6fab2dc4..40344c0a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 // Manifest version information!
 def versionMajor = 1
 def versionMinor = 0
-def versionPatch = 4
+def versionPatch = 5
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 apply plugin: 'com.android.application'
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/DisclosureAgreementDialogFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/DisclosureAgreementDialogFragment.java
index a9eb5462..0903c995 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/DisclosureAgreementDialogFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/DisclosureAgreementDialogFragment.java
@@ -43,6 +43,9 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         content.setText(result);
         content.setMovementMethod(LinkMovementMethod.getInstance());
+        getDialog().setTitle(getString(R.string.disclosure_agreement_title));
+        getDialog().setCancelable(false);
+
         return v;
     }
 
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationCompleteDialogFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationCompleteDialogFragment.java
index b726a6b3..663b03bb 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationCompleteDialogFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/RegistrationCompleteDialogFragment.java
@@ -20,6 +20,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         setCancelable(false);
         View v = inflater.inflate(R.layout.dialog_registration_complete, container);
         ButterKnife.bind(this, v);
+        getDialog().setTitle(getString(R.string.registration_complete));
         return v;
     }
 
diff --git a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
index 2dc6d8ed..c0bee761 100644
--- a/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
+++ b/app/src/main/java/com/rockthevote/grommet/ui/registration/ReviewAndConfirmFragment.java
@@ -89,9 +89,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ButterKnife.bind(this, view);
-
         dialog = new DisclosureAgreementDialogFragment();
-        dialog.setCancelable(false);
     }
 
     @Override
diff --git a/app/src/main/res/layout/dialog_disclosure_agreement.xml b/app/src/main/res/layout/dialog_disclosure_agreement.xml
index 10e26b07..e26ec206 100644
--- a/app/src/main/res/layout/dialog_disclosure_agreement.xml
+++ b/app/src/main/res/layout/dialog_disclosure_agreement.xml
@@ -1,32 +1,41 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:paddingEnd="24dp"
-              android:paddingStart="24dp"
-              android:paddingTop="24dp">
-
-    <TextView
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingEnd="24dp"
+                android:paddingStart="24dp"
+                android:paddingTop="24dp">
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingEnd="@dimen/content_area_padding"
-        android:text="@string/disclosure_agreement_title"
-        android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle"/>
+        android:layout_above="@+id/disclosure_button_bar"
+        android:layout_alignParentTop="true"
+        android:fillViewport="true"
+        >
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_content"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:paddingBottom="24dp"
+                android:paddingTop="8dp"
+                tools:text="@string/disclosure_agreement"/>
+        </LinearLayout>
+    </ScrollView>
 
-    <TextView
-        android:id="@+id/text_content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="24dp"
-        android:paddingTop="8dp"
-        tools:text="@string/disclosure_agreement"/>
 
     <LinearLayout
+        android:id="@+id/disclosure_button_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
+        android:layout_alignParentBottom="true"
         android:gravity="end"
         android:orientation="horizontal"
         android:paddingBottom="8dp">
@@ -48,5 +57,4 @@
             />
     </LinearLayout>
 
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_registration_complete.xml b/app/src/main/res/layout/dialog_registration_complete.xml
index 35316a7f..804aff83 100644
--- a/app/src/main/res/layout/dialog_registration_complete.xml
+++ b/app/src/main/res/layout/dialog_registration_complete.xml
@@ -7,42 +7,11 @@
               android:paddingStart="24dp"
               android:paddingTop="24dp">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_weight=".1"
-            android:paddingEnd="@dimen/content_area_padding"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_done_black_24dp"
-            android:tint="@color/colorAccent"
-            />
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="fill_horizontal"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:paddingEnd="@dimen/content_area_padding"
-            android:paddingStart="@dimen/content_area_padding"
-            android:text="@string/registration_complete"
-            android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle"/>
-
-    </LinearLayout>
-
-
     <TextView
         android:id="@+id/drc_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="24dp"
-        android:paddingTop="8dp"
         android:text="@string/registration_complete_dialog_text"/>
 
     <LinearLayout
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a9e95956..859821af 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="textColorError">@android:color/holo_red_dark</item>
+        <item name="android:dialogTheme">@style/GrommetDatePickerDialog</item>
 
     </style>
 
@@ -19,10 +20,15 @@
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
     </style>
 
+    <!--<style name="GrommetDialog" parent="Theme.AppCompat.Light.Dialog">-->
+        <!--<item name="windowNoTitle">false</item>-->
+    <!--</style>-->
+
     <style name="GrommetDatePickerDialog" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:datePickerStyle">@style/GrommetDatePicker</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:windowNoTitle">false</item>
     </style>
 
     <style name="GrommetDatePicker" parent="android:Widget.Material.Light.DatePicker">