Skip to content

Commit fe24da5

Browse files
eneskarpuzoglueneskarpuzoglu
committed
Bug Fixed
1 parent aa46aaa commit fe24da5

File tree

9 files changed

+172
-166
lines changed

9 files changed

+172
-166
lines changed

‎app/src/main/java/ka/enes/com/simple/MainActivity.java‎

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,46 @@ protected void onCreate(Bundle savedInstanceState) {
2222
setContentView(R.layout.activity_main);
2323
}
2424
public void progress(View view){
25-
dialog = new FastDialogBuilder(this)
26-
.progressDialog("Please Wait!").create();
27-
dialog.show();
25+
FastDialog.p(this).progressText("Please Wait!").create().show();
2826
}
2927
public void warn(View view){
30-
dialog = new FastDialogBuilder(this)
31-
.setText("Warning")
32-
.withIcon()
33-
.create();
34-
dialog.show();
28+
FastDialog.e(this)
29+
.setText("Error Dialog")
30+
.hideTitle()
31+
.create()
32+
.show();
3533
}
3634
public void text(View view){
37-
dialog = new FastDialogBuilder(this)
38-
.setTitle("Warning")
35+
FastDialog.w(this)
36+
.setTitleText("Warning")
3937
.setText("Warning Text")
40-
.changeColor(ContextCompat.getColor(getApplicationContext(),R.color.colorAccent),
41-
ContextCompat.getColor(getApplicationContext(),R.color.colorSecondaryText),
42-
ContextCompat.getColor(getApplicationContext(),R.color.colorPrimaryText))
38+
.changeColor(ContextCompat.getColor(getApplicationContext(),R.color.warning),
39+
ContextCompat.getColor(getApplicationContext(),R.color.text2),
40+
ContextCompat.getColor(getApplicationContext(),R.color.text))
4341
.setHint("please enter text")
4442
.setAnimation(Animations.GROW_IN)
45-
.negativeText("Cancel")
46-
.create();
47-
dialog.show();
43+
.possitiveText("Accept")
44+
.create()
45+
.show();
4846
}
4947
public void number(View view){
50-
dialog = new FastDialogBuilder(this)
51-
.setTitle("Warning")
52-
.setText("Warning Text")
48+
FastDialog.d(this)
49+
.setTitleText("Dialog")
50+
.setText("Dialog Text")
5351
.setHint("please enter number")
54-
.decimalEditText(true)
52+
.decimalEditText()
5553
.setAnimation(Animations.FADE_IN)
5654
.possitiveText("Ok")
5755
.negativeText("Cancel")
58-
.create();
59-
dialog.show();
56+
.create()
57+
.show();
6058
}
6159
public void bottomAnim(View view){
62-
dialog = new FastDialogBuilder(this)
63-
.setTitle("Warning")
64-
.setText("Warning Text")
60+
dialog.i(this)
61+
.setTitleText("Information")
62+
.setText("Information Text")
6563
.possitiveText("Ok")
6664
.negativeText("Cancel")
67-
.withIcon()
6865
.setAnimation(Animations.SLIDE_BOTTOM)
6966
.setPosition(Positions.BOTTOM)
7067
.possitiveClickListener(new PossitiveClick() {
@@ -74,27 +71,26 @@ public void onClick(View view) {
7471
dialog.dismiss();
7572
}
7673
})
77-
.create();
78-
dialog.show();
74+
.create()
75+
.show();
7976
}
8077
public void topAnim(View view){
81-
dialog = new FastDialogBuilder(this)
82-
.setTitle("Warning")
78+
dialog.w(this)
79+
.setTitleText("Warning")
8380
.setText("Warning Text")
8481
.possitiveText("Ok")
8582
.negativeText("Cancel")
8683
.setHint("please enter your name")
87-
.withIcon()
8884
.setAnimation(Animations.SLIDE_TOP)
8985
.setPosition(Positions.TOP)
9086
.possitiveClickListener(new PossitiveClick() {
9187
@Override
9288
public void onClick(View view) {
93-
Toast.makeText(MainActivity.this,"Ok Pressed",Toast.LENGTH_SHORT).show();
89+
Toast.makeText(MainActivity.this,dialog.getInputText().equals("")?"EditText is Empty":dialog.getInputText(),Toast.LENGTH_SHORT).show();
9490
dialog.dismiss();
9591
}
9692
})
97-
.create();
98-
dialog.show();
93+
.create()
94+
.show();
9995
}
10096
}

‎fastdialog/src/main/java/karpuzoglu/enes/com/fastdialog/FastDialog.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package karpuzoglu.enes.com.fastdialog;
22

33
import android.app.Dialog;
4+
import android.content.Context;
5+
import android.widget.EditText;
46

57
/**
68
* Created by ENES on 7.12.2018.
@@ -12,11 +14,47 @@ public FastDialog(FastDialogBuilder builder) {
1214
dialog = builder.getDialog();
1315
}
1416

17+
public static FastDialogBuilder i(Context context){
18+
FastDialogBuilder dialogBuilder = new FastDialogBuilder(context,0);
19+
dialog = dialogBuilder.getDialog();
20+
return dialogBuilder;
21+
}
22+
public static FastDialogBuilder e(Context context){
23+
FastDialogBuilder dialogBuilder = new FastDialogBuilder(context,1);
24+
dialog = dialogBuilder.getDialog();
25+
return dialogBuilder;
26+
}
27+
public static FastDialogBuilder w(Context context){
28+
FastDialogBuilder dialogBuilder = new FastDialogBuilder(context,2);
29+
dialog = dialogBuilder.getDialog();
30+
return dialogBuilder;
31+
}
32+
public static FastDialogBuilder d(Context context){
33+
FastDialogBuilder dialogBuilder = new FastDialogBuilder(context,3);
34+
dialog = dialogBuilder.getDialog();
35+
return dialogBuilder;
36+
}
37+
public static FastDialogBuilder p(Context context){
38+
FastDialogBuilder dialogBuilder = new FastDialogBuilder(context,4);
39+
dialog = dialogBuilder.getDialog();
40+
return dialogBuilder;
41+
}
1542
public void show(){
1643
if (dialog.isShowing()) return;
1744
dialog.show();
1845
}
1946
public void dismiss(){
2047
if (dialog.isShowing()) dialog.dismiss();
2148
}
49+
public String getInputText(){
50+
EditText etWarning = dialog.findViewById(R.id.warning_dialog_et);
51+
EditText etWarningDecimal = dialog.findViewById(R.id.warning_dialog_et_decimal);
52+
String text = "";
53+
if (!etWarning.getText().toString().trim().equals("")){
54+
text = etWarning.getText().toString().trim();
55+
}else if(!etWarningDecimal.getText().toString().trim().equals("")){
56+
text = etWarningDecimal.getText().toString().trim();
57+
}
58+
return text;
59+
}
2260
}

‎fastdialog/src/main/java/karpuzoglu/enes/com/fastdialog/FastDialogBuilder.java‎

Lines changed: 83 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import android.app.Dialog;
44
import android.content.Context;
55
import android.graphics.drawable.Drawable;
6+
import android.graphics.drawable.GradientDrawable;
67
import android.support.annotation.NonNull;
8+
import android.support.v4.content.ContextCompat;
79
import android.view.Gravity;
810
import android.view.View;
911
import android.view.WindowManager;
@@ -19,7 +21,13 @@
1921
* Created by ENES on 7.12.2018.
2022
*/
2123
public class FastDialogBuilder {
24+
private final static int INFO_DIALOG = 0;
25+
private final static int ERROR_DIALOG = 1;
26+
private final static int WARNING_DIALOG = 2;
27+
private final static int DIALOG = 3;
28+
private final static int PROGRESS_DIALOG = 4;
2229
private Dialog dialog;
30+
private int type = -1;
2331
private Context context;
2432
private TextView tvTitle;
2533
private TextView tvProgress;
@@ -32,99 +40,83 @@ public class FastDialogBuilder {
3240
private PossitiveClick possitiveClick;
3341
private NegativeClick negativeClick;
3442

35-
public FastDialogBuilder(@NonNull Context context){
43+
public FastDialogBuilder(@NonNull Context context,int type){
3644
this.context=context;
45+
this.type=type;
3746
dialog =new Dialog(context);
38-
dialog.setContentView(R.layout.warning_dialog);
39-
WindowManager.LayoutParams lWindowParams = new WindowManager.LayoutParams();
40-
lWindowParams.copyFrom(getDialog().getWindow().getAttributes());
41-
lWindowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
42-
lWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
43-
dialog.getWindow().setAttributes(lWindowParams);
44-
tvTitle = dialog.findViewById(R.id.warning_dialog_title);
45-
lawWarning = dialog.findViewById(R.id.warning_dialog_animation);
46-
tvWarning = dialog.findViewById(R.id.warning_dialog_text);
47-
etWarning = dialog.findViewById(R.id.warning_dialog_et);
48-
etWarningDecimal = dialog.findViewById(R.id.warning_dialog_et_decimal);
49-
btCancel = dialog.findViewById(R.id.warning_dialog_cancel_bt);
50-
btOk = dialog.findViewById(R.id.warning_dialog_ok_bt);
51-
btCancel.setOnClickListener(new View.OnClickListener() {
52-
@Override
53-
public void onClick(View v) {
54-
if(negativeClick != null)
55-
negativeClick.onClick(v);
56-
dialog.dismiss();
57-
}
58-
});
59-
btOk.setOnClickListener(new View.OnClickListener() {
60-
@Override
61-
public void onClick(View v) {
62-
if(possitiveClick != null)
63-
possitiveClick.onClick(v);
64-
}
65-
});
66-
Drawable etDrawable = new DrawableBuilder()
67-
.rectangle()
68-
.hairlineBordered()
69-
.bottomLeftRadius(20)
70-
.topLeftRadius(20)
71-
.topRightRadius(20)
72-
.bottomRightRadius(20)
73-
.strokeColor(context.getColor(R.color.colorPrimaryDark))
74-
.build();
75-
etWarningDecimal.setBackground(etDrawable);
76-
etWarning.setBackground(etDrawable);
77-
Drawable btDrawable = new DrawableBuilder()
78-
.rectangle()
79-
.solidColor(context.getColor(R.color.colorPrimaryDark))
80-
.bottomLeftRadius(20)
81-
.topLeftRadius(20)
82-
.topRightRadius(20)
83-
.bottomRightRadius(20)
84-
.build();
85-
btOk.setBackground(btDrawable);
86-
btCancel.setBackground(btDrawable);
47+
if (type == PROGRESS_DIALOG){
48+
dialog.setContentView(R.layout.progress_dialog);
49+
WindowManager.LayoutParams lWindowParams = new WindowManager.LayoutParams();
50+
lWindowParams.copyFrom(getDialog().getWindow().getAttributes());
51+
lWindowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
52+
lWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
53+
dialog.getWindow().setAttributes(lWindowParams);
54+
tvProgress = dialog.findViewById(R.id.wait_text);
55+
}else{
56+
dialog.setContentView(R.layout.warning_dialog);
57+
WindowManager.LayoutParams lWindowParams = new WindowManager.LayoutParams();
58+
lWindowParams.copyFrom(getDialog().getWindow().getAttributes());
59+
lWindowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
60+
lWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
61+
dialog.getWindow().setAttributes(lWindowParams);
62+
tvTitle = dialog.findViewById(R.id.warning_dialog_title);
63+
lawWarning = dialog.findViewById(R.id.warning_dialog_animation);
64+
tvWarning = dialog.findViewById(R.id.warning_dialog_text);
65+
etWarning = dialog.findViewById(R.id.warning_dialog_et);
66+
etWarningDecimal = dialog.findViewById(R.id.warning_dialog_et_decimal);
67+
btCancel = dialog.findViewById(R.id.warning_dialog_cancel_bt);
68+
btOk = dialog.findViewById(R.id.warning_dialog_ok_bt);
69+
btCancel.setOnClickListener(new View.OnClickListener() {
70+
@Override
71+
public void onClick(View v) {
72+
if(negativeClick != null)
73+
negativeClick.onClick(v);
74+
dialog.dismiss();
75+
}
76+
});
77+
btOk.setOnClickListener(new View.OnClickListener() {
78+
@Override
79+
public void onClick(View v) {
80+
if(possitiveClick != null)
81+
possitiveClick.onClick(v);
82+
}
83+
});
84+
GradientDrawable shape = new GradientDrawable();
85+
shape.setShape(GradientDrawable.RECTANGLE);
86+
//shape.setCornerRadii(new float[] { 20,20,20,20,20,20,20,20 });
87+
shape.setCornerRadius(20);
88+
shape.setColor(ContextCompat.getColor(context,R.color.primary));
89+
shape.setStroke(3, ContextCompat.getColor(context,R.color.primary));
90+
btOk.setBackground(shape);
91+
btCancel.setBackground(shape);
8792

88-
tvTitle.setVisibility(View.GONE);
89-
lawWarning.setVisibility(View.GONE);
90-
tvWarning.setVisibility(View.GONE);
91-
etWarning.setVisibility(View.GONE);
92-
etWarningDecimal.setVisibility(View.GONE);
93-
btCancel.setVisibility(View.GONE);
94-
btOk.setVisibility(View.GONE);
93+
tvTitle.setVisibility(View.VISIBLE);
94+
lawWarning.setVisibility(View.VISIBLE);
95+
tvWarning.setVisibility(View.GONE);
96+
etWarning.setVisibility(View.GONE);
97+
etWarningDecimal.setVisibility(View.GONE);
98+
btCancel.setVisibility(View.GONE);
99+
btOk.setVisibility(View.GONE);
100+
}
95101
}
96102
public FastDialogBuilder changeColor(int colorItem,int colorItemText,int colorText){
97103
tvTitle.setBackgroundColor(colorItem);
98104
tvTitle.setTextColor(colorItemText);
99105
tvWarning.setTextColor(colorText);
100-
Drawable btDrawable = new DrawableBuilder()
101-
.rectangle()
102-
.bottomLeftRadius(20)
103-
.topLeftRadius(20)
104-
.topRightRadius(20)
105-
.bottomRightRadius(20)
106-
.solidColor(colorItem)
107-
.build();
108-
Drawable etDrawable = new DrawableBuilder()
109-
.rectangle()
110-
.bottomLeftRadius(20)
111-
.topLeftRadius(20)
112-
.topRightRadius(20)
113-
.bottomRightRadius(20)
114-
.hairlineBordered()
115-
.strokeColor(colorItem)
116-
.build();
117-
etWarning.setBackground(etDrawable);
118-
etWarningDecimal.setBackground(etDrawable);
119-
btCancel.setBackground(btDrawable);
120-
btOk.setBackground(btDrawable);
106+
GradientDrawable shape = new GradientDrawable();
107+
shape.setShape(GradientDrawable.RECTANGLE);
108+
//shape.setCornerRadii(new float[] { 20,20,20,20,20,20,20,20 });
109+
shape.setCornerRadius(20);
110+
shape.setColor(colorItem);
111+
shape.setStroke(3, colorItem);
112+
113+
btCancel.setBackground(shape);
114+
btOk.setBackground(shape);
121115
btCancel.setTextColor(colorItemText);
122116
btOk.setTextColor(colorItemText);
123117
return this;
124118
}
125-
public FastDialogBuilder progressDialog(String progressString){
126-
dialog.setContentView(R.layout.progress_dialog);
127-
tvProgress = dialog.findViewById(R.id.wait_text);
119+
public FastDialogBuilder progressText(String progressString){
128120
tvProgress.setText(progressString);
129121
return this;
130122
}
@@ -158,13 +150,16 @@ public FastDialogBuilder setPosition(Positions position){
158150
}
159151
return this;
160152
}
161-
public FastDialogBuilder setTitle(String title){
162-
tvTitle.setVisibility(View.VISIBLE);
153+
public FastDialogBuilder setTitleText(String title){
163154
tvTitle.setText(title);
164155
return this;
165156
}
166-
public FastDialogBuilder withIcon(){
167-
lawWarning.setVisibility(View.VISIBLE);
157+
public FastDialogBuilder hideTitle(){
158+
tvTitle.setVisibility(View.GONE);
159+
return this;
160+
}
161+
public FastDialogBuilder hideIcon(){
162+
lawWarning.setVisibility(View.GONE);
168163
return this;
169164
}
170165
public FastDialogBuilder setText(String text){
@@ -188,14 +183,9 @@ public FastDialogBuilder possitiveText(String possitive){
188183
btOk.setText(possitive);
189184
return this;
190185
}
191-
public FastDialogBuilder decimalEditText(boolean bool){
192-
if(bool){
193-
etWarning.setVisibility(View.GONE);
194-
etWarningDecimal.setVisibility(View.VISIBLE);
195-
}else{
196-
etWarning.setVisibility(View.VISIBLE);
197-
etWarningDecimal.setVisibility(View.GONE);
198-
}
186+
public FastDialogBuilder decimalEditText(){
187+
etWarning.setVisibility(View.GONE);
188+
etWarningDecimal.setVisibility(View.VISIBLE);
199189
return this;
200190
}
201191
public FastDialogBuilder possitiveClickListener(PossitiveClick click){

0 commit comments

Comments
 (0)