From a137ceac949715f1fe552b3c124a719cc5a4d7d1 Mon Sep 17 00:00:00 2001
From: perlajarillo <perlai.jarillo@gmail.com>
Date: Sat, 13 Oct 2018 13:25:12 -0400
Subject: [PATCH 1/4] Making use of styles.xml rather than formatting every
 view

---
 .../src/main/res/layout/activity_about.xml    | 169 +----
 .../src/main/res/layout/activity_issue.xml    | 158 +---
 .../src/main/res/layout/activity_location.xml |  79 +-
 .../app/src/main/res/layout/activity_main.xml | 120 +--
 .../src/main/res/layout/activity_rep_call.xml | 170 +----
 .../src/main/res/layout/activity_settings.xml |   6 +-
 .../src/main/res/layout/activity_stats.xml    |  78 +-
 .../src/main/res/layout/activity_tutorial.xml |   6 +-
 .../main/res/layout/contact_stat_textview.xml |  14 +-
 .../res/layout/empty_issues_address_view.xml  |  30 +-
 .../res/layout/empty_issues_search_view.xml   |  28 +-
 .../src/main/res/layout/empty_issues_view.xml |  28 +-
 .../res/layout/field_office_list_item.xml     |  26 +-
 .../app/src/main/res/layout/filter_item.xml   |  18 +-
 .../src/main/res/layout/issue_search_box.xml  |  13 +-
 5calls/app/src/main/res/layout/issue_view.xml |  63 +-
 .../app/src/main/res/layout/item_outcome.xml  |   6 +-
 .../app/src/main/res/layout/licence_view.xml  |   6 +-
 .../src/main/res/layout/load_more_view.xml    |  20 +-
 5calls/app/src/main/res/layout/nav_header.xml |  17 +-
 .../app/src/main/res/layout/rep_list_view.xml |  63 +-
 .../res/layout/time_preference_dialog.xml     |   6 +-
 .../src/main/res/layout/tutorial_item_1.xml   |  73 +-
 .../src/main/res/layout/tutorial_item_2.xml   |  73 +-
 .../src/main/res/layout/tutorial_item_3.xml   |  71 +-
 5calls/app/src/main/res/values/colors.xml     |   1 +
 5calls/app/src/main/res/values/styles.xml     | 683 +++++++++++++++++-
 27 files changed, 954 insertions(+), 1071 deletions(-)

diff --git a/5calls/app/src/main/res/layout/activity_about.xml b/5calls/app/src/main/res/layout/activity_about.xml
index 3f82a63..3b824e9 100644
--- a/5calls/app/src/main/res/layout/activity_about.xml
+++ b/5calls/app/src/main/res/layout/activity_about.xml
@@ -1,177 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+    android:background="@color/background_color">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        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"
-        >
+    <LinearLayout style="@style/mainLinearLayout">
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/about_header"
-            android:textAllCaps="true"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/h1_text_size"
-            android:textStyle="bold"
-            />
+            style="@style/tutorialHeadStyle"
+            android:layout_marginBottom="@dimen/text_layout_marginBottom16"
+            android:text="@string/about_header" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/about_p1"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            />
+            style="@style/paragraphTextStyle"
+            android:text="@string/about_p1" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/about_p2"
-            android:textColor="@color/colorAccent"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            />
+            style="@style/subheadingTutorialStyle"
+            android:layout_marginBottom="@dimen/text_layout_marginBottom16"
+            android:text="@string/about_p2" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/about_p3"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            />
+            style="@style/paragraphTextStyle"
+            android:text="@string/about_p3" />
 
         <TextView
             android:id="@+id/calls_to_date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:layout_marginTop="16dp"
-            android:textColor="@color/colorAccent"
-            android:textSize="@dimen/h2_text_size"
-            android:textStyle="bold"
-            />
+            style="@style/aboutSubtStyle" />
 
         <Button
             android:id="@+id/sign_up_newsletter_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_margin="0dp"
-            android:background="@android:color/transparent"
-            android:minHeight="@dimen/accessibility_min_size"
-            android:text="@string/sign_up_newsletter_btn"
-            android:textAlignment="textStart"
-            android:textColor="@color/colorAccent"
-            />
+            style="@style/transparentBtnStyle"
+            android:text="@string/sign_up_newsletter_btn" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/about_us_prompt"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            android:textStyle="bold|italic"
-            />
+            style="@style/aboutParagraphTextStyle"
+            android:text="@string/about_us_prompt" />
 
         <Button
             android:id="@+id/about_us_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_margin="0dp"
-            android:background="@android:color/transparent"
-            android:minHeight="@dimen/accessibility_min_size"
-            android:text="@string/about_us_btn"
-            android:textAlignment="textStart"
-            android:textColor="@color/colorAccent"
-            />
+            style="@style/transparentBtnStyle"
+            android:text="@string/about_us_btn" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/contact_us_prompt"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            android:textStyle="bold|italic"
-        />
+            style="@style/aboutParagraphTextStyle"
+            android:text="@string/contact_us_prompt" />
 
         <Button
             android:id="@+id/contact_us_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_margin="0dp"
-            android:background="@android:color/transparent"
-            android:minHeight="@dimen/accessibility_min_size"
-            android:text="@string/contact_us_btn"
-            android:textAlignment="textStart"
-            android:textColor="@color/colorAccent"
-        />
+            style="@style/transparentBtnStyle"
+            android:text="@string/contact_us_btn" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/rate_us_prompt"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            android:textStyle="bold|italic"
-            />
-
+            style="@style/aboutParagraphTextStyle"
+            android:text="@string/rate_us_prompt" />
+        <!-- wasn't in next btn <item name="android:layout_margin">@dimen/layout_margin_button</item>-->
         <Button
             android:id="@+id/rate_us_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:background="@android:color/transparent"
-            android:minHeight="@dimen/accessibility_min_size"
-            android:text="@string/rate_us_btn"
-            android:textAlignment="textStart"
-            android:textColor="@color/colorAccent"
-            />
+            style="@style/transparentBtnStyle"
+            android:text="@string/rate_us_btn" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:linksClickable="true"
-            android:text="@string/open_source_info"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            />
+            style="@style/linksParagraphTextStyle"
+            android:text="@string/open_source_info" />
 
         <TextView
             android:id="@+id/version_info"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/text_size_paragraph"
-            />
+            style="@style/paragraphTextStyle" />
 
         <Button
             android:id="@+id/license_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:minHeight="@dimen/accessibility_min_size"
-            android:text="@string/license_btn"
-            android:textColor="@color/colorAccent"
-            />
-
+            style="@style/licenceBtnStyle"
+            android:text="@string/license_btn" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/activity_issue.xml b/5calls/app/src/main/res/layout/activity_issue.xml
index 1f48a2a..22ffea5 100644
--- a/5calls/app/src/main/res/layout/activity_issue.xml
+++ b/5calls/app/src/main/res/layout/activity_issue.xml
@@ -2,66 +2,30 @@
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:android.support.design="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color">
+    style="@style/scrollViewStyle">
 
-    <android.support.v4.widget.NestedScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="48dp"
-        android:background="@color/background_color"
-        android:clipToPadding="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        >
+        style="@style/nestedScrollViewStyleTop"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:id="@+id/main_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="16dp"
+            style="@style/issueLinearLayout"
             android:paddingTop="@dimen/activity_vertical_margin"
-            >
+            android:paddingBottom="@dimen/activity_vertical_margin">
 
             <TextView
                 android:id="@+id/issue_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:textAllCaps="true"
-                android:textColor="@color/colorPrimary"
-                android:textSize="@dimen/h1_text_size"
-                android:textStyle="bold"
-                />
+                style="@style/issueHeadStyle" />
 
             <TextView
                 android:id="@+id/link"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:clickable="true"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:textColor="@color/colorAccent"
-                android:textSize="@dimen/h2_text_size"
-                android:visibility="gone"
-                />
+                style="@style/issueNameTextStyle" />
 
             <TextView
                 android:id="@+id/issue_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/activity_horizontal_margin"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:textColor="@color/colorPrimaryDark"
-                android:textSize="16sp"
-                />
+                style="@style/issueDescriptionTextStyle" />
 
         </LinearLayout>
 
@@ -69,125 +33,65 @@
 
     <android.support.v4.widget.NestedScrollView
         android:id="@+id/bottom_sheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorAccent"
-        android:elevation="16dp"
+        style="@style/nestedScrollViewStyleDown"
         android.support.design:ignore="UnusedAttribute"
         app:behavior_hideable="false"
         app:behavior_peekHeight="52dp"
-        app:layout_behavior="@string/bottom_sheet_behavior"
-        >
+        app:layout_behavior="@string/bottom_sheet_behavior">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
+        <LinearLayout style="@style/issueLinearLayout">
 
             <RelativeLayout
                 android:id="@+id/rep_prompt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/issueRelativeLayoutStyle"
                 android:background="@color/colorAccent"
-                android:minHeight="52dp"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                >
+                android:minHeight="@dimen/issue_height_relative_layout">
 
                 <ImageView
                     android:id="@+id/expand_contacts_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:contentDescription="@null"
-                    android:rotation="180"
-                    android:scaleType="center"
-                    android:src="@drawable/ic_expand_more_white_24dp"
-                    />
+                    style="@style/issueImageView" />
 
                 <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toLeftOf="@id/expand_contacts_icon"
-                    android:layout_toStartOf="@id/expand_contacts_icon"
-                    android:paddingBottom="16dp"
-                    android:paddingTop="16dp"
-                    android:text="@string/rep_section_prompt"
-                    android:textColor="@android:color/white"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    />
-
+                    style="@style/issueContactTextStyle"
+                    android:text="@string/rep_section_prompt" />
 
             </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/rep_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/issueLinearLayout"
                 android:divider="@drawable/layout_divider"
-                android:orientation="vertical"
-                android:showDividers="middle"
-                />
+                android:showDividers="middle" />
 
             <RelativeLayout
                 android:id="@+id/no_calls_left"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/issueRelativeLayoutStyle"
                 android:background="@color/issue_background_color"
-                android:paddingBottom="16dp"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingTop="16dp"
-                android:visibility="gone"
-                >
+                android:paddingTop="@dimen/activity_horizontal_margin"
+                android:paddingBottom="@dimen/activity_horizontal_margin"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/no_calls_message"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_toLeftOf="@+id/update_location_btn"
-                    android:layout_toStartOf="@id/update_location_btn"
+                    style="@style/issueTextNoCallsStyle"
                     android:text="@string/no_calls_left"
-                    android:textColor="@color/colorPrimary"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    />
+                    android:textColor="@color/colorPrimary" />
 
                 <TextView
                     android:id="@+id/split_district_warning"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
+                    style="@style/issueTextNoCallsStyle"
                     android:layout_below="@id/no_calls_message"
-                    android:layout_marginTop="8dp"
-                    android:layout_toLeftOf="@id/update_location_btn"
-                    android:layout_toStartOf="@id/update_location_btn"
+                    android:layout_marginTop="@dimen/grid_padding"
                     android:text="@string/split_district_warning"
-                    android:textColor="@color/colorPrimaryDark"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    />
+                    android:textColor="@color/colorPrimaryDark" />
 
                 <Button
-                    android:id="@id/update_location_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/update_location_btn"
+                    style="@style/licenceBtnStyle"
                     android:layout_alignBaseline="@id/split_district_warning"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:background="@android:color/transparent"
-                    android:minHeight="@dimen/accessibility_min_size"
-                    android:text="@string/update"
-                    android:textColor="@color/colorAccent"
-                    />
+                    android:text="@string/update" />
 
             </RelativeLayout>
 
diff --git a/5calls/app/src/main/res/layout/activity_location.xml b/5calls/app/src/main/res/layout/activity_location.xml
index b7b162a..aee8212 100644
--- a/5calls/app/src/main/res/layout/activity_location.xml
+++ b/5calls/app/src/main/res/layout/activity_location.xml
@@ -1,93 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_location"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+    style="@style/scrollViewStyle">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        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"
+        style="@style/mainLinearLayout"
         tools:context="org.a5calls.android.a5calls.controller.LocationActivity">
 
         <TextView
             android:id="@+id/location_prompt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/location_prompt"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/h2_text_size"
