From 4beec4e66a5d3ca7b01b4d9b3b44e0e316861ffe Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 20 Dec 2018 16:40:48 -0600
Subject: [PATCH] Add the BitShares icon to the Main screen toolbar and update
 the toolbar background so that it automatically uses the primaryColor of the
 selected theme.

---
 .../bitsybitshareswallet/fragments/HomeFragment.kt   |  5 +++++
 app/src/main/res/drawable/ic_bitsy_logo_2.xml        | 12 ++++++++++++
 app/src/main/res/layout/activity_main.xml            |  4 ++--
 app/src/main/res/layout/activity_maps.xml            |  9 ---------
 4 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_bitsy_logo_2.xml
 delete mode 100644 app/src/main/res/layout/activity_maps.xml

diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
index d3debf5..a531972 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
@@ -3,7 +3,9 @@ package cy.agorise.bitsybitshareswallet.fragments
 import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
 import android.preference.PreferenceManager
+import android.util.Log
 import android.view.*
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
@@ -27,6 +29,9 @@ class HomeFragment : Fragment() {
     ): View? {
         setHasOptionsMenu(true)
 
+        val toolbar: Toolbar? = activity?.findViewById(R.id.toolbar)
+        toolbar?.navigationIcon = resources.getDrawable(R.drawable.ic_bitsy_logo_2, null)
+
         return inflater.inflate(R.layout.fragment_home, container, false)
     }
 
diff --git a/app/src/main/res/drawable/ic_bitsy_logo_2.xml b/app/src/main/res/drawable/ic_bitsy_logo_2.xml
new file mode 100644
index 0000000..1761527
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bitsy_logo_2.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="29dp"
+    android:height="40dp"
+    android:viewportWidth="294778"
+    android:viewportHeight="400026">
+  <path
+      android:pathData="M251503,87576c-31929,-31929 -75261,-46069 -117225,-42422l23262,20527c64770,5019 115859,59297 115859,125894 0,69331 -56104,125435 -125893,125435l0,0 0,0c-69333,0 -126350,-56104 -126350,-125435 0,-26911 8209,-52000 22806,-72526l0,-31473 -457,0c-57930,57929 -57930,150981 -457,208453l104454,103998 103999,-104455c57472,-57472 57929,-150524 0,-207996l0,0 2,0z"
+      android:fillColor="#FEFEFE"/>
+  <path
+      android:pathData="M89122,257258c13686,12315 31018,20069 50631,21438l0,-55193c-4105,-911 -8210,-2736 -11403,-5019l-39228,38771 0,3zM151613,223503l0,55193c19612,-1369 37402,-9123 50631,-21438l-38771,-38770c-3647,2279 -7756,4104 -11860,5019l0,-4zM115121,198415c458,4562 2280,8210 4562,11860l-38771,39228c-12314,-14140 -20069,-31472 -20980,-51088l55192,0 -3,0zM231891,198415c-1368,19159 -8667,36491 -20527,50174l-39227,-39228c2280,-3193 3648,-6840 4562,-10946l55192,0zM115121,186558l-55191,0c0,-20069 0,-41053 0,-71611l60208,59753c-2737,3649 -4562,7756 -5019,11860l2,-2zM231434,186558l-54735,0c-912,-4104 -2737,-8209 -5019,-11860l38771,-38771c12314,13685 20070,31472 20980,50631l3,0zM202244,127715c-13229,-11860 -31019,-20069 -50631,-20981l0,55193c4104,911 8209,2280 11860,4562l38771,-38771 0,-3zM59930,96700c14595,15053 61122,61576 68874,69332 3648,-1825 6842,-3648 10946,-4105 0,-15508 0,-90770 0,-90770l-80278,-71157c0,0 458,94420 458,96700z"
+      android:fillColor="#FEFEFE"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cbd06d5..d412b6c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,8 +11,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorPrimary"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
         android:theme="@style/ThemeOverlay.AppCompat.Dark" />
 
     <fragment
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
deleted file mode 100644
index 37b4872..0000000
--- a/app/src/main/res/layout/activity_maps.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          xmlns:map="http://schemas.android.com/apk/res-auto"
-          android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:id="@+id/map"
-          tools:context=".activities.MapsActivity"
-          android:name="com.google.android.gms.maps.SupportMapFragment"/>
\ No newline at end of file