Onboarding & signup

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java

@@ -17,6 +17,7 @@ import android.widget.LinearLayout;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.discover.DiscoverFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.views.TabBar;
 import org.parceler.Parcels;

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -38,9 +38,9 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountByID;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
-import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Relationship;

mastodon/src/main/java/org/joinmastodon/android/fragments/ScrollableToTop.java

@@ -1,5 +1,5 @@
 package org.joinmastodon.android.fragments;
 
-/*package*/ interface ScrollableToTop{
+public interface ScrollableToTop{
 	void scrollToTop();
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java

@@ -1,30 +1,66 @@
 package org.joinmastodon.android.fragments;
 
-import android.app.Fragment;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogFragment;
+import org.joinmastodon.android.ui.InterpolatingMotionEffect;
+import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
 
 import androidx.annotation.Nullable;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.fragments.AppKitFragment;
-import me.grishka.appkit.views.FragmentRootLinearLayout;
+import me.grishka.appkit.utils.V;
 
 public class SplashFragment extends AppKitFragment{
 
-	private View contentView;
+	private SizeListenerFrameLayout contentView;
+	private View artContainer, blueFill, greenFill;
+	private InterpolatingMotionEffect motionEffect;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
+	}
 
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
-		contentView= inflater.inflate(R.layout.fragment_splash, container, false);
+		contentView=(SizeListenerFrameLayout) inflater.inflate(R.layout.fragment_splash, container, false);
 		contentView.findViewById(R.id.btn_get_started).setOnClickListener(this::onButtonClick);
 		contentView.findViewById(R.id.btn_log_in).setOnClickListener(this::onButtonClick);
+
+		artContainer=contentView.findViewById(R.id.art_container);
+		blueFill=contentView.findViewById(R.id.blue_fill);
+		greenFill=contentView.findViewById(R.id.green_fill);
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_clouds), V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_right_hill), V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_left_hill), V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_center_hill), V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_plane_elephant), V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
+
+		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
+			@Override
+			public void onSizeChanged(int w, int h, int oldw, int oldh){
+				contentView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+					@Override
+					public boolean onPreDraw(){
+						contentView.getViewTreeObserver().removeOnPreDrawListener(this);
+						updateArtSize(w, h);
+						return true;
+					}
+				});
+			}
+		});
+
 		return contentView;
 	}
 
@@ -33,10 +69,46 @@ public class SplashFragment extends AppKitFragment{
 		extras.putBoolean("signup", v.getId()==R.id.btn_get_started);
 		Nav.go(getActivity(), InstanceCatalogFragment.class, extras);
 	}
-//
-//	@Override
-//	public void onApplyWindowInsets(WindowInsets insets){
-//		if(contentView!=null)
-//			contentView.dispatchApplyWindowInsets(insets);
-//	}
+
+	private void updateArtSize(int w, int h){
+		float scale=w/(float)V.dp(412);
+		artContainer.setScaleX(scale);
+		artContainer.setScaleY(scale);
+		blueFill.setScaleY(h/2f);
+		greenFill.setScaleY(h-artContainer.getBottom()+V.dp(90));
+	}
+
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		super.onApplyWindowInsets(insets);
+		int bottomInset=insets.getSystemWindowInsetBottom();
+		if(bottomInset>0 && bottomInset<V.dp(36)){
+			contentView.setPadding(contentView.getPaddingLeft(), contentView.getPaddingTop(), contentView.getPaddingRight(), V.dp(36));
+		}
+		((ViewGroup.MarginLayoutParams)blueFill.getLayoutParams()).topMargin=-contentView.getPaddingTop();
+		((ViewGroup.MarginLayoutParams)greenFill.getLayoutParams()).bottomMargin=-contentView.getPaddingBottom();
+	}
+
+	@Override
+	public boolean wantsLightStatusBar(){
+		return true;
+	}
+
+	@Override
+	public boolean wantsLightNavigationBar(){
+		return true;
+	}
+
+	@Override
+	protected void onShown(){
+		super.onShown();
+		motionEffect.activate();
+	}
+
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		motionEffect.deactivate();
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
@@ -15,6 +15,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
+import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FollowSuggestion;
 import org.joinmastodon.android.model.Relationship;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.discover;
 
 import android.app.Fragment;
 import android.os.Build;
