From bb0e7b6b81661c2df8d75d04ba3e8388d7d376e9 Mon Sep 17 00:00:00 2001
From: Ashutosh Dadhich <ashutosh.dadhich@hotmail.com>
Date: Sat, 11 Mar 2017 22:51:04 +0530
Subject: [PATCH] Hard-coded dimensions/strings moved to dimens.xml and
 strings.xml

---
 .../main/res/layout/activity_circle_intro.xml |  37 ++-
 app/src/main/res/layout/activity_trustees.xml | 268 +++++++++---------
 .../res/layout/fragment_assault_awareness.xml |  33 ++-
 .../res/layout/fragment_confidentiality.xml   |  30 +-
 app/src/main/res/layout/fragment_radar.xml    |  44 +--
 ...fragment_reporting_contact_other_staff.xml |  23 +-
 .../fragment_reporting_contact_post_staff.xml |  19 +-
 .../res/layout/fragment_single_textview.xml   |  27 +-
 .../res/layout/fragment_support_services.xml  |  47 +--
 app/src/main/res/layout/fragment_was.xml      |  16 +-
 app/src/main/res/layout/intro4.xml            |  35 +--
 .../res/layout/navbar_listview_header.xml     |   8 +-
 app/src/main/res/values/dimens.xml            |   7 +
 app/src/main/res/values/integers.xml          |  10 +-
 app/src/main/res/values/strings.xml           |   2 +
 15 files changed, 316 insertions(+), 290 deletions(-)

diff --git a/app/src/main/res/layout/activity_circle_intro.xml b/app/src/main/res/layout/activity_circle_intro.xml
index f7c5740..06da164 100644
--- a/app/src/main/res/layout/activity_circle_intro.xml
+++ b/app/src/main/res/layout/activity_circle_intro.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
 
     <android.support.v4.view.ViewPager
@@ -15,9 +12,9 @@
     <LinearLayout
         android:id="@+id/layoutDots"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="@dimen/trustee_margin_top"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="15dp"
+        android:layout_marginBottom="@dimen/contacting_post_staff_marginTop_15"
         android:gravity="center"
         android:orientation="horizontal"></LinearLayout>
 
@@ -25,10 +22,9 @@
         android:id="@+id/horizontal_line"
         android:layout_width="match_parent"
         android:layout_height="0.75dp"
-        android:alpha=".5"
         android:layout_above="@id/layoutDots"
-        android:background="@android:color/white"
-        />
+        android:alpha="@integer/circle_intro_alpha"
+        android:background="@android:color/white" />
 
     <ImageButton
         android:id="@+id/btn_next"
@@ -36,10 +32,10 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_marginBottom="@dimen/activity_circle_intro_margin_bottom"
+        android:layout_marginRight="@dimen/activity_circle_intro_margin_right"
         android:background="@null"
-        android:src="@drawable/ic_navigate_next_white_24dp"
-        android:layout_marginBottom="18dp"
-        android:layout_marginRight="28dp"/>
+        android:src="@drawable/ic_navigate_next_white_24dp" />
 
     <Button
         android:id="@+id/btn_skip"
@@ -47,23 +43,24 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="@null"
-        android:text="Skip"
-        android:textColor="@android:color/white"
         android:layout_marginBottom="7.5dp"
-        android:layout_marginLeft="20dp"/>
+        android:layout_marginLeft="@dimen/trustee_margin_bottom"
+        android:background="@null"
+        android:text="@string/skip"
+        android:textColor="@android:color/white" />
+
     <Button
         android:id="@+id/btn_done"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_marginBottom="7.5dp"
+        android:layout_marginRight="@dimen/trustee_margin_bottom"
         android:background="@null"
-        android:text="Done"
+        android:text="@string/done"
         android:textColor="@android:color/white"
-        android:layout_marginBottom="7.5dp"
-        android:layout_marginRight="20dp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_trustees.xml b/app/src/main/res/layout/activity_trustees.xml
index 9ba1cdd..c5c6f6e 100644
--- a/app/src/main/res/layout/activity_trustees.xml
+++ b/app/src/main/res/layout/activity_trustees.xml
@@ -1,270 +1,270 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/activity_trustee_background"
     android:fitsSystemWindows="true"
-    android:isScrollContainer="true"
-    android:background="@color/activity_trustee_background">
+    android:isScrollContainer="true">
+
     <RelativeLayout
         android:layout_width="match_parent"
-        android:gravity="center_horizontal"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal">
 
-        <include android:layout_height="wrap_content"
+        <include
             android:id="@+id/toolbar_trustees"
-            android:layout_width="match_parent"
             layout="@layout/toolbar"
-            />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/toolbar_trustees"
+            android:gravity="center_horizontal"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin"
-            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:gravity="center_horizontal">
+            android:paddingTop="@dimen/activity_vertical_margin">
 
             <TextView
