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

Organize button styles more neatly

Browse Source
This commit is contained in:
Grishka
2022-02-16 01:46:13 +03:00
parent 1e911c2245
commit f7ddac6ae6
22 changed files with 115 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java
View File

@@ -1,7 +1,5 @@
package org.joinmastodon.android.api.requests.oauth;
import android.net.Uri;
import org.joinmastodon.android.api.MastodonAPIRequest;
import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.model.Application;

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

@@ -6,6 +6,7 @@ import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
@@ -55,7 +56,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
@Override
public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
setRetainInstance(true);
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
setRetainInstance(true);
}
@Override

3
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
View File

@@ -49,7 +49,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
super.onCreate(savedInstanceState);
accountID=getArguments().getString("account");
setRetainInstance(true);
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
setRetainInstance(true);
Bundle args=new Bundle();
args.putString("account", accountID);

6
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -12,6 +12,7 @@ import android.content.res.Configuration;
import android.graphics.Outline;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.view.Gravity;
@@ -123,7 +124,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
@Override
public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
setRetainInstance(true);
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
setRetainInstance(true);
accountID=getArguments().getString("account");
if(getArguments().containsKey("profileAccount")){
@@ -435,7 +437,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
if(isOwnProfile && isInEditMode){
Button cancelButton=new Button(getActivity(), null, 0, R.style.Widget_Mastodon_Button_Secondary);
Button cancelButton=new Button(getActivity(), null, 0, R.style.Widget_Mastodon_Button_Secondary_LightOnDark);
cancelButton.setText(R.string.cancel);
cancelButton.setOnClickListener(v->exitEditMode());
FrameLayout wrap=new FrameLayout(getActivity());