-            />
+            style="@style/headingStyle"
+            android:text="@string/location_prompt" />
 
         <TextView
             android:id="@+id/gps_prompt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="@string/location_gps_prompt"
-            android:textSize="@dimen/label_text_size"
-            android:visibility="gone"
-            />
+            style="@style/locationGpsTextStyle"
+            android:text="@string/location_gps_prompt" />
 
         <Button
             android:id="@+id/btn_gps"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/btn_gps"
-            android:textColor="@color/colorPrimaryDark"
-            android:visibility="gone"
-            />
+            style="@style/locationGpsBtnStyle"
+            android:text="@string/btn_gps" />
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="@string/location_address_prompt"
-            android:textSize="@dimen/label_text_size"
-            />
+            style="@style/descriptiveTextStyle"
+            android:text="@string/location_address_prompt" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            >
+            android:layout_marginTop="8dp">
 
             <EditText
                 android:id="@+id/address_edit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_toStartOf="@+id/address_submit"
-                android:hint="@string/address_hint"
-                android:imeOptions="actionDone"
-                android:minHeight="@dimen/accessibility_min_size"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@id/address_submit"
-                />
+                style="@style/zipEditTextStyle" />
 
             <Button
-                android:id="@id/address_submit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="16dp"
-                android:minHeight="@dimen/accessibility_min_size"
-                android:minWidth="@dimen/accessibility_min_size"
-                android:text="@string/submit"
-                android:textColor="@color/colorPrimaryDark"
-                android:layout_alignParentRight="true"
-                android:layout_marginLeft="16dp"
-                />
-
+                android:id="@+id/address_submit"
+                style="@style/submitBtn" />
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/5calls/app/src/main/res/layout/activity_main.xml b/5calls/app/src/main/res/layout/activity_main.xml
index dcb8417..d315c8a 100644
--- a/5calls/app/src/main/res/layout/activity_main.xml
+++ b/5calls/app/src/main/res/layout/activity_main.xml
@@ -3,57 +3,36 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="org.a5calls.android.a5calls.controller.MainActivity"
-    >
+    style="@style/mainContainersStyle"
+    tools:context="org.a5calls.android.a5calls.controller.MainActivity">
 
     <android.support.design.widget.CoordinatorLayout
         android:id="@+id/activity_main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/background_color"
-        android:fitsSystemWindows="true"
-        >
+        style="@style/mainContainersStyle"
+        android:background="@color/background_color">
 
         <android.support.design.widget.AppBarLayout
             android:id="@+id/appbar"
-            android:layout_width="match_parent"
-            android:layout_height="216dp"
-            android:fitsSystemWindows="true"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            >
+            style="@style/mainContainersStyle"
+            android:layout_height="@dimen/app_bar_layout_size"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
             <android.support.design.widget.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
+                style="@style/mainContainersStyle"
                 app:contentScrim="?attr/colorPrimary"
                 app:expandedTitleMarginBottom="72dp"
                 app:expandedTitleMarginEnd="48dp"
                 app:expandedTitleMarginStart="48dp"
                 app:expandedTitleTextAppearance="@style/AppTheme.CollapsingToolbar"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-                app:statusBarScrim="@android:color/transparent"
-                >
+                app:statusBarScrim="@android:color/transparent">
 
                 <TextView
                     android:id="@+id/action_bar_subtitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_marginBottom="32dp"
-                    android:layout_marginEnd="64dp"
-                    android:layout_marginLeft="48dp"
-                    android:layout_marginRight="64dp"
-                    android:layout_marginStart="48dp"
+                    style="@style/mainTitleStyle"
                     android:text="@string/about_p2"
-                    android:textColor="@android:color/white"
-                    android:textSize="@dimen/abc_text_size_subhead_material"
-                    app:layout_collapseMode="parallax"
-                    />
+                    app:layout_collapseMode="parallax" />
 
                 <android.support.v7.widget.Toolbar
                     android:id="@+id/toolbar"
@@ -61,89 +40,45 @@
                     android:layout_height="?attr/actionBarSize"
                     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                     app:layout_collapseMode="pin"
-                    app:popupTheme="@style/AppTheme.NoBarTheme.MainActivity"
-                    />
+                    app:popupTheme="@style/AppTheme.NoBarTheme.MainActivity" />
 
             </android.support.design.widget.CollapsingToolbarLayout>
 
         </android.support.design.widget.AppBarLayout>
 
-        <android.support.v4.widget.SwipeRefreshLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
+        <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/swipe_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            >
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                >
+            <LinearLayout style="@style/issueLinearLayout">
 
                 <android.support.v7.widget.AppCompatSpinner
                     android:id="@+id/filter"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/accessibility_min_size"
-                    android:background="@color/colorAccent"
-                    android:elevation="3dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:spinnerMode="dropdown"
-                    tools:ignore="UnusedAttribute"
-                    />
+                    style="@style/spinnerStyle"
+                    tools:ignore="UnusedAttribute" />
 
                 <RelativeLayout
                     android:id="@+id/search_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/accessibility_min_size"
-                    android:background="@color/check_color"
-                    android:elevation="3dp"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute"
-                    >
+                    style="@style/mainSearchBarStyle"
+                    tools:ignore="UnusedAttribute">
 
                     <TextView
                         android:id="@+id/search_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/accessibility_min_size"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:layout_marginEnd="@dimen/accessibility_min_size"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="@dimen/accessibility_min_size"
-                        android:layout_marginStart="16dp"
-                        android:drawableLeft="@drawable/baseline_search_white_24"
-                        android:drawablePadding="16dp"
-                        android:drawableStart="@drawable/baseline_search_white_24"
-                        android:ellipsize="marquee"
-                        android:gravity="center_vertical"
-                        android:singleLine="true"
-                        android:textColor="@android:color/white"
-                        android:textSize="16sp"
-                        android:textStyle="bold"
-                        />
+                        style="@style/searchTextStyle" />
 
                     <ImageButton
                         android:id="@+id/clear_search_button"
-                        android:layout_width="@dimen/accessibility_min_size"
-                        android:layout_height="@dimen/accessibility_min_size"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        android:background="@android:color/transparent"
-                        android:contentDescription="@string/clear_search_btn"
-                        android:foreground="?android:attr/selectableItemBackground"
-                        android:src="@drawable/ic_close_white_24dp"
-                        />
+                        style="@style/mainSearchBtnStyle"
+                        android:contentDescription="@string/clear_search_btn" />
 
                 </RelativeLayout>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/issues_recycler_view"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    />
+                    android:layout_height="match_parent" />
 
             </LinearLayout>
 
@@ -153,13 +88,8 @@
 
     <android.support.design.widget.NavigationView
         android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="#EEE"
-        android:fitsSystemWindows="true"
+        style="@style/mainNavigationViewStyle"
         app:headerLayout="@layout/nav_header"
-        app:menu="@menu/menu_navigation"
-        />
+        app:menu="@menu/menu_navigation" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/activity_rep_call.xml b/5calls/app/src/main/res/layout/activity_rep_call.xml
index eccdff7..8b83067 100644
--- a/5calls/app/src/main/res/layout/activity_rep_call.xml
+++ b/5calls/app/src/main/res/layout/activity_rep_call.xml
@@ -1,205 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scroll_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+    style="@style/scrollViewStyle">
 
     <LinearLayout
         android:id="@+id/rep_call_root"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        >
+        style="@style/mainLinearLayout">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
+            android:layout_height="wrap_content">
 
             <TextView
                 android:id="@+id/call_this_office"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:text="@string/call_this_office"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp"
-                android:textStyle="bold|italic"
-                android:layout_alignParentLeft="true"
+                style="@style/repCallTextStyle"
                 android:layout_alignParentStart="true"
-                />
+                android:layout_alignParentLeft="true"
+                android:layout_marginBottom="16dp"
+                android:text="@string/call_this_office" />
 
             <ImageButton
                 android:id="@+id/contact_done_img"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@android:color/transparent"
+                style="@style/ImageButtonStyle"
                 android:contentDescription="@string/contact_done_img_description"
-                android:scaleType="fitCenter"
-                android:src="@drawable/checked"
-                />
+                android:src="@drawable/checked" />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/rep_info"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
+            android:layout_height="wrap_content">
 
             <ImageView
                 android:id="@+id/rep_image"
-                android:layout_width="@dimen/rep_image_size"
-                android:layout_height="@dimen/rep_image_size"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:contentDescription="@null"
-                android:layout_marginRight="16dp"
-                />
+                style="@style/repImageStyle" />
 
             <TextView
                 android:id="@+id/contact_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:layout_alignWithParentIfMissing="true"
-                android:layout_marginBottom="8dp"
+                style="@style/contactNameStyle"
                 android:layout_toEndOf="@id/rep_image"
-                android:layout_toRightOf="@id/rep_image"
-                android:textColor="@color/colorPrimary"
-                android:textSize="24sp"
-                android:textStyle="bold"
-                />
+                android:layout_toRightOf="@id/rep_image" />
 
             <org.a5calls.android.a5calls.controller.SingleLineResizableTextView
                 android:id="@+id/phone_number"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignWithParentIfMissing="true"
-                android:layout_below="@id/contact_name"
-                android:layout_toEndOf="@id/rep_image"
-                android:layout_toRightOf="@id/rep_image"
-                android:textColor="@color/colorPrimary"
-                android:textSize="32sp"
-                android:textStyle="bold"
-                />
+                style="@style/SingleLineResizableStyle" />
 
             <Button
                 android:id="@+id/local_office_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignWithParentIfMissing="true"
-                android:layout_below="@id/phone_number"
-                android:layout_toEndOf="@id/rep_image"
-                android:layout_toRightOf="@id/rep_image"
-                android:background="@android:color/transparent"
-                android:text="@string/local_office_link"
-                android:textAllCaps="false"
-                android:textColor="@color/colorAccent"
-                android:textSize="16sp"
-                />
+                style="@style/localOffBtnRepCallStyle" />
 
         </RelativeLayout>
 
         <LinearLayout
             android:id="@+id/field_office_section"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:orientation="vertical"
-            >
+            style="@style/issueLinearLayout"
+            android:layout_marginBottom="16dp">
 
             <TextView
                 android:id="@+id/field_office_prompt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp"
-                android:textStyle="bold|italic"
-                />
+                style="@style/repCallTextStyle"
+                android:layout_width="wrap_content" />
 
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/script_section"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
+            style="@style/issueLinearLayout">
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/contact_reason_prompt"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp"
-                android:textStyle="bold|italic"
-                />
+                style="@style/repCallTextStyle"
+                android:text="@string/contact_reason_prompt" />
 
             <TextView
                 android:id="@+id/contact_reason"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/text_size_paragraph"
-                />
+                style="@style/splashTextStyle"
+                android:layout_marginTop="@dimen/margin_top4"
+                android:textSize="@dimen/text_size_paragraph" />
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/call_script_prompt"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp"
-                android:textStyle="bold|italic"
-                />
+                style="@style/repCallTextStyle"
+                android:layout_marginTop="@dimen/margin_top8"
+                android:text="@string/call_script_prompt" />
 
             <TextView
                 android:id="@+id/call_script"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:background="@color/script_background_color"
-                android:padding="16dp"
-                android:textColor="@color/textColorDarkGrey"
-                android:textSize="@dimen/text_size_paragraph"
-                android:textIsSelectable="true"
-                />
+                style="@style/callScriptTextStyle" />
 
         </LinearLayout>
 
         <TextView
             android:id="@+id/buttons_prompt"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/buttons_prompt"
-            android:textColor="@color/colorPrimary"
-            android:textSize="18sp"
-            android:textStyle="bold|italic"
-            />
+            style="@style/repCallTextStyle"
+            android:text="@string/buttons_prompt" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/outcome_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:nestedScrollingEnabled="false"
-            />
+            style="@style/RecyclerViewStyle" />
     </LinearLayout>
 </ScrollView>
