X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionModel.java;h=34d3a8493a3a9e782de7d315b1f25d9e6656d7bb;hb=73db4eac40acaf517513c6ccc0c3e44472c7dbdf;hp=b0241b1ae0aaa8ff06b8cd2037ce765defea6c35;hpb=152803e67d4a629d589b2d66c88a781d67c371c6;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java index b0241b1a..34d3a849 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionModel.java @@ -21,6 +21,7 @@ import android.annotation.SuppressLint; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; @@ -28,7 +29,9 @@ import androidx.lifecycle.ViewModel; import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.model.Currency; +import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.Misc; @@ -69,6 +72,14 @@ public class NewTransactionModel extends ViewModel { */ private final HashMap> slots = new HashMap<>(); private int checkHoldCounter = 0; + private boolean observingDataProfile; + private Observer profileObserver = + profile -> showCurrency.postValue(profile.getShowCommodityByDefault()); + public void observeDataProfile(LifecycleOwner activity) { + if (!observingDataProfile) + Data.profile.observe(activity, profileObserver); + observingDataProfile = true; + } void holdSubmittableChecks() { checkHoldCounter++; } @@ -364,7 +375,7 @@ public class NewTransactionModel extends ViewModel { if ((items.size() > 2) && (emptyItems.size() == 1)) { List currItems = itemsForCurrency.getList(currName); - if (currItems.size() == 1){ + if (currItems.size() == 1) { Item item = emptyItems.get(0); removeRow(item, adapter); }