@@ -10,6 +10,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java

@@ -1,10 +1,11 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.discover;
 
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
+import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Status;
 
 import java.util.List;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;

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

@@ -0,0 +1,172 @@
+package org.joinmastodon.android.fragments.onboarding;
+
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.Button;
+import android.widget.Toast;
+
+import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
+import org.joinmastodon.android.api.requests.accounts.ResendConfirmationEmail;
+import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.HomeFragment;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.io.File;
+import java.util.Collections;
+
+import androidx.annotation.Nullable;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.APIRequest;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.utils.V;
+
+public class AccountActivationFragment extends AppKitFragment{
+	private String accountID;
+
+	private Button btn, backBtn;
+	private View buttonBar;
+	private Handler uiHandler=new Handler(Looper.getMainLooper());
+	private Runnable pollRunnable=this::tryGetAccount;
+	private APIRequest currentRequest;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
+		View view=inflater.inflate(R.layout.fragment_onboarding_activation, container, false);
+
+		btn=view.findViewById(R.id.btn_next);
+		btn.setOnClickListener(v->onButtonClick());
+		buttonBar=view.findViewById(R.id.button_bar);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->onBackButtonClick());
+
+		return view;
+	}
+
+	@Override
+	public boolean wantsLightStatusBar(){
+		return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)!=Configuration.UI_MODE_NIGHT_YES;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=27){
+			int inset=insets.getSystemWindowInsetBottom();
+			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
+		}else{
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
+		}
+	}
+
+	@Override
+	protected void onShown(){
+		super.onShown();
+		tryGetAccount();
+	}
+
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		if(currentRequest!=null){
+			currentRequest.cancel();
+			currentRequest=null;
+		}else{
+			uiHandler.removeCallbacks(pollRunnable);
+		}
+	}
+
+	private void onButtonClick(){
+		startActivity(Intent.makeMainSelectorActivity(Intent.ACTION_MAIN, Intent.CATEGORY_APP_EMAIL).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+	}
+
+	private void onBackButtonClick(){
+		new ResendConfirmationEmail(null)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Object result){
+						Toast.makeText(getActivity(), R.string.resent_email, Toast.LENGTH_SHORT).show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+					}
+				})
+				.wrapProgress(getActivity(), R.string.loading, false)
+				.exec(accountID);
+	}
+
+	private void tryGetAccount(){
+		currentRequest=new GetOwnAccount()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Account result){
+						currentRequest=null;
+						AccountSessionManager mgr=AccountSessionManager.getInstance();
+						AccountSession session=mgr.getAccount(accountID);
+						mgr.removeAccount(accountID);
+						mgr.addAccount(session.instance, session.token, result, session.app, true);
+						String newID=mgr.getLastActiveAccountID();
+						Bundle args=new Bundle();
+						args.putString("account", newID);
+						if(session.self.avatar!=null || session.self.displayName!=null){
+							File avaFile=session.self.avatar!=null ? new File(session.self.avatar) : null;
+							new UpdateAccountCredentials(session.self.displayName, "", avaFile, null, Collections.emptyList())
+									.setCallback(new Callback<>(){
+										@Override
+										public void onSuccess(Account result){
+											if(avaFile!=null)
+												avaFile.delete();
+											mgr.updateAccountInfo(newID, result);
+											Nav.goClearingStack(getActivity(), HomeFragment.class, args);
+										}
+
+										@Override
+										public void onError(ErrorResponse error){
+											if(avaFile!=null)
+												avaFile.delete();
+											Nav.goClearingStack(getActivity(), HomeFragment.class, args);
+										}
+									})
+									.exec(newID);
+						}else{
+							Nav.goClearingStack(getActivity(), HomeFragment.class, args);
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						currentRequest=null;
+						uiHandler.postDelayed(pollRunnable, 10_000L);
+					}
+				})
+				.exec(accountID);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java

@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments.onboarding;
 
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Build;
@@ -12,11 +11,12 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
@@ -28,6 +28,12 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogCategory;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.tabs.TabLayout;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
 
 import java.net.IDN;
 import java.util.ArrayList;
