Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 04:15:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android - Show names of screens when going back in the Main screen (Home-Login-Friends)

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-06-14 21:06:40 -03:00
parent 248be87fa3
commit 61d1bf7bf7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/app/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
View file

@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private void loadHomeFragment() { private void loadHomeFragment() {
Fragment fragment = HomeFragment.newInstance(); Fragment fragment = HomeFragment.newInstance();
loadFragment(fragment, getString(R.string.home), false); loadFragment(fragment, getString(R.string.home), true);
} }
private void loadLoginFragment() { private void loadLoginFragment() {
@ -152,7 +152,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
FragmentTransaction ft = fragmentManager.beginTransaction(); FragmentTransaction ft = fragmentManager.beginTransaction();
ft.replace(R.id.content_frame, fragment); ft.replace(R.id.content_frame, fragment);
if (addToBackStack) { if (addToBackStack) {
ft.addToBackStack(null); ft.addToBackStack(title);
} }
ft.commit(); ft.commit();
setTitle(title); setTitle(title);
@ -298,8 +298,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
@Override @Override
public void onBackPressed() { public void onBackPressed() {
int index = getFragmentManager().getBackStackEntryCount() - 1; int index = getFragmentManager().getBackStackEntryCount() - 1;
if (index > -1) { if (index > 0) {
super.onBackPressed(); super.onBackPressed();
index--;
if (index > -1) {
setTitle(getFragmentManager().getBackStackEntryAt(index).getName());
}
if (backToScene) { if (backToScene) {
backToScene = false; backToScene = false;
goToLastLocation(); goToLastLocation();