From 61d1bf7bf7e7ae2e203604f1dd2e94f12efd478e Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Thu, 14 Jun 2018 21:06:40 -0300
Subject: [PATCH] Android - Show names of screens when going back in the Main
 screen (Home-Login-Friends)

---
 .../io/highfidelity/hifiinterface/MainActivity.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 8bb84168a5..d1ac6d5ec8 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private void loadHomeFragment() {
         Fragment fragment = HomeFragment.newInstance();
-        loadFragment(fragment, getString(R.string.home), false);
+        loadFragment(fragment, getString(R.string.home), true);
     }
 
     private void loadLoginFragment() {
@@ -152,7 +152,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         FragmentTransaction ft = fragmentManager.beginTransaction();
         ft.replace(R.id.content_frame, fragment);
         if (addToBackStack) {
-            ft.addToBackStack(null);
+            ft.addToBackStack(title);
         }
         ft.commit();
         setTitle(title);
@@ -298,8 +298,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     @Override
     public void onBackPressed() {
         int index = getFragmentManager().getBackStackEntryCount() - 1;
-        if (index > -1) {
+        if (index > 0) {
             super.onBackPressed();
+            index--;
+            if (index > -1) {
+                setTitle(getFragmentManager().getBackStackEntryAt(index).getName());
+            }
             if (backToScene) {
                 backToScene = false;
                 goToLastLocation();