@@ -40,14 +46,15 @@ import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
@@ -59,7 +66,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private Button nextButton;
 	private MastodonAPIRequest<?> getCategoriesRequest;
 	private EditText searchEdit;
-	private UsableRecyclerView categoriesList;
+	private TabLayout categoriesList;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
 	private String currentSearchQuery;
 	private String currentCategory="all";
@@ -68,6 +75,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private GetInstance loadingInstanceRequest;
 	private HashMap<String, Instance> instancesCache=new HashMap<>();
 	private ProgressDialog instanceProgressDialog;
+	private View buttonBar;
 
 	private boolean isSignup;
 
@@ -145,8 +153,14 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 						CatalogCategory all=new CatalogCategory();
 						all.category="all";
 						categories.add(all);
-						categories.addAll(result);
-						categoriesList.getAdapter().notifyItemRangeInserted(0, categories.size());
+						result.stream().sorted(Comparator.comparingInt((CatalogCategory cc)->cc.serversCount).reversed()).forEach(categories::add);
+						for(CatalogCategory cat:categories){
+							int titleRes=getTitleForCategory(cat.category);
+							TabLayout.Tab tab=categoriesList.newTab().setText(titleRes!=0 ? getString(titleRes) : cat.category).setCustomView(R.layout.item_instance_category);
+							ImageView emoji=tab.getCustomView().findViewById(R.id.emoji);
+							emoji.setImageResource(getEmojiForCategory(cat.category));
+							categoriesList.addTab(tab);
+						}
 					}
 
 					@Override
@@ -170,6 +184,24 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_onboarding_instance_catalog, list, false);
 		searchEdit=headerView.findViewById(R.id.search_edit);
 		categoriesList=headerView.findViewById(R.id.categories_list);
+		categoriesList.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
+			@Override
+			public void onTabSelected(TabLayout.Tab tab){
+				CatalogCategory category=categories.get(tab.getPosition());
+				currentCategory=category.category;
+				updateFilteredList();
+			}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){
+
+			}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+
+			}
+		});
 		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
 		searchEdit.addTextChangedListener(new TextWatcher(){
 			@Override
@@ -187,8 +219,6 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			public void afterTextChanged(Editable s){
 			}
 		});
-		categoriesList.setAdapter(new CategoriesAdapter());
-		categoriesList.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false));
 
 		mergeAdapter=new MergeRecyclerAdapter();
 		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
@@ -201,6 +231,13 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		super.onViewCreated(view, savedInstanceState);
 		nextButton=view.findViewById(R.id.btn_next);
 		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setEnabled(chosenInstance!=null);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
