diff options
3 files changed, 81 insertions, 5 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java index 9a0427dbb..433d87549 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java @@ -152,7 +152,7 @@ public class EditActivity extends AppCompatActivity { } @Override - public boolean onCreateOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(@NonNull Menu menu) { if (viewModel.canEdit()) { getMenuInflater().inflate(R.menu.card_edit_menu, menu); @ColorInt final int colorAccent = ContextCompat.getColor(this, R.color.accent); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java index 5888329b0..6c4f293b9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java @@ -4,11 +4,15 @@ import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandTo import android.app.Dialog; import android.content.Context; +import android.content.DialogInterface; import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; +import android.view.inputmethod.EditorInfo; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -21,7 +25,7 @@ import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.DialogStackCreateBinding; import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment; -public class EditStackDialogFragment extends BrandedDialogFragment { +public class EditStackDialogFragment extends BrandedDialogFragment implements DialogInterface.OnClickListener { private static final String KEY_STACK_ID = "stack_id"; private static final String KEY_OLD_TITLE = "old_title"; private EditStackListener editStackListener; @@ -46,16 +50,58 @@ public class EditStackDialogFragment extends BrandedDialogFragment { final var builder = new AlertDialog.Builder(requireActivity()) .setView(binding.getRoot()) .setNeutralButton(android.R.string.cancel, null); + final var args = getArguments(); + if (args == null) { builder.setTitle(R.string.add_list) - .setPositiveButton(R.string.simple_add, (dialog, which) -> editStackListener.onCreateStack(binding.input.getText().toString())); + .setPositiveButton(R.string.simple_add, null); } else { binding.input.setText(args.getString(KEY_OLD_TITLE)); builder.setTitle(R.string.rename_list) - .setPositiveButton(R.string.simple_rename, (dialog, which) -> editStackListener.onUpdateStack(args.getLong(KEY_STACK_ID), binding.input.getText().toString())); + .setPositiveButton(R.string.simple_rename, null); } - return builder.create(); + final var dialog = builder.create(); + + dialog.setOnShowListener(d -> { + final boolean inputIsValid = inputIsValid(binding.input.getText()); + dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(inputIsValid); + dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(v -> onClick(dialog, DialogInterface.BUTTON_POSITIVE)); + }); + + binding.input.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + // Nothing to do + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + final boolean inputIsValid = inputIsValid(binding.input.getText()); + if (inputIsValid) { + binding.inputWrapper.setError(null); + } + dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(inputIsValid); + } + + @Override + public void afterTextChanged(Editable s) { + // Nothing to do + } + }); + + binding.input.setOnEditorActionListener((textView, actionId, event) -> { + //noinspection SwitchStatementWithTooFewBranches + switch (actionId) { + case EditorInfo.IME_ACTION_DONE: + onClick(dialog, DialogInterface.BUTTON_POSITIVE); + return true; + } + return false; + }); + + + return dialog; } @Nullable @@ -91,4 +137,33 @@ public class EditStackDialogFragment extends BrandedDialogFragment { public void applyBrand(int mainColor) { applyBrandToEditTextInputLayout(mainColor, binding.inputWrapper); } + + @Override + public void onClick(DialogInterface dialog, int which) { + final var args = getArguments(); + final var createMode = args == null; + + //noinspection SwitchStatementWithTooFewBranches + switch (which) { + case DialogInterface.BUTTON_POSITIVE: + final var currentUserInput = binding.input.getText(); + if (inputIsValid(currentUserInput)) { + if (createMode) { + editStackListener.onCreateStack(binding.input.getText().toString()); + } else { + editStackListener.onUpdateStack(args.getLong(KEY_STACK_ID), binding.input.getText().toString()); + } + } else { + binding.inputWrapper.setError(getString(R.string.title_is_mandatory)); + binding.input.requestFocus(); + } + break; + default: + throw new IllegalStateException("Unexpected button: " + which); + } + } + + private static boolean inputIsValid(@Nullable CharSequence input) { + return input != null && !input.toString().trim().isEmpty(); + } } diff --git a/fastlane/metadata/android/en-US/changelogs/1020002.txt b/fastlane/metadata/android/en-US/changelogs/1020002.txt index 7e05ffd6d..a24e27d8d 100644 --- a/fastlane/metadata/android/en-US/changelogs/1020002.txt +++ b/fastlane/metadata/android/en-US/changelogs/1020002.txt @@ -1,4 +1,5 @@ - 💬 Allow multi line comments (#1299) - 🐞 Handle offline card creation better (#1295) +- ⚠️ Prevent empty list names (#1317) - ⚙️ Add monochrome icon for Android 12+ (#1306) - ⚙️ Use new Android 12 SplashScreen API
\ No newline at end of file |