-                android:layout_width="fill_parent"
                 android:id="@+id/subtitle_trustees"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:textStyle="bold"
+                android:text="@string/circle_subtitle"
                 android:textColor="@color/primary_text_default_material_dark"
                 android:textSize="@dimen/sub_title_font"
-                android:text="@string/circle_subtitle"
-                />
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/comradeTitle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="@dimen/text_normal"
-                android:textColor="@color/activity_trustee_text_color"
-                android:text="@string/add_comrades_text"
-                android:layout_below="@+id/subtitle_trustees"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_marginTop="21dp" />
+                android:layout_below="@+id/subtitle_trustees"
+                android:layout_marginTop="@dimen/trustee_textview_margin_top"
+                android:gravity="center"
+                android:text="@string/add_comrades_text"
+                android:textColor="@color/activity_trustee_text_color"
+                android:textSize="@dimen/text_normal" />
 
             <EditText
                 android:id="@+id/comrade1EditText"
-                android:layout_below="@id/comradeTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/trustee_margin"
+                android:layout_below="@id/comradeTitle"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/trustee_margin"
+                android:layout_marginRight="@dimen/trustee_margin"
                 android:layout_marginTop="@dimen/trustee_margin"
-                android:textCursorDrawable="@null"
                 android:background="@drawable/edit_text_bg"
-                android:layout_gravity="center"
-                android:textColor="@color/activity_trustee_edittext_color"
                 android:cursorVisible="false"
-                android:inputType="number"
-                android:imeOptions="actionNext"
-                android:hint="@string/comrade1"
                 android:ems="@integer/ems"
-                android:paddingTop="@dimen/padding_top"/>
+                android:hint="@string/comrade1"
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:paddingTop="@dimen/padding_top"
+                android:textColor="@color/activity_trustee_edittext_color"
+                android:textCursorDrawable="@null" />
 
             <ImageButton
-                android:layout_alignTop="@id/comrade1EditText"
-                android:layout_alignRight="@id/comrade1EditText"
-                android:layout_alignBottom="@+id/comrade1EditText"
-                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
-                android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
-                android:layout_marginRight="@dimen/contact_pick_button_margin"
                 android:layout_width="@dimen/contact_pick_button_width"
                 android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
-                android:src="@drawable/contact_pick"
-                android:background="@null"
+                android:layout_alignBottom="@+id/comrade1EditText"
+                android:layout_alignRight="@id/comrade1EditText"
+                android:layout_alignTop="@id/comrade1EditText"
                 android:layout_gravity="right"
+                android:layout_marginRight="@dimen/contact_pick_button_margin"
+                android:background="@null"
                 android:onClick="addContact"
-                android:tag="1"/>
+                android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
+                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
+                android:scaleType="fitCenter"
+                android:src="@drawable/contact_pick"
+                android:tag="1" />
 
             <EditText
                 android:id="@+id/comrade2EditText"
-                android:layout_below="@id/comrade1EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/trustee_margin"
+                android:layout_below="@id/comrade1EditText"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/trustee_margin"
+                android:layout_marginRight="@dimen/trustee_margin"
                 android:layout_marginTop="@dimen/trustee_margin"
-                android:inputType="number"
-                android:imeOptions="actionNext"
-                android:textCursorDrawable="@null"
                 android:background="@drawable/edit_text_bg"
-                android:layout_gravity="center"
-                android:textColor="@color/activity_trustee_edittext_color"
-                android:hint="@string/comrade2"
                 android:ems="@integer/ems"
-                android:paddingTop="@dimen/padding_top"/>
+                android:hint="@string/comrade2"
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:paddingTop="@dimen/padding_top"
+                android:textColor="@color/activity_trustee_edittext_color"
+                android:textCursorDrawable="@null" />
 
             <ImageButton
-                android:layout_alignTop="@id/comrade2EditText"
-                android:layout_alignRight="@id/comrade2EditText"
-                android:layout_alignBottom="@+id/comrade2EditText"
-                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
-                android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
-                android:layout_marginRight="@dimen/contact_pick_button_margin"
                 android:layout_width="@dimen/contact_pick_button_width"
                 android:layout_height="wrap_content"
-                android:scaleType="fitCenter"
-                android:src="@drawable/contact_pick"
-                android:background="@null"
+                android:layout_alignBottom="@+id/comrade2EditText"
+                android:layout_alignRight="@id/comrade2EditText"
+                android:layout_alignTop="@id/comrade2EditText"
                 android:layout_gravity="right"
+                android:layout_marginRight="@dimen/contact_pick_button_margin"
+                android:background="@null"
                 android:onClick="addContact"
-                android:tag="2"/>
+                android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
+                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
+                android:scaleType="fitCenter"
+                android:src="@drawable/contact_pick"
+                android:tag="2" />
 
             <EditText
                 android:id="@+id/comrade3EditText"
