Skip to content

Commit

Permalink
#update update dialog CharSequence
Browse files Browse the repository at this point in the history
  • Loading branch information
wumeng1 authored and wumeng1 committed Aug 9, 2021
1 parent dca6267 commit f900f97
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 36 deletions.
12 changes: 6 additions & 6 deletions lib_widget/src/main/java/com/mirkowu/lib_widget/dialog/BottomListDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public class BottomListDialog extends BaseDialog {

private boolean showCancelBtn; //是否显示取消按钮
private boolean useRoundBackground; // 是否使用圆角背景
private String title;
private List<String> data;
private CharSequence title;
private List<CharSequence> data;

public BottomListDialog() {
setShowBottom(true);
Expand Down Expand Up @@ -121,12 +121,12 @@ public void onItemClick(View view, Object item, int position) {
setShowBottom(true);
}

public BottomListDialog setTitle(String title) {
public BottomListDialog setTitle(CharSequence title) {
this.title = title;
return this;
}

public BottomListDialog setData(List<String> data) {
public BottomListDialog setData(List<CharSequence> data) {
this.data = data;
return this;
}
Expand Down Expand Up @@ -162,15 +162,15 @@ public interface OnItemClickListener<T> {
void onItemClick(BottomListDialog dialog, T data, int position);
}

public static class ListAdapter extends BaseRVAdapter<String, BaseRVHolder> {
public static class ListAdapter extends BaseRVAdapter<CharSequence, BaseRVHolder> {
@NonNull
@Override
public BaseRVHolder onCreateHolder(@NonNull ViewGroup parent, int viewType) {
return new BaseRVHolder(mLayoutInflater.inflate(R.layout.widget_item_bottom_list, parent, false));
}

@Override
public void onBindHolder(@NonNull BaseRVHolder holder, String item, int position) {
public void onBindHolder(@NonNull BaseRVHolder holder, CharSequence item, int position) {
TextView tvContent = holder.getView(R.id.tvContent);
tvContent.setText(item);
}
Expand Down
30 changes: 15 additions & 15 deletions lib_widget/src/main/java/com/mirkowu/lib_widget/dialog/InputDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public class InputDialog extends BaseDialog implements View.OnClickListener {
private TextView tvPositive;
private TextView tvNegative;

private String title;
private String hint;
private String content;
private String inputHint;
private String mPositiveText;
private String mNegativeText;
private CharSequence title;
private CharSequence hint;
private CharSequence content;
private CharSequence inputHint;
private CharSequence mPositiveText;
private CharSequence mNegativeText;
private int hintTextColor;
private int positiveTextColor;
private int negativeTextColor;
Expand Down Expand Up @@ -110,28 +110,28 @@ public void onClick(View v) {
}


public InputDialog setTitle(String title) {
public InputDialog setTitle(CharSequence title) {
this.title = title;
return this;
}

public InputDialog setHint(String hint) {
public InputDialog setHint(CharSequence hint) {
this.hint = hint;
return this;
}

public InputDialog setHint(String hint, @ColorRes int textColorInt) {
public InputDialog setHint(CharSequence hint, @ColorRes int textColorInt) {
this.hint = hint;
this.hintTextColor = textColorInt;
return this;
}

public InputDialog setContent(String content) {
public InputDialog setContent(CharSequence content) {
this.content = content;
return this;
}

public InputDialog setInputHint(String hint) {
public InputDialog setInputHint(CharSequence hint) {
this.inputHint = hint;
return this;
}
Expand All @@ -153,13 +153,13 @@ public InputDialog setInputMaxCharLength(int maxCharLength) {
* @param negativeText
* @return
*/
public InputDialog setNegativeButton(String negativeText, @ColorRes int textColorInt) {
public InputDialog setNegativeButton(CharSequence negativeText, @ColorRes int textColorInt) {
this.mNegativeText = negativeText;
this.negativeTextColor = textColorInt;
return this;
}

public InputDialog setNegativeButton(String negativeText) {
public InputDialog setNegativeButton(CharSequence negativeText) {
this.mNegativeText = negativeText;
return this;
}
Expand All @@ -169,13 +169,13 @@ public InputDialog setNegativeButton(String negativeText) {
*
* @return
*/
public InputDialog setPositiveButton(String positiveText, @ColorRes int textColorInt) {
public InputDialog setPositiveButton(CharSequence positiveText, @ColorRes int textColorInt) {
this.mPositiveText = positiveText;
this.positiveTextColor = textColorInt;
return this;
}

public InputDialog setPositiveButton(String positiveText) {
public InputDialog setPositiveButton(CharSequence positiveText) {
this.mPositiveText = positiveText;
return this;
}
Expand Down
20 changes: 15 additions & 5 deletions lib_widget/src/main/java/com/mirkowu/lib_widget/dialog/LoadingDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,34 @@
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;

import com.mirkowu.lib_util.utilcode.util.StringUtils;
import com.mirkowu.lib_widget.R;


/**
* 加载弹窗
*/
public class LoadingDialog extends BaseDialog {
private String mMessage;
protected CharSequence mMessage;

public LoadingDialog() {
setDimAmount(0f);
setTouchOutCancel(false);
setDialogCancelable(true);
}

public LoadingDialog(CharSequence message) {
this();
setMessage(message);
}

public LoadingDialog(@StringRes int resId) {
this();
setMessage(resId);
}

@Override
public int getLayoutResId() {
public int getLayoutResId() {
return R.layout.widget_dialog_loading;
}

Expand All @@ -53,14 +64,13 @@ public void onStart() {
}
}

public LoadingDialog setMessage(String message) {
public LoadingDialog setMessage(CharSequence message) {
this.mMessage = message;
return this;
}

public LoadingDialog setMessage(@StringRes int resId) {
this.mMessage = getContext().getString(resId);
return this;
return setMessage(StringUtils.getString(resId));
}

@Override
Expand Down
20 changes: 10 additions & 10 deletions lib_widget/src/main/java/com/mirkowu/lib_widget/dialog/PromptDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
public class PromptDialog extends BaseDialog implements View.OnClickListener {
private static final int DEFAULT_WIDTH = 280; //默认宽度 dp
private int mIconResId;
private String mTitle;
private String mContent;
private String mPositiveText;
private String mNegativeText;
private CharSequence mTitle;
private CharSequence mContent;
private CharSequence mPositiveText;
private CharSequence mNegativeText;
private int mPositiveTextColorResId;
private int mNegativeTextColorResId;
protected OnButtonClickListener mOnButtonClickListener;
Expand Down Expand Up @@ -110,7 +110,7 @@ public PromptDialog setIcon(@DrawableRes int iconResId) {
return this;
}

public PromptDialog setTitle(String title) {
public PromptDialog setTitle(CharSequence title) {
this.mTitle = title;
return this;
}
Expand All @@ -119,7 +119,7 @@ public PromptDialog setTitle(@StringRes int resId) {
return setTitle(StringUtils.getString(resId));
}

public PromptDialog setContent(String content) {
public PromptDialog setContent(CharSequence content) {
this.mContent = content;
return this;
}
Expand All @@ -134,7 +134,7 @@ public PromptDialog setContent(@StringRes int resId) {
* @param negativeText
* @return
*/
public PromptDialog setNegativeButton(String negativeText, @ColorRes int textColor) {
public PromptDialog setNegativeButton(CharSequence negativeText, @ColorRes int textColor) {
this.mNegativeText = negativeText;
this.mNegativeTextColorResId = textColor;
return this;
Expand All @@ -145,7 +145,7 @@ public PromptDialog setNegativeButton(@StringRes int resId, @ColorRes int textCo
}


public PromptDialog setNegativeButton(String negativeText) {
public PromptDialog setNegativeButton(CharSequence negativeText) {
this.mNegativeText = negativeText;
return this;
}
Expand All @@ -159,7 +159,7 @@ public PromptDialog setNegativeButton(@StringRes int resId) {
*
* @return
*/
public PromptDialog setPositiveButton(String positiveText, @ColorRes int textColor) {
public PromptDialog setPositiveButton(CharSequence positiveText, @ColorRes int textColor) {
this.mPositiveText = positiveText;
this.mPositiveTextColorResId = textColor;
return this;
Expand All @@ -170,7 +170,7 @@ public PromptDialog setPositiveButton(@StringRes int resId, @ColorRes int textCo
}


public PromptDialog setPositiveButton(String positiveText) {
public PromptDialog setPositiveButton(CharSequence positiveText) {
this.mPositiveText = positiveText;
return this;
}
Expand Down

0 comments on commit f900f97

Please sign in to comment.