X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateDetailsViewModel.java;h=9a4682d95eb93694dac1aed726bcac215950a846;hb=99e70e3030eefa70be9fe5d71e8f858a991b987b;hp=9f87aa796cdc8605e14c400b004f006a8e2bb40f;hpb=5921c8117df3703b5004d0abc74fd02a09ca51f6;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 9f87aa79..9a4682d9 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 @@ -24,6 +24,7 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; +import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.dao.TemplateAccountDAO; import net.ktnx.mobileledger.dao.TemplateHeaderDAO; import net.ktnx.mobileledger.db.DB; @@ -32,6 +33,7 @@ import net.ktnx.mobileledger.db.TemplateHeader; import net.ktnx.mobileledger.db.TemplateWithAccounts; import net.ktnx.mobileledger.model.TemplateDetailsItem; import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.Misc; import java.util.ArrayList; import java.util.Collections; @@ -41,18 +43,19 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; public class TemplateDetailsViewModel extends ViewModel { + static final String TAG = "template-details-model"; + static final String DB_TAG = TAG + "-db"; private final MutableLiveData> items = new MutableLiveData<>(Collections.emptyList()); + private final AtomicInteger syntheticItemId = new AtomicInteger(0); private Long mPatternId; - private String mDefaultPatternName; + private String mDefaultTemplateName; private boolean itemsLoaded = false; - private final AtomicInteger syntheticItemId = new AtomicInteger(0); - - public String getDefaultPatternName() { - return mDefaultPatternName; + public String getDefaultTemplateName() { + return mDefaultTemplateName; } - public void setDefaultPatternName(String name) { - mDefaultPatternName = name; + public void setDefaultTemplateName(String name) { + mDefaultTemplateName = name; } public void resetItems() { @@ -72,10 +75,10 @@ public class TemplateDetailsViewModel extends ViewModel { srcList = Collections.unmodifiableList(srcList); - { - Logger.debug("tmpl", "Considering old list"); + if (BuildConfig.DEBUG) { + Logger.debug(TAG, "Considering old list"); for (TemplateDetailsItem item : srcList) - Logger.debug("tmpl", String.format(Locale.US, " id %d pos %d", item.getId(), + Logger.debug(TAG, String.format(Locale.US, " id %d pos %d", item.getId(), item.getPosition())); } @@ -85,7 +88,6 @@ public class TemplateDetailsViewModel extends ViewModel { if (srcList.size() < 1) { final TemplateDetailsItem.Header header = TemplateDetailsItem.createHeader(); - header.setName(mDefaultPatternName); header.setId(0); newList.add(header); changes = true; @@ -135,7 +137,7 @@ public class TemplateDetailsViewModel extends ViewModel { } if (changes) { - Logger.debug("tmpl", "Changes detected, applying new list"); + Logger.debug(TAG, "Changes detected, applying new list"); if (async) items.postValue(newList); @@ -143,7 +145,7 @@ public class TemplateDetailsViewModel extends ViewModel { items.setValue(newList); } else - Logger.debug("tmpl", "No changes, ignoring new list"); + Logger.debug(TAG, "No changes, ignoring new list"); } public int genItemId() { return syntheticItemId.decrementAndGet(); @@ -172,13 +174,16 @@ public class TemplateDetailsViewModel extends ViewModel { ArrayList l = new ArrayList<>(); TemplateDetailsItem header = TemplateDetailsItem.fromRoomObject(src.header); + Logger.debug(DB_TAG, "Got header template item with id of " + header.getId()); l.add(header); + Collections.sort(src.accounts, + (o1, o2) -> Long.compare(o1.getPosition(), o2.getPosition())); for (TemplateAccount acc : src.accounts) { l.add(TemplateDetailsItem.fromRoomObject(acc)); } for (TemplateDetailsItem i : l) { - Logger.debug("patterns-db", "Loaded pattern item " + i); + Logger.debug(DB_TAG, "Loaded pattern item " + i); } applyList(l, true); itemsLoaded = true; @@ -208,11 +213,17 @@ public class TemplateDetailsViewModel extends ViewModel { TemplateDetailsItem.Header modelHeader = list.get(0) .asHeaderItem(); + + modelHeader.setName(Misc.trim(modelHeader.getName())); + if (modelHeader.getName() + .isEmpty()) + modelHeader.setName(getDefaultTemplateName()); + TemplateHeaderDAO headerDAO = DB.get() .getTemplateDAO(); TemplateHeader dbHeader = modelHeader.toDBO(); if (newPattern) { - dbHeader.setId(null); + dbHeader.setId(0L); dbHeader.setId(mPatternId = headerDAO.insertSync(dbHeader)); } else @@ -233,7 +244,7 @@ public class TemplateDetailsViewModel extends ViewModel { dbAccount.setTemplateId(mPatternId); dbAccount.setPosition(i); if (dbAccount.getId() < 0) { - dbAccount.setId(null); + dbAccount.setId(0); dbAccount.setId(taDAO.insertSync(dbAccount)); } else @@ -249,6 +260,10 @@ public class TemplateDetailsViewModel extends ViewModel { } private ArrayList copyItems() { List oldList = items.getValue(); + + if (oldList == null) + return new ArrayList<>(); + ArrayList result = new ArrayList<>(oldList.size()); for (TemplateDetailsItem item : oldList) { @@ -263,14 +278,62 @@ public class TemplateDetailsViewModel extends ViewModel { return result; } public void moveItem(int sourcePos, int targetPos) { - ArrayList newList = new ArrayList<>(items.getValue()); - TemplateDetailsItem item = newList.remove(sourcePos); - newList.add(targetPos, item); + final List newList = copyItems(); + + if (BuildConfig.DEBUG) { + Logger.debug("drag", "Before move:"); + for (int i = 1; i < newList.size(); i++) { + final TemplateDetailsItem item = newList.get(i); + Logger.debug("drag", + String.format(Locale.US, " %d: id %d, pos %d", i, item.getId(), + item.getPosition())); + } + } + + { + TemplateDetailsItem item = newList.remove(sourcePos); + newList.add(targetPos, item); + } + + // adjust affected items' positions + { + int startPos, endPos; + if (sourcePos < targetPos) { + // moved down + startPos = sourcePos; + endPos = targetPos; + } + else { + // moved up + startPos = targetPos; + endPos = sourcePos; + } + + for (int i = startPos; i <= endPos; i++) { + newList.get(i) + .setPosition(i); + } + } + + if (BuildConfig.DEBUG) { + Logger.debug("drag", "After move:"); + for (int i = 1; i < newList.size(); i++) { + final TemplateDetailsItem item = newList.get(i); + Logger.debug("drag", + String.format(Locale.US, " %d: id %d, pos %d", i, item.getId(), + item.getPosition())); + } + } + items.setValue(newList); } public void removeItem(int position) { - ArrayList newList = new ArrayList<>(items.getValue()); + Logger.debug(TAG, "Removing item at position " + position); + ArrayList newList = copyItems(); newList.remove(position); + for (int i = position; i < newList.size(); i++) + newList.get(i) + .setPosition(i); applyList(newList); } } \ No newline at end of file