From 11a5b36cbc7457d1c61c06bb58aaf05698fe5811 Mon Sep 17 00:00:00 2001 From: "M. Fadli Zein" <45892408+gzeinnumer@users.noreply.github.com> Date: Tue, 16 Nov 2021 23:54:08 +0700 Subject: [PATCH 1/2] text --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 5 ++- .idea/misc.xml | 9 ++++- app/build.gradle | 3 +- .../dialogandroid/MainActivity.java | 36 ++++++++++++++----- da/build.gradle | 3 +- .../dialog/confirmDialog/ConfirmDialog.java | 14 ++++++-- .../confirmDialog/ConfirmDialogSetting.java | 4 +-- .../multi/MultiDatePickerDialog.java | 5 +++ .../multi/MultiDatePickerDialogSetting.java | 2 +- .../single/SingleDatePickerDialog.java | 5 +++ .../single/SingleDatePickerDialogSetting.java | 2 +- .../da/dialog/infoDialog/InfoDialog.java | 14 ++++++-- .../dialog/infoDialog/InfoDialogSetting.java | 4 +-- .../dialog/loadingDialog/LoadingDialog.java | 5 +++ .../loadingDialog/LoadingDialogSetting.java | 2 +- .../numberPicker/NumberPickerDialog.java | 10 +++++- .../NumberPickerDialogSetting.java | 4 +-- .../dialog/timePickerDialog/TimeDialog.java | 5 +++ .../timePickerDialog/TimeDialogSetting.java | 2 +- 20 files changed, 106 insertions(+), 30 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 3f9ec78..b13cab6 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,10 +4,10 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..05aa587 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,13 @@ - + + + + diff --git a/app/build.gradle b/app/build.gradle index 0b1600d..10ffbf4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,8 @@ dependencies { implementation 'com.google.android.material:material:1.3.0' api 'com.agrawalsuneet.androidlibs:dotsloader:1.4' - implementation 'com.github.gzeinnumer:SimpleMaterialStyle:2.2.1' + implementation 'com.github.gzeinnumer:SimpleMaterialStyle:2.3.3' + implementation 'com.github.gzeinnumer:EasySpannableText:1.0.1' implementation project(':da') } \ No newline at end of file diff --git a/app/src/main/java/com/gzeinnumer/dialogandroid/MainActivity.java b/app/src/main/java/com/gzeinnumer/dialogandroid/MainActivity.java index 2a338ba..b43f0f9 100644 --- a/app/src/main/java/com/gzeinnumer/dialogandroid/MainActivity.java +++ b/app/src/main/java/com/gzeinnumer/dialogandroid/MainActivity.java @@ -1,5 +1,6 @@ package com.gzeinnumer.dialogandroid; +import android.graphics.Typeface; import android.os.Bundle; import android.os.Handler; import android.util.Log; @@ -8,6 +9,7 @@ import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import com.google.android.material.timepicker.TimeFormat; import com.gzeinnumer.da.constant.ButtonStyle; @@ -20,14 +22,25 @@ import com.gzeinnumer.da.dialog.numberPicker.NumberPickerDialog; import com.gzeinnumer.da.dialog.timePickerDialog.TimeDialog; import com.gzeinnumer.da.dialog.timePickerDialog.callback.TimeDialogPositiveCallBack; +import com.gzeinnumer.est.SpannableBuilder; public class MainActivity extends AppCompatActivity { - + CharSequence sequence; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + int sizeInDp = 21; + int color = ContextCompat.getColor(this, R.color.purple_500); + + sequence = new SpannableBuilder(getApplicationContext()) + .text(Typeface.NORMAL,"NORMAL ") + .textColor(Typeface.BOLD,"BOLD ", color) + .textSize(Typeface.ITALIC,"ITALIC ", sizeInDp) + .textSizeColor(Typeface.BOLD_ITALIC,"BOLD_ITALIC ", sizeInDp, color) + .build(); + confirmDialog(); infoDialog(); numberPickerDialog(); @@ -40,7 +53,8 @@ protected void onCreate(Bundle savedInstanceState) { private void confirmDialog() { findViewById(R.id.ConfirmDialog).setOnClickListener(v -> new ConfirmDialog(getSupportFragmentManager()) .setTitle("ini title") - .setContent("ini content") +// .setContent("ini content") + .setContent(sequence) .onCancelPressedCallBack(() -> Toast.makeText(MainActivity.this, "Cancel", Toast.LENGTH_SHORT).show()) .onOkPressedCallBack(() -> Toast.makeText(MainActivity.this, "Ok", Toast.LENGTH_SHORT).show()) .show()); @@ -58,7 +72,8 @@ private void infoDialog() { // .setButtonColor(getResources().getColor(R.color.colorPrimary)) .setDialogType(DialogType.DialogSuccess) .setTitle("ini title") - .setContent("ini content") +// .setContent("ini content") + .setContent(sequence) .onOkPressedCallBack(() -> Toast.makeText(MainActivity.this, "Ok", Toast.LENGTH_SHORT).show()) .show()); } @@ -67,7 +82,8 @@ private void numberPickerDialog() { findViewById(R.id.NumberPickerDialog).setOnClickListener(v -> new NumberPickerDialog(getSupportFragmentManager()) .setLastValue(12) .setTitle("ini title") - .setContent("ini content") +// .setContent("ini content") + .setContent(sequence) .onOkPressedCallBack(value -> Toast.makeText(MainActivity.this, "Nilai nya " + value, Toast.LENGTH_SHORT).show()) .onCancelPressedCallBack(() -> Toast.makeText(MainActivity.this, "Cancel", Toast.LENGTH_SHORT).show()) .show()); @@ -76,7 +92,8 @@ private void numberPickerDialog() { private void loadingDialog() { findViewById(R.id.LoadingDialog).setOnClickListener(v -> { LoadingDialog loadingDialog = new LoadingDialog(getSupportFragmentManager()) - .setContent("ini content"); +// .setContent("ini content") + .setContent(sequence); loadingDialog.show(); @@ -87,7 +104,8 @@ private void loadingDialog() { private void singleDatePickerDialog() { findViewById(R.id.SingleDatePickerDialog).setOnClickListener(v -> new SingleDatePickerDialog(getSupportFragmentManager()) .setTimeZone("GMT") - .setTitle("Pilih tanggal") +// .setTitle("Pilih tanggal") + .setTitle(sequence) .setSelectedToday(true) .setTimeFormat("dd/MM/yyyy") //pastikan polanya sama .setStartDate("1/08/2020") //pastikan polanya sama @@ -100,7 +118,8 @@ private void singleDatePickerDialog() { private void multiDatePickerDialog() { findViewById(R.id.MultiDatePickerDialog).setOnClickListener(v -> new MultiDatePickerDialog(getSupportFragmentManager()) .setTimeZone("GMT") - .setTitle("Pilih tanggal") +// .setTitle("Pilih tanggal") + .setTitle(sequence) .setTimeFormat("dd/MM/yyyy") //pastikan 3 pola ini sama .setStartDate("1/08/2020") //pastikan 3 pola ini sama .setEndDate("31/12/2020") //pastikan 3 pola ini sama @@ -111,7 +130,8 @@ private void multiDatePickerDialog() { private void timeDialog() { findViewById(R.id.TimeDialog).setOnClickListener(v -> new TimeDialog(getSupportFragmentManager()) - .setTitle("Time") +// .setTitle("Time") + .setTitle(sequence) .setHour(17) .setMinute(17) .setTimeFormat(TimeFormat.CLOCK_24H) diff --git a/da/build.gradle b/da/build.gradle index 6b326c4..791828d 100644 --- a/da/build.gradle +++ b/da/build.gradle @@ -36,7 +36,8 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - implementation 'com.github.gzeinnumer:SimpleMaterialStyle:2.2.3-alpha5' + implementation 'com.github.gzeinnumer:EasySpannableText:1.0.1' + implementation 'com.github.gzeinnumer:SimpleMaterialStyle:2.3.3' implementation 'com.google.android.material:material:1.4.0' api 'com.agrawalsuneet.androidlibs:dotsloader:1.4' } \ No newline at end of file diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialog.java index 4413211..54d3598 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialog.java @@ -41,6 +41,11 @@ public ConfirmDialog setDialogCanvas(Drawable resource) { //TITLE public ConfirmDialog setTitle(String title) { + this.tvTitleValue = (CharSequence) title; + return this; + } + + public ConfirmDialog setTitle(CharSequence title) { this.tvTitleValue = title; return this; } @@ -61,8 +66,13 @@ public ConfirmDialog setTitleAlignment(int alignment) { } //CONTENT - public ConfirmDialog setContent(String title) { - this.tvContentValue = title; + public ConfirmDialog setContent(String content) { + this.tvContentValue = (CharSequence) content; + return this; + } + + public ConfirmDialog setContent(CharSequence content) { + this.tvContentValue = content; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialogSetting.java index 729f785..94fe972 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialogSetting.java @@ -27,8 +27,8 @@ public class ConfirmDialogSetting extends BaseDialog { protected int buttonCancelColor = 0; protected boolean buttonAllCaps = true; protected ButtonStyle btnStyle; - protected String tvTitleValue; - protected String tvContentValue; + protected CharSequence tvTitleValue; + protected CharSequence tvContentValue; protected String dBtnCancelValue; protected String dBtnOkValue; protected Drawable shapeCanvas = null; diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialog.java index 3690995..6ac865d 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialog.java @@ -19,6 +19,11 @@ public MultiDatePickerDialog(FragmentManager context) { //TITLE public MultiDatePickerDialog setTitle(String title) { + this.tvTitleValue = (CharSequence)title; + return this; + } + + public MultiDatePickerDialog setTitle(CharSequence title) { this.tvTitleValue = title; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialogSetting.java index a2b6ba0..85d1c63 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/multi/MultiDatePickerDialogSetting.java @@ -26,7 +26,7 @@ public class MultiDatePickerDialogSetting { protected MaterialDatePicker.Builder builder; protected MaterialDatePicker> materialDatePicker; - protected String tvTitleValue; + protected CharSequence tvTitleValue; protected String timeZone = "GMT"; protected Calendar calendar; diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialog.java index 8a6c1cc..f57a773 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialog.java @@ -19,6 +19,11 @@ public SingleDatePickerDialog(FragmentManager context) { //TITLE public SingleDatePickerDialog setTitle(String title) { + this.tvTitleValue = (CharSequence)title; + return this; + } + + public SingleDatePickerDialog setTitle(CharSequence title) { this.tvTitleValue = title; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialogSetting.java index 80e67de..e98441a 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/datePickerDialog/single/SingleDatePickerDialogSetting.java @@ -25,7 +25,7 @@ public class SingleDatePickerDialogSetting { protected MaterialDatePicker.Builder builder; protected MaterialDatePicker materialDatePicker; - protected String tvTitleValue; + protected CharSequence tvTitleValue; protected String timeZone = "GMT"; protected Calendar calendar; diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialog.java index 2d44a0f..ae3f5c2 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialog.java @@ -46,6 +46,11 @@ public InfoDialog setTitle(String title) { return this; } + public InfoDialog setTitle(CharSequence title) { + this.tvTitleValue = (CharSequence)title; + return this; + } + public InfoDialog setTitleSize(int size) { this.tvTitleSize = size; return this; @@ -62,8 +67,13 @@ public InfoDialog setTitleAlignment(int alignment) { } //CONTENT - public InfoDialog setContent(String title) { - this.tvContentValue = title; + public InfoDialog setContent(String content) { + this.tvContentValue = (CharSequence)content; + return this; + } + + public InfoDialog setContent(CharSequence content) { + this.tvContentValue = content; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialogSetting.java index f503e86..c02e068 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialogSetting.java @@ -29,8 +29,8 @@ public class InfoDialogSetting extends BaseDialog { protected boolean buttonAllCaps = true; protected ButtonStyle btnStyle; protected DialogType dialogType = DialogType.DialogSuccess; - protected String tvTitleValue; - protected String tvContentValue; + protected CharSequence tvTitleValue; + protected CharSequence tvContentValue; protected String dBtnOkValue; protected Drawable shapeCanvas = null; protected double tvTitleSize = 0; diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialog.java index 71ac3d8..ea0a409 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialog.java @@ -39,6 +39,11 @@ public LoadingDialog setDialogCanvas(Drawable resource) { //CONTENT public LoadingDialog setContent(String title) { + this.tvContentValue = (CharSequence)title; + return this; + } + + public LoadingDialog setContent(CharSequence title) { this.tvContentValue = title; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialogSetting.java index f9eb932..5fa5f0b 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/loadingDialog/LoadingDialogSetting.java @@ -15,7 +15,7 @@ public class LoadingDialogSetting extends BaseDialog { - protected String tvContentValue; + protected CharSequence tvContentValue; protected Drawable shapeCanvas = null; protected double tvContentSize = 0; protected int tvContentColor = 0; diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialog.java index 24349dd..e1a9254 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialog.java @@ -44,6 +44,10 @@ public NumberPickerDialog setTitle(String title) { this.tvTitleValue = title; return this; } + public NumberPickerDialog setTitle(CharSequence title) { + this.tvTitleValue = (CharSequence)title; + return this; + } public NumberPickerDialog setTitleSize(int size) { this.tvTitleSize = size; @@ -62,7 +66,11 @@ public NumberPickerDialog setTitleAlignment(int alignment) { //CONTENT public NumberPickerDialog setContent(String title) { - this.tvContentValue = title; + this.tvContentValue = (CharSequence)title; + return this; + } + public NumberPickerDialog setContent(CharSequence content) { + this.tvContentValue = content; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialogSetting.java index b2d403f..e46489b 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/numberPicker/NumberPickerDialogSetting.java @@ -28,8 +28,8 @@ public class NumberPickerDialogSetting extends BaseDialog { protected int buttonCancelColor = 0; protected boolean buttonAllCaps = true; protected ButtonStyle btnStyle; - protected String tvTitleValue; - protected String tvContentValue; + protected CharSequence tvTitleValue; + protected CharSequence tvContentValue; protected String dBtnOkValue; protected String dBtnCancelValue; protected Drawable shapeCanvas = null; diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialog.java b/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialog.java index 5c7b602..98dd7c9 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialog.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialog.java @@ -14,6 +14,11 @@ public TimeDialog(FragmentManager supportFragmentManager) { } public TimeDialog setTitle(String title) { + this.title = (CharSequence)title; + return this; + } + + public TimeDialog setTitle(CharSequence title) { this.title = title; return this; } diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialogSetting.java index b4aa731..0725ec5 100644 --- a/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialogSetting.java +++ b/da/src/main/java/com/gzeinnumer/da/dialog/timePickerDialog/TimeDialogSetting.java @@ -13,7 +13,7 @@ public class TimeDialogSetting { protected FragmentManager supportFragmentManager; protected MaterialTimePicker materialTimePicker; protected TimeDialogPositiveCallBack timeValueResult; - protected String title = "Pick Time"; + protected CharSequence title = "Pick Time"; protected int timeFormat = TimeFormat.CLOCK_24H; protected int hour = 0; protected int minute = 0; From 8c0b69e2f8ab6387575e01c0144db7b31b767c3b Mon Sep 17 00:00:00 2001 From: "M. Fadli Zein" <45892408+gzeinnumer@users.noreply.github.com> Date: Wed, 17 Nov 2021 23:06:11 +0700 Subject: [PATCH 2/2] text --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2399e1f..4ed3335 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@
- + @@ -545,6 +545,8 @@ new TimeDialog(getSupportFragmentManager()) - Bug Fixing - **3.3.0** - Remove Space From Button +- **3.3.1** + - Add CharSequence to Title and Content --- # Contribution