Updates for v1.4.0-beta6 release

Fixed: Split editor showing wrong currency symbol
Fixed: Template transactions overriding user-entered amounts

Author: codinguser

app/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="34"
+    android:versionCode="35"
     android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>

app/res/values/strings.xml

@@ -17,7 +17,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">GnuCash</string>
-    <string name="app_version_name">1.4.0-beta5</string>
+    <string name="app_version_name">1.4.0-beta6</string>
     <string name="title_add_account">Create Account</string>
     <string name="title_edit_account">Edit Account</string>
     <string name="info_details">Info</string>

app/src/org/gnucash/android/ui/transaction/TransactionFormFragment.java

@@ -292,14 +292,22 @@ public Cursor runQuery(CharSequence name) {
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
                 mTransaction = new Transaction(mTransactionsDbAdapter.getTransaction(id), true);
                 mTransaction.setTime(System.currentTimeMillis());
+                //we check here because next method will modify it and we want to catch user-modification
+                boolean amountEntered = mAmountInputFormatter.isInputModified();
                 initializeViewsWithTransaction();
                 List<Split> splitList = mTransaction.getSplits();
                 boolean isSplitPair = splitList.size() == 2 && splitList.get(0).isPairOf(splitList.get(1));
                 if (isSplitPair){
                     mSplitsList.clear();
-                    mAmountEditText.setText(splitList.get(0).getAmount().toPlainString());
+                    if (!amountEntered) //if user already entered an amount
+                        mAmountEditText.setText(splitList.get(0).getAmount().toPlainString());
                 } else {
-                    setAmountEditViewVisible(View.GONE);
+                    if (amountEntered){ //if user entered own amount, clear
+                        mSplitsList.clear();
+                        setAmountEditViewVisible(View.VISIBLE);
+                    } else {
+                        setAmountEditViewVisible(View.GONE);
+                    }
                 }
                 mTransaction = null; //we are creating a new transaction after all
             }
@@ -377,7 +385,7 @@ private void initalizeViews() {
 			code = mTransactionsDbAdapter.getCurrencyCode(accountId);
 		}
 		Currency accountCurrency = Currency.getInstance(code);
-		mCurrencyTextView.setText(accountCurrency.getSymbol(Locale.getDefault()));
+		mCurrencyTextView.setText(accountCurrency.getSymbol());
 
         if (mUseDoubleEntry){
             long defaultTransferAccountID = mAccountsDbAdapter.getDefaultTransferAccountID(accountId);

app/src/org/gnucash/android/ui/transaction/dialog/SplitEditorDialogFragment.java

@@ -196,6 +196,8 @@ public void onClick(View view) {
         updateTransferAccountsList(accountsSpinner);
         accountsSpinner.setOnItemSelectedListener(new TypeButtonLabelUpdater(splitTypeButton));
 
+        Currency accountCurrency = Currency.getInstance(mAccountsDbAdapter.getCurrencyCode(mAccountId));
+        splitCurrencyTextView.setText(accountCurrency.getSymbol());
         splitTypeButton.setAmountFormattingListener(splitAmountEditText, splitCurrencyTextView);
         splitTypeButton.setChecked(mBaseAmount.signum() > 0);
         splitUidTextView.setText(UUID.randomUUID().toString());