-                android:layout_below="@id/comrade2EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:imeOptions="actionNext"
-                android:layout_marginRight="@dimen/trustee_margin"
+                android:layout_below="@id/comrade2EditText"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/trustee_margin"
+                android:layout_marginRight="@dimen/trustee_margin"
                 android:layout_marginTop="@dimen/trustee_margin"
-                android:inputType="number"
-                android:textCursorDrawable="@null"
                 android:background="@drawable/edit_text_bg"
-                android:layout_gravity="center"
-                android:textColor="@color/activity_trustee_edittext_color"
-                android:hint="@string/comrade3"
                 android:ems="@integer/ems"
-                android:paddingTop="@dimen/padding_top"/>
+                android:hint="@string/comrade3"
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:paddingTop="@dimen/padding_top"
+                android:textColor="@color/activity_trustee_edittext_color"
+                android:textCursorDrawable="@null" />
 
             <ImageButton
-                android:layout_alignTop="@id/comrade3EditText"
-                android:layout_alignRight="@id/comrade3EditText"
+                android:layout_width="@dimen/contact_pick_button_width"
+                android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/comrade3EditText"
+                android:layout_alignRight="@id/comrade3EditText"
+                android:layout_alignTop="@id/comrade3EditText"
+                android:layout_gravity="right"
                 android:layout_marginRight="@dimen/contact_pick_button_margin"
-                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
+                android:background="@null"
+                android:onClick="addContact"
                 android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
-                android:layout_width="@dimen/contact_pick_button_width"
-                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
                 android:scaleType="fitCenter"
                 android:src="@drawable/contact_pick"
-                android:background="@null"
-                android:layout_gravity="right"
-                android:onClick="addContact"
-                android:tag="3"/>
+                android:tag="3" />
 
             <EditText
                 android:id="@+id/comrade4EditText"
-                android:layout_below="@id/comrade3EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/trustee_margin"
+                android:layout_below="@id/comrade3EditText"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/trustee_margin"
+                android:layout_marginRight="@dimen/trustee_margin"
                 android:layout_marginTop="@dimen/trustee_margin"
-                android:inputType="number"
-                android:imeOptions="actionNext"
-                android:textCursorDrawable="@null"
                 android:background="@drawable/edit_text_bg"
-                android:layout_gravity="center"
-                android:textColor="@color/activity_trustee_edittext_color"
-                android:hint="@string/comrade4"
                 android:ems="@integer/ems"
-                android:paddingTop="@dimen/padding_top"/>
+                android:hint="@string/comrade4"
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:paddingTop="@dimen/padding_top"
+                android:textColor="@color/activity_trustee_edittext_color"
+                android:textCursorDrawable="@null" />
 
             <ImageButton
-                android:layout_alignTop="@id/comrade4EditText"
-                android:layout_alignRight="@id/comrade4EditText"
+                android:layout_width="@dimen/contact_pick_button_width"
+                android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/comrade4EditText"
+                android:layout_alignRight="@id/comrade4EditText"
+                android:layout_alignTop="@id/comrade4EditText"
+                android:layout_gravity="right"
                 android:layout_marginRight="@dimen/contact_pick_button_margin"
-                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
+                android:background="@null"
+                android:onClick="addContact"
                 android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
-                android:layout_width="@dimen/contact_pick_button_width"
-                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
                 android:scaleType="fitCenter"
                 android:src="@drawable/contact_pick"
-                android:background="@null"
-                android:layout_gravity="right"
-                android:onClick="addContact"
-                android:tag="4"/>
+                android:tag="4" />
 
             <EditText
                 android:id="@+id/comrade5EditText"
-                android:layout_below="@id/comrade4EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/trustee_margin"
+                android:layout_below="@id/comrade4EditText"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/trustee_margin"
+                android:layout_marginRight="@dimen/trustee_margin"
                 android:layout_marginTop="@dimen/trustee_margin"
-                android:inputType="number"
-                android:imeOptions="actionNext"
-                android:textCursorDrawable="@null"
                 android:background="@drawable/edit_text_bg"
-                android:layout_gravity="center"
-                android:textColor="@color/activity_trustee_edittext_color"
-                android:hint="@string/comrade5"
                 android:ems="@integer/ems"
-                android:paddingTop="@dimen/padding_top"/>
+                android:hint="@string/comrade5"
+                android:imeOptions="actionNext"
+                android:inputType="number"
+                android:paddingTop="@dimen/padding_top"
+                android:textColor="@color/activity_trustee_edittext_color"
+                android:textCursorDrawable="@null" />
 
             <ImageButton
-                android:layout_alignTop="@id/comrade5EditText"
-                android:layout_alignRight="@id/comrade5EditText"
+                android:layout_width="@dimen/contact_pick_button_width"
+                android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/comrade5EditText"
+                android:layout_alignRight="@id/comrade5EditText"
+                android:layout_alignTop="@id/comrade5EditText"
+                android:layout_gravity="right"
                 android:layout_marginRight="@dimen/contact_pick_button_margin"
