diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index f41b46584..54da08665 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -541,7 +541,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList private void updateToolbar(){ getToolbar().setOnClickListener(v->scrollToTop()); getToolbar().setNavigationContentDescription(R.string.back); - UiUtils.setToolbarWithSubtitleAppearance(getToolbar()); if(onScrollListener!=null){ onScrollListener.setViews(getToolbar()); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java index 80324555b..535046022 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java @@ -76,12 +76,6 @@ public class SettingsMainFragment extends BaseSettingsFragment{ @Override protected void doLoadData(int offset, int count){} - @Override - protected void onUpdateToolbar(){ - super.onUpdateToolbar(); - UiUtils.setToolbarWithSubtitleAppearance(getToolbar()); - } - @Override protected void onHidden(){ super.onHidden(); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java index 4b44d37dd..c1d1eecdb 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java @@ -754,11 +754,6 @@ public class UiUtils{ }; } - public static void setToolbarWithSubtitleAppearance(Toolbar toolbar){ - toolbar.setTitleTextAppearance(toolbar.getContext(), R.style.m3_title_medium); - toolbar.setSubtitleTextAppearance(toolbar.getContext(), R.style.m3_title_small); - } - @SuppressLint("DefaultLocale") public static String formatMediaDuration(int seconds){ if(seconds>=3600) diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml index 907c6f47e..ca0096527 100644 --- a/mastodon/src/main/res/values/styles.xml +++ b/mastodon/src/main/res/values/styles.xml @@ -189,6 +189,17 @@ 0px ?colorM3Background @color/action_bar_icons + @style/action_bar_title + @style/action_bar_subtitle + + + + +