X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateDetailsAdapter.java;h=fa76664ee7ae798fcf729a7cf00083729a598873;hb=fcdd10b21d0e4af59f70804c63d145512b2cb918;hp=cbc18bd8d2e0ea153bfca250a47830844344516b;hpb=3acb12fa59277802e1a51b038751c5ccd2025958;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsAdapter.java index cbc18bd8..fa76664e 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsAdapter.java @@ -138,7 +138,7 @@ class TemplateDetailsAdapter extends RecyclerView.Adapter 0) flags |= makeFlag(ItemTouchHelper.ACTION_STATE_DRAG, ItemTouchHelper.UP | ItemTouchHelper.DOWN) | @@ -165,8 +165,8 @@ class TemplateDetailsAdapter extends RecyclerView.Adapter b.templateIsFallbackSwitch.toggle(); b.templateIsFallbackLabel.setOnClickListener(fallbackLabelClickListener); b.templateIsFallbackText.setOnClickListener(fallbackLabelClickListener); - b.templateDetailsTemplateParamsHelpButton.setOnClickListener(v -> HelpDialog.show( - b.getRoot() - .getContext(), R.string.template_details_template_params_label, - R.array.template_params_help)); + b.templateParamsHelpButton.setOnClickListener(v -> HelpDialog.show(b.getRoot() + .getContext(), + R.string.template_details_template_params_label, R.array.template_params_help)); } @NotNull private TemplateDetailsItem.Header getItem() { - int pos = getAdapterPosition(); + int pos = getBindingAdapterPosition(); return differ.getCurrentList() .get(pos) .asHeaderItem(); @@ -477,7 +476,7 @@ class TemplateDetailsAdapter extends RecyclerView.Adapter selectHeaderDetailSource(v, HeaderDetail.DATE_YEAR)); - b.templateDetailsYearSource.setOnClickListener( + b.yearSource.setOnClickListener( v -> selectHeaderDetailSource(v, HeaderDetail.DATE_YEAR)); if (header.hasLiteralDateMonth()) { - b.templateDetailsMonthSource.setText(R.string.template_details_source_literal); + b.monthSource.setText(R.string.template_details_source_literal); final Integer dateMonth = header.getDateMonth(); b.templateDetailsDateMonth.setText( (dateMonth == null) ? null : String.valueOf(dateMonth)); - b.templateDetailsDateMonthLayout.setVisibility(View.VISIBLE); + b.monthLayout.setVisibility(View.VISIBLE); } else { - b.templateDetailsDateMonthLayout.setVisibility(View.GONE); - b.templateDetailsMonthSource.setText( + b.monthLayout.setVisibility(View.GONE); + b.monthSource.setText( String.format(Locale.US, groupNoText, header.getDateMonthMatchGroup(), getMatchGroupText(header.getDateMonthMatchGroup()))); } - b.templateDetailsMonthSourceLabel.setOnClickListener( + b.monthSourceLabel.setOnClickListener( v -> selectHeaderDetailSource(v, HeaderDetail.DATE_MONTH)); - b.templateDetailsMonthSource.setOnClickListener( + b.monthSource.setOnClickListener( v -> selectHeaderDetailSource(v, HeaderDetail.DATE_MONTH)); if (header.hasLiteralDateDay()) { - b.templateDetailsDaySource.setText(R.string.template_details_source_literal); + b.daySource.setText(R.string.template_details_source_literal); final Integer dateDay = header.getDateDay(); b.templateDetailsDateDay.setText( (dateDay == null) ? null : String.valueOf(dateDay)); - b.templateDetailsDateDayLayout.setVisibility(View.VISIBLE); + b.dayLayout.setVisibility(View.VISIBLE); } else { - b.templateDetailsDateDayLayout.setVisibility(View.GONE); - b.templateDetailsDaySource.setText( + b.dayLayout.setVisibility(View.GONE); + b.daySource.setText( String.format(Locale.US, groupNoText, header.getDateDayMatchGroup(), getMatchGroupText(header.getDateDayMatchGroup()))); } - b.templateDetailsDaySourceLabel.setOnClickListener( + b.daySourceLabel.setOnClickListener( v -> selectHeaderDetailSource(v, HeaderDetail.DATE_DAY)); - b.templateDetailsDaySource.setOnClickListener( + b.daySource.setOnClickListener( v -> selectHeaderDetailSource(v, HeaderDetail.DATE_DAY)); if (header.hasLiteralTransactionDescription()) { @@ -762,7 +761,7 @@ class TemplateDetailsAdapter extends RecyclerView.Adapter