-                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
+                android:background="@null"
+                android:onClick="addContact"
                 android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
-                android:layout_width="@dimen/contact_pick_button_width"
-                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
                 android:scaleType="fitCenter"
                 android:src="@drawable/contact_pick"
-                android:background="@null"
-                android:layout_gravity="right"
-                android:onClick="addContact"
-                android:tag="5"/>
+                android:tag="5" />
 
             <EditText
                 android:id="@+id/comrade6EditText"
-                android:layout_below="@id/comrade5EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/trustee_margin"
+                android:layout_below="@id/comrade5EditText"
+                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/trustee_margin"
+                android:layout_marginRight="@dimen/trustee_margin"
                 android:layout_marginTop="@dimen/trustee_margin"
-                android:textCursorDrawable="@null"
                 android:background="@drawable/edit_text_bg"
-                android:layout_gravity="center"
-                android:inputType="number"
-                android:textColor="@color/activity_trustee_edittext_color"
+                android:ems="@integer/ems"
                 android:hint="@string/comrade6"
                 android:imeOptions="actionDone"
-                android:ems="@integer/ems"
-                android:paddingTop="@dimen/padding_top"/>
+                android:inputType="number"
+                android:paddingTop="@dimen/padding_top"
+                android:textColor="@color/activity_trustee_edittext_color"
+                android:textCursorDrawable="@null" />
 
             <ImageButton
-                android:layout_alignTop="@id/comrade6EditText"
-                android:layout_alignRight="@id/comrade6EditText"
+                android:layout_width="@dimen/contact_pick_button_width"
+                android:layout_height="wrap_content"
                 android:layout_alignBottom="@+id/comrade6EditText"
+                android:layout_alignRight="@id/comrade6EditText"
+                android:layout_alignTop="@id/comrade6EditText"
+                android:layout_gravity="right"
                 android:layout_marginRight="@dimen/contact_pick_button_margin"
-                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
+                android:background="@null"
+                android:onClick="addContact"
                 android:paddingBottom="@dimen/contact_pick_padding_top_bottom"
-                android:layout_width="@dimen/contact_pick_button_width"
-                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/contact_pick_padding_top_bottom"
                 android:scaleType="fitCenter"
                 android:src="@drawable/contact_pick"
-                android:background="@null"
-                android:layout_gravity="right"
-                android:onClick="addContact"
-                android:tag="6"/>
+                android:tag="6" />
 
             <Button
                 android:id="@+id/okButton"
+                style="@style/NavigateButton"
                 android:layout_width="@dimen/layout_width"
                 android:layout_height="@dimen/trustee_button_height"
-                style="@style/NavigateButton"
-                android:layout_gravity="center"
-                android:layout_centerHorizontal="true"
-                android:text="@string/add_comrades_save"
                 android:layout_below="@id/comrade6EditText"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center"
+                android:layout_marginBottom="@dimen/trustee_margin_bottom"
                 android:layout_marginTop="@dimen/trustee_margin_top"
-                android:layout_marginBottom="@dimen/trustee_margin_bottom"/>
+                android:text="@string/add_comrades_save" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_assault_awareness.xml b/app/src/main/res/layout/fragment_assault_awareness.xml
index 74497c5..bb3ffa7 100644
--- a/app/src/main/res/layout/fragment_assault_awareness.xml
+++ b/app/src/main/res/layout/fragment_assault_awareness.xml
@@ -2,11 +2,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_app"
+    android:paddingBottom="@dimen/activity_horizontal_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_horizontal_margin"
-    android:background="@color/background_app"
     tools:context="com.peacecorps.pcsa.sexual_assault_awareness.MainFragment">
 
     <LinearLayout
@@ -19,41 +19,44 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:text="@string/sexual_assault_subtitle"
             android:textColor="@color/primary_text_default_material_dark"
             android:textSize="@dimen/sub_title_font"
-            android:textStyle="bold"
-            android:text="@string/sexual_assault_subtitle"
-            />
+            android:textStyle="bold" />
 
         <Button
             android:id="@+id/wasButton"
             style="@style/NavigateButton"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/was_assault"
-            android:textSize="18sp"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/commonButton"
             style="@style/NavigateButton"
-            android:textSize="18sp"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/common_questions"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/impactButton"
             style="@style/NavigateButton"
-            android:textSize="18sp"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/impact"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/harassmentButton"
             style="@style/NavigateButton"
-            android:textSize="18sp"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/harassment"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/helpingButton"
             style="@style/NavigateButton"
