capacitor-extended-dialog 0.0.7 → 0.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/java/com/albermonte/extendeddialog/ExtendedDialog.java +1 -2
- package/android/src/main/java/com/albermonte/extendeddialog/FullScreenDialogFragment.java +3 -4
- package/android/src/main/java/com/albermonte/extendeddialog/SheetBottomDialogFragment.java +4 -4
- package/package.json +1 -1
|
@@ -379,8 +379,7 @@ public class ExtendedDialog {
|
|
|
379
379
|
builder.setMessage(message);
|
|
380
380
|
|
|
381
381
|
// Use Material 3 TextInputLayout with outlined style
|
|
382
|
-
TextInputLayout textInputLayout = new TextInputLayout(themedContext
|
|
383
|
-
com.google.android.material.R.attr.textInputOutlinedStyle);
|
|
382
|
+
TextInputLayout textInputLayout = new TextInputLayout(themedContext);
|
|
384
383
|
textInputLayout.setBoxBackgroundMode(TextInputLayout.BOX_BACKGROUND_OUTLINE);
|
|
385
384
|
|
|
386
385
|
final TextInputEditText input = new TextInputEditText(textInputLayout.getContext());
|
|
@@ -297,7 +297,7 @@ public class FullScreenDialogFragment extends DialogFragment {
|
|
|
297
297
|
|
|
298
298
|
// Cancel button (not shown for ALERT type)
|
|
299
299
|
if (type != DialogType.ALERT) {
|
|
300
|
-
MaterialButton cancelBtn = new MaterialButton(ctx, null,
|
|
300
|
+
MaterialButton cancelBtn = new MaterialButton(ctx, null, android.R.attr.borderlessButtonStyle);
|
|
301
301
|
cancelBtn.setText(cancelButton);
|
|
302
302
|
cancelBtn.setBackgroundTintList(ColorStateList.valueOf(android.graphics.Color.TRANSPARENT));
|
|
303
303
|
cancelBtn.setRippleColor(ColorStateList.valueOf(primaryColorValue & 0x1FFFFFFF));
|
|
@@ -317,7 +317,7 @@ public class FullScreenDialogFragment extends DialogFragment {
|
|
|
317
317
|
}
|
|
318
318
|
|
|
319
319
|
// OK button
|
|
320
|
-
okBtn = new MaterialButton(ctx, null,
|
|
320
|
+
okBtn = new MaterialButton(ctx, null, android.R.attr.borderlessButtonStyle);
|
|
321
321
|
okBtn.setText(okButton);
|
|
322
322
|
okBtn.setBackgroundTintList(ColorStateList.valueOf(android.graphics.Color.TRANSPARENT));
|
|
323
323
|
okBtn.setRippleColor(ColorStateList.valueOf(primaryColorValue & 0x1FFFFFFF));
|
|
@@ -351,8 +351,7 @@ public class FullScreenDialogFragment extends DialogFragment {
|
|
|
351
351
|
Context ctx = getThemedContext();
|
|
352
352
|
|
|
353
353
|
// Use Material 3 TextInputLayout with outlined style
|
|
354
|
-
TextInputLayout textInputLayout = new TextInputLayout(ctx
|
|
355
|
-
com.google.android.material.R.attr.textInputOutlinedStyle);
|
|
354
|
+
TextInputLayout textInputLayout = new TextInputLayout(ctx);
|
|
356
355
|
textInputLayout.setBoxBackgroundMode(TextInputLayout.BOX_BACKGROUND_OUTLINE);
|
|
357
356
|
textInputLayout.setLayoutParams(new LinearLayout.LayoutParams(
|
|
358
357
|
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
|
|
@@ -140,7 +140,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
|
|
|
140
140
|
handleParams.topMargin = (int) (16 * density);
|
|
141
141
|
handleParams.bottomMargin = (int) (8 * density);
|
|
142
142
|
dragHandle.setLayoutParams(handleParams);
|
|
143
|
-
int outlineVariantColor = MaterialColors.getColor(ctx,
|
|
143
|
+
int outlineVariantColor = MaterialColors.getColor(ctx, android.R.attr.textColorSecondary, 0xFFCAC4D0);
|
|
144
144
|
android.graphics.drawable.GradientDrawable handleDrawable = new android.graphics.drawable.GradientDrawable();
|
|
145
145
|
handleDrawable.setShape(android.graphics.drawable.GradientDrawable.RECTANGLE);
|
|
146
146
|
handleDrawable.setCornerRadius(handleHeight / 2f);
|
|
@@ -237,7 +237,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
|
|
|
237
237
|
} else {
|
|
238
238
|
confirmBtn.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
|
|
239
239
|
}
|
|
240
|
-
int onPrimaryColor =
|
|
240
|
+
int onPrimaryColor = 0xFFFFFFFF;
|
|
241
241
|
confirmBtn.setTextColor(ColorStateList.valueOf(onPrimaryColor));
|
|
242
242
|
confirmBtn.setCornerRadius((int) (24 * density));
|
|
243
243
|
confirmBtn.setMinHeight(buttonHeight);
|
|
@@ -251,14 +251,14 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
|
|
|
251
251
|
buttonContainer.addView(confirmBtn);
|
|
252
252
|
|
|
253
253
|
// Cancel button (text-only style, no background fill)
|
|
254
|
-
MaterialButton cancelBtn = new MaterialButton(ctx, null,
|
|
254
|
+
MaterialButton cancelBtn = new MaterialButton(ctx, null, android.R.attr.borderlessButtonStyle);
|
|
255
255
|
cancelBtn.setText(cancelButton);
|
|
256
256
|
cancelBtn.setOnClickListener(v -> {
|
|
257
257
|
handleCancel();
|
|
258
258
|
dismiss();
|
|
259
259
|
});
|
|
260
260
|
cancelBtn.setBackgroundTintList(ColorStateList.valueOf(android.graphics.Color.TRANSPARENT));
|
|
261
|
-
cancelBtn.setRippleColor(ColorStateList.valueOf(
|
|
261
|
+
cancelBtn.setRippleColor(ColorStateList.valueOf(primaryColor & 0x1FFFFFFF));
|
|
262
262
|
if (styleOptions.getCancelButtonColor() != null) {
|
|
263
263
|
cancelBtn.setTextColor(ColorStateList.valueOf(styleOptions.getCancelButtonColor()));
|
|
264
264
|
} else {
|
package/package.json
CHANGED