gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Use SharedPreferences to restore the last selected search tab on app restart.

Browse source 
Code refactor to change LastSelectedTab to LastSearchedTab.
Signed-off-by: varad64 <varad23711@users.noreply.github.com>

Code refactor to change LastSelectedTab to LastSearchedTab
This commit is contained in:
varad64 2024-10-01 19:49:54 +05:30 • committed by Konstantin Pastbin
parent 83994a247e
commit 9e47a49ec0
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/app/organicmaps/search/SearchFragment.java
View file

@ -3,6 +3,7 @@ package app.organicmaps.search;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.location.Location;
import android.os.Bundle;
import android.text.TextUtils;
@ -22,6 +23,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import app.organicmaps.Framework;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.bookmarks.data.FeatureId;
@ -299,8 +301,10 @@ public class SearchFragment extends BaseMwmFragment
SearchEngine.INSTANCE.addListener(this);
SharedPreferences preferences = MwmApplication.prefs(requireContext());
int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0);
if (SearchRecents.getSize() == 0 && Config.isSearchHistoryEnabled())
pager.setCurrentItem(TabAdapter.Tab.CATEGORIES.ordinal());
pager.setCurrentItem(lastSelectedTabPosition);
tabAdapter.setTabSelectedListener(tab -> mToolbarController.deactivate());

10
android/app/src/main/java/app/organicmaps/search/TabAdapter.java
View file

@ -1,6 +1,7 @@
package app.organicmaps.search;
import android.content.Context;
import android.content.SharedPreferences;
import android.util.SparseArray;
import android.view.View;
@ -11,6 +12,8 @@ import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.Config;
@ -91,6 +94,9 @@ class TabAdapter extends FragmentPagerAdapter
@Override
public void onTabSelected(TabLayout.Tab tab)
{
SharedPreferences.Editor editor = MwmApplication.prefs(mContext).edit();
editor.putInt(Config.KEY_PREF_LAST_SEARCHED_TAB, tab.getPosition());
editor.apply();
super.onTabSelected(tab);
Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
}
@ -151,7 +157,9 @@ class TabAdapter extends FragmentPagerAdapter
ViewPager.OnPageChangeListener listener = new PageChangedListener(tabs);
mPager.addOnPageChangeListener(listener);
tabs.setOnTabSelectedListener(new OnTabSelectedListenerForViewPager(mPager));
listener.onPageSelected(0);
SharedPreferences preferences = MwmApplication.prefs(mPager.getContext());
int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0);
listener.onPageSelected(lastSelectedTabPosition);
}
void setTabSelectedListener(OnTabSelectedListener listener)

3
android/app/src/main/java/app/organicmaps/util/Config.java
View file

@ -7,7 +7,6 @@ import android.os.Build;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager;
import app.organicmaps.BuildConfig;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@ -36,6 +35,8 @@ public final class Config
private static final String KEY_DONATE_URL = "DonateUrl";
private static final String KEY_PREF_SEARCH_HISTORY = "SearchHistoryEnabled";
public static final String KEY_PREF_LAST_SEARCHED_TAB = "LastSearchTab";
/**
* The total number of app launches.
*/