-            android:text="@string/helping_others"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
+            android:text="@string/helping_others" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_confidentiality.xml b/app/src/main/res/layout/fragment_confidentiality.xml
index 1e2046b..1c3e43b 100644
--- a/app/src/main/res/layout/fragment_confidentiality.xml
+++ b/app/src/main/res/layout/fragment_confidentiality.xml
@@ -2,11 +2,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_app"
+    android:paddingBottom="@dimen/activity_horizontal_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_horizontal_margin"
-    android:background="@color/background_app"
     tools:context="com.peacecorps.pcsa.support_services.ConfidentialityFragment">
 
     <LinearLayout
@@ -19,44 +19,44 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:text="@string/confidentiality_subtitle"
             android:textColor="@color/primary_text_default_material_dark"
             android:textSize="@dimen/sub_title_font"
-            android:textStyle="bold"
-            android:text="@string/confidentiality_subtitle"
-            />
+            android:textStyle="bold" />
 
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/confidentiaity_margin_bottom"
             android:gravity="center"
-            android:layout_marginTop="45dp"
+            android:text="@string/confidentiality_center_text"
             android:textColor="@color/primary_text_default_material_dark"
             android:textSize="@dimen/center_font"
-            android:textStyle="bold"
-            android:text="@string/confidentiality_center_text"
-            />
+            android:textStyle="bold" />
 
         <Button
             android:id="@+id/staffButton"
             style="@style/NavigateButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_35"
             android:gravity="center"
-            android:text="@string/role_staff"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_35"/>
+            android:text="@string/role_staff" />
+
         <Button
             android:id="@+id/communityButton"
             style="@style/NavigateButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/community_title"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_35"/>
+            android:layout_marginTop="@dimen/fragment_main_marginTop_35"
+            android:text="@string/community_title" />
+
         <Button
             android:id="@+id/assaultedButton"
             style="@style/NavigateButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/assaulted_title"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_35"/>
+            android:layout_marginTop="@dimen/fragment_main_marginTop_35"
+            android:text="@string/assaulted_title" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_radar.xml b/app/src/main/res/layout/fragment_radar.xml
index eece8fc..8e25e92 100644
--- a/app/src/main/res/layout/fragment_radar.xml
+++ b/app/src/main/res/layout/fragment_radar.xml
@@ -3,60 +3,62 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_app"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:background="@color/background_app"
     tools:context="com.peacecorps.pcsa.safety_tools.RadarFragment">
+
     <TextView
         android:id="@+id/radar_sub"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:textStyle="bold"
         android:gravity="center"
+        android:text="@string/radar_subtitle"
         android:textColor="@color/primary_text_default_material_dark"
         android:textSize="@dimen/sub_title_font"
-        android:text="@string/radar_subtitle"
-        />
+        android:textStyle="bold" />
 
     <LinearLayout
         android:id="@+id/radar_controller"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/radar_sub"
-        android:orientation="horizontal"
-        android:layout_marginTop="@dimen/fragment_main_marginTop_20">
+        android:layout_marginTop="@dimen/fragment_main_marginTop_20"
+        android:orientation="horizontal">
 
         <ImageView
+            android:id="@+id/prev_step"
             android:layout_width="@dimen/icon_size_radar"
             android:layout_height="@dimen/icon_size_radar"
-            android:id="@+id/prev_step"
 
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_arrow_left"
-            android:layout_weight="0.5"/>
-        <include android:id="@+id/steps_text"
+            android:layout_weight="@integer/circle_intro_alpha"
+            android:src="@drawable/ic_arrow_left" />
+
+        <include
+            android:id="@+id/steps_text"
+            layout="@layout/textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            layout="@layout/textview"/>
+            android:layout_gravity="center_vertical" />
+
         <ImageView
+            android:id="@+id/next_step"
             android:layout_width="@dimen/icon_size_radar"
             android:layout_height="@dimen/icon_size_radar"
-            android:id="@+id/next_step"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_arrow_right"
-            android:layout_weight="0.5"/>
+            android:layout_weight="@integer/circle_intro_alpha"
+            android:src="@drawable/ic_arrow_right" />
 
     </LinearLayout>
 
-    <android.support.v4.view.ViewPager
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/pager"
-        android:layout_below="@id/radar_controller"
         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/fragment_main_marginTop_20"
-        android:layout_height="@dimen/radar_viewpager_height" />
+        android:layout_height="@dimen/radar_viewpager_height"
+        android:layout_below="@id/radar_controller"
+        android:layout_marginTop="@dimen/fragment_main_marginTop_20" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_reporting_contact_other_staff.xml b/app/src/main/res/layout/fragment_reporting_contact_other_staff.xml
index 6ab7088..5534ea9 100644
--- a/app/src/main/res/layout/fragment_reporting_contact_other_staff.xml
+++ b/app/src/main/res/layout/fragment_reporting_contact_other_staff.xml
@@ -12,8 +12,7 @@
         android:orientation="vertical"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingStart="@dimen/activity_horizontal_margin"