diff --git a/5calls/app/src/main/res/layout/activity_settings.xml b/5calls/app/src/main/res/layout/activity_settings.xml
index 172ea0e..0ec8b60 100644
--- a/5calls/app/src/main/res/layout/activity_settings.xml
+++ b/5calls/app/src/main/res/layout/activity_settings.xml
@@ -2,8 +2,6 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color">
-
+    style="@style/scrollViewStyle"
+    >
 </FrameLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/activity_stats.xml b/5calls/app/src/main/res/layout/activity_stats.xml
index 12d5cb3..4e6ef37 100644
--- a/5calls/app/src/main/res/layout/activity_stats.xml
+++ b/5calls/app/src/main/res/layout/activity_stats.xml
@@ -1,90 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/scrollViewStyle">
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/no_calls_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:layout_marginEnd="@dimen/activity_horizontal_margin"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:text="@string/no_calls_impact_message"
-            android:textColor="@color/colorPrimaryDark"
-            android:textSize="24sp"
-            />
+            style="@style/noCallsMsgStyle"
+            android:text="@string/no_calls_impact_message" />
 
         <LinearLayout
             android:id="@+id/stats_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:layout_marginEnd="@dimen/activity_horizontal_margin"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:orientation="vertical"
-            >
+            style="@style/noCallsMsgStyle"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/your_call_count"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorPrimary"
+                style="@style/headingStyle"
                 android:textSize="@dimen/h1_text_size"
-                android:textStyle="bold"
-                />
+                android:textStyle="bold" />
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/topContactTextStyle"
                 android:layout_marginTop="16dp"
                 android:text="@string/motivational_text"
-                android:textColor="@color/colorPrimaryDark"
-                android:textSize="@dimen/text_size_paragraph"
-                />
+                android:textStyle="normal" />
 
             <TextView
                 android:id="@+id/stats_summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textColor="@color/colorPrimary"
-                android:textSize="18sp"
-                android:textStyle="bold"
-                />
+                style="@style/repCallTextStyle"
+                android:layout_marginTop="@dimen/margin_top8"
+                android:textStyle="bold" />
 
             <com.jjoe64.graphview.GraphView
                 android:id="@+id/graph"
-                android:layout_width="match_parent"
-                android:layout_height="200dp"
-                android:layout_marginTop="8dp"
-                android:padding="16dp"
-                />
+                style="@style/graphViewStyle" />
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/top_contacts"
-                android:textColor="@color/colorPrimaryDark"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_size_paragraph"
-                />
-
+                style="@style/topContactTextStyle"
+                android:text="@string/top_contacts" />
         </LinearLayout>
 
     </FrameLayout>
diff --git a/5calls/app/src/main/res/layout/activity_tutorial.xml b/5calls/app/src/main/res/layout/activity_tutorial.xml
index 6219e47..8f05336 100644
--- a/5calls/app/src/main/res/layout/activity_tutorial.xml
+++ b/5calls/app/src/main/res/layout/activity_tutorial.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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/view_pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    />
\ No newline at end of file
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/contact_stat_textview.xml b/5calls/app/src/main/res/layout/contact_stat_textview.xml
index f97a669..e99290e 100644
--- a/5calls/app/src/main/res/layout/contact_stat_textview.xml
+++ b/5calls/app/src/main/res/layout/contact_stat_textview.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:textColor="@color/colorPrimaryDark"
-    android:textSize="@dimen/text_size_paragraph"
-    >
-
-</TextView>
\ No newline at end of file
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/splashTextStyle"
+    android:paddingTop="@dimen/grid_padding"
+    android:textSize="@dimen/text_size_paragraph"></TextView>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/empty_issues_address_view.xml b/5calls/app/src/main/res/layout/empty_issues_address_view.xml
index ec42109..4d41214 100644
--- a/5calls/app/src/main/res/layout/empty_issues_address_view.xml
+++ b/5calls/app/src/main/res/layout/empty_issues_address_view.xml
@@ -1,34 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/scrollViewStyle">
 
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/emptyInvalidStyle"
         android:layout_above="@+id/location_btn"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        android:text="@string/error_address_invalid"
-        android:textAlignment="center"
-        android:textSize="18sp"
-        />
+        android:text="@string/error_address_invalid" />
 
     <Button
         android:id="@id/location_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@android:color/transparent"
-        android:drawablePadding="8dp"
+        style="@style/emptyIssuesBtnStyle"
         android:drawableLeft="@drawable/ic_gps_fixed_white_24dp"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/try_again_btn"
-        android:textColor="@color/colorAccent"
-        />
+        android:text="@string/try_again_btn" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/empty_issues_search_view.xml b/5calls/app/src/main/res/layout/empty_issues_search_view.xml
index 307ff50..0e92eec 100644
--- a/5calls/app/src/main/res/layout/empty_issues_search_view.xml
+++ b/5calls/app/src/main/res/layout/empty_issues_search_view.xml
@@ -1,34 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+    android:background="@color/background_color">
 
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/emptyInvalidStyle"
         android:layout_above="@+id/search_btn"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        android:text="@string/error_search_had_no_results"
-        android:textAlignment="center"
-        android:textSize="18sp"
-        />
+        android:text="@string/error_search_had_no_results" />
 
     <Button
         android:id="@id/search_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@android:color/transparent"
+        style="@style/emptyIssuesBtnStyle"
         android:drawableLeft="@drawable/baseline_search_white_24"
-        android:drawablePadding="8dp"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/try_again_btn"
-        android:textColor="@color/colorAccent"
-        />
+        android:text="@string/try_again_btn" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/empty_issues_view.xml b/5calls/app/src/main/res/layout/empty_issues_view.xml
index 377ccb0..b73e249 100644
--- a/5calls/app/src/main/res/layout/empty_issues_view.xml
+++ b/5calls/app/src/main/res/layout/empty_issues_view.xml
@@ -1,34 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color"
-    >
+    android:background="@color/background_color">
 
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/emptyInvalidStyle"
         android:layout_above="@+id/refresh_btn"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        android:text="@string/request_error"
-        android:textAlignment="center"
-        android:textSize="18sp"
-        />
+        android:text="@string/request_error" />
 
     <Button
         android:id="@id/refresh_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@android:color/transparent"
-        android:drawablePadding="8dp"
+        style="@style/emptyIssuesBtnStyle"
         android:drawableLeft="@drawable/ic_refresh_white_24dp"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/try_again_btn"
-        android:textColor="@color/colorAccent"
-        />
+        android:text="@string/try_again_btn" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/field_office_list_item.xml b/5calls/app/src/main/res/layout/field_office_list_item.xml
index adf02cf..fa925dc 100644
--- a/5calls/app/src/main/res/layout/field_office_list_item.xml
+++ b/5calls/app/src/main/res/layout/field_office_list_item.xml
@@ -1,33 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingLeft="16dp"
-    >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/horizontalLinearLayoutStyle">
 
     <!-- TODO: Make the local office click target accessible -->
 
     <TextView
         android:id="@+id/field_office_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:minHeight="32dp"
-        android:textColor="@color/colorAccent"
-        android:textSize="18sp"
-        />
+        style="@style/fieldOfficeTextStyle" />
 
     <TextView
         android:id="@+id/field_office_city"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:textColor="@color/colorPrimaryDark"
-        android:textSize="18sp"
-        android:layout_marginLeft="4dp"
-        />
+        style="@style/fieldCityTextStyle" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/filter_item.xml b/5calls/app/src/main/res/layout/filter_item.xml
index 88e89cd..8ba65a1 100644
--- a/5calls/app/src/main/res/layout/filter_item.xml
+++ b/5calls/app/src/main/res/layout/filter_item.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="24dp"
-    android:layout_marginRight="24dp"
-    android:drawableEnd="@drawable/ic_filter_list_white_24dp"
-    android:drawablePadding="22dp"
-    android:drawableRight="@drawable/ic_filter_list_white_24dp"
-    android:ellipsize="marquee"
-    android:gravity="center_vertical"
-    android:minHeight="@dimen/accessibility_min_size"
-    android:singleLine="true"
-    android:textColor="@android:color/white"
-    android:textSize="16sp"
-    android:textStyle="bold"
-    android:foreground="?android:attr/selectableItemBackground"
-    >
-
+    style="@style/filterItemStyle">
 </TextView>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/issue_search_box.xml b/5calls/app/src/main/res/layout/issue_search_box.xml
index d3158e1..1f3b349 100644
--- a/5calls/app/src/main/res/layout/issue_search_box.xml
+++ b/5calls/app/src/main/res/layout/issue_search_box.xml
@@ -2,18 +2,9 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="24dp"
-    >
+    android:padding="@dimen/frame_padding">
 
     <EditText
         android:id="@+id/search_box"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/search_hint"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:minWidth="@dimen/min_button_width"
-        android:singleLine="true"
-        android:maxLines="1"
-        />
-
+        style="@style/searchBoxStyle" />
 </FrameLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/issue_view.xml b/5calls/app/src/main/res/layout/issue_view.xml
index d3fe65b..9968781 100644
--- a/5calls/app/src/main/res/layout/issue_view.xml
+++ b/5calls/app/src/main/res/layout/issue_view.xml
@@ -1,51 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:clickable="true"
-        android:foreground="?android:attr/selectableItemBackground"
-        android:background="@color/issue_background_color"
-        >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/viewRelativeLayoutStyle">
 
-        <TextView
-            android:id="@+id/issue_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_toEndOf="@+id/issue_done_img"
-            android:layout_toRightOf="@id/issue_done_img"
-            android:textColor="@color/colorPrimaryDark"
-            android:textSize="24sp"
-            />
+    <TextView
+        android:id="@+id/issue_name"
+        style="@style/issueViewTextStyle"
+        android:layout_toEndOf="@+id/issue_done_img"
+        android:layout_toRightOf="@id/issue_done_img" />
 
-        <TextView
-            android:id="@+id/issue_call_count"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_below="@id/issue_name"
-            android:layout_toEndOf="@id/issue_done_img"
-            android:layout_toRightOf="@id/issue_done_img"
-            android:textColor="@color/colorPrimaryDark"
-            android:textSize="16sp"
-            />
+    <TextView
+        android:id="@+id/issue_call_count"
+        style="@style/issueCallCountStyle"
+        android:layout_below="@id/issue_name"
+        android:layout_toEndOf="@id/issue_done_img"
+        android:layout_toRightOf="@id/issue_done_img" />
 
-        <ImageView
-            android:id="@+id/issue_done_img"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:contentDescription="@null"
-            android:scaleType="fitCenter"
-            android:src="@drawable/checked"
-            />
+    <ImageView
+        android:id="@+id/issue_done_img"
+        style="@style/issueImageStyle"
+        android:src="@drawable/checked" />
 
-    </RelativeLayout>
+</RelativeLayout>
diff --git a/5calls/app/src/main/res/layout/item_outcome.xml b/5calls/app/src/main/res/layout/item_outcome.xml
index cce559b..0e2a06a 100644
--- a/5calls/app/src/main/res/layout/item_outcome.xml
+++ b/5calls/app/src/main/res/layout/item_outcome.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/outcome_button"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/button_color"
-    android:minHeight="@dimen/accessibility_min_size"
-    android:textColor="@color/colorPrimaryDark" />
+    style="@style/outcomeBtnStyle" />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/licence_view.xml b/5calls/app/src/main/res/layout/licence_view.xml
index c18c4c9..41c6201 100644
--- a/5calls/app/src/main/res/layout/licence_view.xml
+++ b/5calls/app/src/main/res/layout/licence_view.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WebView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    />
\ No newline at end of file
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/load_more_view.xml b/5calls/app/src/main/res/layout/load_more_view.xml
index ecb92c2..60aaca7 100644
--- a/5calls/app/src/main/res/layout/load_more_view.xml
+++ b/5calls/app/src/main/res/layout/load_more_view.xml
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="72dp"
-    >
+    android:layout_height="@dimen/load_more_height">
 
     <Button
         android:id="@+id/load_more_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        style="@style/licenceBtnStyle"
         android:layout_gravity="center"
