mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Main activity title is sometimes "Contributions", sometimes "Commons" (#4472)

Browse source 
Fixes #4438  Replace == with equals() in onRestoreInstanceState
This commit is contained in:
Ashar 2021-06-23 21:45:39 +05:30 • committed by GitHub
parent 7b016c7dcf
commit 399d798159
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -4,13 +4,12 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@ -247,17 +246,23 @@ public class MainActivity extends BaseActivity
@Override @Override
protected void onRestoreInstanceState(Bundle savedInstanceState) { protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState); super.onRestoreInstanceState(savedInstanceState);
String currentFragmentName = savedInstanceState.getString("activeFragment"); String activeFragmentName = savedInstanceState.getString("activeFragment");
if(currentFragmentName == ActiveFragment.CONTRIBUTIONS.name()) { if(activeFragmentName != null) {
restoreActiveFragment(activeFragmentName);
}
}
private void restoreActiveFragment(@NonNull String fragmentName) {
if(fragmentName.equals(ActiveFragment.CONTRIBUTIONS.name())) {
setTitle(getString(R.string.contributions_fragment)); setTitle(getString(R.string.contributions_fragment));
loadFragment(ContributionsFragment.newInstance(),false); loadFragment(ContributionsFragment.newInstance(),false);
}else if(currentFragmentName == ActiveFragment.NEARBY.name()) { }else if(fragmentName.equals(ActiveFragment.NEARBY.name())) {
setTitle(getString(R.string.nearby_fragment)); setTitle(getString(R.string.nearby_fragment));
loadFragment(NearbyParentFragment.newInstance(),false); loadFragment(NearbyParentFragment.newInstance(),false);
}else if(currentFragmentName == ActiveFragment.EXPLORE.name()) { }else if(fragmentName.equals(ActiveFragment.EXPLORE.name())) {
setTitle(getString(R.string.navigation_item_explore)); setTitle(getString(R.string.navigation_item_explore));
loadFragment(ExploreFragment.newInstance(),false); loadFragment(ExploreFragment.newInstance(),false);
}else if(currentFragmentName == ActiveFragment.BOOKMARK.name()) { }else if(fragmentName.equals(ActiveFragment.BOOKMARK.name())) {
setTitle(getString(R.string.favorites)); setTitle(getString(R.string.favorites));
loadFragment(BookmarkFragment.newInstance(),false); loadFragment(BookmarkFragment.newInstance(),false);
} }