owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(settings): add giant header to all subpages

Browse Source
This commit is contained in:
FineFindus
2023-05-19 15:10:31 +02:00
parent 4e188503a2
commit 3c8715a7c4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
View File

@@ -93,6 +93,8 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
DomainManager.getInstance().setCurrentDomain(session.domain + "/settings"); DomainManager.getInstance().setCurrentDomain(session.domain + "/settings");
addItems(items); addItems(items);
String title = getArguments().getString("title", getTitle().toString());
items.add(0, new GiantHeaderItem(title));
} }
@Override @Override
@@ -128,6 +130,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
public void onViewCreated(View view, Bundle savedInstanceState){ public void onViewCreated(View view, Bundle savedInstanceState){
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
this.view = view; this.view = view;
hideToolbar();
} }
protected void hideToolbar() { protected void hideToolbar() {
@@ -756,7 +759,9 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
@Override @Override
public void onClick() { public void onClick() {
Nav.go(getActivity(), item.fragmentClass, getArguments()); Bundle args = getArguments();
args.putString("title", item.text);
Nav.go(getActivity(), item.fragmentClass, args);
} }
} }

5
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
View File

@@ -12,7 +12,6 @@ import java.util.ArrayList;
public class SettingsMainFragment extends SettingsBaseFragment { public class SettingsMainFragment extends SettingsBaseFragment {
@Override @Override
public void addItems(ArrayList<Item> items) { public void addItems(ArrayList<Item> items) {
items.add(new GiantHeaderItem(getContext().getString(R.string.settings)));
if (GithubSelfUpdater.needSelfUpdating()) { if (GithubSelfUpdater.needSelfUpdating()) {
GithubSelfUpdater updater = GithubSelfUpdater.getInstance(); GithubSelfUpdater updater = GithubSelfUpdater.getInstance();
@@ -34,9 +33,9 @@ public class SettingsMainFragment extends SettingsBaseFragment {
@Override @Override
public void onViewCreated(View view, Bundle savedInstanceState) { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
if (GithubSelfUpdater.needSelfUpdating()) if (GithubSelfUpdater.needSelfUpdating()) {
E.register(this); E.register(this);
hideToolbar(); }
} }
@Override @Override