-        android:background="@android:color/transparent"
-        android:minHeight="@dimen/accessibility_min_size"
         android:text="@string/load_more_btn"
-        android:textColor="@color/colorAccent"
-        android:textSize="@dimen/text_size_paragraph"
-        />
+        android:textSize="@dimen/text_size_paragraph" />
 
     <ProgressBar
         android:id="@+id/progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_margin="16dp"
-        android:indeterminate="true"
-        android:layout_gravity="center"
-        />
-
+        style="@style/progressBarStyle" />
 </FrameLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/nav_header.xml b/5calls/app/src/main/res/layout/nav_header.xml
index 12306ff..c2fb02f 100644
--- a/5calls/app/src/main/res/layout/nav_header.xml
+++ b/5calls/app/src/main/res/layout/nav_header.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="160dp"
-    android:background="@android:color/white"
-    android:gravity="bottom"
-    android:orientation="vertical"
-    >
+    style="@style/linearLayoutHeaderStyle">
 
     <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="140dp"
-        android:contentDescription="@null"
-        android:padding="8dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/banner_5calls"
-        />
-
+        style="@style/headerImageStyle"
+        android:src="@drawable/banner_5calls" />
 </LinearLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/rep_list_view.xml b/5calls/app/src/main/res/layout/rep_list_view.xml
index 2a01fd0..8896a20 100644
--- a/5calls/app/src/main/res/layout/rep_list_view.xml
+++ b/5calls/app/src/main/res/layout/rep_list_view.xml
@@ -1,72 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:minHeight="@dimen/accessibility_min_size"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:background="@color/issue_background_color"
-    android:foreground="?android:attr/selectableItemBackground"
-    >
+    style="@style/repListRelativeStyle">
 
     <ImageView
         android:id="@+id/rep_image"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="16dp"
-        android:contentDescription="@null"
-        />
+        style="@style/repImageStyle"
+        android:layout_width="@dimen/rep_list_img_dimens"
+        android:layout_height="@dimen/rep_list_img_dimens"
+        android:layout_centerVertical="true" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="42dp"
+        style="@style/repListLinearStyle"
         android:layout_toEndOf="@id/rep_image"
-        android:layout_toRightOf="@id/rep_image"
-        >
+        android:layout_toRightOf="@id/rep_image">
 
         <TextView
             android:id="@+id/contact_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorPrimary"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            />
+            style="@style/repListContactNameStyle" />
 
         <TextView
             android:id="@+id/contact_reason"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textColor="@color/textColorDarkGrey"
-            android:textSize="14sp"
-            />
+            style="@style/repListReasonStyle" />
 
     </LinearLayout>
 
     <ImageView
         android:id="@+id/contact_done_img"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:background="@android:color/transparent"
-        android:contentDescription="@null"
-        android:scaleType="fitCenter"
-        android:src="@drawable/checked"
-        />
-
+        style="@style/repListImageStyle"
+        android:src="@drawable/checked" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/time_preference_dialog.xml b/5calls/app/src/main/res/layout/time_preference_dialog.xml
index d3984d4..e02892f 100644
--- a/5calls/app/src/main/res/layout/time_preference_dialog.xml
+++ b/5calls/app/src/main/res/layout/time_preference_dialog.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/time_picker"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:theme="@style/AppTheme"
-    />
\ No newline at end of file
+    style="@style/timePickerStyle" />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/tutorial_item_1.xml b/5calls/app/src/main/res/layout/tutorial_item_1.xml
index 91a8c54..8bf3837 100644
--- a/5calls/app/src/main/res/layout/tutorial_item_1.xml
+++ b/5calls/app/src/main/res/layout/tutorial_item_1.xml
@@ -1,63 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
-    android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/tutorialRelativeLayoutStyle">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:orientation="vertical"
-            >
+    <LinearLayout style="@style/tutorialLinearLayoutStyle">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp"
-                android:text="@string/about_header"
-                android:textAllCaps="true"
-                android:textColor="@color/colorPrimary"
-                android:textSize="@dimen/h1_text_size"
-                android:textStyle="bold"
-                />
+        <TextView
+            style="@style/tutorialHeadStyle"
+            android:text="@string/about_header" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="32dp"
-                android:text="@string/about_p2"
-                android:textColor="@color/colorAccent"
-                android:textSize="24sp"
-                android:textStyle="bold"
-                />
+        <TextView
+            style="@style/subheadingTutorialStyle"
+            android:text="@string/about_p2" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/about_splash"
-                android:textColor="@color/colorPrimaryDark"
-                android:textSize="18sp"
-                />
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/btn_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:background="@android:color/transparent"
-            android:minHeight="@dimen/accessibility_min_size"
-            android:text="@string/next"
-            android:textColor="@color/colorAccent"
-            android:layout_alignParentRight="true"
-            />
+        <TextView
+            style="@style/splashTextStyle"
+            android:text="@string/about_splash" />
+    </LinearLayout>
 
+    <Button
+        android:id="@+id/btn_next"
+        style="@style/nextBtnTutorialStyle"
+        android:text="@string/next" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/tutorial_item_2.xml b/5calls/app/src/main/res/layout/tutorial_item_2.xml
index 5cc42da..92179c0 100644
--- a/5calls/app/src/main/res/layout/tutorial_item_2.xml
+++ b/5calls/app/src/main/res/layout/tutorial_item_2.xml
@@ -1,78 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
-    android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/tutorialRelativeLayoutStyle">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:orientation="vertical"
-        >
+    <LinearLayout style="@style/tutorialLinearLayoutStyle">
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:text="@string/about_header"
-            android:textAllCaps="true"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/h1_text_size"
-            android:textStyle="bold"
-            />
+            style="@style/tutorialHeadStyle"
+            android:text="@string/about_header" />
 
         <TextView
             android:id="@+id/calls_to_date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:text="@string/about_p2_2"
-            android:textColor="@color/colorAccent"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            />
+            style="@style/subheadingTutorialStyle"
+            android:text="@string/about_p2_2" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/about_splash_2"
-            android:textColor="@color/colorPrimaryDark"
-            android:textSize="18sp"
-            />
+            style="@style/splashTextStyle"
+            android:layout_marginBottom="@dimen/margin_text"
+            android:text="@string/about_splash_2" />
 
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:background="@android:color/transparent"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/back"
-        android:textColor="@color/colorAccent"
-        android:layout_alignParentLeft="true"
-        />
+        style="@style/backBtnTutorialStyle"
+        android:text="@string/back" />
 
     <Button
         android:id="@+id/btn_next"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:background="@android:color/transparent"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/next"
-        android:textColor="@color/colorAccent"
-        android:layout_alignParentRight="true"
-        />
+        style="@style/nextBtnTutorialStyle"
+        android:text="@string/next" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/tutorial_item_3.xml b/5calls/app/src/main/res/layout/tutorial_item_3.xml
index b9e34f6..98884ce 100644
--- a/5calls/app/src/main/res/layout/tutorial_item_3.xml
+++ b/5calls/app/src/main/res/layout/tutorial_item_3.xml
@@ -1,77 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingEnd="@dimen/activity_horizontal_margin"
-    android:paddingStart="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/tutorialRelativeLayoutStyle">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:orientation="vertical"
-        >
+    <LinearLayout style="@style/tutorialLinearLayoutStyle">
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:text="@string/about_header"
-            android:textAllCaps="true"
-            android:textColor="@color/colorPrimary"
-            android:textSize="@dimen/h1_text_size"
-            android:textStyle="bold"
-            />
+            style="@style/tutorialHeadStyle"
+            android:text="@string/about_header" />
 
         <TextView
             android:id="@+id/calls_to_date"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:textColor="@color/colorAccent"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            />
+            style="@style/subheadingTutorialStyle" />
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/about_splash_3"
-            android:textColor="@color/colorPrimaryDark"
-            android:textSize="18sp"
-            />
+            style="@style/splashTextStyle"
+            android:layout_marginBottom="@dimen/margin_text"
+            android:text="@string/about_splash_3" />
 
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:background="@android:color/transparent"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/back"
-        android:textColor="@color/colorAccent"
-        />
+        style="@style/backBtnTutorialStyle"
+        android:text="@string/back" />
 
     <Button
         android:id="@+id/get_started_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:background="@android:color/transparent"
-        android:minHeight="@dimen/accessibility_min_size"
-        android:text="@string/get_started_btn"
-        android:textColor="@color/colorAccent"
-        />
+        style="@style/nextBtnTutorialStyle"
+        android:text="@string/get_started_btn" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/values/colors.xml b/5calls/app/src/main/res/values/colors.xml
index d20b451..80d0b56 100644
--- a/5calls/app/src/main/res/values/colors.xml
+++ b/5calls/app/src/main/res/values/colors.xml
@@ -15,4 +15,5 @@
     <color name="voicemail_color">@color/colorPrimary</color>
     <color name="unavailable_color">@color/colorPrimaryDark</color>
     <color name="graph_legend_background_color">#9EEE</color>
+    <color name="navigation_view_background_color">#EEE</color>
 </resources>
diff --git a/5calls/app/src/main/res/values/styles.xml b/5calls/app/src/main/res/values/styles.xml
index 35cab40..97f2a6f 100644
--- a/5calls/app/src/main/res/values/styles.xml
+++ b/5calls/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
         <item name="android:alertDialogTheme">@style/AppTheme.Dialog</item>
     </style>
 
-    <style name="AppTheme.NoBarTheme.MainActivity" parent="AppTheme.NoBarTheme"/>
+    <style name="AppTheme.NoBarTheme.MainActivity" parent="AppTheme.NoBarTheme" />
 
     <style name="AppTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -33,4 +33,683 @@
     <style name="AppTheme.SpinnerTheme" parent="Base.Widget.AppCompat.Spinner.Underlined">
 
     </style>