+		list.setItemAnimator(new BetterItemAnimator());
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 16, 16, DividerItemDecoration.NOT_FIRST));
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+		buttonBar=view.findViewById(R.id.button_bar);
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
 	}
 
 	private void onNextClick(View v){
@@ -218,12 +255,71 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 
 	private void proceedWithAuthOrSignup(Instance instance){
 		if(isSignup){
-			Toast.makeText(getActivity(), "not implemented yet", Toast.LENGTH_SHORT).show();
+			Bundle args=new Bundle();
+			args.putParcelable("instance", Parcels.wrap(instance));
+			Nav.go(getActivity(), InstanceRulesFragment.class, args);
 		}else{
 			AccountSessionManager.getInstance().authenticate(getActivity(), instance);
 		}
 	}
 
+//	private String getEmojiForCategory(String category){
+//		return switch(category){
+//			case "all" -> "💬";
+//			case "academia" -> "📚";
+//			case "activism" -> "✊";
+//			case "food" -> "🍕";
+//			case "furry" -> "🦁";
+//			case "games" -> "🕹";
+//			case "general" -> "🐘";
+//			case "journalism" -> "📰";
+//			case "lgbt" -> "🏳️‍🌈";
+//			case "regional" -> "📍";
+//			case "art" -> "🎨";
+//			case "music" -> "🎼";
+//			case "tech" -> "📱";
+//			default -> "❓";
+//		};
+//	}
+
+	private int getEmojiForCategory(String category){
+		return switch(category){
+			case "all" -> R.drawable.ic_category_all;
+			case "academia" -> R.drawable.ic_category_academia;
+			case "activism" -> R.drawable.ic_category_activism;
+			case "food" -> R.drawable.ic_category_food;
+			case "furry" -> R.drawable.ic_category_furry;
+			case "games" -> R.drawable.ic_category_games;
+			case "general" -> R.drawable.ic_category_general;
+			case "journalism" -> R.drawable.ic_category_journalism;
+			case "lgbt" -> R.drawable.ic_category_lgbt;
+			case "regional" -> R.drawable.ic_category_regional;
+			case "art" -> R.drawable.ic_category_art;
+			case "music" -> R.drawable.ic_category_music;
+			case "tech" -> R.drawable.ic_category_tech;
+			default -> R.drawable.ic_category_unknown;
+		};
+	}
+
+	private int getTitleForCategory(String category){
+		return switch(category){
+			case "all" -> R.string.category_all;
+			case "academia" -> R.string.category_academia;
+			case "activism" -> R.string.category_activism;
+			case "food" -> R.string.category_food;
+			case "furry" -> R.string.category_furry;
+			case "games" -> R.string.category_games;
+			case "general" -> R.string.category_general;
+			case "journalism" -> R.string.category_journalism;
+			case "lgbt" -> R.string.category_lgbt;
+			case "regional" -> R.string.category_regional;
+			case "art" -> R.string.category_art;
+			case "music" -> R.string.category_music;
+			case "tech" -> R.string.category_tech;
+			default -> 0;
+		};
+	}
+
 	private boolean onSearchEnterPressed(TextView v, int actionId, KeyEvent event){
 		if(event!=null && event.getAction()!=KeyEvent.ACTION_DOWN)
 			return true;
@@ -290,6 +386,8 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	}
 
 	private void loadInstanceInfo(String _domain){
+		if(TextUtils.isEmpty(_domain))
+			return;
 		String domain;
 		try{
 			domain=IDN.toASCII(_domain);
@@ -299,7 +397,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
 			for(CatalogInstance ci:filteredData){
-				if(ci.domain.equals(currentSearchQuery))
+				if(ci.domain.equals(domain))
 					return;
 			}
 			CatalogInstance ci=cachedInstance.toCatalogInstance();
@@ -330,7 +428,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 						if(domain.equals(currentSearchQuery)){
 							boolean found=false;
 							for(CatalogInstance ci:filteredData){
-								if(ci.domain.equals(currentSearchQuery)){
+								if(ci.domain.equals(domain)){
 									found=true;
 									break;
 								}
@@ -350,7 +448,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 						if(instanceProgressDialog!=null){
 							instanceProgressDialog.dismiss();
 							instanceProgressDialog=null;
-							new AlertDialog.Builder(getActivity())
+							new M3AlertDialogBuilder(getActivity())
 									.setTitle(R.string.error)
 									.setMessage(getString(R.string.not_a_mastodon_instance, domain)+"\n\n"+((MastodonErrorResponse)error).error)
 									.setPositiveButton(R.string.ok, null)
@@ -360,6 +458,17 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 				}).execNoAuth(domain);
 	}
 
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=27){
+			int inset=insets.getSystemWindowInsetBottom();
+			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
+		}else{
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
+		}
+	}
+
 	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
 		public InstancesAdapter(){
 			super(imgLoader);
@@ -399,13 +508,17 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			userCount=findViewById(R.id.user_count);
 			lang=findViewById(R.id.lang);
 			radioButton=findViewById(R.id.radiobtn);
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
+				UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
+				UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
+			}
 		}
 
 		@Override
 		public void onBind(CatalogInstance item){
 			title.setText(item.normalizedDomain);
 			description.setText(item.description);
-			userCount.setText(""+item.totalUsers);
+			userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
 			lang.setText(item.language.toUpperCase());
 			radioButton.setChecked(chosenInstance==item);
 		}
@@ -430,57 +543,4 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			loadInstanceInfo(chosenInstance.domain);
 		}
 	}
