Simplified #show() on dialog

This commit is contained in:
Moez Bhatti
2015-12-06 03:12:32 -05:00
parent 8bd89c84d2
commit b844b5aa4a
10 changed files with 32 additions and 29 deletions
@@ -39,7 +39,7 @@ public class DialogHelper {
context.showMenu(); context.showMenu();
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); .show();
} }
@@ -59,7 +59,7 @@ public class DialogHelper {
}).start(); }).start();
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); .show();
} }
public static void showChangelog(QKActivity context) { public static void showChangelog(QKActivity context) {
@@ -199,7 +199,7 @@ public class DonationManager {
.setContext(mContext) .setContext(mContext)
.setCustomView(view); .setCustomView(view);
dialog.show(mContext.getFragmentManager(), "donate dialog"); dialog.show();
} }
public void donatePaypal() { public void donatePaypal() {
@@ -46,7 +46,7 @@ public class ConversationDetailsDialog implements ConversationDetails {
.setTitle(R.string.dialog_conversation_details_title) .setTitle(R.string.dialog_conversation_details_title)
.setCustomView(listView) .setCustomView(listView)
.setPositiveButton(R.string.okay, null) .setPositiveButton(R.string.okay, null)
.show(mFragmentManager, "conversation details"); .show();
} }
} }
@@ -194,7 +194,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.OnOpenListen
.setMessage(R.string.icon_ready_message) .setMessage(R.string.icon_ready_message)
.setCustomView(imageView) .setCustomView(imageView)
.setPositiveButton(R.string.okay, null) .setPositiveButton(R.string.okay, null)
.show(getFragmentManager(), null); .show();
// Only show the MMS setup fragment if it hasn't already been dismissed // Only show the MMS setup fragment if it hasn't already been dismissed
} else if (!wasMmsSetupFragmentDismissed(savedInstanceState)) { } else if (!wasMmsSetupFragmentDismissed(savedInstanceState)) {
@@ -449,7 +449,7 @@ public class ThemeManager {
} }
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(((MainActivity) context).getFragmentManager(), "icon"); .show();
} }
public static int getBackgroundColor() { public static int getBackgroundColor() {
@@ -558,7 +558,7 @@ public class ThemeManager {
.setCustomView(palette) .setCustomView(palette)
.setNegativeButton(R.string.cancel, null); .setNegativeButton(R.string.cancel, null);
dialog.show(context.getFragmentManager(), "colorpicker"); dialog.show();
} }
private static void showColourPickerDialog(final QKActivity context, int swatchColour) { private static void showColourPickerDialog(final QKActivity context, int swatchColour) {
@@ -580,7 +580,7 @@ public class ThemeManager {
.setTitle(R.string.pref_theme) .setTitle(R.string.pref_theme)
.setCustomView(palette) .setCustomView(palette)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(context.getFragmentManager(), "colorpicker"); .show();
} }
public static void setStatusBarTintEnabled(boolean enabled) { public static void setStatusBarTintEnabled(boolean enabled) {
@@ -35,7 +35,7 @@ public class BlockedNumberDialog {
} }
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(context.getFragmentManager(), "remove from future blocked"); .show();
} }
}) })
.setPositiveButton(R.string.add, new View.OnClickListener() { .setPositiveButton(R.string.add, new View.OnClickListener() {
@@ -55,10 +55,10 @@ public class BlockedNumberDialog {
} }
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(context.getFragmentManager(), "add to future blocked"); .show();
} }
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.show(context.getFragmentManager(), "future blocked conversations"); .show();
} }
} }
@@ -2,6 +2,7 @@ package com.moez.QKSMS.ui.dialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.app.FragmentManager;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
@@ -33,11 +34,6 @@ import java.util.ArrayList;
public class QKDialog extends DialogFragment { public class QKDialog extends DialogFragment {
private final String TAG = "QKDialog"; private final String TAG = "QKDialog";
public static final String LIST_TAG = "list";
public static final String DETAILS_TAG = "details";
public static final String RESTART_TAG = "restart";
public static final String CONFIRMATION_TAG = "confirmation";
protected QKActivity mContext; protected QKActivity mContext;
protected Resources mResources; protected Resources mResources;
@@ -461,4 +457,13 @@ public class QKDialog extends DialogFragment {
} }
} }
public void show() {
super.show(mContext.getFragmentManager(), null);
}
@Deprecated
@Override
public void show(FragmentManager manager, String tag) {
super.show(manager, tag);
}
} }
@@ -44,7 +44,6 @@ import android.view.ViewGroup;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.mms.ContentType; import com.google.android.mms.ContentType;
import com.google.android.mms.MmsException; import com.google.android.mms.MmsException;
import com.google.android.mms.pdu_alt.PduBody; import com.google.android.mms.pdu_alt.PduBody;
@@ -83,6 +82,8 @@ import com.moez.QKSMS.ui.view.ComposeView;
import com.moez.QKSMS.ui.view.MessageListRecyclerView; import com.moez.QKSMS.ui.view.MessageListRecyclerView;
import com.moez.QKSMS.ui.view.SmoothLinearLayoutManager; import com.moez.QKSMS.ui.view.SmoothLinearLayoutManager;
import com.moez.QKSMS.ui.widget.WidgetProvider; import com.moez.QKSMS.ui.widget.WidgetProvider;
import ezvcard.Ezvcard;
import ezvcard.VCard;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@@ -93,9 +94,6 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import ezvcard.Ezvcard;
import ezvcard.VCard;
public class MessageListFragment extends QKContentFragment implements ActivityLauncher, SensorEventListener, public class MessageListFragment extends QKContentFragment implements ActivityLauncher, SensorEventListener,
LoaderManager.LoaderCallbacks<Cursor>, RecyclerCursorAdapter.MultiSelectListener, LoaderManager.LoaderCallbacks<Cursor>, RecyclerCursorAdapter.MultiSelectListener,
RecyclerCursorAdapter.ItemClickListener<MessageItem> { RecyclerCursorAdapter.ItemClickListener<MessageItem> {
@@ -358,7 +356,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
MessageUtils.viewMmsMessageAttachment(getActivity(), messageItem.mMessageUri, messageItem.mSlideshow, getAsyncDialog()); MessageUtils.viewMmsMessageAttachment(getActivity(), messageItem.mMessageUri, messageItem.mSlideshow, getAsyncDialog());
} }
}) })
.show(getFragmentManager(), null); .show();
break; break;
} }
} else if (messageItem != null && messageItem.isOutgoingMessage() && messageItem.isFailedMessage()) { } else if (messageItem != null && messageItem.isOutgoingMessage() && messageItem.isFailedMessage()) {
@@ -451,7 +449,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
} }
dialog.buildMenu(l); dialog.buildMenu(l);
dialog.show(getFragmentManager(), "messagelistitem options"); dialog.show();
} }
private void addCallAndContactMenuItems(QKDialog dialog, MessageItem msgItem) { private void addCallAndContactMenuItems(QKDialog dialog, MessageItem msgItem) {
@@ -634,7 +632,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
case R.id.menu_notification_settings: case R.id.menu_notification_settings:
ConversationNotificationSettingsDialog.newInstance(mThreadId, mConversation.getRecipients().formatNames(", ")) ConversationNotificationSettingsDialog.newInstance(mThreadId, mConversation.getRecipients().formatNames(", "))
.setContext(mContext) .setContext(mContext)
.show(getFragmentManager(), "notification prefs"); .show();
return true; return true;
case R.id.menu_delete_conversation: case R.id.menu_delete_conversation:
@@ -989,7 +987,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
break; break;
} }
} }
}).show(getFragmentManager(), QKDialog.LIST_TAG); }).show();
return true; return true;
} }
@@ -1017,7 +1015,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
.setTitle(R.string.message_details_title) .setTitle(R.string.message_details_title)
.setMessage(messageDetails) .setMessage(messageDetails)
.setCancelOnTouchOutside(true) .setCancelOnTouchOutside(true)
.show(getFragmentManager(), QKDialog.DETAILS_TAG); .show();
return true; return true;
} }
@@ -1054,7 +1052,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
.setTitle(R.string.delivery_header_title) .setTitle(R.string.delivery_header_title)
.setItems(items, null) .setItems(items, null)
.setPositiveButton(R.string.okay, null) .setPositiveButton(R.string.okay, null)
.show(getFragmentManager(), "delivery report"); .show();
} }
/** /**
@@ -546,7 +546,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
ThemeManager.showColourSwatchesDialog(mContext); ThemeManager.showColourSwatchesDialog(mContext);
break; break;
case BUBBLES: case BUBBLES:
new BubblePreferenceDialog().setContext(mContext).show(mContext.getFragmentManager(), "bubbles"); new BubblePreferenceDialog().setContext(mContext).show();
break; break;
case ICON: case ICON:
ThemeManager.setIcon(mContext); ThemeManager.setIcon(mContext);
@@ -600,7 +600,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
startActivity(browserIntent); startActivity(browserIntent);
} }
}) })
.show(getFragmentManager(), "thanks"); .show();
break; break;
case SIMPLE_PREFS: case SIMPLE_PREFS:
mContext.onOptionsItemSelected(mContext.getMenu().findItem(R.id.simple_settings)); mContext.onOptionsItemSelected(mContext.getMenu().findItem(R.id.simple_settings));
@@ -538,7 +538,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L
toggleDelayedMessaging(); toggleDelayedMessaging();
} }
}) })
.show(((QKActivity) mContext).getFragmentManager(), "delayed message info"); .show();
mPrefs.edit().putBoolean(KEY_DELAYED_INFO_DIALOG_SHOWN, true).apply(); //This should be changed, the dialog should be shown each time when delayed messaging is disabled. mPrefs.edit().putBoolean(KEY_DELAYED_INFO_DIALOG_SHOWN, true).apply(); //This should be changed, the dialog should be shown each time when delayed messaging is disabled.
} }