-</resources>
+
+    <style name="headingStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/h2_text_size</item>
+    </style>
+
+    <style name="locationGpsTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/layout_margin_top</item>
+        <item name="android:textSize">@dimen/label_text_size</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="locationGpsBtnStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_top16</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="descriptiveTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/text_layout_marginBottom</item>
+        <item name="android:textSize">@dimen/label_text_size</item>
+    </style>
+
+    <style name="zipEditTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_toStartOf">@id/address_submit</item>
+        <item name="android:hint">@string/address_hint</item>
+        <item name="android:imeOptions">actionDone</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_toLeftOf">@+id/address_submit</item>
+    </style>
+
+    <style name="submitBtn">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_marginStart">@dimen/margin_text</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:minWidth">@dimen/accessibility_min_size</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginLeft">@dimen/margin_left</item>
+        <item name="android:text">@string/submit</item>
+    </style>
+
+    <style name="scrollViewStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:background">@color/background_color</item>
+    </style>
+
+    <style name="mainLinearLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
+        <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingTop">@dimen/activity_vertical_margin</item>
+    </style>
+
+    <style name="issueLinearLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="tutorialRelativeLayoutStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
+        <item name="android:paddingEnd">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingStart">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingTop">@dimen/activity_vertical_margin</item>
+    </style>
+
+    <style name="tutorialLinearLayoutStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="tutorialHeadStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom</item>
+        <item name="android:textSize">@dimen/h1_text_size</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="issueHeadStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom16</item>\
+        <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/h1_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="subheadingTutorialStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textSize">@dimen/subheading_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="splashTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/splash_text_size</item>
+    </style>
+
+    <style name="nextBtnTutorialStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="backBtnTutorialStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="paragraphTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom16</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+    </style>
+
+    <style name="aboutParagraphTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+        <item name="android:textStyle">bold|italic</item>
+    </style>
+
+    <style name="linksParagraphTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/text_layout_marginBottom</item>
+        <item name="android:linksClickable">true</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+    </style>
+
+    <style name="aboutSubtStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/text_layout_marginTop</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textSize">@dimen/h2_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="transparentBtnStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">start</item>
+        <item name="android:layout_margin">@dimen/layout_margin_button</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:textAlignment">textStart</item>
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="licenceBtnStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="nestedScrollViewStyleTop">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginBottom">@dimen/nested_view_margin</item>
+        <item name="android:background">@color/background_color</item>
+        <item name="android:clipToPadding">false</item>
+    </style>
+
+    <style name="issueNameTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom16</item>
+        <item name="android:clickable">true</item>
+        <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textSize">@dimen/h2_text_size</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="issueDescriptionTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+    </style>
+
+    <style name="nestedScrollViewStyleDown">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:elevation">@dimen/activity_vertical_margin</item>
+        <item name="android:background">@color/colorAccent</item>
+    </style>
+
+    <style name="issueRelativeLayoutStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
+    </style>
+
+    <style name="issueImageView">
+        <item name="android:layout_width">@dimen/issue_image_layout</item>
+        <item name="android:layout_height">@dimen/issue_image_layout</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:contentDescription">@null</item>
+        <item name="android:rotation">180</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:src">@drawable/ic_expand_more_white_24dp</item>
+    </style>
+
+
+    <style name="issueContactTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_toLeftOf">@id/expand_contacts_icon</item>
+        <item name="android:layout_toStartOf">@id/expand_contacts_icon</item>
+        <item name="android:paddingBottom">@dimen/activity_horizontal_margin</item>
+        <item name="android:paddingTop">@dimen/activity_horizontal_margin</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="issueTextNoCallsStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_toStartOf">@id/update_location_btn</item>
+        <item name="android:layout_toLeftOf">@+id/update_location_btn</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="mainContainersStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:fitsSystemWindows">true</item>
+    </style>
+
+    <style name="mainTitleStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_marginStart">@dimen/main_title_start_left_margin</item>
+        <item name="android:layout_marginLeft">@dimen/main_title_start_left_margin</item>
+        <item name="android:layout_marginEnd">@dimen/main_title_end_right_margin</item>
+        <item name="android:layout_marginRight">@dimen/main_title_end_right_margin</item>
+        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">@dimen/abc_text_size_subhead_material</item>
+    </style>
+
+    <style name="spinnerStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/accessibility_min_size</item>
+        <item name="android:background">@color/colorAccent</item>
+        <item name="android:elevation">@dimen/spinner_elevation</item>
+        <item name="android:paddingLeft">@dimen/paddin_spinner</item>
+        <item name="android:paddingRight">@dimen/paddin_spinner</item>
+        <item name="android:spinnerMode">dropdown</item>
+    </style>
+
+    <style name="mainSearchBarStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/accessibility_min_size</item>
+        <item name="android:background">@color/check_color</item>
+        <item name="android:elevation">@dimen/spinner_elevation</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="searchTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/accessibility_min_size</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_marginStart">@dimen/text_layout_marginBottom16</item>
+        <item name="android:layout_marginLeft">@dimen/text_layout_marginBottom16</item>
+        <item name="android:layout_marginEnd">@dimen/accessibility_min_size</item>
+        <item name="android:layout_marginRight">@dimen/accessibility_min_size</item>
+        <item name="android:drawableStart">@drawable/baseline_search_white_24</item>
+        <item name="android:drawableLeft">@drawable/baseline_search_white_24</item>
+        <item name="android:drawablePadding">@dimen/paddin_spinner</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="mainSearchBtnStyle">
+        <item name="android:layout_width">@dimen/accessibility_min_size</item>
+        <item name="android:layout_height">@dimen/accessibility_min_size</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
+        <item name="android:src">@drawable/ic_close_white_24dp</item>
+    </style>
+
+    <style name="mainNavigationViewStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_gravity">start</item>
+        <item name="android:background">@color/navigation_view_background_color</item>
+        <item name="android:fitsSystemWindows">true</item>
+    </style>
+
+    <style name="filterItemStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginEnd">@dimen/filter_item_margin</item>
+        <item name="android:layout_marginRight">@dimen/filter_item_margin</item>
+        <item name="android:drawableEnd">@drawable/ic_filter_list_white_24dp</item>
+        <item name="android:drawablePadding">@dimen/filter_item_padding</item>
+        <item name="android:drawableRight">@drawable/ic_filter_list_white_24dp</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
+    </style>
+
+    <style name="repCallTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/text_layout_marginBottom16</item>\
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/splash_text_size</item>
+        <item name="android:textStyle">bold|italic</item>
+    </style>
+
+    <style name="RecyclerViewStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:nestedScrollingEnabled">false</item>
+        <item name="android:paddingTop">@dimen/grid_padding</item>
+    </style>
+
+    <style name="ImageButtonStyle">
+        <item name="android:layout_width">@dimen/issue_image_layout</item>
+        <item name="android:layout_height">@dimen/issue_image_layout</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+
+    <style name="repImageStyle">
+        <item name="android:layout_width">@dimen/rep_image_size</item>
+        <item name="android:layout_height">@dimen/rep_image_size</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_marginRight">@dimen/margin_rigth</item>
+        <item name="contentDescription">@null</item>
+    </style>
+
+    <style name="contactNameStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignWithParentIfMissing">true</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginBottom">@dimen/margin_bottom</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/subheading_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="SingleLineResizableStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignWithParentIfMissing">true</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/h1_text_size</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:layout_below">@id/contact_name</item>
+        <item name="android:layout_toEndOf">@id/rep_image</item>
+        <item name="android:layout_toRightOf">@id/rep_image</item>
+    </style>
+
+    <style name="localOffBtnRepCallStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignWithParentIfMissing">true</item>
+        <item name="android:layout_below">@id/phone_number</item>
+        <item name="android:layout_toEndOf">@id/rep_image</item>
+        <item name="android:layout_toRightOf">@id/rep_image</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:text">@string/local_office_link</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textSize">@dimen/label_text_size</item>
+    </style>
+
+    <style name="callScriptTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_top8</item>
+        <item name="android:background">@color/script_background_color</item>
+        <item name="android:padding">@dimen/paddin_spinner</item>
+        <item name="android:textColor">@color/textColorDarkGrey</item>
+        <item name="android:textIsSelectable">true</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+    </style>
+
+    <style name="noCallsMsgStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">@dimen/activity_vertical_margin</item>
+        <item name="android:layout_marginEnd">@dimen/activity_horizontal_margin</item>
+        <item name="android:layout_marginLeft">@dimen/activity_horizontal_margin</item>
+        <item name="android:layout_marginRight">@dimen/activity_horizontal_margin</item>
+        <item name="android:layout_marginStart">@dimen/activity_horizontal_margin</item>
+        <item name="android:layout_marginTop">@dimen/activity_vertical_margin</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/subheading_text_size</item>
+    </style>
+
+    <style name="graphViewStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/grap_view_height</item>
+        <item name="android:layout_marginTop">@dimen/margin_top8</item>
+        <item name="android:padding">@dimen/paddin_spinner</item>
+    </style>
+
+    <style name="topContactTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/text_layout_marginBottom16</item>\
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="emptyInvalidStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerHorizontal">true</item>\
+        <item name="android:layout_marginLeft">@dimen/text_layout_margin32</item>
+        <item name="android:layout_marginRight">@dimen/text_layout_margin32</item>
+        <item name="android:textSize">@dimen/splash_text_size</item>
+        <item name="android:textAlignment">center</item>
+    </style>
+
+    <style name="emptyIssuesBtnStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:layout_centerInParent">true</item>
+        <item name="android:drawablePadding">@dimen/grid_padding</item>
+    </style>
+
+    <style name="horizontalLinearLayoutStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:paddingStart">@dimen/activity_horizontal_padding</item>
+        <item name="android:paddingLeft">@dimen/activity_horizontal_padding</item>
+    </style>
+
+    <style name="fieldOfficeTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:clickable">true</item>
+        <item name="android:minHeight">@dimen/text_layout_margin32</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textSize">@dimen/splash_text_size</item>
+    </style>
+
+    <style name="fieldCityTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginStart">@dimen/margin_top4</item>
+        <item name="android:layout_marginLeft">@dimen/margin_top4</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/splash_text_size</item>
+    </style>
+
+    <style name="searchBoxStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:hint">@string/search_hint</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:minWidth">@dimen/min_button_width</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="viewRelativeLayoutStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">@dimen/activity_horizontal_padding</item>
+        <item name="android:clickable">true</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/issue_background_color</item>
+    </style>
+
+    <style name="issueViewTextStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/subheading_text_size</item>
+    </style>
+
+    <style name="issueCallCountStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textSize">@dimen/text_size_paragraph</item>
+    </style>
+
+    <style name="issueImageStyle">
+        <item name="android:layout_width">@dimen/text_box_dimen</item>
+        <item name="android:layout_height">@dimen/text_box_dimen</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginEnd">@dimen/margin_rigth</item>
+        <item name="android:layout_marginRight">@dimen/margin_rigth</item>
+        <item name="contentDescription">@null</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+
+    <style name="outcomeBtnStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@color/button_color</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:textColor">@color/colorPrimaryDark</item>
+    </style>
+
+    <style name="progressBarStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">@dimen/margin_top16</item>
+        <item name="android:indeterminate">true</item>
+        <item name="android:layout_gravity">center</item>
+    </style>
+
+    <style name="linearLayoutHeaderStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">@dimen/linear_header_height</item>
+        <item name="android:background">@android:color/white</item>
+        <item name="android:gravity">bottom</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="headerImageStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/img_header_height</item>
+        <item name="android:contentDescription">@null</item>
+        <item name="android:padding">@dimen/grid_padding</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+
+    <style name="timePickerStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:theme">@style/AppTheme</item>
+    </style>
+
+    <style name="repListRelativeStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/load_more_height</item>
+        <item name="android:minHeight">@dimen/accessibility_min_size</item>
+        <item name="android:orientation">vertical</item>
+        <item name=" android:paddingBottom">@dimen/rep_list_dimens</item>
+        <item name=" android:paddingTop">@dimen/rep_list_dimens</item>
+        <item name=" android:paddingLeft">@dimen/rep_list_dimens_left_right</item>
+        <item name=" android:paddingRight">@dimen/rep_list_dimens_left_right</item>
+        <item name="android:background">@color/issue_background_color</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
+    </style>
+
+    <style name="repListLinearStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_alignWithParentIfMissing">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:layout_marginRight">@dimen/rep_list_linear_dimens</item>
+    </style>
+
+    <style name="repListContactNameStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:textSize">@dimen/splash_text_size</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="repListReasonStyle">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_top4</item>
+        <item name="android:textColor">@color/textColorDarkGrey</item>
+        <item name="android:textSize">@dimen/min_resizable_text_size</item>
+    </style>
+
+    <style name="repListImageStyle">
+        <item name="android:layout_width">@dimen/issue_image_layout</item>
+        <item name="android:layout_height">@dimen/issue_image_layout</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:contentDescription">@null</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+</resources>
\ No newline at end of file

From 527d653c7846b56ef5cc69097706a7418f494ba3 Mon Sep 17 00:00:00 2001
From: perlajarillo <perlai.jarillo@gmail.com>
Date: Sat, 13 Oct 2018 13:28:00 -0400
Subject: [PATCH 2/4] Including dimen resources instead hardcoding them.

---
 5calls/app/src/main/res/values/dimens.xml | 41 ++++++++++++++++++++---
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/5calls/app/src/main/res/values/dimens.xml b/5calls/app/src/main/res/values/dimens.xml
index 6a641f5..e9e1aeb 100644
--- a/5calls/app/src/main/res/values/dimens.xml
+++ b/5calls/app/src/main/res/values/dimens.xml
@@ -9,15 +9,48 @@
     <dimen name="h2_text_size">28sp</dimen>
 
     <dimen name="rep_image_size">120dp</dimen>