-        >
+        android:paddingStart="@dimen/activity_horizontal_margin">
 
         <TextView
             android:layout_width="fill_parent"
@@ -33,12 +32,13 @@
             <ImageView
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
-                android:layout_weight="2" />
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
+
                 <include
                     android:id="@+id/pcsaves"
                     layout="@layout/button"
@@ -58,14 +58,15 @@
                 android:id="@+id/link_to_post_staff"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
-                android:layout_weight="2"
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two"
                 android:gravity="center"
                 android:src="@drawable/ic_arrow_left" />
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
+
                 <include
                     android:id="@+id/ova"
                     layout="@layout/button"
@@ -83,12 +84,12 @@
             <ImageView
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
-                android:layout_weight="2" />
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
 
                 <include
                     android:id="@+id/oig"
@@ -107,12 +108,12 @@
             <ImageView
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
-                android:layout_weight="2" />
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="@dimen/intro_layout_height"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
 
                 <include
                     android:id="@+id/ocrd"
diff --git a/app/src/main/res/layout/fragment_reporting_contact_post_staff.xml b/app/src/main/res/layout/fragment_reporting_contact_post_staff.xml
index 4c90f24..947153b 100644
--- a/app/src/main/res/layout/fragment_reporting_contact_post_staff.xml
+++ b/app/src/main/res/layout/fragment_reporting_contact_post_staff.xml
@@ -31,7 +31,8 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
+
                 <include
                     android:id="@+id/post_staff_pcmo"
                     layout="@layout/button"
@@ -43,7 +44,7 @@
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
                 android:layout_gravity="center_horizontal"
-                android:layout_weight="2"/>
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />
 
         </LinearLayout>
 
@@ -56,7 +57,8 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
+
                 <include
                     android:id="@+id/post_staff_ssm"
                     layout="@layout/button"
@@ -69,8 +71,8 @@
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
                 android:layout_gravity="center_horizontal"
-                android:src="@drawable/ic_arrow_right"
-                android:layout_weight="2"/>
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two"
+                android:src="@drawable/ic_arrow_right" />
 
         </LinearLayout>
 
@@ -80,9 +82,10 @@
             android:layout_marginTop="@dimen/button_margin_top">
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="@dimen/intro_layout_height"
                 android:layout_height="wrap_content"
-                android:layout_weight="5">
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">
+
                 <include
                     android:id="@+id/post_staff_sarl"
                     layout="@layout/button"
@@ -94,7 +97,7 @@
                 android:layout_width="0dp"
                 android:layout_height="@dimen/icon_size_poststaff"
                 android:layout_gravity="center_horizontal"
-                android:layout_weight="2"/>
+                android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_single_textview.xml b/app/src/main/res/layout/fragment_single_textview.xml
index 8c58a17..7546d01 100644
--- a/app/src/main/res/layout/fragment_single_textview.xml
+++ b/app/src/main/res/layout/fragment_single_textview.xml
@@ -3,44 +3,45 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_app"
     android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:background="@color/background_app"
-    tools:context=".SingleTextViewFragment"
-    android:weightSum="1">
+    android:weightSum="@integer/intro4_weight_sum"
+    tools:context=".SingleTextViewFragment">
 
     <TextView
         android:id="@+id/layout_subtitle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:textStyle="bold"
         android:textColor="@color/primary_text_default_material_dark"
-        android:textSize="@dimen/sub_title_font" />
+        android:textSize="@dimen/sub_title_font"
+        android:textStyle="bold" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="@dimen/contact_pick_button_margin">
+
         <ScrollView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scrollbars="vertical"
             android:layout_marginTop="@dimen/contacting_post_staff_marginTop_15"
-            android:background="@drawable/bg_textview_rounded_rectangle">
+            android:background="@drawable/bg_textview_rounded_rectangle"
+            android:scrollbars="vertical">
 
             <TextView
+                android:id="@+id/layout_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/primary_text_default_material_dark"
-                android:id="@+id/layout_content"
-                android:padding="@dimen/reporting_types_padding"
-                android:textSize="18sp"
                 android:fadeScrollbars="false"
-                android:scrollbarStyle="insideInset" />
+                android:padding="@dimen/reporting_types_padding"
+                android:scrollbarStyle="insideInset"
+                android:textColor="@color/primary_text_default_material_dark"
+                android:textSize="@dimen/text_size_normal" />
         </ScrollView>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_support_services.xml b/app/src/main/res/layout/fragment_support_services.xml
index 3648850..351e68f 100644
--- a/app/src/main/res/layout/fragment_support_services.xml
+++ b/app/src/main/res/layout/fragment_support_services.xml
@@ -2,12 +2,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@color/background_app"
+    android:paddingBottom="@dimen/activity_horizontal_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_horizontal_margin"
-    android:background="@color/background_app"
     tools:context="com.peacecorps.pcsa.support_services.SupportServicesFragment">
 
     <LinearLayout
