From 2088d3a4ba66bf4990c25e050ede7dc1176181ae Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Jun 2019 21:41:53 +0200 Subject: [PATCH] Restore display tab on changing theme --- app/src/main/java/eu/faircode/email/FragmentOptions.java | 4 ++++ .../main/java/eu/faircode/email/FragmentOptionsDisplay.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 98f5d1fcf7..1df5338b69 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -61,6 +61,10 @@ public class FragmentOptions extends FragmentBase { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { TabLayout tabLayout = view.findViewById(R.id.tab_layout); tabLayout.setupWithViewPager(pager); + + String tab = getActivity().getIntent().getStringExtra("tab"); + if ("display".equals(tab)) + pager.setCurrentItem(4); } private class PagerAdapter extends FragmentStatePagerAdapter { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index da82af484f..8302a34859 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -280,6 +280,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer rgTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @Override public void onCheckedChanged(RadioGroup group, int checkedId) { + getActivity().getIntent().putExtra("tab", "display"); + switch (checkedId) { case R.id.rbThemeLight: prefs.edit().putString("theme", "light").apply();