-
     <dimen name="min_resizable_text_size">14sp</dimen>
     <dimen name="one_sp">1sp</dimen>
-
     <dimen name="graph_line_width">3sp</dimen>
-
     <integer name="horizontal_labels_count">4</integer>
-
     <dimen name="expanded_toolbar_title_size">26sp</dimen>
     <dimen name="min_button_width">220dp</dimen>
     <dimen name="grid_padding">8dp</dimen>
+    <dimen name="subheading_text_size">24sp</dimen>
+    <dimen name="splash_text_size">18sp</dimen>
+    <dimen name="text_layout_marginBottom">32dp</dimen>
+    <dimen name="text_layout_marginBottom16">16dp</dimen>
+    <dimen name="text_layout_marginTop">16dp</dimen>
+    <dimen name="margin_text">16dp</dimen>
+    <dimen name="layout_margin_button">0dp</dimen>
+    <dimen name="nested_view_margin">48dp</dimen>
+    <dimen name="main_title_start_left_margin">48dp</dimen>
+    <dimen name="main_title_end_right_margin">64dp</dimen>
+    <dimen name="issue_height_relative_layout">52dp</dimen>
+    <dimen name="issue_image_layout">36dp</dimen>
+    <dimen name="app_bar_layout_size">216dp</dimen>
+    <dimen name="spinner_elevation">3dp</dimen>
+    <dimen name="paddin_spinner">16dp</dimen>
+    <dimen name="filter_item_margin">24dp</dimen>
+    <dimen name="filter_item_padding">22dp</dimen>
+    <dimen name="margin_rigth">16dp</dimen>
+    <dimen name="margin_left">16dp</dimen>
+    <dimen name="margin_top16">16dp</dimen>
+    <dimen name="margin_bottom">8dp</dimen>
+    <dimen name="margin_top4">4dp</dimen>
+    <dimen name="margin_top8">8dp</dimen>
+    <dimen name="grap_view_height">200dp</dimen>
+    <dimen name="text_layout_margin32">32dp</dimen>
+    <dimen name="activity_horizontal_padding">16dp</dimen>
+    <dimen name="frame_padding">24dp</dimen>
+    <dimen name="max_lines">1</dimen>
+    <dimen name="text_box_dimen">36dp</dimen>
+    <dimen name="load_more_height">72dp</dimen>
+    <dimen name="linear_header_height">160dp</dimen>
+    <dimen name="img_header_height">140dp</dimen>
+    <dimen name="rep_list_dimens">8dp</dimen>
+    <dimen name="rep_list_dimens_left_right">16dp</dimen>
+    <dimen name="rep_list_img_dimens">64dp</dimen>
+    <dimen name="rep_list_linear_dimens">42dp</dimen>
+    <dimen name="layout_margin_top">32dp</dimen>
 </resources>

From 1afc51175e966741a076ae896a6e10cf2b94c2f9 Mon Sep 17 00:00:00 2001
From: perlajarillo <perlai.jarillo@gmail.com>
Date: Mon, 5 Nov 2018 19:09:16 -0500
Subject: [PATCH 3/4] Keeping outside from styles.xml what does not belongs in
 it.

---
 .../src/main/res/layout/activity_about.xml    | 40 +++++++++----
 .../src/main/res/layout/activity_issue.xml    | 13 +++-
 .../src/main/res/layout/activity_location.xml | 28 ++++++---
 .../app/src/main/res/layout/activity_main.xml |  4 +-
 .../src/main/res/layout/activity_rep_call.xml | 59 +++++++++++++------
 .../src/main/res/layout/activity_stats.xml    | 27 ++++++---
 .../src/main/res/layout/activity_tutorial.xml |  3 +-
 .../main/res/layout/contact_stat_textview.xml |  4 +-
 .../res/layout/empty_issues_address_view.xml  |  9 ++-
 .../res/layout/empty_issues_search_view.xml   |  9 ++-
 .../src/main/res/layout/empty_issues_view.xml |  9 ++-
 .../res/layout/field_office_list_item.xml     | 10 +++-
 .../src/main/res/layout/issue_search_box.xml  |  3 +-
 5calls/app/src/main/res/layout/issue_view.xml | 10 +++-
 .../app/src/main/res/layout/item_outcome.xml  |  3 +-
 .../app/src/main/res/layout/licence_view.xml  |  3 +-
 .../src/main/res/layout/load_more_view.xml    |  9 ++-
 5calls/app/src/main/res/layout/nav_header.xml |  8 ++-
 .../app/src/main/res/layout/rep_list_view.xml | 22 +++++--
 .../res/layout/time_preference_dialog.xml     |  3 +-
 .../src/main/res/layout/tutorial_item_1.xml   | 19 ++++--
 .../src/main/res/layout/tutorial_item_2.xml   | 19 ++++--
 .../src/main/res/layout/tutorial_item_3.xml   | 19 ++++--
 5calls/app/src/main/res/values/styles.xml     | 13 ----
 24 files changed, 231 insertions(+), 115 deletions(-)

diff --git a/5calls/app/src/main/res/layout/activity_about.xml b/5calls/app/src/main/res/layout/activity_about.xml
index 3b824e9..f06fe73 100644
--- a/5calls/app/src/main/res/layout/activity_about.xml
+++ b/5calls/app/src/main/res/layout/activity_about.xml
@@ -2,18 +2,24 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color">
+    android:background="@color/background_color"
+    >
 
-    <LinearLayout style="@style/mainLinearLayout">
+    <LinearLayout style="@style/mainLinearLayout"
+        android:orientation="vertical"
+        >
 
         <TextView
             style="@style/tutorialHeadStyle"
             android:layout_marginBottom="@dimen/text_layout_marginBottom16"
-            android:text="@string/about_header" />
+            android:text="@string/about_header"
+            />
 
         <TextView
             style="@style/paragraphTextStyle"
-            android:text="@string/about_p1" />
+            android:layout_marginBottom="@dimen/text_layout_marginBottom16"
+            android:text="@string/about_p1"
+            />
 
         <TextView
             style="@style/subheadingTutorialStyle"
@@ -22,6 +28,7 @@
 
         <TextView
             style="@style/paragraphTextStyle"
+            android:layout_marginBottom="@dimen/text_layout_marginBottom16"
             android:text="@string/about_p3" />
 
         <TextView
@@ -35,21 +42,25 @@
 
         <TextView
             style="@style/aboutParagraphTextStyle"
-            android:text="@string/about_us_prompt" />
+            android:text="@string/about_us_prompt"
+            />
 
         <Button
             android:id="@+id/about_us_btn"
             style="@style/transparentBtnStyle"
-            android:text="@string/about_us_btn" />
+            android:text="@string/about_us_btn"
+            />
 
         <TextView
             style="@style/aboutParagraphTextStyle"
-            android:text="@string/contact_us_prompt" />
+            android:text="@string/contact_us_prompt"
+            />
 
         <Button
             android:id="@+id/contact_us_btn"
             style="@style/transparentBtnStyle"
-            android:text="@string/contact_us_btn" />
+            android:text="@string/contact_us_btn"
+            />
 
         <TextView
             style="@style/aboutParagraphTextStyle"
@@ -58,19 +69,24 @@
         <Button
             android:id="@+id/rate_us_btn"
             style="@style/transparentBtnStyle"
-            android:text="@string/rate_us_btn" />
+            android:text="@string/rate_us_btn"
+            />
 
         <TextView
             style="@style/linksParagraphTextStyle"
-            android:text="@string/open_source_info" />
+            android:text="@string/open_source_info"
+            />
 
         <TextView
             android:id="@+id/version_info"
-            style="@style/paragraphTextStyle" />
+            style="@style/paragraphTextStyle"
+            android:layout_marginTop="@dimen/margin_top16"
+            />
 
         <Button
             android:id="@+id/license_btn"
             style="@style/licenceBtnStyle"
-            android:text="@string/license_btn" />
+            android:text="@string/license_btn"
+            />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/activity_issue.xml b/5calls/app/src/main/res/layout/activity_issue.xml
index 22ffea5..4e3568d 100644
--- a/5calls/app/src/main/res/layout/activity_issue.xml
+++ b/5calls/app/src/main/res/layout/activity_issue.xml
@@ -12,6 +12,7 @@
         <LinearLayout
             android:id="@+id/main_layout"
             style="@style/issueLinearLayout"
+            android:orientation="vertical"
             android:paddingTop="@dimen/activity_vertical_margin"
             android:paddingBottom="@dimen/activity_vertical_margin">
 
@@ -39,7 +40,9 @@
         app:behavior_peekHeight="52dp"
         app:layout_behavior="@string/bottom_sheet_behavior">
 
-        <LinearLayout style="@style/issueLinearLayout">
+        <LinearLayout style="@style/issueLinearLayout"
+            android:orientation="vertical"
+            >
 
             <RelativeLayout
                 android:id="@+id/rep_prompt"
@@ -49,17 +52,21 @@
 
                 <ImageView
                     android:id="@+id/expand_contacts_icon"
-                    style="@style/issueImageView" />
+                    style="@style/issueImageView"
+                    android:contentDescription="@null"
+                    />
 
                 <TextView
                     style="@style/issueContactTextStyle"
-                    android:text="@string/rep_section_prompt" />
+                    android:text="@string/rep_section_prompt"
+                    />
 
             </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/rep_list"
                 style="@style/issueLinearLayout"
+                android:orientation="vertical"
                 android:divider="@drawable/layout_divider"
                 android:showDividers="middle" />
 
diff --git a/5calls/app/src/main/res/layout/activity_location.xml b/5calls/app/src/main/res/layout/activity_location.xml
index aee8212..f463cc8 100644
--- a/5calls/app/src/main/res/layout/activity_location.xml
+++ b/5calls/app/src/main/res/layout/activity_location.xml
@@ -2,43 +2,53 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_location"
-    style="@style/scrollViewStyle">
+    style="@style/scrollViewStyle"
+    >
 
     <LinearLayout
         style="@style/mainLinearLayout"
-        tools:context="org.a5calls.android.a5calls.controller.LocationActivity">
+        android:orientation="vertical"
+        tools:context="org.a5calls.android.a5calls.controller.LocationActivity"
+        >
 
         <TextView
             android:id="@+id/location_prompt"
             style="@style/headingStyle"
-            android:text="@string/location_prompt" />
+            android:text="@string/location_prompt"
+            />
 
         <TextView
             android:id="@+id/gps_prompt"
             style="@style/locationGpsTextStyle"
-            android:text="@string/location_gps_prompt" />
+            android:text="@string/location_gps_prompt"
+            />
 
         <Button
             android:id="@+id/btn_gps"
             style="@style/locationGpsBtnStyle"
-            android:text="@string/btn_gps" />
+            android:text="@string/btn_gps"
+            />
 
         <TextView
             style="@style/descriptiveTextStyle"
-            android:text="@string/location_address_prompt" />
+            android:text="@string/location_address_prompt"
+            />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="8dp"
+            >
 
             <EditText
                 android:id="@+id/address_edit"
-                style="@style/zipEditTextStyle" />
+                style="@style/zipEditTextStyle"
+                />
 
             <Button
                 android:id="@+id/address_submit"
-                style="@style/submitBtn" />
+                style="@style/submitBtn"
+                />
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/5calls/app/src/main/res/layout/activity_main.xml b/5calls/app/src/main/res/layout/activity_main.xml
index d315c8a..88fea50 100644
--- a/5calls/app/src/main/res/layout/activity_main.xml
+++ b/5calls/app/src/main/res/layout/activity_main.xml
@@ -52,7 +52,9 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <LinearLayout style="@style/issueLinearLayout">
+            <LinearLayout style="@style/issueLinearLayout"
+                android:orientation="vertical"
+                >
 
                 <android.support.v7.widget.AppCompatSpinner
                     android:id="@+id/filter"
