X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=64161a5cc1964e922d30ca83d9ce5da679efe588;hb=90a2528c5da0a524701fade91d1a2a45e0fccdc5;hp=f283aee53e124f609bd4084b46ada0920743f5fd;hpb=ff27cd8c41424676ec046c58448d23cd4313d1dc;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java index f283aee5..64161a5c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java @@ -94,7 +94,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer amountValidityObserver; private boolean inUpdate = false; private boolean syncingData = false; - private View commentButton; //TODO multiple amounts with different currencies per posting NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) { super(itemView); @@ -103,7 +102,6 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvComment = lAccount.findViewById(R.id.comment); tvTransactionComment = itemView.findViewById(R.id.transaction_comment); new TextViewClearHelper().attachToTextView((EditText) tvComment); - commentButton = lAccount.findViewById(R.id.comment_button); tvAmount = itemView.findViewById(R.id.account_row_acc_amounts); tvCurrency = itemView.findViewById(R.id.currency); tvDate = itemView.findViewById(R.id.new_transaction_date); @@ -121,10 +119,11 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvDate.setOnClickListener(v -> pickTransactionDate()); - commentButton.setOnClickListener(v -> { - tvComment.setVisibility(View.VISIBLE); - tvComment.requestFocus(); - }); + lAccount.findViewById(R.id.comment_button) + .setOnClickListener(v -> { + tvComment.setVisibility(View.VISIBLE); + tvComment.requestFocus(); + }); transactionCommentLayout.findViewById(R.id.comment_button) .setOnClickListener(v -> { @@ -132,9 +131,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvTransactionComment.requestFocus(); }); - mProfile = Data.profile.getValue(); - if (mProfile == null) - throw new AssertionError(); + mProfile = Data.getProfile(); View.OnFocusChangeListener focusMonitor = (v, hasFocus) -> { final int id = v.getId(); @@ -188,10 +185,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance() .getMonetaryDecimalSeparator()); - localeObserver = locale -> { - decimalSeparator = String.valueOf(DecimalFormatSymbols.getInstance(locale) - .getMonetaryDecimalSeparator()); - }; + localeObserver = locale -> decimalSeparator = String.valueOf( + DecimalFormatSymbols.getInstance(locale) + .getMonetaryDecimalSeparator()); decimalDot = "."; @@ -721,7 +717,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } @Override public void onDatePicked(int year, int month, int day) { - item.setDate(new SimpleDate(year, month+1, day)); + item.setDate(new SimpleDate(year, month + 1, day)); boolean focused = tvDescription.requestFocus(); if (focused) Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext());