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

A bunch of stuff. I dont know wtf I am doing

This commit is contained in:
sk 2022-12-16 02:14:06 +01:00 committed by LucasGGamerM
parent 90645f4d90
commit caddf0021c
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
View File

@ -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<Filter> wordFilters=new ArrayList<>();
public String pushAccountID;
public Preferences preferences;
public AccountActivationInfo activationInfo;
private transient MastodonAPIController apiController;
private transient StatusInteractionController statusInteractionController;

4
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
View File

@ -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);
}

4
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java
View File

@ -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);
}

4
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
View File

@ -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);
}

4
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
View File

@ -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);
}