From 086f056216fed4dd3dc326075aaf09a86de6a0b9 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Sun, 29 Oct 2017 17:26:13 +0100 Subject: [PATCH] Modify toolbar item positions --- .../activity/AboutActivity.java | 28 ++++------- .../activity/AspectListFragment.java | 2 - .../activity/MainActivity.java | 47 +++++++------------ .../activity/PodSelectionFragment.java | 1 - .../activity/SettingsActivity.java | 3 +- .../activity/TagListFragment.java | 2 - .../IntellihideToolbarActivityListener.java | 4 +- .../dfa/diaspora_android/ui/HtmlTextView.java | 1 - .../ui/theme/CustomFragment.java | 2 - .../ui/theme/ThemedActivity.java | 3 -- .../diaspora_android/util/AppSettings.java | 4 ++ .../diaspora_android/web/BrowserFragment.java | 2 - app/src/main/res/menu/main__menu_bottom.xml | 7 --- app/src/main/res/menu/stream__menu_bottom.xml | 8 ---- .../res/values/strings-not_translatable.xml | 1 + app/src/main/res/values/strings.xml | 2 + app/src/main/res/xml/preferences__master.xml | 7 +++ 17 files changed, 43 insertions(+), 81 deletions(-) delete mode 100644 app/src/main/res/menu/main__menu_bottom.xml delete mode 100644 app/src/main/res/menu/stream__menu_bottom.xml diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java index a58c4760..03fb1155 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java @@ -34,8 +34,6 @@ import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; @@ -107,11 +105,7 @@ public class AboutActivity extends ThemedActivity @Override public void onResume() { super.onResume(); - if (getAppSettings().isIntellihideToolbars()) { - this.enableToolbarHiding(); - } else { - this.disableToolbarHiding(); - } + setToolbarIntellihide(getAppSettings().isIntellihideToolbars()); } @Override @@ -121,20 +115,16 @@ public class AboutActivity extends ThemedActivity ThemeHelper.setPrimaryColorAsBackground(_linearLayout); } - @Override - public void enableToolbarHiding() { - AppLog.d(this, "Enable Intellihide"); + public void setToolbarIntellihide(boolean enable) { AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) _linearLayout.getLayoutParams(); - //scroll|enterAlways|snap - params.setScrollFlags(toolbarDefaultScrollFlags); - _appBarLayout.setExpanded(true, true); - } + if (enable) { + AppLog.d(this, "Enable Intellihide"); + params.setScrollFlags(toolbarDefaultScrollFlags); - @Override - public void disableToolbarHiding() { - AppLog.d(this, "Disable Intellihide"); - AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) _linearLayout.getLayoutParams(); - params.setScrollFlags(0); // clear all scroll flags + } else { + AppLog.d(this, "Disable Intellihide"); + params.setScrollFlags(0); // clear all scroll flags + } _appBarLayout.setExpanded(true, true); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java index 0051715b..5e615f2a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AspectListFragment.java @@ -26,8 +26,6 @@ import android.support.v7.widget.AppCompatImageView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index e1ec4f95..c4750ce1 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -90,7 +90,6 @@ import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper; import net.gsantner.opoc.util.SimpleMarkdownParser; import java.io.IOException; -import java.lang.reflect.Method; import butterknife.BindView; import butterknife.ButterKnife; @@ -366,11 +365,7 @@ public class MainActivity extends ThemedActivity AppLog.v(this, "Fragment was not visible. Replace it."); fm.beginTransaction().addToBackStack(null).replace(R.id.fragment_container, fragment, fragment.getFragmentTag()).commit(); invalidateOptionsMenu(); - if (_appSettings.isIntellihideToolbars() && fragment.isAllowedIntellihide()) { - this.enableToolbarHiding(); - } else { - this.disableToolbarHiding(); - } + setToolbarIntellihide(_appSettings.isIntellihideToolbars() && fragment.isAllowedIntellihide()); } else { AppLog.v(this, "Fragment was already visible. Do nothing."); } @@ -654,10 +649,9 @@ public class MainActivity extends ThemedActivity if (_appSettings.isRecreateMainActivity()) { recreate(); } - if (_appSettings.isIntellihideToolbars()) { - enableToolbarHiding(); - } else { - disableToolbarHiding(); + setToolbarIntellihide(_appSettings.isIntellihideToolbars()); + if (getSupportActionBar() != null) { + getSupportActionBar().setDisplayShowTitleEnabled(AppSettings.get().isShowTitleInMainView()); } updateNavigationViewEntryVisibilities(); } @@ -679,13 +673,12 @@ public class MainActivity extends ThemedActivity CustomFragment top = getTopFragment(); if (top != null) { - boolean isPodSel = top.getFragmentTag().equals(PodSelectionFragment.TAG); - - // Extended notifications - cache = _appSettings.isExtendedNotificationsActivated(); - getMenuInflater().inflate(R.menu.main__menu_top, menu); - menu.findItem(R.id.action_notifications).setVisible(!cache); - menu.findItem(R.id.action_notifications_extended).setVisible(cache); + if (!top.getFragmentTag().equals(PodSelectionFragment.TAG)) { + cache = _appSettings.isExtendedNotificationsActivated(); + getMenuInflater().inflate(R.menu.main__menu_top, menu); + menu.findItem(R.id.action_notifications).setVisible(!cache); + menu.findItem(R.id.action_notifications_extended).setVisible(cache); + } } final boolean darkBg = ContextUtils.get().shouldColorOnTopBeLight(AppSettings.get().getPrimaryColor()); @@ -1222,20 +1215,16 @@ public class MainActivity extends ThemedActivity toolbarTop.setPopupTheme(popupTheme); } - @Override - public void enableToolbarHiding() { - AppLog.d(this, "Enable Intellihide"); + public void setToolbarIntellihide(boolean enable) { AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTop.getLayoutParams(); - //scroll|enterAlways|snap - params.setScrollFlags(toolbarDefaultScrollFlags); - appBarLayout.setExpanded(true, true); - } + if (enable) { + AppLog.d(this, "Enable Intellihide"); + params.setScrollFlags(toolbarDefaultScrollFlags); - @Override - public void disableToolbarHiding() { - AppLog.d(this, "Disable Intellihide"); - AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbarTop.getLayoutParams(); - params.setScrollFlags(0); // clear all scroll flags + } else { + AppLog.d(this, "Disable Intellihide"); + params.setScrollFlags(0); // clear all scroll flags + } appBarLayout.setExpanded(true, true); } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java index f1f5ea11..9207beea 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodSelectionFragment.java @@ -22,7 +22,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Build; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java index 6dff1ca6..de5cae55 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java @@ -190,8 +190,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference /** Usability */ else if (settings.isKeyEqual(key, R.string.pref_key__is_overview_statusbar_hidden)) { AppSettings.get().setRecreateMainActivity(true); - } - else if (settings.isKeyEqual(key, R.string.pref_key__language)) { + } else if (settings.isKeyEqual(key, R.string.pref_key__language)) { AppSettings.get().setRecreateMainActivity(true); } /** Network */ diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/TagListFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/TagListFragment.java index 80c5dce6..8502be10 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/TagListFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/TagListFragment.java @@ -26,8 +26,6 @@ import android.support.v7.widget.AppCompatImageView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/listener/IntellihideToolbarActivityListener.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/IntellihideToolbarActivityListener.java index dbb51587..58f04704 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/listener/IntellihideToolbarActivityListener.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/IntellihideToolbarActivityListener.java @@ -10,7 +10,5 @@ import android.support.design.widget.AppBarLayout; public interface IntellihideToolbarActivityListener { int toolbarDefaultScrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS | AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP; - void enableToolbarHiding(); - - void disableToolbarHiding(); + void setToolbarIntellihide(boolean enable); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java index 3e39d79c..26552ec1 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java @@ -18,7 +18,6 @@ */ package com.github.dfa.diaspora_android.ui; -import android.annotation.TargetApi; import android.content.Context; import android.support.v7.widget.AppCompatTextView; import android.text.Html; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java index 88636c88..82dcf93c 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/CustomFragment.java @@ -20,8 +20,6 @@ package com.github.dfa.diaspora_android.ui.theme; import android.os.Bundle; import android.support.v4.app.Fragment; -import android.view.Menu; -import android.view.MenuInflater; /** * Customized abstract Fragment class with some useful methods diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java index bf6dbfad..fd3aaef7 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java @@ -21,7 +21,6 @@ package com.github.dfa.diaspora_android.ui.theme; import android.annotation.TargetApi; import android.app.ActivityManager; import android.content.pm.ActivityInfo; -import android.content.res.Configuration; import android.graphics.drawable.BitmapDrawable; import android.os.Build; import android.support.v7.app.AppCompatActivity; @@ -31,8 +30,6 @@ import com.github.dfa.diaspora_android.R; import com.github.dfa.diaspora_android.util.AppSettings; import com.github.dfa.diaspora_android.util.ContextUtils; -import java.util.Locale; - /** * Activity that supports color schemes * Created by vanitas on 06.10.16. diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java index 10252ed3..d33f291a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java @@ -448,4 +448,8 @@ public class AppSettings extends AppSettingsBase { setRecreateMainActivity(false); return value; } + + public boolean isShowTitleInMainView() { + return getBool(R.string.pref_key__show_title, false); + } } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java index e1d8cb2d..ccf3db0f 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java @@ -31,8 +31,6 @@ import android.os.Environment; import android.support.design.widget.Snackbar; import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; import android.webkit.WebSettings; diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml deleted file mode 100644 index 8cc61e1a..00000000 --- a/app/src/main/res/menu/main__menu_bottom.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/app/src/main/res/menu/stream__menu_bottom.xml b/app/src/main/res/menu/stream__menu_bottom.xml deleted file mode 100644 index f2978247..00000000 --- a/app/src/main/res/menu/stream__menu_bottom.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml index 0d4c0567..4ec47306 100644 --- a/app/src/main/res/values/strings-not_translatable.xml +++ b/app/src/main/res/values/strings-not_translatable.xml @@ -126,4 +126,5 @@ pref_key__adblock_enable pref_key__is_overview_statusbar_hidden pref_key__recreate_main_activity + pref_key__show_title diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 29703b48..db79e82c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -96,4 +96,6 @@ Jump to last visited page in stream? Hide statusbar at main view Hide statusbar + Show title in the main view + Show title diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml index 4efbbd9b..9b3586f7 100644 --- a/app/src/main/res/xml/preferences__master.xml +++ b/app/src/main/res/xml/preferences__master.xml @@ -80,6 +80,13 @@ android:summary="@string/pref_desc__topbar_stream_shortcut" android:title="@string/pref_title__topbar_stream_shortcut"/> + +