X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateDetailsViewModel.java;h=7f983807c59e3cd686f6d18fa2e7886b6b77dd9e;hb=edb8bc2eaacb16972c550209008fa403ed660432;hp=608bb6344cade07fab781509a1cdc37de1ade915;hpb=59ec619c8f3a34e90804067691854864d45d45e6;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java index 608bb634..7f983807 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java @@ -38,6 +38,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; public class TemplateDetailsViewModel extends ViewModel { private final MutableLiveData> items = @@ -45,6 +46,7 @@ public class TemplateDetailsViewModel extends ViewModel { private Long mPatternId; private String mDefaultPatternName; private boolean itemsLoaded = false; + private final AtomicInteger syntheticItemId = new AtomicInteger(0); public String getDefaultPatternName() { return mDefaultPatternName; @@ -54,37 +56,34 @@ public class TemplateDetailsViewModel extends ViewModel { } public void resetItems() { - ArrayList newList = new ArrayList<>(); - final TemplateDetailsItem.Header header = TemplateDetailsItem.createHeader(); - header.setName(mDefaultPatternName); - header.setId(0); - newList.add(header); - - while (newList.size() < 3) { - final TemplateDetailsItem.AccountRow aRow = TemplateDetailsItem.createAccountRow(); - aRow.setId(newList.size() + 1); - newList.add(aRow); - } - - items.setValue(newList); + checkItemConsistency(new ArrayList<>()); } - private void checkItemConsistency() { - ArrayList newList = new ArrayList<>(items.getValue()); + public void checkItemConsistency(List list) { + if (list == null) + list = new ArrayList<>(items.getValue()); + boolean changes = false; - if (newList.size() < 1) { + if (list.size() < 1) { final TemplateDetailsItem.Header header = TemplateDetailsItem.createHeader(); header.setName(mDefaultPatternName); - newList.add(header); + header.setId(0); + list.add(header); changes = true; } - while (newList.size() < 3) { - newList.add(TemplateDetailsItem.createAccountRow()); + while (list.size() < 3) { + final TemplateDetailsItem.AccountRow accountRow = + TemplateDetailsItem.createAccountRow(); + accountRow.setId(genItemId()); + list.add(accountRow); changes = true; } if (changes) - items.setValue(newList); + items.setValue(list); + } + public int genItemId() { + return syntheticItemId.decrementAndGet(); } public LiveData> getItems(Long patternId) { if (itemsLoaded && Objects.equals(patternId, this.mPatternId)) @@ -163,13 +162,14 @@ public class TemplateDetailsViewModel extends ViewModel { TemplateAccountDAO taDAO = DB.get() .getTemplateAccountDAO(); + taDAO.prepareForSave(mPatternId); for (int i = 1; i < list.size(); i++) { final TemplateDetailsItem.AccountRow accRowItem = list.get(i) .asAccountRowItem(); TemplateAccount dbAccount = accRowItem.toDBO(dbHeader.getId()); dbAccount.setTemplateId(mPatternId); dbAccount.setPosition(i); - if (newPattern) { + if (dbAccount.getId() < 0) { dbAccount.setId(null); dbAccount.setId(taDAO.insertSync(dbAccount)); } @@ -181,6 +181,19 @@ public class TemplateDetailsViewModel extends ViewModel { dbAccount.getId(), dbAccount.getAccountName(), dbAccount.getAccountComment(), dbAccount.getNegateAmount(), accRowItem)); } + taDAO.finishSave(mPatternId); }); } + public void moveItem(int sourcePos, int targetPos) { + ArrayList newList = new ArrayList<>(items.getValue()); + TemplateDetailsItem item = newList.remove(sourcePos); + newList.add(targetPos, item); + items.setValue(newList); + } + public void removeItem(int position) { + ArrayList newList = new ArrayList<>(items.getValue()); + newList.remove(position); + checkItemConsistency(newList); + items.setValue(newList); + } } \ No newline at end of file