From 2673a06d6f083f5899df347742e39e3963193a12 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Wed, 25 Apr 2018 17:47:05 -0300
Subject: [PATCH] Tweak UI (status bar, action bar, privacy policy, login)

---
 .../hifiinterface/MainActivity.java           | 14 +++--
 .../app/src/main/res/font/raleway_italic.xml  |  7 +++
 .../app/src/main/res/layout/activity_main.xml |  5 +-
 .../src/main/res/layout/fragment_login.xml    | 55 +++++++++++--------
 .../src/main/res/layout/fragment_policy.xml   | 16 +++---
 android/app/src/main/res/values/colors.xml    |  5 +-
 android/app/src/main/res/values/dimens.xml    |  3 +
 .../src/main/res/values/preloaded_fonts.xml   |  1 +
 8 files changed, 64 insertions(+), 42 deletions(-)
 create mode 100644 android/app/src/main/res/font/raleway_italic.xml

diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index 274ad95347..2298308541 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -9,6 +9,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.support.v4.view.GravityCompat;
@@ -16,21 +17,17 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
 import io.highfidelity.hifiinterface.fragment.GotoFragment;
 import io.highfidelity.hifiinterface.fragment.HomeFragment;
 import io.highfidelity.hifiinterface.fragment.LoginFragment;
@@ -74,6 +71,11 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
         mDrawerLayout = findViewById(R.id.drawer_layout);
 
+        Window window = getWindow();
+        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        window.setStatusBarColor(ContextCompat.getColor(this, R.color.statusbar_color));
+
         loadHomeFragment();
     }
 
diff --git a/android/app/src/main/res/font/raleway_italic.xml b/android/app/src/main/res/font/raleway_italic.xml
new file mode 100644
index 0000000000..6bf9dfa29c
--- /dev/null
+++ b/android/app/src/main/res/font/raleway_italic.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="name=Raleway&amp;italic=1"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index 3401c962b3..31bed89e91 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -16,8 +16,9 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:background="?attr/colorPrimaryDark"
+            android:elevation="4dp"
+            />
 
         <FrameLayout
             android:id="@+id/content_frame"
diff --git a/android/app/src/main/res/layout/fragment_login.xml b/android/app/src/main/res/layout/fragment_login.xml
index 3cfe74d8e1..481d133bc4 100644
--- a/android/app/src/main/res/layout/fragment_login.xml
+++ b/android/app/src/main/res/layout/fragment_login.xml
@@ -8,13 +8,14 @@
 
     <ImageView
         android:id="@+id/header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/hifi_header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="35dp"/>
+        app:srcCompat="@drawable/hifi_header" />
 
     <TextView
         android:id="@+id/error"
@@ -32,69 +33,75 @@
         android:id="@+id/username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
         android:background="@drawable/rounded_edit"
-        android:padding="9dp"
+        android:padding="7dp"
         android:paddingRight="12dp"
         android:ems="10"
         android:fontFamily="@font/raleway"
+        android:textSize="14sp"
         android:inputType="textEmailAddress"
         android:textStyle="italic"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
         android:gravity="right"
         app:layout_constraintTop_toBottomOf="@id/header"
-        android:layout_marginTop="35dp"
+        android:layout_marginTop="60dp"
         android:hint="@string/username_or_email" />
 
     <EditText
         android:id="@+id/password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
         android:background="@drawable/rounded_edit"
-        android:padding="9dp"
+        android:padding="7dp"
         android:paddingRight="12dp"
         android:ems="10"
         android:fontFamily="@font/raleway"
+        android:textSize="14sp"
         android:inputType="textPassword"
         android:textStyle="italic"
         android:textColor="@color/editTextColor"
         android:textColorHint="@color/editTextColor"
         android:gravity="right"
-        android:layout_marginTop="14dp"
         app:layout_constraintTop_toBottomOf="@id/username"
         android:hint="@string/password"
+        android:layout_marginTop="12dp"
         android:imeOptions="actionDone"/>
 
     <Button
         android:id="@+id/loginButton"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="33dp"