@@ -20,57 +19,61 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
+            android:text="@string/support_services_subtitle"
             android:textColor="@color/primary_text_default_material_dark"
             android:textSize="@dimen/sub_title_font"
-            android:textStyle="bold"
-            android:text="@string/support_services_subtitle"
-            />
+            android:textStyle="bold" />
 
         <Button
             android:id="@+id/benefitsButton"
             style="@style/NavigateButton"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/benefits"
-            android:textSize="18sp"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/servicesButton"
             style="@style/NavigateButton"
-            android:textSize="18sp"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/available_services"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/commitmentButton"
             style="@style/NavigateButton"
-            android:textSize="18sp"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/commitment"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/afterButton"
             style="@style/NavigateButton"
-            android:textSize="18sp"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/after_assault"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
+
         <Button
             android:id="@+id/confidentialityButton"
             style="@style/NavigateButton"
-            android:text="@string/title_activity_confidentiality"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
+            android:text="@string/title_activity_confidentiality" />
+
         <Button
             android:id="@+id/mythButton"
-            android:textSize="18sp"
             style="@style/NavigateButton"
+            android:layout_marginTop="@dimen/fragment_main_marginTop_20"
             android:text="@string/mythbusters"
-            android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
+            android:textSize="@dimen/text_size_normal" />
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/supportHelpFabButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:scaleType="center"
+            android:layout_gravity="right"
+            android:layout_margin="@dimen/activity_horizontal_margin"
             android:clickable="true"
-            android:src="@drawable/ic_help"
-            android:layout_gravity="right" />
+            android:scaleType="center"
+            android:src="@drawable/ic_help" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_was.xml b/app/src/main/res/layout/fragment_was.xml
index f2848d3..dc1c31c 100644
--- a/app/src/main/res/layout/fragment_was.xml
+++ b/app/src/main/res/layout/fragment_was.xml
@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:weightSum="1"
+    android:weightSum="@integer/intro4_weight_sum"
     tools:context=".SingleTextViewFragment">
 
     <LinearLayout
@@ -34,8 +34,8 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="6">
+                android:layout_height="@dimen/intro_layout_height"
+                android:layout_weight="@integer/reporting_type_weight_sum">
 
                 <ScrollView
                     android:layout_width="match_parent"
@@ -56,7 +56,7 @@
                             android:scrollbarStyle="insideInset"
                             android:scrollbars="vertical"
                             android:textColor="@color/primary_text_default_material_dark"
-                            android:textSize="18sp" />
+                            android:textSize="@dimen/text_size_normal" />
 
                     </LinearLayout>
                 </ScrollView>
@@ -64,10 +64,10 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="8dp"
-                android:layout_weight="1"
-                android:layout_gravity="bottom">
+                android:layout_height="@dimen/intro_layout_height"
+                android:layout_gravity="bottom"
+                android:layout_marginTop="@dimen/contact_pick_button_margin"
+                android:layout_weight="@integer/intro4_weight_sum">
 
                 <include
                     android:id="@+id/knowButton"
diff --git a/app/src/main/res/layout/intro4.xml b/app/src/main/res/layout/intro4.xml
index dc153a1..6d1836f 100644
--- a/app/src/main/res/layout/intro4.xml
+++ b/app/src/main/res/layout/intro4.xml
@@ -1,53 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_weight="@integer/intro4_layout_weight"
     android:background="@color/intro4_background"
-    android:layout_weight="@integer/intro4_layout_weight">
+    android:orientation="vertical">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="@dimen/intro_layout_height"
         android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="@dimen/intro_padding_20"
         android:layout_weight="@integer/intro4_textView_weight"
         android:fontFamily="sans-serif-thin"
-        android:textColor="@color/intro_text_color"
+        android:gravity="center"
+        android:paddingLeft="@dimen/intro_padding_20"
         android:paddingRight="@dimen/intro_padding"
-        android:textSize="@dimen/text_large"
-        android:text="@string/slide_four_head"/>
+        android:text="@string/slide_four_head"
+        android:textColor="@color/intro_text_color"
+        android:textSize="@dimen/text_large" />
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="@dimen/intro_layout_height"
-        android:orientation="vertical"
-        android:gravity="center"
         android:layout_weight="@integer/intro4_linear_layout_weight"
+        android:gravity="center"
+        android:orientation="vertical"
         android:weightSum="@integer/intro4_weight_sum">
 
         <ImageView
             android:layout_width="183dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_weight="@integer/intro4_imageview_weight"
             android:paddingLeft="@dimen/intro_padding_16"
             android:paddingRight="@dimen/intro_padding_16"
-            android:layout_weight="0.61"
-            android:src="@drawable/ic_thumb"/>
+            android:src="@drawable/ic_thumb" />
     </LinearLayout>
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="@dimen/intro_layout_height"
-        android:layout_weight="@integer/intro4_textView_weight"
         android:layout_gravity="center"
