From 7be11fc6975141931aea5d921c673e12bb197253 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Mon, 26 Mar 2018 19:44:26 -0300
Subject: [PATCH] Align UI of Go To activity

---
 .../hifiinterface/GotoActivity.java           |  3 ++-
 .../hifiinterface/view/DomainAdapter.java     |  2 +-
 .../app/src/main/res/drawable/domain_bg.xml   | 10 ++++++++
 .../app/src/main/res/drawable/search_bg.xml   |  9 +++++++
 .../app/src/main/res/font/raleway_bold.xml    |  7 ++++++
 .../app/src/main/res/font/raleway_medium.xml  |  7 ++++++
 .../app/src/main/res/layout/content_goto.xml  |  6 +++--
 .../app/src/main/res/layout/domain_view.xml   | 24 +++++++++----------
 android/app/src/main/res/values/colors.xml    |  3 ++-
 .../src/main/res/values/preloaded_fonts.xml   |  2 ++
 android/app/src/main/res/values/styles.xml    | 18 ++++++++++++++
 scripts/system/+android/bottombar.js          | 16 ++++++++-----
 12 files changed, 83 insertions(+), 24 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/domain_bg.xml
 create mode 100644 android/app/src/main/res/drawable/search_bg.xml
 create mode 100644 android/app/src/main/res/font/raleway_bold.xml
 create mode 100644 android/app/src/main/res/font/raleway_medium.xml

diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/GotoActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/GotoActivity.java
index 326a96b71e..f1cb7e0e01 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/GotoActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/GotoActivity.java
@@ -32,6 +32,7 @@ public class GotoActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_goto);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setTitleTextAppearance(this, R.style.GotoActionBarTitleStyle);
         setSupportActionBar(toolbar);
 
         ActionBar actionbar = getSupportActionBar();