-
-	private class CategoriesAdapter extends RecyclerView.Adapter<CategoryViewHolder>{
-		@NonNull
-		@Override
-		public CategoryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new CategoryViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull CategoryViewHolder holder, int position){
-			holder.bind(categories.get(position));
-		}
-
-		@Override
-		public int getItemCount(){
-			return categories.size();
-		}
-	}
-
-	private class CategoryViewHolder extends BindableViewHolder<CatalogCategory> implements UsableRecyclerView.Clickable{
-		private final RadioButton radioButton;
-
-		public CategoryViewHolder(){
-			super(getActivity(), R.layout.item_instance_category, categoriesList);
-			radioButton=findViewById(R.id.radiobtn);
-		}
-
-		@Override
-		public void onBind(CatalogCategory item){
-			radioButton.setText(item.category);
-			radioButton.setChecked(item.category.equals(currentCategory));
-		}
-
-		@Override
-		public void onClick(){
-			if(currentCategory.equals(item.category))
-				return;
-			int i=0;
-			for(CatalogCategory c:categories){
-				if(c.category.equals(currentCategory)){
-					RecyclerView.ViewHolder holder=categoriesList.findViewHolderForAdapterPosition(i);
-					if(holder!=null){
-						((CategoryViewHolder)holder).radioButton.setChecked(false);
-					}
-					break;
-				}
-				i++;
-			}
-			currentCategory=item.category;
-			radioButton.setChecked(true);
-			updateFilteredList();
-		}
-	}
 }

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

@@ -0,0 +1,137 @@
+package org.joinmastodon.android.fragments.onboarding;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class InstanceRulesFragment extends AppKitFragment{
+	private UsableRecyclerView list;
+	private MergeRecyclerAdapter adapter;
+	private Button btn;
+	private View buttonBar;
+	private Instance instance;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setRetainInstance(true);
+	}
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+		View view=inflater.inflate(R.layout.fragment_onboarding_rules, container, false);
+
+		list=view.findViewById(R.id.list);
+		list.setLayoutManager(new LinearLayoutManager(getActivity()));
+		View headerView=inflater.inflate(R.layout.item_list_header, list, false);
+		TextView title=headerView.findViewById(R.id.title);
+		TextView subtitle=headerView.findViewById(R.id.subtitle);
+		title.setText(R.string.instance_rules_title);
+		subtitle.setText(getString(R.string.instance_rules_subtitle, instance.uri));
+
+		adapter=new MergeRecyclerAdapter();
+		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
+		adapter.addAdapter(new ItemsAdapter());
+		list.setAdapter(adapter);
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 16, 16, DividerItemDecoration.NOT_FIRST));
+
+		btn=view.findViewById(R.id.btn_next);
+		btn.setOnClickListener(v->onButtonClick());
+		buttonBar=view.findViewById(R.id.button_bar);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
+
+		return view;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+	}
+
+	protected void onButtonClick(){
+		Bundle args=new Bundle();
+		args.putParcelable("instance", Parcels.wrap(instance));
+		Nav.go(getActivity(), SignupFragment.class, args);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=27){
+			int inset=insets.getSystemWindowInsetBottom();
+			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
+		}else{
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
+		}
+	}
+
+	private class ItemsAdapter extends RecyclerView.Adapter<ItemViewHolder>{
+
+		@NonNull
+		@Override
+		public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new ItemViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull ItemViewHolder holder, int position){
+			holder.bind(instance.rules.get(position));
+		}
+
+		@Override
+		public int getItemCount(){
+			return instance.rules.size();
+		}
+	}
+
+	private class ItemViewHolder extends BindableViewHolder<Instance.Rule>{
+		private final TextView title, subtitle;
+		private final ImageView checkbox;
+
+		public ItemViewHolder(){
+			super(getActivity(), R.layout.item_report_choice, list);
+			title=findViewById(R.id.title);
+			subtitle=findViewById(R.id.subtitle);
+			checkbox=findViewById(R.id.checkbox);
+			subtitle.setVisibility(View.GONE);
+		}
+
+		@Override
+		public void onBind(Instance.Rule item){
+			title.setText(item.text);
+		}
+	}
+}

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

