Refactoring

app/src/main/java/eu/faircode/email/ActivitySetup.java

@@ -394,7 +394,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         Bundle args = new Bundle();
         args.putBoolean("export", export);
 
-        FragmentPassword fragment = new FragmentPassword();
+        FragmentDialogPassword fragment = new FragmentDialogPassword();
         fragment.setArguments(args);
         fragment.show(getSupportFragmentManager(), "password");
     }
@@ -1019,7 +1019,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
         return intent;
     }
 
-    public static class FragmentPassword extends DialogFragment {
+    public static class FragmentDialogPassword extends DialogFragment {
         private TextInputLayout etPassword1;
         private TextInputLayout etPassword2;
 

app/src/main/java/eu/faircode/email/ActivityView.java

@@ -583,7 +583,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private void checkFirst() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (prefs.getBoolean("first", true))
-            new FragmentFirst().show(getSupportFragmentManager(), "first");
+            new FragmentDialogFirst().show(getSupportFragmentManager(), "first");
     }
 
     private void checkCrash() {
@@ -862,7 +862,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         if (faq.resolveActivity(getPackageManager()) == null)
             Helper.view(this, this, getIntentRate(this));
         else
-            new FragmentRate().show(getSupportFragmentManager(), "rate");
+            new FragmentDialogRate().show(getSupportFragmentManager(), "rate");
     }
 
     private void onMenuOtherApps() {
@@ -1178,7 +1178,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         return intent;
     }
 
-    public static class FragmentFirst extends DialogFragment {
+    public static class FragmentDialogFirst extends DialogFragment {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -1195,7 +1195,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         }
     }
 
-    public static class FragmentRate extends DialogFragment {
+    public static class FragmentDialogRate extends DialogFragment {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -2488,7 +2488,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             Bundle args = new Bundle();
             args.putLong("id", message.id);
 
-            FragmentColor fragment = new FragmentColor();
+            FragmentDialogColor fragment = new FragmentDialogColor();
             fragment.initialize(R.string.title_flag_color, color, args, context);
             fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_COLOR);
             fragment.show(parentFragment.getFragmentManager(), "message:color");
@@ -3090,7 +3090,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             args.putLong("message", message.id);
             args.putBoolean("copy", copy);
 
-            FragmentSelectFolder fragment = new FragmentSelectFolder();
+            FragmentDialogFolder fragment = new FragmentDialogFolder();
             fragment.setArguments(args);
             fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_MOVE);
             fragment.show(parentFragment.getFragmentManager(), "message:move");

app/src/main/java/eu/faircode/email/FragmentAccount.java

@@ -291,7 +291,7 @@ public class FragmentAccount extends FragmentBase {
         btnColor.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                FragmentColor fragment = new FragmentColor();
+                FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.initialize(R.string.title_account_color, color, new Bundle(), getContext());
                 fragment.setTargetFragment(FragmentAccount.this, REQUEST_COLOR);
                 fragment.show(getFragmentManager(), "account:color");

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -1083,7 +1083,7 @@ public class FragmentCompose extends FragmentBase {
         Bundle args = new Bundle();
         args.putString("title", getString(R.string.title_send_at));
 
-        FragmentDuration fragment = new FragmentDuration();
+        FragmentDialogDuration fragment = new FragmentDialogDuration();
         fragment.setArguments(args);
         fragment.setTargetFragment(this, REQUEST_SEND_AFTER);
         fragment.show(getFragmentManager(), "send:after");
@@ -3258,7 +3258,7 @@ public class FragmentCompose extends FragmentBase {
                     ForegroundColorSpan[] spans = ss.getSpans(start, end, ForegroundColorSpan.class);
                     int color = (spans.length > 0 ? spans[0].getForegroundColor() : Color.TRANSPARENT);
 
-                    FragmentColor fragment = new FragmentColor();
+                    FragmentDialogColor fragment = new FragmentDialogColor();
                     fragment.initialize(R.string.title_style_color, color, args, getContext());
                     fragment.setTargetFragment(FragmentCompose.this, REQUEST_COLOR);
                     fragment.show(getFragmentManager(), "account:color");

app/src/main/java/eu/faircode/email/FragmentDialogAsk.java

@@ -37,7 +37,7 @@ import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
 
-public class FragmentAsk extends DialogFragment {
+public class FragmentDialogAsk extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

app/src/main/java/eu/faircode/email/FragmentDialogColor.java

@@ -29,7 +29,7 @@ import com.android.colorpicker.ColorPickerDialog;
 
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentColor extends ColorPickerDialog {
+public class FragmentDialogColor extends ColorPickerDialog {
     private Bundle args;
 
     public void initialize(int title, int color, Bundle args, Context context) {

app/src/main/java/eu/faircode/email/FragmentDialogDuration.java

@@ -44,7 +44,7 @@ import java.util.Date;
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentDuration extends DialogFragment {
+public class FragmentDialogDuration extends DialogFragment {
     private Calendar cal = Calendar.getInstance();
 
     @Override

app/src/main/java/eu/faircode/email/FragmentDialogFolder.java

@@ -41,7 +41,7 @@ import java.util.List;
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentSelectFolder extends DialogFragment {
+public class FragmentDialogFolder extends DialogFragment {
     private TwoStateOwner owner = new TwoStateOwner("folder:select");
 
     @NonNull

app/src/main/java/eu/faircode/email/FragmentFolder.java

@@ -322,7 +322,7 @@ public class FragmentFolder extends FragmentBase {
         Bundle aargs = new Bundle();
         aargs.putString("question", getString(R.string.title_folder_delete));
 
-        FragmentAsk ask = new FragmentAsk();
+        FragmentDialogAsk ask = new FragmentDialogAsk();
         ask.setArguments(aargs);
         ask.setTargetFragment(FragmentFolder.this, REQUEST_DELETE_FOLDER);
         ask.show(getFragmentManager(), "folder:delete");
@@ -497,7 +497,7 @@ public class FragmentFolder extends FragmentBase {
                     Bundle aargs = new Bundle();
                     aargs.putString("question", getString(R.string.title_ask_save));
 
-                    FragmentAsk ask = new FragmentAsk();
+                    FragmentDialogAsk ask = new FragmentDialogAsk();
                     ask.setArguments(aargs);
                     ask.setTargetFragment(FragmentFolder.this, REQUEST_SAVE_CHANGES);
                     ask.show(getFragmentManager(), "folder:save");

app/src/main/java/eu/faircode/email/FragmentIdentity.java

@@ -262,7 +262,7 @@ public class FragmentIdentity extends FragmentBase {
         btnColor.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                FragmentColor fragment = new FragmentColor();
+                FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.initialize(R.string.title_flag_color, color, new Bundle(), getContext());
                 fragment.setTargetFragment(FragmentIdentity.this, REQUEST_COLOR);
                 fragment.show(getFragmentManager(), "identity:color");

app/src/main/java/eu/faircode/email/FragmentRule.java

@@ -297,7 +297,7 @@ public class FragmentRule extends FragmentBase {
         btnColor.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                FragmentColor fragment = new FragmentColor();
+                FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.initialize(R.string.title_flag_color, color, new Bundle(), getContext());
                 fragment.setTargetFragment(FragmentRule.this, REQUEST_COLOR);
                 fragment.show(getFragmentManager(), "rule:color");