mirror of
https://github.com/TwidereProject/Twidere-Android
synced 2025-02-15 11:10:38 +01:00
removed MaterialDialog usage
This commit is contained in:
parent
b20f0431fb
commit
dce0739d15
@ -1189,15 +1189,17 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList
|
|||||||
if (!status.account_key.equals(status.user_key)) {
|
if (!status.account_key.equals(status.user_key)) {
|
||||||
selectionStart = mEditText.length();
|
selectionStart = mEditText.length();
|
||||||
}
|
}
|
||||||
if (status.is_retweet) {
|
if (status.is_retweet && !TextUtils.isEmpty(status.retweeted_by_user_screen_name)) {
|
||||||
mentions.add(status.retweeted_by_user_screen_name);
|
mentions.add(status.retweeted_by_user_screen_name);
|
||||||
}
|
}
|
||||||
if (status.is_quote) {
|
if (status.is_quote && !TextUtils.isEmpty(status.quoted_user_screen_name)) {
|
||||||
mentions.add(status.quoted_user_screen_name);
|
mentions.add(status.quoted_user_screen_name);
|
||||||
}
|
}
|
||||||
if (!ArrayUtils.isEmpty(status.mentions)) {
|
if (!ArrayUtils.isEmpty(status.mentions)) {
|
||||||
for (ParcelableUserMention mention : status.mentions) {
|
for (ParcelableUserMention mention : status.mentions) {
|
||||||
if (mention.key.equals(status.account_key)) continue;
|
if (mention.key.equals(status.account_key) || TextUtils.isEmpty(mention.screen_name)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
mentions.add(mention.screen_name);
|
mentions.add(mention.screen_name);
|
||||||
}
|
}
|
||||||
mentions.addAll(mExtractor.extractMentionedScreennames(status.quoted_text_plain));
|
mentions.addAll(mExtractor.extractMentionedScreennames(status.quoted_text_plain));
|
||||||
|
@ -17,10 +17,9 @@ package org.mariotaku.twidere.fragment;
|
|||||||
|
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.preference.ListPreference;
|
import android.support.v7.preference.ListPreference;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
||||||
|
|
||||||
import org.mariotaku.twidere.util.TwidereArrayUtils;
|
import org.mariotaku.twidere.util.TwidereArrayUtils;
|
||||||
|
|
||||||
public class ThemedListPreferenceDialogFragmentCompat extends ThemedPreferenceDialogFragmentCompat {
|
public class ThemedListPreferenceDialogFragmentCompat extends ThemedPreferenceDialogFragmentCompat {
|
||||||
@ -40,7 +39,7 @@ public class ThemedListPreferenceDialogFragmentCompat extends ThemedPreferenceDi
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPrepareDialogBuilder(AlertDialogWrapper.Builder builder) {
|
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
|
||||||
super.onPrepareDialogBuilder(builder);
|
super.onPrepareDialogBuilder(builder);
|
||||||
final ListPreference preference = getListPreference();
|
final ListPreference preference = getListPreference();
|
||||||
final String[] entries = TwidereArrayUtils.toStringArray(preference.getEntries());
|
final String[] entries = TwidereArrayUtils.toStringArray(preference.getEntries());
|
||||||
|
@ -11,8 +11,6 @@ import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by mariotaku on 16/3/15.
|
* Created by mariotaku on 16/3/15.
|
||||||
*/
|
*/
|
||||||
@ -24,7 +22,7 @@ public abstract class ThemedPreferenceDialogFragmentCompat extends PreferenceDia
|
|||||||
final Context context = getContext();
|
final Context context = getContext();
|
||||||
final DialogPreference preference = getPreference();
|
final DialogPreference preference = getPreference();
|
||||||
onClick(null, DialogInterface.BUTTON_NEGATIVE);
|
onClick(null, DialogInterface.BUTTON_NEGATIVE);
|
||||||
final AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context)
|
final AlertDialog.Builder builder = new AlertDialog.Builder(context)
|
||||||
.setTitle(preference.getDialogTitle())
|
.setTitle(preference.getDialogTitle())
|
||||||
.setIcon(preference.getDialogIcon())
|
.setIcon(preference.getDialogIcon())
|
||||||
.setPositiveButton(preference.getPositiveButtonText(), this)
|
.setPositiveButton(preference.getPositiveButtonText(), this)
|
||||||
@ -46,11 +44,7 @@ public abstract class ThemedPreferenceDialogFragmentCompat extends PreferenceDia
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void onPrepareDialogBuilder(AlertDialog.Builder builder) {
|
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void onPrepareDialogBuilder(AlertDialogWrapper.Builder builder) {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@ import android.graphics.Color;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.preference.DialogPreference;
|
import android.support.v7.preference.DialogPreference;
|
||||||
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
||||||
import android.support.v7.preference.PreferenceFragmentCompat;
|
import android.support.v7.preference.PreferenceFragmentCompat;
|
||||||
@ -36,9 +37,6 @@ import android.util.Log;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.DialogAction;
|
|
||||||
import com.afollestad.materialdialogs.MaterialDialog;
|
|
||||||
|
|
||||||
import org.mariotaku.twidere.R;
|
import org.mariotaku.twidere.R;
|
||||||
import org.mariotaku.twidere.preference.iface.IDialogPreference;
|
import org.mariotaku.twidere.preference.iface.IDialogPreference;
|
||||||
import org.mariotaku.twidere.util.TwidereColorUtils;
|
import org.mariotaku.twidere.util.TwidereColorUtils;
|
||||||
@ -109,7 +107,7 @@ public class ColorPickerPreference extends DialogPreference implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static final class ColorPickerPreferenceDialogFragment extends PreferenceDialogFragmentCompat
|
public static final class ColorPickerPreferenceDialogFragment extends PreferenceDialogFragmentCompat
|
||||||
implements DialogInterface.OnShowListener, MaterialDialog.SingleButtonCallback {
|
implements DialogInterface.OnShowListener, DialogInterface.OnClickListener {
|
||||||
|
|
||||||
private ColorPickerDialog.Controller mController;
|
private ColorPickerDialog.Controller mController;
|
||||||
|
|
||||||
@ -127,15 +125,12 @@ public class ColorPickerPreference extends DialogPreference implements
|
|||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||||
final ColorPickerPreference preference = (ColorPickerPreference) getPreference();
|
final ColorPickerPreference preference = (ColorPickerPreference) getPreference();
|
||||||
final Context context = getContext();
|
final Context context = getContext();
|
||||||
final MaterialDialog.Builder builder = new MaterialDialog.Builder(context);
|
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||||
builder.title(preference.getDialogTitle());
|
builder.setTitle(preference.getDialogTitle());
|
||||||
builder.customView(R.layout.cp__dialog_color_picker, false);
|
builder.setView(R.layout.cp__dialog_color_picker);
|
||||||
|
builder.setPositiveButton(android.R.string.ok, this);
|
||||||
builder.positiveText(android.R.string.ok);
|
builder.setNegativeButton(android.R.string.cancel, this);
|
||||||
builder.negativeText(android.R.string.cancel);
|
Dialog dialog = builder.create();
|
||||||
builder.onPositive(this);
|
|
||||||
builder.onNegative(this);
|
|
||||||
Dialog dialog = builder.build();
|
|
||||||
dialog.setOnShowListener(this);
|
dialog.setOnShowListener(this);
|
||||||
return dialog;
|
return dialog;
|
||||||
}
|
}
|
||||||
@ -166,20 +161,6 @@ public class ColorPickerPreference extends DialogPreference implements
|
|||||||
mController.setInitialColor(preference.getValue());
|
mController.setInitialColor(preference.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(@NonNull MaterialDialog materialDialog, @NonNull DialogAction dialogAction) {
|
|
||||||
switch (dialogAction) {
|
|
||||||
case POSITIVE:
|
|
||||||
onClick(materialDialog, DialogInterface.BUTTON_POSITIVE);
|
|
||||||
break;
|
|
||||||
case NEUTRAL:
|
|
||||||
onClick(materialDialog, DialogInterface.BUTTON_NEUTRAL);
|
|
||||||
break;
|
|
||||||
case NEGATIVE:
|
|
||||||
onClick(materialDialog, DialogInterface.BUTTON_NEGATIVE);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,6 @@ import android.view.KeyEvent;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
||||||
|
|
||||||
import org.mariotaku.twidere.R;
|
import org.mariotaku.twidere.R;
|
||||||
import org.mariotaku.twidere.fragment.ThemedPreferenceDialogFragmentCompat;
|
import org.mariotaku.twidere.fragment.ThemedPreferenceDialogFragmentCompat;
|
||||||
@ -140,7 +139,7 @@ public class KeyboardShortcutPreference extends DialogPreference implements IDia
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPrepareDialogBuilder(AlertDialogWrapper.Builder builder) {
|
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
|
||||||
builder.setPositiveButton(android.R.string.ok, this);
|
builder.setPositiveButton(android.R.string.ok, this);
|
||||||
builder.setNegativeButton(android.R.string.cancel, this);
|
builder.setNegativeButton(android.R.string.cancel, this);
|
||||||
builder.setNeutralButton(R.string.clear, this);
|
builder.setNeutralButton(R.string.clear, this);
|
||||||
|
@ -27,13 +27,12 @@ import android.content.DialogInterface.OnMultiChoiceClickListener;
|
|||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.preference.DialogPreference;
|
import android.support.v7.preference.DialogPreference;
|
||||||
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
||||||
import android.support.v7.preference.PreferenceFragmentCompat;
|
import android.support.v7.preference.PreferenceFragmentCompat;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
||||||
|
|
||||||
import org.mariotaku.twidere.R;
|
import org.mariotaku.twidere.R;
|
||||||
import org.mariotaku.twidere.preference.iface.IDialogPreference;
|
import org.mariotaku.twidere.preference.iface.IDialogPreference;
|
||||||
|
|
||||||
@ -91,7 +90,7 @@ abstract class MultiSelectListPreference extends DialogPreference implements IDi
|
|||||||
throw new IllegalArgumentException();
|
throw new IllegalArgumentException();
|
||||||
mValues = new boolean[length];
|
mValues = new boolean[length];
|
||||||
mPreferences = preference.getDefaultSharedPreferences();
|
mPreferences = preference.getDefaultSharedPreferences();
|
||||||
final AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getContext());
|
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||||
for (int i = 0; i < length; i++) {
|
for (int i = 0; i < length; i++) {
|
||||||
mValues[i] = mPreferences.getBoolean(mKeys[i], mDefaultValues[i]);
|
mValues[i] = mPreferences.getBoolean(mKeys[i], mDefaultValues[i]);
|
||||||
}
|
}
|
||||||
|
@ -23,13 +23,12 @@ import android.content.Context;
|
|||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.res.TypedArray;
|
import android.content.res.TypedArray;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.preference.DialogPreference;
|
import android.support.v7.preference.DialogPreference;
|
||||||
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
||||||
import android.support.v7.preference.PreferenceFragmentCompat;
|
import android.support.v7.preference.PreferenceFragmentCompat;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
||||||
|
|
||||||
import org.mariotaku.twidere.Constants;
|
import org.mariotaku.twidere.Constants;
|
||||||
import org.mariotaku.twidere.R;
|
import org.mariotaku.twidere.R;
|
||||||
import org.mariotaku.twidere.fragment.ThemedPreferenceDialogFragmentCompat;
|
import org.mariotaku.twidere.fragment.ThemedPreferenceDialogFragmentCompat;
|
||||||
@ -111,7 +110,7 @@ public class NotificationTypePreference extends DialogPreference implements
|
|||||||
private boolean[] mCheckedItems;
|
private boolean[] mCheckedItems;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPrepareDialogBuilder(AlertDialogWrapper.Builder builder) {
|
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
|
||||||
NotificationTypePreference preference = (NotificationTypePreference) getPreference();
|
NotificationTypePreference preference = (NotificationTypePreference) getPreference();
|
||||||
final int value = preference.getPersistedInt(preference.getDefaultValue());
|
final int value = preference.getPersistedInt(preference.getDefaultValue());
|
||||||
mCheckedItems = preference.getCheckedItems(value);
|
mCheckedItems = preference.getCheckedItems(value);
|
||||||
|
@ -8,6 +8,7 @@ import android.content.SharedPreferences;
|
|||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.preference.DialogPreference;
|
import android.support.v7.preference.DialogPreference;
|
||||||
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
import android.support.v7.preference.PreferenceDialogFragmentCompat;
|
||||||
import android.support.v7.preference.PreferenceFragmentCompat;
|
import android.support.v7.preference.PreferenceFragmentCompat;
|
||||||
@ -20,9 +21,6 @@ import android.widget.AdapterView;
|
|||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
import android.widget.SeekBar;
|
import android.widget.SeekBar;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
||||||
import com.afollestad.materialdialogs.MaterialDialog;
|
|
||||||
|
|
||||||
import org.mariotaku.twidere.Constants;
|
import org.mariotaku.twidere.Constants;
|
||||||
import org.mariotaku.twidere.R;
|
import org.mariotaku.twidere.R;
|
||||||
import org.mariotaku.twidere.preference.iface.IDialogPreference;
|
import org.mariotaku.twidere.preference.iface.IDialogPreference;
|
||||||
@ -156,7 +154,7 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const
|
|||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||||
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getContext());
|
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||||
final ThemeBackgroundPreference preference = (ThemeBackgroundPreference) getPreference();
|
final ThemeBackgroundPreference preference = (ThemeBackgroundPreference) getPreference();
|
||||||
final SharedPreferences preferences = preference.getSharedPreferences();
|
final SharedPreferences preferences = preference.getSharedPreferences();
|
||||||
preference.setValue(preference.getPersistedString(null));
|
preference.setValue(preference.getPersistedString(null));
|
||||||
@ -175,7 +173,7 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const
|
|||||||
@Override
|
@Override
|
||||||
public void onShow(DialogInterface dialog) {
|
public void onShow(DialogInterface dialog) {
|
||||||
if (preferences != null) {
|
if (preferences != null) {
|
||||||
final MaterialDialog materialDialog = (MaterialDialog) dialog;
|
final AlertDialog materialDialog = (AlertDialog) dialog;
|
||||||
final LayoutInflater inflater = materialDialog.getLayoutInflater();
|
final LayoutInflater inflater = materialDialog.getLayoutInflater();
|
||||||
final ListView listView = materialDialog.getListView();
|
final ListView listView = materialDialog.getListView();
|
||||||
assert listView != null;
|
assert listView != null;
|
||||||
@ -190,7 +188,6 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const
|
|||||||
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||||
materialDialog.onItemClick(parent, view, position, id);
|
|
||||||
preference.setSelectedOption(position);
|
preference.setSelectedOption(position);
|
||||||
updateAlphaVisibility();
|
updateAlphaVisibility();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user