@@ -63,7 +64,7 @@ public class GotoActivity extends AppCompatActivity {
         TabWidget tabwidget=tabs.getTabWidget();
         for(int i=0;i<tabwidget.getChildCount();i++){
             TextView tv=(TextView) tabwidget.getChildAt(i).findViewById(android.R.id.title);
-            tv.setTextColor(getColor(R.color.tabs));
+            tv.setTextAppearance(R.style.TabText);
         }
 
 
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
index 7d57581810..a029a9eea5 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java
@@ -37,7 +37,7 @@ public class DomainAdapter extends RecyclerView.Adapter<DomainAdapter.ViewHolder
 
     // references to our domains
     private Domain[] mDomains = {
-            new Domain("dev-master-mobile", "hifi://dev-mobile-master", 0),
+            new Domain("dev-mobile-master", "hifi://dev-mobile-master", 0),
             new Domain("dev-mobile", "hifi://dev-mobile", 0),
             new Domain("dev-welcome", "hifi://dev-welcome", 0),
     };
diff --git a/android/app/src/main/res/drawable/domain_bg.xml b/android/app/src/main/res/drawable/domain_bg.xml
new file mode 100644
index 0000000000..d30d6413e1
--- /dev/null
+++ b/android/app/src/main/res/drawable/domain_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="1dp" android:left="12dp" android:bottom="6dp" android:right="12dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/backgroundDark" />
+            <corners android:radius="4dp"/>
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/search_bg.xml b/android/app/src/main/res/drawable/search_bg.xml
new file mode 100644
index 0000000000..fd1a9ea42e
--- /dev/null
+++ b/android/app/src/main/res/drawable/search_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="7dp" android:left="12dp" android:bottom="7dp" android:right="12dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/backgroundSearch" />
+            <corners android:radius="20dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/android/app/src/main/res/font/raleway_bold.xml b/android/app/src/main/res/font/raleway_bold.xml
new file mode 100644
index 0000000000..136472c0b3
--- /dev/null
+++ b/android/app/src/main/res/font/raleway_bold.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;weight=700"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/android/app/src/main/res/font/raleway_medium.xml b/android/app/src/main/res/font/raleway_medium.xml
new file mode 100644
index 0000000000..3894c95b10
--- /dev/null
+++ b/android/app/src/main/res/font/raleway_medium.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;weight=500"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/android/app/src/main/res/layout/content_goto.xml b/android/app/src/main/res/layout/content_goto.xml
index ee8acc8748..0cdb547b4b 100644
--- a/android/app/src/main/res/layout/content_goto.xml
+++ b/android/app/src/main/res/layout/content_goto.xml
@@ -25,11 +25,13 @@
             <TabWidget
                 android:id="@android:id/tabs"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:background="@color/backgroundDark"/>
 
             <SearchView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="42dp"
+                android:background="@drawable/search_bg"/>
             <FrameLayout
                 android:id="@android:id/tabcontent"
                 android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/domain_view.xml b/android/app/src/main/res/layout/domain_view.xml
index 47028856d6..d0ed2d3a44 100644
--- a/android/app/src/main/res/layout/domain_view.xml
+++ b/android/app/src/main/res/layout/domain_view.xml
@@ -8,23 +8,22 @@
     android:paddingRight="14dp"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:background="@color/backgroundLight">
+    android:background="@drawable/domain_bg">
     <ImageView
         android:id="@+id/domainThumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundDark"
         app:srcCompat="@android:drawable/ic_menu_gallery" />
 
     <TextView
         android:id="@+id/domainName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="12dp"
+        android:layout_marginBottom="14dp"
+        android:layout_marginLeft="10dp"
         android:fontFamily="@font/raleway_semibold"
         android:text=""
-        android:textSize="20sp"
+        android:textSize="21sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />
 
@@ -32,11 +31,11 @@
         android:id="@+id/amountOfPeople"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="7dp"
         android:layout_marginTop="8dp"
         android:fontFamily="@font/raleway"
-        android:text="0"
-        android:textSize="18sp"
+        android:text="10"
+        android:textSize="16sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -44,10 +43,9 @@
         android:id="@+id/imageView2"
         android:layout_width="12dp"
         android:layout_height="13dp"
-        android:layout_marginStart="2dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginBottom="3dp"
         app:srcCompat="@drawable/ic_person"
-        app:layout_constraintTop_toTopOf="@id/amountOfPeople"
         app:layout_constraintBottom_toBottomOf="@id/amountOfPeople"
         app:layout_constraintLeft_toRightOf="@id/amountOfPeople"/>
 
@@ -61,13 +59,13 @@
         app:layout_constraintRight_toRightOf="parent"
         android:padding="1dp"
         android:layout_marginRight="10dp"
-        android:layout_marginTop="15dp"/>
+        android:layout_marginTop="12dp"/>
 
     <ImageButton
         android:id="@+id/imageViewShare"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="9dp"
         app:layout_constraintTop_toBottomOf="@id/imageButtonBookmark"
         app:layout_constraintLeft_toLeftOf="@id/imageButtonBookmark"
         app:layout_constraintRight_toRightOf="@id/imageButtonBookmark"
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 9ed5686d3c..731aff02d8 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -2,9 +2,10 @@
 <resources>
     <color name="white_opaque">#ffffff</color>
     <color name="colorPrimary">#272727</color>
-    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorPrimaryDark">#000000</color>
     <color name="colorAccent">#54D7FD</color>
     <color name="tabs">#1EB5EC</color>
     <color name="backgroundDark">#333333</color>
     <color name="backgroundLight">#4F4F4F</color>
+    <color name="backgroundSearch">#33999999</color>
 </resources>
diff --git a/android/app/src/main/res/values/preloaded_fonts.xml b/android/app/src/main/res/values/preloaded_fonts.xml
index 82bcb6c19f..a5085536a3 100644
--- a/android/app/src/main/res/values/preloaded_fonts.xml
+++ b/android/app/src/main/res/values/preloaded_fonts.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <array name="preloaded_fonts" translatable="false">
+        <item>@font/raleway_bold</item>
+        <item>@font/raleway_medium</item>
         <item>@font/raleway_semibold</item>
     </array>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 31fcbd8350..c0f06f8df0 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -15,6 +15,24 @@
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
+    <!-- Customizing GoTo ActionBar -->
+    <style name="GotoActionBarTitleStyle"
+        parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
+        <item name="android:textSize">18dp</item>
+        <item name="android:paddingLeft">0dp</item>
+        <item name="android:fontFamily">@font/raleway_bold</item>
+        <item name="android:layout_marginLeft">0dp</item>
+    </style>
+
+    <style name="TabText">
+        <item name="android:fontFamily">@font/raleway_medium</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/tabs</item>
+        <item name="android:height">30dp</item>
+        <item name="android:layout_margin">0dp</item>
+        <item name="android:padding">0dp</item>
+    </style>
+
     <!-- Overriding text size so it's not so big in portrait -->
     <style name="ActionBarTitleStyle"
         parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
diff --git a/scripts/system/+android/bottombar.js b/scripts/system/+android/bottombar.js
index 3435edb548..a254c87859 100644
--- a/scripts/system/+android/bottombar.js
+++ b/scripts/system/+android/bottombar.js
@@ -47,6 +47,7 @@ function init() {
     raiseBottomBar();
 
     GlobalServices.connected.connect(handleLogin);
+    GlobalServices.myUsernameChanged.connect(onUsernameChanged);
     GlobalServices.disconnected.connect(handleLogout);
 }
 
@@ -240,15 +241,17 @@ function processedNewAvatar(url, modelName) {
 }
 
 function handleLogin() {
-    Script.setTimeout(function() {
-        if (Account.isLoggedIn()) {
-            MyAvatar.displayName=Account.getUsername();
-        }
-    }, 2000);
     if (loginBtn) {
         loginBtn.editProperties({text: "LOG OUT"});
     }
 }
+
+function onUsernameChanged(username) {
+    if (Account.isLoggedIn()) {
+        MyAvatar.displayName=username;
+    }
+}
+
 function handleLogout() {
     MyAvatar.displayName="";
     if (loginBtn) {
@@ -257,9 +260,10 @@ function handleLogout() {
 }
 
 Script.scriptEnding.connect(function () {
-	shutdown();
+    shutdown();
     GlobalServices.connected.disconnect(handleLogin);
     GlobalServices.disconnected.disconnect(handleLogout);
+    GlobalServices.myUsernameChanged.disconnect(onUsernameChanged);
 });
 
 init();