From caddf0021ce8eeb5637b755074c168906661ab41 Mon Sep 17 00:00:00 2001 From: sk Date: Fri, 16 Dec 2022 02:14:06 +0100 Subject: [PATCH] A bunch of stuff. I dont know wtf I am doing --- .../org/joinmastodon/android/api/session/AccountSession.java | 2 ++ .../fragments/onboarding/AccountActivationFragment.java | 4 ++-- .../fragments/onboarding/GoogleMadeMeAddThisFragment.java | 4 ++-- .../android/fragments/onboarding/InstanceRulesFragment.java | 4 ++-- .../android/fragments/onboarding/SignupFragment.java | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java index c1930eabc..735b19aca 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java @@ -7,6 +7,7 @@ import org.joinmastodon.android.api.StatusInteractionController; import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Application; import org.joinmastodon.android.model.Filter; +import org.joinmastodon.android.model.Preferences; import org.joinmastodon.android.model.PushSubscription; import org.joinmastodon.android.model.Token; @@ -28,6 +29,7 @@ public class AccountSession{ public long filtersLastUpdated; public List wordFilters=new ArrayList<>(); public String pushAccountID; + public Preferences preferences; public AccountActivationInfo activationInfo; private transient MastodonAPIController apiController; private transient StatusInteractionController statusInteractionController; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java index dd86fdae6..fcbe081bd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java @@ -96,9 +96,9 @@ public class AccountActivationFragment extends ToolbarFragment{ view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background)); } - @Override +// @Override protected void onUpdateToolbar(){ - super.onUpdateToolbar(); +// super.onUpdateToolbar(); getToolbar().setBackground(null); getToolbar().setElevation(0); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java index 3cf0767c9..2416f3cc0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java @@ -115,9 +115,9 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{ view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background)); } - @Override +// @Override protected void onUpdateToolbar(){ - super.onUpdateToolbar(); +// super.onUpdateToolbar(); getToolbar().setBackground(null); getToolbar().setElevation(0); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java index ae09efc7f..c3ab13586 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java @@ -81,9 +81,9 @@ public class InstanceRulesFragment extends ToolbarFragment{ view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background)); } - @Override +// @Override protected void onUpdateToolbar(){ - super.onUpdateToolbar(); +// super.onUpdateToolbar(); getToolbar().setBackground(null); getToolbar().setElevation(0); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java index 987cc0b8e..82d33afcf 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java @@ -147,9 +147,9 @@ public class SignupFragment extends ToolbarFragment{ view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background)); } - @Override +// @Override protected void onUpdateToolbar(){ - super.onUpdateToolbar(); +// super.onUpdateToolbar(); getToolbar().setBackground(null); getToolbar().setElevation(0); }