@@ -0,0 +1,290 @@
+package org.joinmastodon.android.fragments.onboarding;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIController;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.accounts.RegisterAccount;
+import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
+import org.joinmastodon.android.api.requests.oauth.GetOauthToken;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Application;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.Token;
+import org.joinmastodon.android.ui.OutlineProviders;
+import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+
+import androidx.annotation.Nullable;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.APIRequest;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.imageloader.ViewImageLoader;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.V;
+
+public class SignupFragment extends AppKitFragment{
+	private static final int AVATAR_RESULT=198;
+	private static final String TAG="SignupFragment";
+
+	private Instance instance;
+
+	private EditText displayName, username, email, password;
+	private Button btn;
+	private View buttonBar;
+	private TextWatcher buttonStateUpdater=new SimpleTextWatcher(e->updateButtonState());
+	private ImageView avatar;
+	private APIRequest currentBackgroundRequest;
+	private Application apiApplication;
+	private Token apiToken;
+	private boolean submitAfterGettingToken;
+	private ProgressDialog progressDialog;
+	private Uri avatarUri;
+	private File avatarFile;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setRetainInstance(true);
+		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
+		createAppAndGetToken();
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
+		View view=inflater.inflate(R.layout.fragment_onboarding_signup, container, false);
+
+		TextView title=view.findViewById(R.id.title);
+		TextView domain=view.findViewById(R.id.domain);
+		displayName=view.findViewById(R.id.display_name);
+		username=view.findViewById(R.id.username);
+		email=view.findViewById(R.id.email);
+		password=view.findViewById(R.id.password);
+		avatar=view.findViewById(R.id.avatar);
+		View avaWrap=view.findViewById(R.id.ava_wrap);
+
+		title.setText(getString(R.string.signup_title, instance.uri));
+		domain.setText('@'+instance.uri);
+
+		username.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+			@Override
+			public boolean onPreDraw(){
+				username.getViewTreeObserver().removeOnPreDrawListener(this);
+				username.setPadding(username.getPaddingLeft(), username.getPaddingTop(), domain.getWidth(), username.getPaddingBottom());
+				return true;
+			}
+		});
+
+		btn=view.findViewById(R.id.btn_next);
+		btn.setOnClickListener(v->onButtonClick());
+		buttonBar=view.findViewById(R.id.button_bar);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
+		updateButtonState();
+
+		username.addTextChangedListener(buttonStateUpdater);
+		email.addTextChangedListener(buttonStateUpdater);
+		password.addTextChangedListener(buttonStateUpdater);
+
+		avaWrap.setOutlineProvider(OutlineProviders.roundedRect(22));
+		avaWrap.setClipToOutline(true);
+		avaWrap.setOnClickListener(v->onAvatarClick());
+
+		return view;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+	}
+
+	private void onButtonClick(){
+		showProgressDialog();
+		if(currentBackgroundRequest!=null){
+			submitAfterGettingToken=true;
+		}else if(apiApplication==null){
+			submitAfterGettingToken=true;
+			createAppAndGetToken();
+		}else if(apiToken==null){
+			submitAfterGettingToken=true;
+			getToken();
+		}else{
+			submit();
+		}
+	}
+
+	private void copyAvatar(Runnable onDone){
+		// Need to copy the avatar from the content provider to somewhere accessible in case the app gets killed between signup and account activation
+		Activity activity=getActivity();
+		MastodonAPIController.runInBackground(()->{
+			String origName=UiUtils.getFileName(avatarUri);
+			avatarFile=new File(activity.getCacheDir(), System.currentTimeMillis()+origName.substring(origName.lastIndexOf('.')));
+			try(InputStream in=activity.getContentResolver().openInputStream(avatarUri);
+				FileOutputStream out=new FileOutputStream(avatarFile)){
+				byte[] buf=new byte[10240];
+				int read;
+				while((read=in.read(buf))>0){
+					out.write(buf, 0, read);
+				}
+			}catch(IOException x){
+				Log.w(TAG, "copyAvatar: error copying", x);
+			}
+			activity.runOnUiThread(onDone);
+		});
+	}
+
+	private void submit(){
+		if(avatarUri!=null && (avatarFile==null || !avatarFile.exists())){
+			copyAvatar(this::actuallySubmit);
+		}else{
+			actuallySubmit();
+		}
+	}
+
+	private void actuallySubmit(){
+		String username=this.username.getText().toString();
+		String email=this.email.getText().toString();
+		new RegisterAccount(username, email, password.getText().toString(), getResources().getConfiguration().locale.getLanguage(), null)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Token result){
+						progressDialog.dismiss();
+						progressDialog=null;
+						Account fakeAccount=new Account();
+						fakeAccount.acct=fakeAccount.username=username;
+						fakeAccount.id="tmp"+System.currentTimeMillis();
+						fakeAccount.displayName=displayName.getText().toString();
+						if(avatarFile!=null)
+							fakeAccount.avatar=avatarFile.getAbsolutePath();
+						AccountSessionManager.getInstance().addAccount(instance, result, fakeAccount, apiApplication, false);
+						Bundle args=new Bundle();
+						args.putString("account", AccountSessionManager.getInstance().getLastActiveAccountID());
+						Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+						progressDialog.dismiss();
+						progressDialog=null;
+					}
+				})
+				.exec(instance.uri, apiToken);
+	}
+
+	private void showProgressDialog(){
+		progressDialog=new ProgressDialog(getActivity());
+		progressDialog.setMessage(getString(R.string.loading));
+		progressDialog.setCancelable(false);
+		progressDialog.show();
+	}
+
+	private void updateButtonState(){
+		btn.setEnabled(username.length()>0 && email.length()>0 && email.getText().toString().contains("@") && password.length()>=8);
+	}
+
+	private void createAppAndGetToken(){
+		currentBackgroundRequest=new CreateOAuthApp()
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Application result){
+						apiApplication=result;
+						getToken();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						currentBackgroundRequest=null;
+						if(submitAfterGettingToken){
+							submitAfterGettingToken=false;
+							progressDialog.dismiss();
+							progressDialog=null;
+							error.showToast(getActivity());
+						}
+					}
+				})
+				.execNoAuth(instance.uri);
+	}
+
+	private void getToken(){
+		currentBackgroundRequest=new GetOauthToken(apiApplication.clientId, apiApplication.clientSecret, null, GetOauthToken.GrantType.CLIENT_CREDENTIALS)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Token result){
+						currentBackgroundRequest=null;
+						apiToken=result;
+						if(submitAfterGettingToken){
+							submitAfterGettingToken=false;
+							submit();
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						currentBackgroundRequest=null;
+						if(submitAfterGettingToken){
+							submitAfterGettingToken=false;
+							progressDialog.dismiss();
+							progressDialog=null;
+							error.showToast(getActivity());
+						}
+					}
+				})
+				.execNoAuth(instance.uri);
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=27){
+			int inset=insets.getSystemWindowInsetBottom();
+			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
+		}else{
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
+		}
+	}
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data){
+		if(requestCode==AVATAR_RESULT && resultCode==Activity.RESULT_OK){
+			avatarUri=data.getData();
+			if(avatarFile!=null && avatarFile.exists())
+				avatarFile.delete();
+			ViewImageLoader.load(avatar, getResources().getDrawable(R.drawable.default_avatar), new UrlImageLoaderRequest(avatarUri, V.dp(100), V.dp(100)));
+		}
+	}
+
+	private void onAvatarClick(){
+		startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT).setType("image/*").addCategory(Intent.CATEGORY_OPENABLE), AVATAR_RESULT);
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/fragments/report/BaseReportChoiceFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.report;
 
 import android.app.Activity;
 import android.os.Build;

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.report;
 
 import android.app.Activity;
 import android.graphics.Canvas;
@@ -15,10 +15,10 @@ import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
 
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
+import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
@@ -33,7 +33,6 @@ import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.report;
 
 import android.app.Activity;
 import android.os.Build;

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.report;
 
 import android.app.Activity;
 import android.os.Build;
@@ -8,17 +8,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.requests.reports.SendReport;
-import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.ReportReason;
@@ -26,8 +20,6 @@ import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
-import java.util.ArrayList;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.report;
 
 import android.os.Bundle;
 

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportRuleChoiceFragment.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.report;
 
 import android.os.Bundle;