diff --git a/5calls/app/src/main/res/layout/activity_rep_call.xml b/5calls/app/src/main/res/layout/activity_rep_call.xml
index 8b83067..4a0faa1 100644
--- a/5calls/app/src/main/res/layout/activity_rep_call.xml
+++ b/5calls/app/src/main/res/layout/activity_rep_call.xml
@@ -5,11 +5,14 @@
 
     <LinearLayout
         android:id="@+id/rep_call_root"
-        style="@style/mainLinearLayout">
+        style="@style/mainLinearLayout"
+        android:orientation="vertical"
+        >
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            >
 
             <TextView
                 android:id="@+id/call_this_office"
@@ -17,85 +20,105 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginBottom="16dp"
-                android:text="@string/call_this_office" />
+                android:text="@string/call_this_office"
+                />
 
             <ImageButton
                 android:id="@+id/contact_done_img"
                 style="@style/ImageButtonStyle"
                 android:contentDescription="@string/contact_done_img_description"
-                android:src="@drawable/checked" />
+                android:src="@drawable/checked"
+                />
 
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/rep_info"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            >
 
             <ImageView
                 android:id="@+id/rep_image"
-                style="@style/repImageStyle" />
+                style="@style/repImageStyle"
+                android:contentDescription="@null"
+                />
 
             <TextView
                 android:id="@+id/contact_name"
                 style="@style/contactNameStyle"
                 android:layout_toEndOf="@id/rep_image"
-                android:layout_toRightOf="@id/rep_image" />
+                android:layout_toRightOf="@id/rep_image"
+                />
 
             <org.a5calls.android.a5calls.controller.SingleLineResizableTextView
                 android:id="@+id/phone_number"
-                style="@style/SingleLineResizableStyle" />
+                style="@style/SingleLineResizableStyle"
+                />
 
             <Button
                 android:id="@+id/local_office_btn"
-                style="@style/localOffBtnRepCallStyle" />
+                style="@style/localOffBtnRepCallStyle"
+                />
 
         </RelativeLayout>
 
         <LinearLayout
             android:id="@+id/field_office_section"
             style="@style/issueLinearLayout"
-            android:layout_marginBottom="16dp">
+            android:orientation="vertical"
+            android:layout_marginBottom="16dp"
+            >
 
             <TextView
                 android:id="@+id/field_office_prompt"
                 style="@style/repCallTextStyle"
-                android:layout_width="wrap_content" />
+                android:layout_width="wrap_content"
+                />
 
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/script_section"
-            style="@style/issueLinearLayout">
+            style="@style/issueLinearLayout"
+            android:orientation="vertical"
+
+            >
 
             <TextView
                 style="@style/repCallTextStyle"
-                android:text="@string/contact_reason_prompt" />
+                android:text="@string/contact_reason_prompt"
+                />
 
             <TextView
                 android:id="@+id/contact_reason"
                 style="@style/splashTextStyle"
                 android:layout_marginTop="@dimen/margin_top4"
-                android:textSize="@dimen/text_size_paragraph" />
+                android:textSize="@dimen/text_size_paragraph"
+                />
 
             <TextView
                 style="@style/repCallTextStyle"
                 android:layout_marginTop="@dimen/margin_top8"
-                android:text="@string/call_script_prompt" />
+                android:text="@string/call_script_prompt"
+                />
 
             <TextView
                 android:id="@+id/call_script"
-                style="@style/callScriptTextStyle" />
+                style="@style/callScriptTextStyle"
+                />
 
         </LinearLayout>
 
         <TextView
             android:id="@+id/buttons_prompt"
             style="@style/repCallTextStyle"
-            android:text="@string/buttons_prompt" />
+            android:text="@string/buttons_prompt"
+            />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/outcome_list"
-            style="@style/RecyclerViewStyle" />
+            style="@style/RecyclerViewStyle"
+            />
     </LinearLayout>
 </ScrollView>
diff --git a/5calls/app/src/main/res/layout/activity_stats.xml b/5calls/app/src/main/res/layout/activity_stats.xml
index 4e6ef37..bff9843 100644
--- a/5calls/app/src/main/res/layout/activity_stats.xml
+++ b/5calls/app/src/main/res/layout/activity_stats.xml
@@ -1,46 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/scrollViewStyle">
+    style="@style/scrollViewStyle"
+    >
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        >
 
         <TextView
             android:id="@+id/no_calls_message"
             style="@style/noCallsMsgStyle"
-            android:text="@string/no_calls_impact_message" />
+            android:text="@string/no_calls_impact_message"
+            />
 
         <LinearLayout
             android:id="@+id/stats_holder"
             style="@style/noCallsMsgStyle"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            >
 
             <TextView
                 android:id="@+id/your_call_count"
                 style="@style/headingStyle"
                 android:textSize="@dimen/h1_text_size"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                />
 
             <TextView
                 style="@style/topContactTextStyle"
                 android:layout_marginTop="16dp"
                 android:text="@string/motivational_text"
-                android:textStyle="normal" />
+                android:textStyle="normal"
+                />
 
             <TextView
                 android:id="@+id/stats_summary"
                 style="@style/repCallTextStyle"
                 android:layout_marginTop="@dimen/margin_top8"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                />
 
             <com.jjoe64.graphview.GraphView
                 android:id="@+id/graph"
-                style="@style/graphViewStyle" />
+                style="@style/graphViewStyle"
+                />
 
             <TextView
                 style="@style/topContactTextStyle"
-                android:text="@string/top_contacts" />
+                android:text="@string/top_contacts"
+                />
         </LinearLayout>
 
     </FrameLayout>
diff --git a/5calls/app/src/main/res/layout/activity_tutorial.xml b/5calls/app/src/main/res/layout/activity_tutorial.xml
index 8f05336..6776f74 100644
--- a/5calls/app/src/main/res/layout/activity_tutorial.xml
+++ b/5calls/app/src/main/res/layout/activity_tutorial.xml
@@ -2,4 +2,5 @@
 <android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/view_pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent"
+    />
diff --git a/5calls/app/src/main/res/layout/contact_stat_textview.xml b/5calls/app/src/main/res/layout/contact_stat_textview.xml
index e99290e..bb8466a 100644
--- a/5calls/app/src/main/res/layout/contact_stat_textview.xml
+++ b/5calls/app/src/main/res/layout/contact_stat_textview.xml
@@ -2,4 +2,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/splashTextStyle"
     android:paddingTop="@dimen/grid_padding"
-    android:textSize="@dimen/text_size_paragraph"></TextView>
\ No newline at end of file
+    android:textSize="@dimen/text_size_paragraph">
+
+</TextView>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/empty_issues_address_view.xml b/5calls/app/src/main/res/layout/empty_issues_address_view.xml
index 4d41214..509c956 100644
--- a/5calls/app/src/main/res/layout/empty_issues_address_view.xml
+++ b/5calls/app/src/main/res/layout/empty_issues_address_view.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/scrollViewStyle">
+    style="@style/scrollViewStyle"
+    >
 
     <TextView
         style="@style/emptyInvalidStyle"
         android:layout_above="@+id/location_btn"
-        android:text="@string/error_address_invalid" />
+        android:text="@string/error_address_invalid"
+        />
 
     <Button
         android:id="@id/location_btn"
         style="@style/emptyIssuesBtnStyle"
         android:drawableLeft="@drawable/ic_gps_fixed_white_24dp"
-        android:text="@string/try_again_btn" />
+        android:text="@string/try_again_btn"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/empty_issues_search_view.xml b/5calls/app/src/main/res/layout/empty_issues_search_view.xml
index 0e92eec..046348d 100644
--- a/5calls/app/src/main/res/layout/empty_issues_search_view.xml
+++ b/5calls/app/src/main/res/layout/empty_issues_search_view.xml
@@ -2,17 +2,20 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color">
+    android:background="@color/background_color"
+    >
 
     <TextView
         style="@style/emptyInvalidStyle"
         android:layout_above="@+id/search_btn"
-        android:text="@string/error_search_had_no_results" />
+        android:text="@string/error_search_had_no_results"
+        />
 
     <Button
         android:id="@id/search_btn"
         style="@style/emptyIssuesBtnStyle"
         android:drawableLeft="@drawable/baseline_search_white_24"
-        android:text="@string/try_again_btn" />
+        android:text="@string/try_again_btn"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/empty_issues_view.xml b/5calls/app/src/main/res/layout/empty_issues_view.xml
index b73e249..376af4c 100644
--- a/5calls/app/src/main/res/layout/empty_issues_view.xml
+++ b/5calls/app/src/main/res/layout/empty_issues_view.xml
@@ -2,17 +2,20 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_color">
+    android:background="@color/background_color"
+    >
 
     <TextView
         style="@style/emptyInvalidStyle"
         android:layout_above="@+id/refresh_btn"
-        android:text="@string/request_error" />
+        android:text="@string/request_error"
+        />
 
     <Button
         android:id="@id/refresh_btn"
         style="@style/emptyIssuesBtnStyle"
         android:drawableLeft="@drawable/ic_refresh_white_24dp"
-        android:text="@string/try_again_btn" />
+        android:text="@string/try_again_btn"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/field_office_list_item.xml b/5calls/app/src/main/res/layout/field_office_list_item.xml
index fa925dc..878a321 100644
--- a/5calls/app/src/main/res/layout/field_office_list_item.xml
+++ b/5calls/app/src/main/res/layout/field_office_list_item.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/horizontalLinearLayoutStyle">
+    style="@style/horizontalLinearLayoutStyle"
+    android:orientation="horizontal"
+    >
 
     <!-- TODO: Make the local office click target accessible -->
 
     <TextView
         android:id="@+id/field_office_number"
-        style="@style/fieldOfficeTextStyle" />
+        style="@style/fieldOfficeTextStyle"
+        />
 
     <TextView
         android:id="@+id/field_office_city"
-        style="@style/fieldCityTextStyle" />
+        style="@style/fieldCityTextStyle"
+        />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/issue_search_box.xml b/5calls/app/src/main/res/layout/issue_search_box.xml
index 1f3b349..e9fe0e1 100644
--- a/5calls/app/src/main/res/layout/issue_search_box.xml
+++ b/5calls/app/src/main/res/layout/issue_search_box.xml
@@ -6,5 +6,6 @@
 
     <EditText
         android:id="@+id/search_box"
-        style="@style/searchBoxStyle" />
+        style="@style/searchBoxStyle"
+        />
 </FrameLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/issue_view.xml b/5calls/app/src/main/res/layout/issue_view.xml
index 9968781..2f8e58a 100644
--- a/5calls/app/src/main/res/layout/issue_view.xml
+++ b/5calls/app/src/main/res/layout/issue_view.xml
@@ -7,18 +7,22 @@
         android:id="@+id/issue_name"
         style="@style/issueViewTextStyle"
         android:layout_toEndOf="@+id/issue_done_img"
-        android:layout_toRightOf="@id/issue_done_img" />
+        android:layout_toRightOf="@id/issue_done_img"
+        />
 
     <TextView
         android:id="@+id/issue_call_count"
         style="@style/issueCallCountStyle"
         android:layout_below="@id/issue_name"
         android:layout_toEndOf="@id/issue_done_img"
-        android:layout_toRightOf="@id/issue_done_img" />
+        android:layout_toRightOf="@id/issue_done_img"
+        />
 
     <ImageView
         android:id="@+id/issue_done_img"
         style="@style/issueImageStyle"
-        android:src="@drawable/checked" />
+        android:contentDescription="@null"
+        android:src="@drawable/checked"
+        />
 
 </RelativeLayout>
diff --git a/5calls/app/src/main/res/layout/item_outcome.xml b/5calls/app/src/main/res/layout/item_outcome.xml
index 0e2a06a..7e1e64d 100644
--- a/5calls/app/src/main/res/layout/item_outcome.xml
+++ b/5calls/app/src/main/res/layout/item_outcome.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/outcome_button"
-    style="@style/outcomeBtnStyle" />
\ No newline at end of file
+    style="@style/outcomeBtnStyle"
+    />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/licence_view.xml b/5calls/app/src/main/res/layout/licence_view.xml
index 41c6201..1a29825 100644
--- a/5calls/app/src/main/res/layout/licence_view.xml
+++ b/5calls/app/src/main/res/layout/licence_view.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WebView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent"
+    />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/load_more_view.xml b/5calls/app/src/main/res/layout/load_more_view.xml
index 60aaca7..97e0b49 100644
--- a/5calls/app/src/main/res/layout/load_more_view.xml
+++ b/5calls/app/src/main/res/layout/load_more_view.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/load_more_height">
+    android:layout_height="@dimen/load_more_height"
+    >
 
     <Button
         android:id="@+id/load_more_btn"
         style="@style/licenceBtnStyle"
         android:layout_gravity="center"
         android:text="@string/load_more_btn"