+        android:layout_marginTop="14dp"
         android:background="@drawable/rounded_button"
-        android:textColor="@color/white_opaque"
+        android:fontFamily="@font/raleway_semibold"
+        android:paddingBottom="0dp"
+        android:paddingLeft="49dp"
+        android:paddingRight="49dp"
+        android:paddingTop="0dp"
         android:text="@string/login"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="14dp"
         app:layout_constraintRight_toRightOf="@id/username"
-        app:layout_constraintTop_toBottomOf="@id/password"
-        android:paddingRight="30dp"
-        android:paddingLeft="30dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
-        android:layout_marginTop="16dp"/>
+        app:layout_constraintTop_toBottomOf="@id/password" />
 
     <TextView
         android:id="@+id/forgotPassword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:fontFamily="@font/raleway_semibold"
+        android:textSize="12dp"
         android:text="@string/forgot_password"
         android:textStyle="italic"
-        android:padding="10dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="@id/loginButton"
+        android:paddingRight="10dp"
+        app:layout_constraintLeft_toLeftOf="@id/password"
+        app:layout_constraintTop_toBottomOf="@id/password"
+        android:layout_marginTop="11dp"
         android:textColor="@color/colorButton1"/>
 
 
diff --git a/android/app/src/main/res/layout/fragment_policy.xml b/android/app/src/main/res/layout/fragment_policy.xml
index 2a282ef631..9009a29a6d 100644
--- a/android/app/src/main/res/layout/fragment_policy.xml
+++ b/android/app/src/main/res/layout/fragment_policy.xml
@@ -6,23 +6,23 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="io.highfidelity.hifiinterface.MainActivity"
-    tools:showIn="@layout/activity_main">
+    android:background="@color/backgroundLight">
 
     <ImageView
         android:id="@+id/header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/hifi_header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="35dp"
-        />
+        app:srcCompat="@drawable/hifi_header" />
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        android:layout_marginTop="170dp"
+        android:layout_marginTop="162dp"
         app:layout_constraintTop_toBottomOf="@id/header"
         app:layout_constraintBottom_toBottomOf="parent"
         android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -34,6 +34,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/raleway"
-            android:textSize="14sp" />
+            android:textSize="12sp" />
     </ScrollView>
 </android.support.constraint.ConstraintLayout>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 6e756a85fa..8d351542e6 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="white_opaque">#ffffff</color>
-    <color name="colorPrimary">#272727</color>
-    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorPrimary">@color/backgroundLight</color>
+    <color name="colorPrimaryDark">@color/backgroundDark</color>
     <color name="colorAccent">#54D7FD</color>
     <color name="backgroundEditText">#E3E3E3</color>
     <color name="editTextColor">#575757</color>
@@ -15,4 +15,5 @@
     <color name="editTextHint">#9e9e9e</color>
     <color name="menuOption">#F2F2F2</color>
     <color name="colorLoginError">#FF7171</color>
+    <color name="statusbar_color">#33000000</color>
 </resources>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 440adcf6b9..a7640e4313 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -11,4 +11,7 @@
     <dimen name="text_size_subtitle_material_toolbar">12dp</dimen>
     <dimen name="button_horizontal_margin">12dp</dimen>
     <dimen name="edit_text_padding">8dp</dimen>
+    <dimen name="header_hifi_margin_top">40dp</dimen>
+    <dimen name="header_hifi_height">88dp</dimen>
+    <dimen name="header_hifi_width">372dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/preloaded_fonts.xml b/android/app/src/main/res/values/preloaded_fonts.xml
index 6f9d0e424e..11b7a7c9f7 100644
--- a/android/app/src/main/res/values/preloaded_fonts.xml
+++ b/android/app/src/main/res/values/preloaded_fonts.xml
@@ -2,6 +2,7 @@
 <resources>
     <array name="preloaded_fonts" translatable="false">
         <item>@font/raleway_bold</item>
+        <item>@font/raleway_italic</item>
         <item>@font/raleway_light_italic</item>
         <item>@font/raleway_medium</item>
         <item>@font/raleway_semibold</item>