diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index 6be34719b5..de4689a8b4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -102,20 +102,6 @@ public class FragmentBase extends Fragment { return null; } - protected boolean isActionBarShown() { - FragmentActivity activity = getActivity(); - if (activity instanceof ActivityBase) - return ((ActivityBase) activity).isActionBarShown(); - else - return false; - } - - protected void showActionBar(boolean show) { - FragmentActivity activity = getActivity(); - if (activity instanceof ActivityBase) - ((ActivityBase) activity).showActionBar(show); - } - protected void setCount(String count) { this.count = count; updateSubtitle(); diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index 2eb0a78b2d..057c6f84c2 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -121,7 +121,6 @@ public class FragmentFolders extends FragmentBase { private boolean primary; private boolean show_hidden = false; private boolean show_flagged = false; - private boolean hide_toolbar = false; private String searching = null; private AdapterFolder adapter; @@ -154,7 +153,6 @@ public class FragmentFolders extends FragmentBase { compact = prefs.getBoolean("compact_folders", true); show_hidden = false; // prefs.getBoolean("hidden_folders", false); show_flagged = prefs.getBoolean("flagged_folders", false); - hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); if (BuildConfig.DEBUG) { ViewModelSelected selectedModel = @@ -217,22 +215,7 @@ public class FragmentFolders extends FragmentBase { }); rvFolder.setHasFixedSize(false); - LinearLayoutManager llm = new LinearLayoutManager(getContext()) { - @Override - public void onLayoutCompleted(RecyclerView.State state) { - super.onLayoutCompleted(state); - if (!isActionBarShown()) - try { - int range = computeVerticalScrollRange(state); - int extend = computeVerticalScrollExtent(state); - boolean canScrollVertical = (range > extend); - if (!canScrollVertical) // anymore - showActionBar(true); - } catch (Throwable ex) { - Log.e(ex); - } - } - }; + LinearLayoutManager llm = new LinearLayoutManager(getContext()); rvFolder.setLayoutManager(llm); if (!cards && dividers) { @@ -323,27 +306,6 @@ public class FragmentFolders extends FragmentBase { rvFolder.addItemDecoration(categoryDecorator); } - rvFolder.addOnScrollListener(new RecyclerView.OnScrollListener() { - private boolean show = true; - - @Override - public void onScrolled(@NonNull RecyclerView rv, int dx, int dy) { - if (hide_toolbar && dy != 0) - try { - show = (dy < 0 || rv.computeVerticalScrollOffset() == 0); - } catch (Throwable ex) { - Log.e(ex); - show = true; - } - } - - @Override - public void onScrollStateChanged(@NonNull RecyclerView rv, int newState) { - if (hide_toolbar && newState != RecyclerView.SCROLL_STATE_DRAGGING) - showActionBar(show); - } - }); - adapter = new AdapterFolder(this, account, unified, primary, compact, show_hidden, show_flagged, null); rvFolder.setAdapter(adapter); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 0ac895aba4..1ffe401493 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -332,7 +332,6 @@ public class FragmentMessages extends FragmentBase private int searchIndex = 0; private TextView searchView = null; - private boolean hide_toolbar; private boolean cards; private boolean dividers; private boolean category; @@ -404,7 +403,6 @@ public class FragmentMessages extends FragmentBase final private LongSparseArray accountSwipes = new LongSparseArray<>(); private NumberFormat NF = NumberFormat.getNumberInstance(); - private final ObjectHolder showToolbar = new ObjectHolder<>(true); private static final ExecutorService executor = Helper.getBackgroundExecutor(1, "more"); @@ -486,7 +484,6 @@ public class FragmentMessages extends FragmentBase SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); cards = prefs.getBoolean("cards", true); dividers = prefs.getBoolean("dividers", true); category = prefs.getBoolean("group_category", false); @@ -823,21 +820,6 @@ public class FragmentMessages extends FragmentBase } } - @Override - public void onLayoutCompleted(RecyclerView.State state) { - super.onLayoutCompleted(state); - if (!isActionBarShown()) - try { - int range = computeVerticalScrollRange(state); - int extend = computeVerticalScrollExtent(state); - boolean canScrollVertical = (range > extend); - if (!canScrollVertical) // anymore - showActionBar(true); - } catch (Throwable ex) { - Log.e(ex); - } - } - @Override public void onItemsAdded(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) { iProperties.layoutChanged(); @@ -1235,20 +1217,6 @@ public class FragmentMessages extends FragmentBase updateExpanded(); } } - - if (hide_toolbar && dy != 0) - try { - showToolbar.value = (dy < 0 || rv.computeVerticalScrollOffset() == 0); - } catch (Throwable ex) { - Log.e(ex); - showToolbar.value = true; - } - } - - @Override - public void onScrollStateChanged(@NonNull RecyclerView rv, int newState) { - if (hide_toolbar && newState != RecyclerView.SCROLL_STATE_DRAGGING) - showActionBar(showToolbar.value); } }); @@ -1312,8 +1280,6 @@ public class FragmentMessages extends FragmentBase ibUp.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showToolbar.value = true; - showActionBar(true); scrollToVisibleItem(llm, false); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 13053ca46a..97ce2a7f9c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -143,7 +143,7 @@ public class FragmentOptions extends FragmentBase { "cards", "beige", "tabular_card_bg", "shadow_unread", "shadow_border", "shadow_highlight", "dividers", "tabular_unread_bg", "portrait2", "portrait2c", "portrait_min_size", "landscape", "landscape_min_size", "column_width", - "hide_toolbar", "nav_categories", "nav_last_sync", "nav_count", "nav_unseen_drafts", "nav_count_pinned", "show_unexposed", + "nav_categories", "nav_last_sync", "nav_count", "nav_unseen_drafts", "nav_count_pinned", "show_unexposed", "indentation", "date", "date_week", "date_fixed", "date_bold", "date_time", "threading", "threading_unread", "show_filtered", "highlight_unread", "highlight_color", "color_stripe", "color_stripe_wide", diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 526028b10f..3449db43fd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -92,7 +92,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private SwitchCompat swOpenPane; private TextView tvColumnWidth; private SeekBar sbColumnWidth; - private SwitchCompat swHideToolbar; private SwitchCompat swNavOptions; private SwitchCompat swNavCategories; private SwitchCompat swNavLastSync; @@ -213,7 +212,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer "date", "date_week", "date_fixed", "date_bold", "date_time", "group_category", "cards", "beige", "tabular_card_bg", "shadow_unread", "shadow_border", "shadow_highlight", "dividers", "tabular_unread_bg", "portrait2", "portrait2c", "landscape", "close_pane", "open_pane", "column_width", - "hide_toolbar", "nav_options", "nav_categories", "nav_last_sync", "nav_count", "nav_unseen_drafts", "nav_count_pinned", "show_unexposed", + "nav_options", "nav_categories", "nav_last_sync", "nav_count", "nav_unseen_drafts", "nav_count_pinned", "show_unexposed", "threading", "threading_unread", "indentation", "seekbar", "actionbar", "actionbar_swap", "actionbar_color", "highlight_unread", "highlight_color", "color_stripe", "color_stripe_wide", "avatars", "bimi", "gravatars", "libravatars", "favicons", "favicons_partial", "favicons_manifest", "generated_icons", "identicons", @@ -270,7 +269,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swOpenPane = view.findViewById(R.id.swOpenPane); tvColumnWidth = view.findViewById(R.id.tvColumnWidth); sbColumnWidth = view.findViewById(R.id.sbColumnWidth); - swHideToolbar = view.findViewById(R.id.swHideToolbar); swNavOptions = view.findViewById(R.id.swNavOptions); swNavCategories = view.findViewById(R.id.swNavCategories); swNavLastSync = view.findViewById(R.id.swNavLastSync); @@ -637,13 +635,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer } }); - swHideToolbar.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("hide_toolbar", checked).apply(); - } - }); - swNavOptions.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -1564,7 +1555,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer tvColumnWidth.setText(getString(R.string.title_advanced_column_width, NF.format(column_width))); sbColumnWidth.setProgress(column_width); - swHideToolbar.setChecked(prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE)); swNavOptions.setChecked(prefs.getBoolean("nav_options", true)); swNavCategories.setChecked(prefs.getBoolean("nav_categories", false)); swNavLastSync.setChecked(prefs.getBoolean("nav_last_sync", true)); diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml index 35bafe0676..c311520765 100644 --- a/app/src/main/res/layout/fragment_options_display.xml +++ b/app/src/main/res/layout/fragment_options_display.xml @@ -586,17 +586,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - Collapse row or column when closing a conversation Start with two rows or two columns Message column width / row height: %1$s %% - Hide top toolbar when scrolling messages Show navigation menu options Show account categories in the navigation menu Pin navigation menu