-        android:textSize="@dimen/text_size_paragraph" />
+        android:textSize="@dimen/text_size_paragraph"
+        />
 
     <ProgressBar
         android:id="@+id/progress_bar"
-        style="@style/progressBarStyle" />
+        style="@style/progressBarStyle"
+        />
 </FrameLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/nav_header.xml b/5calls/app/src/main/res/layout/nav_header.xml
index c2fb02f..ae3fa75 100644
--- a/5calls/app/src/main/res/layout/nav_header.xml
+++ b/5calls/app/src/main/res/layout/nav_header.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/linearLayoutHeaderStyle">
+    style="@style/linearLayoutHeaderStyle"
+    android:orientation="vertical"
+    >
 
     <ImageView
         style="@style/headerImageStyle"
-        android:src="@drawable/banner_5calls" />
+        android:contentDescription="@null"
+        android:src="@drawable/banner_5calls"
+        />
 </LinearLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/rep_list_view.xml b/5calls/app/src/main/res/layout/rep_list_view.xml
index 8896a20..839e015 100644
--- a/5calls/app/src/main/res/layout/rep_list_view.xml
+++ b/5calls/app/src/main/res/layout/rep_list_view.xml
@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/repListRelativeStyle">
+    style="@style/repListRelativeStyle"
+    android:orientation="vertical"
+    >
 
     <ImageView
         android:id="@+id/rep_image"
         style="@style/repImageStyle"
+        android:contentDescription="@null"
         android:layout_width="@dimen/rep_list_img_dimens"
         android:layout_height="@dimen/rep_list_img_dimens"
-        android:layout_centerVertical="true" />
+        android:layout_centerVertical="true"
+        />
 
     <LinearLayout
         style="@style/repListLinearStyle"
+        android:orientation="vertical"
         android:layout_toEndOf="@id/rep_image"
-        android:layout_toRightOf="@id/rep_image">
+        android:layout_toRightOf="@id/rep_image"
+        >
 
         <TextView
             android:id="@+id/contact_name"
-            style="@style/repListContactNameStyle" />
+            style="@style/repListContactNameStyle"
+            />
 
         <TextView
             android:id="@+id/contact_reason"
-            style="@style/repListReasonStyle" />
+            style="@style/repListReasonStyle"
+            />
 
     </LinearLayout>
 
     <ImageView
         android:id="@+id/contact_done_img"
         style="@style/repListImageStyle"
-        android:src="@drawable/checked" />
+        android:contentDescription="@null"
+        android:src="@drawable/checked"
+        />
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/time_preference_dialog.xml b/5calls/app/src/main/res/layout/time_preference_dialog.xml
index e02892f..4245068 100644
--- a/5calls/app/src/main/res/layout/time_preference_dialog.xml
+++ b/5calls/app/src/main/res/layout/time_preference_dialog.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/time_picker"
-    style="@style/timePickerStyle" />
\ No newline at end of file
+    style="@style/timePickerStyle"
+    />
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/tutorial_item_1.xml b/5calls/app/src/main/res/layout/tutorial_item_1.xml
index 8bf3837..174f2c5 100644
--- a/5calls/app/src/main/res/layout/tutorial_item_1.xml
+++ b/5calls/app/src/main/res/layout/tutorial_item_1.xml
@@ -1,24 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/tutorialRelativeLayoutStyle">
+    style="@style/tutorialRelativeLayoutStyle"
+    >
 
-    <LinearLayout style="@style/tutorialLinearLayoutStyle">
+    <LinearLayout style="@style/tutorialLinearLayoutStyle"
+        android:orientation="vertical"
+        >
 
         <TextView
             style="@style/tutorialHeadStyle"
-            android:text="@string/about_header" />
+            android:text="@string/about_header"
+            />
 
         <TextView
             style="@style/subheadingTutorialStyle"
-            android:text="@string/about_p2" />
+            android:text="@string/about_p2"
+            />
 
         <TextView
             style="@style/splashTextStyle"
-            android:text="@string/about_splash" />
+            android:text="@string/about_splash"
+            />
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_next"
         style="@style/nextBtnTutorialStyle"
-        android:text="@string/next" />
+        android:text="@string/next"
+        />
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/tutorial_item_2.xml b/5calls/app/src/main/res/layout/tutorial_item_2.xml
index 92179c0..b4eb206 100644
--- a/5calls/app/src/main/res/layout/tutorial_item_2.xml
+++ b/5calls/app/src/main/res/layout/tutorial_item_2.xml
@@ -2,32 +2,39 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/tutorialRelativeLayoutStyle">
 
-    <LinearLayout style="@style/tutorialLinearLayoutStyle">
+    <LinearLayout style="@style/tutorialLinearLayoutStyle"
+        android:orientation="vertical"
+        >
 
         <TextView
             style="@style/tutorialHeadStyle"
-            android:text="@string/about_header" />
+            android:text="@string/about_header"
+            />
 
         <TextView
             android:id="@+id/calls_to_date"
             style="@style/subheadingTutorialStyle"
-            android:text="@string/about_p2_2" />
+            android:text="@string/about_p2_2"
+            />
 
         <TextView
             style="@style/splashTextStyle"
             android:layout_marginBottom="@dimen/margin_text"
-            android:text="@string/about_splash_2" />
+            android:text="@string/about_splash_2"
+            />
 
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_back"
         style="@style/backBtnTutorialStyle"
-        android:text="@string/back" />
+        android:text="@string/back"
+        />
 
     <Button
         android:id="@+id/btn_next"
         style="@style/nextBtnTutorialStyle"
-        android:text="@string/next" />
+        android:text="@string/next"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/layout/tutorial_item_3.xml b/5calls/app/src/main/res/layout/tutorial_item_3.xml
index 98884ce..eeacb85 100644
--- a/5calls/app/src/main/res/layout/tutorial_item_3.xml
+++ b/5calls/app/src/main/res/layout/tutorial_item_3.xml
@@ -2,31 +2,38 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/tutorialRelativeLayoutStyle">
 
-    <LinearLayout style="@style/tutorialLinearLayoutStyle">
+    <LinearLayout style="@style/tutorialLinearLayoutStyle"
+        android:orientation="vertical"
+        >
 
         <TextView
             style="@style/tutorialHeadStyle"
-            android:text="@string/about_header" />
+            android:text="@string/about_header"
+            />
 
         <TextView
             android:id="@+id/calls_to_date"
-            style="@style/subheadingTutorialStyle" />
+            style="@style/subheadingTutorialStyle"
+            />
 
         <TextView
             style="@style/splashTextStyle"
             android:layout_marginBottom="@dimen/margin_text"
-            android:text="@string/about_splash_3" />
+            android:text="@string/about_splash_3"
+            />
 
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_back"
         style="@style/backBtnTutorialStyle"
-        android:text="@string/back" />
+        android:text="@string/back"
+        />
 
     <Button
         android:id="@+id/get_started_btn"
         style="@style/nextBtnTutorialStyle"
-        android:text="@string/get_started_btn" />
+        android:text="@string/get_started_btn"
+        />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/5calls/app/src/main/res/values/styles.xml b/5calls/app/src/main/res/values/styles.xml
index 97f2a6f..da297c7 100644
--- a/5calls/app/src/main/res/values/styles.xml
+++ b/5calls/app/src/main/res/values/styles.xml
@@ -98,7 +98,6 @@
     <style name="mainLinearLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
         <item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
         <item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
         <item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
@@ -108,7 +107,6 @@
     <style name="issueLinearLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
     </style>
 
     <style name="tutorialRelativeLayoutStyle">
@@ -124,7 +122,6 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:orientation">vertical</item>
     </style>
 
     <style name="tutorialHeadStyle">
@@ -190,7 +187,6 @@
     <style name="paragraphTextStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">@dimen/text_layout_marginBottom16</item>
         <item name="android:textColor">@color/colorPrimary</item>
         <item name="android:textSize">@dimen/text_size_paragraph</item>
     </style>
@@ -291,7 +287,6 @@
         <item name="android:layout_alignParentEnd">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:contentDescription">@null</item>
         <item name="android:rotation">180</item>
         <item name="android:scaleType">center</item>
         <item name="android:src">@drawable/ic_expand_more_white_24dp</item>
@@ -447,7 +442,6 @@
         <item name="android:layout_alignParentStart">true</item>
         <item name="android:layout_alignParentLeft">true</item>
         <item name="android:layout_marginRight">@dimen/margin_rigth</item>
-        <item name="contentDescription">@null</item>
     </style>
 
     <style name="contactNameStyle">
@@ -552,7 +546,6 @@
     <style name="horizontalLinearLayoutStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">horizontal</item>
         <item name="android:paddingStart">@dimen/activity_horizontal_padding</item>
         <item name="android:paddingLeft">@dimen/activity_horizontal_padding</item>
     </style>
@@ -619,7 +612,6 @@
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_marginEnd">@dimen/margin_rigth</item>
         <item name="android:layout_marginRight">@dimen/margin_rigth</item>
-        <item name="contentDescription">@null</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
 
@@ -644,13 +636,11 @@
         <item name="android:layout_height">@dimen/linear_header_height</item>
         <item name="android:background">@android:color/white</item>
         <item name="android:gravity">bottom</item>
-        <item name="android:orientation">vertical</item>
     </style>
 
     <style name="headerImageStyle">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/img_header_height</item>
-        <item name="android:contentDescription">@null</item>
         <item name="android:padding">@dimen/grid_padding</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
@@ -666,7 +656,6 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/load_more_height</item>
         <item name="android:minHeight">@dimen/accessibility_min_size</item>
-        <item name="android:orientation">vertical</item>
         <item name=" android:paddingBottom">@dimen/rep_list_dimens</item>
         <item name=" android:paddingTop">@dimen/rep_list_dimens</item>
         <item name=" android:paddingLeft">@dimen/rep_list_dimens_left_right</item>
@@ -678,7 +667,6 @@
     <style name="repListLinearStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
         <item name="android:layout_alignParentEnd">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_alignWithParentIfMissing">true</item>
@@ -709,7 +697,6 @@
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:background">@android:color/transparent</item>
-        <item name="android:contentDescription">@null</item>
         <item name="android:scaleType">fitCenter</item>
     </style>
 </resources>
\ No newline at end of file

From c8a81876df38f6e4152e8791fcf3e04714e5b681 Mon Sep 17 00:00:00 2001
From: Perla Jarillo <perlai.jarillo@gmail.com>
Date: Tue, 13 Nov 2018 11:08:56 -0500
Subject: [PATCH 4/4] Removing comment in activity_about

Removing unnecessary comment.
---
 5calls/app/src/main/res/layout/activity_about.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/5calls/app/src/main/res/layout/activity_about.xml b/5calls/app/src/main/res/layout/activity_about.xml
index f06fe73..c64d036 100644
--- a/5calls/app/src/main/res/layout/activity_about.xml
+++ b/5calls/app/src/main/res/layout/activity_about.xml
@@ -65,7 +65,7 @@
         <TextView
             style="@style/aboutParagraphTextStyle"
             android:text="@string/rate_us_prompt" />
-        <!-- wasn't in next btn <item name="android:layout_margin">@dimen/layout_margin_button</item>-->
+
         <Button
             android:id="@+id/rate_us_btn"
             style="@style/transparentBtnStyle"
@@ -89,4 +89,4 @@
             android:text="@string/license_btn"
             />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>