diff --git a/5calls/app/src/main/res/layout/activity_about.xml b/5calls/app/src/main/res/layout/activity_about.xml
index 3f82a63..c64d036 100644
--- a/5calls/app/src/main/res/layout/activity_about.xml
+++ b/5calls/app/src/main/res/layout/activity_about.xml
@@ -1,177 +1,92 @@
-
-
+ style="@style/subheadingTutorialStyle"
+ android:layout_marginBottom="@dimen/text_layout_marginBottom16"
+ android:text="@string/about_p2" />
+ style="@style/paragraphTextStyle"
+ android:layout_marginBottom="@dimen/text_layout_marginBottom16"
+ android:text="@string/about_p3" />
+ style="@style/aboutSubtStyle" />
+ style="@style/transparentBtnStyle"
+ android:text="@string/sign_up_newsletter_btn" />
+ />
+ />
+ style="@style/aboutParagraphTextStyle"
+ android:text="@string/rate_us_prompt" />
-
-
\ 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..4e3568d 100644
--- a/5calls/app/src/main/res/layout/activity_issue.xml
+++ b/5calls/app/src/main/res/layout/activity_issue.xml
@@ -2,66 +2,31 @@
+ style="@style/scrollViewStyle">
-
+ style="@style/nestedScrollViewStyleTop"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ android:paddingBottom="@dimen/activity_vertical_margin">
+ style="@style/issueHeadStyle" />
+ style="@style/issueNameTextStyle" />
+ style="@style/issueDescriptionTextStyle" />
@@ -69,125 +34,71 @@
+ app:layout_behavior="@string/bottom_sheet_behavior">
-
+ android:minHeight="@dimen/issue_height_relative_layout">
-
+ android:divider="@drawable/layout_divider"
+ android:showDividers="middle" />
+ android:paddingTop="@dimen/activity_horizontal_margin"
+ android:paddingBottom="@dimen/activity_horizontal_margin"
+ android:visibility="gone">
+ android:textColor="@color/colorPrimary" />
+ android:textColor="@color/colorPrimaryDark" />
+ android:text="@string/update" />
diff --git a/5calls/app/src/main/res/layout/activity_location.xml b/5calls/app/src/main/res/layout/activity_location.xml
index b7b162a..f463cc8 100644
--- a/5calls/app/src/main/res/layout/activity_location.xml
+++ b/5calls/app/src/main/res/layout/activity_location.xml
@@ -1,58 +1,37 @@
-
+ tools:context="org.a5calls.android.a5calls.controller.LocationActivity"
+ >
-
diff --git a/5calls/app/src/main/res/layout/activity_main.xml b/5calls/app/src/main/res/layout/activity_main.xml
index dcb8417..88fea50 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">
+ style="@style/mainContainersStyle"
+ android:background="@color/background_color">
+ style="@style/mainContainersStyle"
+ android:layout_height="@dimen/app_bar_layout_size"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+ app:statusBarScrim="@android:color/transparent">
+ app:layout_collapseMode="parallax" />
+ app:popupTheme="@style/AppTheme.NoBarTheme.MainActivity" />
-
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
+ style="@style/spinnerStyle"
+ tools:ignore="UnusedAttribute" />
+ style="@style/mainSearchBarStyle"
+ tools:ignore="UnusedAttribute">
+ style="@style/searchTextStyle" />
+ style="@style/mainSearchBtnStyle"
+ android:contentDescription="@string/clear_search_btn" />
+ android:layout_height="match_parent" />
@@ -153,13 +90,8 @@
+ app:menu="@menu/menu_navigation" />
\ 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..4a0faa1 100644
--- a/5calls/app/src/main/res/layout/activity_rep_call.xml
+++ b/5calls/app/src/main/res/layout/activity_rep_call.xml
@@ -1,21 +1,12 @@
-
+ style="@style/scrollViewStyle">
@@ -59,147 +40,85 @@
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 @@
-
+ style="@style/scrollViewStyle"
+ >
\ 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 da531a6..74632e9 100644
--- a/5calls/app/src/main/res/layout/activity_stats.xml
+++ b/5calls/app/src/main/res/layout/activity_stats.xml
@@ -1,9 +1,6 @@
-
+
+
+ style="@style/graphViewStyle" />
-
diff --git a/5calls/app/src/main/res/layout/activity_tutorial.xml b/5calls/app/src/main/res/layout/activity_tutorial.xml
index 6219e47..6776f74 100644
--- a/5calls/app/src/main/res/layout/activity_tutorial.xml
+++ b/5calls/app/src/main/res/layout/activity_tutorial.xml
@@ -1,7 +1,6 @@
-
\ 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..bb8466a 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,7 @@
-
+
\ 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..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,34 +1,19 @@
-
\ 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..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
@@ -1,34 +1,21 @@
-
\ 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..376af4c 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,21 @@
-
\ 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..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,33 +1,19 @@
-
\ 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 @@
-
+ style="@style/filterItemStyle">
\ 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..e9fe0e1 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,10 @@
+ android:padding="@dimen/frame_padding">
-
\ 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..2f8e58a 100644
--- a/5calls/app/src/main/res/layout/issue_view.xml
+++ b/5calls/app/src/main/res/layout/issue_view.xml
@@ -1,51 +1,28 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/5calls/app/src/main/res/layout/item_outcome.xml b/5calls/app/src/main/res/layout/item_outcome.xml
index cce559b..7e1e64d 100644
--- a/5calls/app/src/main/res/layout/item_outcome.xml
+++ b/5calls/app/src/main/res/layout/item_outcome.xml
@@ -1,8 +1,5 @@
+ 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..1a29825 100644
--- a/5calls/app/src/main/res/layout/licence_view.xml
+++ b/5calls/app/src/main/res/layout/licence_view.xml
@@ -1,6 +1,5 @@
-
\ 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..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,28 +1,19 @@
-
\ 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..ae3fa75 100644
--- a/5calls/app/src/main/res/layout/nav_header.xml
+++ b/5calls/app/src/main/res/layout/nav_header.xml
@@ -1,19 +1,12 @@
-
\ 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..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,72 +1,41 @@
-
\ 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..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,8 +1,5 @@
\ 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..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,63 +1,31 @@
-
-
+
-
-
-
-
-
+
-
+
-
+
+
\ 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..b4eb206 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,40 @@
-
+
-
\ 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..eeacb85 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,39 @@
-
+
-
\ 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/colorPrimary
@color/colorPrimaryDark
#9EEE
+ #EEE
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 @@
28sp
120dp
-
14sp
1sp
-
3sp
-
4
-
26sp
220dp
8dp
+ 24sp
+ 18sp
+ 32dp
+ 16dp
+ 16dp
+ 16dp
+ 0dp
+ 48dp
+ 48dp
+ 64dp
+ 52dp
+ 36dp
+ 216dp
+ 3dp
+ 16dp
+ 24dp
+ 22dp
+ 16dp
+ 16dp
+ 16dp
+ 8dp
+ 4dp
+ 8dp
+ 200dp
+ 32dp
+ 16dp
+ 24dp
+ 1
+ 36dp
+ 72dp
+ 160dp
+ 140dp
+ 8dp
+ 16dp
+ 64dp
+ 42dp
+ 32dp
diff --git a/5calls/app/src/main/res/values/styles.xml b/5calls/app/src/main/res/values/styles.xml
index 35cab40..da297c7 100644
--- a/5calls/app/src/main/res/values/styles.xml
+++ b/5calls/app/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
- @style/AppTheme.Dialog
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file