X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemHolder.java;h=a5a4541fd3579635fe102e53dc55f1a14f327ad7;hb=048d949ea24d8971bd2c29ae9613e0e4373d2e37;hp=81487af661a1f4b7dcc9c9539f1991755c32eba8;hpb=ec8e98c8095ed1368ae8b35c8b8ef6e59b9bcb2f;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 81487af6..a5a4541f 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 @@ -63,6 +63,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder private Observer hintObserver; private Observer focusedAccountObserver; private Observer accountCountObserver; + private Observer editableObserver; private boolean inUpdate = false; private boolean syncingData = false; NewTransactionItemHolder(@NonNull View itemView, NewTransactionItemsAdapter adapter) { @@ -80,12 +81,14 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.setNextFocusForwardId(View.NO_ID); // magic! tvDate.setOnFocusChangeListener((v, hasFocus) -> { - if (hasFocus) pickTransactionDate(); + if (hasFocus) + pickTransactionDate(); }); tvDate.setOnClickListener(v -> pickTransactionDate()); mProfile = Data.profile.getValue(); - if (mProfile == null) throw new AssertionError(); + if (mProfile == null) + throw new AssertionError(); MLDB.hookAutocompletionAdapter(tvDescription.getContext(), tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE, "description", false, adapter, mProfile); @@ -104,7 +107,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder @Override public void afterTextChanged(Editable s) { // debug("input", "text changed"); - if (inUpdate) return; + if (inUpdate) + return; Logger.debug("textWatcher", "calling syncData()"); syncData(); @@ -119,7 +123,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder tvAmount.addTextChangedListener(tw); dateObserver = date -> { - if (syncingData) return; + if (syncingData) + return; syncingData = true; try { tvDate.setText(item.getFormattedDate()); @@ -129,7 +134,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } }; descriptionObserver = description -> { - if (syncingData) return; + if (syncingData) + return; syncingData = true; try { tvDescription.setText(description); @@ -139,7 +145,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } }; hintObserver = hint -> { - if (syncingData) return; + if (syncingData) + return; syncingData = true; try { tvAmount.setHint(hint); @@ -148,6 +155,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder syncingData = false; } }; + editableObserver = this::setEditable; focusedAccountObserver = index -> { if ((index != null) && index.equals(getAdapterPosition())) { switch (item.getType()) { @@ -157,8 +165,9 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder //if (!tvDate.hasFocus()) tvDate.requestFocus(); boolean focused = tvDescription.requestFocus(); tvDescription.dismissDropDown(); - if (focused) Misc.showSoftKeyboard( - (NewTransactionActivity) tvDescription.getContext()); + if (focused) + Misc.showSoftKeyboard( + (NewTransactionActivity) tvDescription.getContext()); break; case transactionRow: focused = tvAccount.requestFocus(); @@ -171,16 +180,45 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder } }; accountCountObserver = count -> { - if (getAdapterPosition() == count) tvAmount.setImeOptions(EditorInfo.IME_ACTION_DONE); - else tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT); + final int adapterPosition = getAdapterPosition(); + final int layoutPosition = getLayoutPosition(); + Logger.debug("holder", + String.format(Locale.US, "count=%d; pos=%d, layoutPos=%d [%s]", count, + adapterPosition, layoutPosition, item.getType() + .toString() + .concat(item.getType() == + NewTransactionModel.ItemType.transactionRow + ? String.format(Locale.US, + "'%s'=%s", + item.getAccount() + .getAccountName(), + item.getAccount() + .isAmountSet() + ? String.format(Locale.US, + "%.2f", + item.getAccount() + .getAmount()) + : "unset") : ""))); + if (adapterPosition == count) + tvAmount.setImeOptions(EditorInfo.IME_ACTION_DONE); + else + tvAmount.setImeOptions(EditorInfo.IME_ACTION_NEXT); }; } + private void setEditable(Boolean editable) { + tvDate.setEnabled(editable); + tvDescription.setEnabled(editable); + tvAccount.setEnabled(editable); + tvAmount.setEnabled(editable); + } private void beginUpdates() { - if (inUpdate) throw new RuntimeException("Already in update mode"); + if (inUpdate) + throw new RuntimeException("Already in update mode"); inUpdate = true; } private void endUpdates() { - if (!inUpdate) throw new RuntimeException("Not in update mode"); + if (!inUpdate) + throw new RuntimeException("Not in update mode"); inUpdate = false; } /** @@ -189,7 +227,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder * Stores the data from the UI elements into the model item */ private void syncData() { - if (item == null) return; + if (item == null) + return; if (syncingData) { Logger.debug("new-trans", "skipping syncData() loop"); @@ -212,10 +251,23 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder String amount = String.valueOf(tvAmount.getText()); amount = amount.trim(); - if (!amount.isEmpty()) item.getAccount() - .setAmount(Float.parseFloat(amount)); - else item.getAccount() - .resetAmount(); + if (!amount.isEmpty()) { + try { + item.getAccount() + .setAmount(Float.parseFloat(amount)); + } + catch (NumberFormatException e) { + Logger.debug("new-trans", String.format( + "assuming amount is not set due to number format exception. " + + "input was '%s'", + amount)); + item.getAccount() + .resetAmount(); + } + } + else + item.getAccount() + .resetAmount(); break; case bottomFiller: @@ -244,6 +296,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder this.item.stopObservingDate(dateObserver); this.item.stopObservingDescription(descriptionObserver); this.item.stopObservingAmountHint(hintObserver); + this.item.stopObservingEditableFlag(editableObserver); this.item.getModel() .stopObservingFocusedItem(focusedAccountObserver); this.item.getModel() @@ -259,6 +312,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder lHead.setVisibility(View.VISIBLE); lAccount.setVisibility(View.GONE); lPadding.setVisibility(View.GONE); + setEditable(true); break; case transactionRow: LedgerTransactionAccount acc = item.getAccount(); @@ -269,11 +323,13 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder lHead.setVisibility(View.GONE); lAccount.setVisibility(View.VISIBLE); lPadding.setVisibility(View.GONE); + setEditable(true); break; case bottomFiller: lHead.setVisibility(View.GONE); lAccount.setVisibility(View.GONE); lPadding.setVisibility(View.VISIBLE); + setEditable(false); break; } @@ -284,6 +340,7 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder item.observeDate(activity, dateObserver); item.observeDescription(activity, descriptionObserver); item.observeAmountHint(activity, hintObserver); + item.observeEditableFlag(activity, editableObserver); item.getModel() .observeFocusedItem(activity, focusedAccountObserver); item.getModel() @@ -300,7 +357,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder c.set(year, month, day); item.setDate(c.getTime()); boolean focused = tvDescription.requestFocus(); - if (focused) Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext()); + if (focused) + Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext()); } @Override