Skip to content

Commit 1aca796

Browse files
number edit text added
1 parent 36fe1d3 commit 1aca796

File tree

6 files changed

+50
-13
lines changed

6 files changed

+50
-13
lines changed

.idea/caches/gradle_models.ser

-3 Bytes
Binary file not shown.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Provides you easily create various pop-up dialogs that you can use.
5555
positiveText(String positive) // set positive button on fast-dialog and set button text
5656
cancelable(boolean bool) // set cancelable to fast-dialog
5757
decimalEditText() // set EditText to decimalEditText
58+
numberEditText() // set EditText to numberEditText
5859
setTextMaxLength(int length) // set EditText max length
5960
setMinValue(int min) // set number picker minimum value
6061
setMaxValue(int max) // set number picker maximum value
@@ -161,7 +162,8 @@ Provides you easily create various pop-up dialogs that you can use.
161162
.setTitleText("Dialog")
162163
.setText("Dialog Text")
163164
.setHint("please enter number")
164-
.decimalEditText()
165+
//.decimalEditText()
166+
.numberEditText()
165167
.setAnimation(Animations.FADE_IN)
166168
.positiveText("Ok")
167169
.negativeText("Cancel")

app/src/main/java/ka/enes/com/sample/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public void number(View view){
6565
.setTitleText("Dialog")
6666
.setText("Dialog Text")
6767
.setHint("please enter number")
68-
.decimalEditText()
68+
//.decimalEditText()
69+
.numberEditText()
6970
.setAnimation(Animations.FADE_IN)
7071
.positiveText("Ok")
7172
.negativeText("Cancel")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,14 @@ public void dismiss(Activity activity){
6060
public String getInputText(){
6161
ClearableEditText etWarning = builder.getDialog().findViewById(R.id.warning_dialog_et);
6262
ClearableEditText etWarningDecimal = builder.getDialog().findViewById(R.id.warning_dialog_et_decimal);
63+
ClearableEditText etWarningNumber = builder.getDialog().findViewById(R.id.warning_dialog_et_number);
6364
String text = "";
6465
if (!etWarning.getText().toString().trim().equals("")){
6566
text = etWarning.getText().toString().trim();
6667
}else if(!etWarningDecimal.getText().toString().trim().equals("")){
6768
text = etWarningDecimal.getText().toString().trim();
69+
}else if (!etWarningNumber.getText().toString().trim().equals("")){
70+
text = etWarningNumber.getText().toString().trim();
6871
}
6972
return text;
7073
}

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class FastDialogBuilder {
3535
private TextView tvWarning;
3636
private ClearableEditText etWarning;
3737
private ClearableEditText etWarningDecimal;
38+
private ClearableEditText etWarningNumber;
3839
private ClearableEditText etUsername;
3940
private NumberPicker numberPicker;
4041
private ClearableEditText etPassword;
@@ -49,6 +50,7 @@ public class FastDialogBuilder {
4950
private RecyclerView rvFolder;
5051

5152
private boolean isDecimal = false;
53+
private boolean isNumber = false;
5254
private boolean fullScreen = true;
5355
private Type type;
5456

@@ -126,6 +128,7 @@ private FastDialogBuilder createDialog(Type type){
126128
tvWarning = dialog.findViewById(R.id.warning_dialog_text);
127129
etWarning = dialog.findViewById(R.id.warning_dialog_et);
128130
etWarningDecimal = dialog.findViewById(R.id.warning_dialog_et_decimal);
131+
etWarningNumber = dialog.findViewById(R.id.warning_dialog_et_number);
129132
btCancel = dialog.findViewById(R.id.warning_dialog_cancel_bt);
130133
btOk = dialog.findViewById(R.id.warning_dialog_ok_bt);
131134
btCancel.setOnClickListener(v -> {
@@ -146,6 +149,7 @@ private FastDialogBuilder createDialog(Type type){
146149
tvWarning.setVisibility(View.GONE);
147150
etWarning.setVisibility(View.GONE);
148151
etWarningDecimal.setVisibility(View.GONE);
152+
etWarningNumber.setVisibility(View.GONE);
149153
btCancel.setVisibility(View.GONE);
150154
btOk.setVisibility(View.GONE);
151155
}
@@ -273,6 +277,7 @@ public FastDialogBuilder setHint(String hint){
273277
etWarning.setVisibility(View.VISIBLE);
274278
etWarning.setHint(hint);
275279
etWarningDecimal.setHint(hint);
280+
etWarningNumber.setHint(hint);
276281
return this;
277282
}
278283
public FastDialogBuilder loginWithEmail(){
@@ -294,8 +299,18 @@ public FastDialogBuilder positiveText(String positive){
294299
}
295300
public FastDialogBuilder decimalEditText(){
296301
etWarning.setVisibility(View.GONE);
302+
etWarningNumber.setVisibility(View.GONE);
297303
etWarningDecimal.setVisibility(View.VISIBLE);
298304
isDecimal = true;
305+
isNumber = false;
306+
return this;
307+
}
308+
public FastDialogBuilder numberEditText(){
309+
etWarning.setVisibility(View.GONE);
310+
etWarningDecimal.setVisibility(View.GONE);
311+
etWarningNumber.setVisibility(View.VISIBLE);
312+
isDecimal = false;
313+
isNumber = true;
299314
return this;
300315
}
301316
void positiveClickListener(PositiveClick click){
@@ -317,16 +332,20 @@ public FastDialogBuilder cancelable(boolean bool){
317332
public FastDialogBuilder privateEditText(){
318333
etWarning.setTransformationMethod(PasswordTransformationMethod.getInstance());
319334
etWarningDecimal.setTransformationMethod(PasswordTransformationMethod.getInstance());
335+
etWarningNumber.setTransformationMethod(PasswordTransformationMethod.getInstance());
320336
return this;
321337
}
322338
public FastDialogBuilder setInputText(String str){
323-
if (!isDecimal){
324-
etWarning.setText(str);
325-
etWarning.setSelection(etWarning.getText().length());
326-
}
327-
else{
339+
if (isDecimal){
328340
etWarningDecimal.setText(str);
329341
etWarningDecimal.setSelection(etWarningDecimal.getText().length());
342+
}else if (isNumber){
343+
etWarningNumber.setText(str);
344+
etWarningNumber.setSelection(etWarningNumber.getText().length());
345+
}
346+
else{
347+
etWarning.setText(str);
348+
etWarning.setSelection(etWarning.getText().length());
330349
}
331350

332351
return this;
@@ -335,6 +354,7 @@ public FastDialogBuilder setInputText(String str){
335354
public FastDialogBuilder setTextMaxLength(int length){
336355
etWarning.setFilters(new InputFilter[] { new InputFilter.LengthFilter(length) });
337356
etWarningDecimal.setFilters(new InputFilter[] { new InputFilter.LengthFilter(length) });
357+
etWarningNumber.setFilters(new InputFilter[] { new InputFilter.LengthFilter(length) });
338358
return this;
339359
}
340360

fastdialog/src/main/res/layout/warning_dialog.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:padding="5dp"
1818
android:text="@string/warning"
1919
android:textColor="@color/text2"
20-
android:textSize="15dp"
20+
android:textSize="15sp"
2121
android:textStyle="bold" />
2222
<LinearLayout
2323
android:layout_width="match_parent"
@@ -39,7 +39,7 @@
3939
android:layout_height="wrap_content"
4040
android:textColor="@color/text"
4141
android:gravity="center"
42-
android:textSize="15dp"
42+
android:textSize="15sp"
4343
android:padding="5dp"/>
4444
</LinearLayout>
4545
<karpuzoglu.enes.com.fastdialog.ClearableEditText
@@ -51,7 +51,7 @@
5151
android:background="@drawable/custom_edittext_dialog"
5252
android:padding="10dp"
5353
android:textColor="@color/text"
54-
android:textSize="15dp" />
54+
android:textSize="15sp" />
5555
<karpuzoglu.enes.com.fastdialog.ClearableEditText
5656
android:id="@+id/warning_dialog_et_decimal"
5757
android:layout_width="match_parent"
@@ -62,7 +62,18 @@
6262
android:padding="10dp"
6363
android:inputType="numberDecimal"
6464
android:textColor="@color/text"
65-
android:textSize="15dp" />
65+
android:textSize="15sp" />
66+
<karpuzoglu.enes.com.fastdialog.ClearableEditText
67+
android:id="@+id/warning_dialog_et_number"
68+
android:layout_width="match_parent"
69+
android:layout_height="wrap_content"
70+
android:layout_marginLeft="15dp"
71+
android:layout_marginRight="15dp"
72+
android:background="@drawable/custom_edittext_dialog"
73+
android:padding="10dp"
74+
android:inputType="number"
75+
android:textColor="@color/text"
76+
android:textSize="15sp" />
6677
<LinearLayout
6778
android:layout_width="match_parent"
6879
android:layout_height="wrap_content"
@@ -73,7 +84,7 @@
7384
android:layout_height="55dp"
7485
android:textColor="@color/text2"
7586
android:layout_margin="15dp"
76-
android:textSize="20dp"
87+
android:textSize="20sp"
7788
android:text="@string/cancel"
7889
android:textAllCaps="false"
7990
android:layout_weight="1"/>
@@ -83,7 +94,7 @@
8394
android:layout_height="55dp"
8495
android:textColor="@color/text2"
8596
android:layout_margin="15dp"
86-
android:textSize="20dp"
97+
android:textSize="20sp"
8798
android:textAllCaps="false"
8899
android:text="@string/ok"
89100
android:layout_weight="1"/>

0 commit comments

Comments
 (0)