+        android:layout_weight="@integer/intro4_textView_weight"
+        android:fontFamily="sans-serif-thin"
         android:gravity="center"
-        android:textColor="@color/intro_text_color"
         android:paddingLeft="@dimen/intro_padding_64"
         android:paddingRight="@dimen/intro_padding_64"
+        android:text="@string/slide_four_bottom"
+        android:textColor="@color/intro_text_color"
         android:textSize="@dimen/text_large"
-        android:textStyle="bold"
-        android:fontFamily="sans-serif-thin"
-        android:text="@string/slide_four_bottom"/>
+        android:textStyle="bold" />
+
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="@dimen/intro_padding_64" />
diff --git a/app/src/main/res/layout/navbar_listview_header.xml b/app/src/main/res/layout/navbar_listview_header.xml
index f96af39..c3b9cc4 100644
--- a/app/src/main/res/layout/navbar_listview_header.xml
+++ b/app/src/main/res/layout/navbar_listview_header.xml
@@ -3,14 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/main_yellow"
-    android:padding="5dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:padding="@dimen/app_button_side_padding">
 
     <ImageView
         android:layout_width="@dimen/navbar_icon_header_size"
         android:layout_height="@dimen/navbar_icon_header_height"
-        android:src="@drawable/ic_logo_horizontal"
-        android:layout_gravity="center_horizontal" />
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/ic_logo_horizontal" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ee94477..ec41976 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,12 +6,17 @@
     <dimen name="reporting_resources_layout_height">0dp</dimen>
     <dimen name="reporting_confidentiality_textview_padding">10dp</dimen>
     <dimen name="reporting_resource_padding">10dp</dimen>
+
+
     <dimen name="homescreen_margin">10dp</dimen>
     <dimen name="textview_padding">10dp</dimen>
     <dimen name="reporting_types_padding">10dp</dimen>
+    <dimen name="activity_circle_intro_margin_bottom">18dp</dimen>
+    <dimen name="activity_circle_intro_margin_right">28dp</dimen>
     <dimen name="trustee_margin">10dp</dimen>
     <dimen name="trustee_button_height">50dp</dimen>
     <dimen name="trustee_margin_top">40dp</dimen>
+    <dimen name="trustee_textview_margin_top">21dp</dimen>
     <dimen name="trustee_margin_bottom">20dp</dimen>
     <dimen name="reporting_types_width">250dp</dimen>
     <dimen name="contacting_post_staff_marginTop">30dp</dimen>
@@ -26,6 +31,7 @@
     <dimen name="circle_of_trust_width_25">25dp</dimen>
     <dimen name="circle_of_trust_height">50dp</dimen>
     <dimen name="circle_of_trust_image_width">80dp</dimen>
+    <dimen name="confidentiaity_margin_bottom">45dp</dimen>
     <dimen name="circle_of_trust_image_height">80dp</dimen>
     <dimen name="circle_of_trust_marginLeft_request_button">40dp</dimen>
     <dimen name="circle_of_trust_marginLeft">70dp</dimen>
@@ -54,6 +60,7 @@
     <dimen name="text_extra_small">12sp</dimen>
     <dimen name="text_small">16sp</dimen>
     <dimen name="text_normal">20sp</dimen>
+    <dimen name="text_size_normal">18sp</dimen>
     <dimen name="text_large">28sp</dimen>
     <dimen name="safety_resource_text_size">40sp</dimen>
 
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 7a3b710..bc2285d 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="intro4_layout_weight" >10</integer>
-    <integer name="intro4_textView_weight" >3</integer>
-    <integer name="intro4_linear_layout_weight" >5</integer>
+    <integer name="intro4_layout_weight">10</integer>
+    <integer name="intro4_textView_weight">3</integer>
+    <integer name="intro4_linear_layout_weight">5</integer>
     <integer name="intro4_weight_sum">1</integer>
+    <integer name="reporting_contact_other_staff_weight_sum_two">2</integer>
+    <integer name="reporting_contact_other_staff_weight_sum_five">5</integer>
     <integer name="rotation">90</integer>
+    <item name="circle_intro_alpha" format="float" type="integer">0.5</item>
+    <item name="intro4_imageview_weight" format="float" type="integer">0.61</item>
     <integer name="ems">10</integer>
     <integer name="reporting_confidentiality_weight_sum">6</integer>
     <integer name="reporting_resource_weight_sum">6</integer>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9372baa..d1073e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,8 @@
 
     <!--String related to Circle of Trust-->
     <string name="circle_title">Circle of Trust</string>
+    <string name="skip">Skip</string>
+    <string name="done">Done</string>
     <string name="home_title">A Safety Resource for Peace Corps Volunteers</string>
     <string name="helping">Helping</string>
     <string name="friends_and_community">Friends and community members</string>