Merge lp:~tlnd/financisto/bug-fixes into lp:~financisto-dev/financisto/trunk

[tlnd]

Induced by the redesign of the income/expense amount input fields, the handling of the credit card limit is kind of corrupted. While previously the limit had been stored as a positive value, it is stored as a negative one (expense) when creating new accounts -- which is reasonable. However, negative amounts have not been considered, e.g. to visualize the balance in the account list with a colorful bar.

For legacy support, the absolute value is considered now.

=== modified file 'src/ru/orangesoftware/financisto/activity/AccountActivity.java'
--- src/ru/orangesoftware/financisto/activity/AccountActivity.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/activity/AccountActivity.java	2011-06-07 17:47:24 +0000
@@ -130,6 +130,8 @@
 		x.addEditNode(layout, R.string.title, accountTitle);		
 		currencyText = x.addListNodePlus(layout, R.id.currency, R.id.currency_add, R.string.currency, R.string.select_currency);
 		
+		limitInput.setExpense();
+		limitInput.disableIncomeExpenseButton();
 		limitAmountView = x.addEditNode(layout, R.string.limit_amount, limitInput);
 		setVisibility(limitAmountView, View.GONE);
 
@@ -207,7 +209,7 @@
 				String sortOrder = Utils.text(sortOrderText);
 				account.sortOrder = sortOrder == null ? 0 : Integer.parseInt(sortOrder);
 				account.isIncludeIntoTotals  = isIncludedIntoTotals.isChecked();
-				account.limitAmount = limitInput.getAmount();
+				account.limitAmount = -Math.abs(limitInput.getAmount());
 				
 				long accountId = em.saveAccount(account);
 				long amount = amountInput.getAmount();
@@ -329,8 +331,9 @@
 	}
 	
 	private void selectCurrency(Currency c) {
-		currencyText.setText(c.name);						
+		currencyText.setText(c.name);
 		amountInput.setCurrency(c);
+		limitInput.setCurrency(c);
 		account.currency = c;		
 	}
 
@@ -355,8 +358,8 @@
 		/********************************/		
 		
 		isIncludedIntoTotals.setChecked(account.isIncludeIntoTotals);
-		if (account.limitAmount > 0) {
-			limitInput.setAmount(account.limitAmount);
+		if (account.limitAmount != 0) {
+			limitInput.setAmount(-Math.abs(account.limitAmount));
 		}
 	}
 
 
=== modified file 'src/ru/orangesoftware/financisto/adapter/AccountListAdapter2.java'
--- src/ru/orangesoftware/financisto/adapter/AccountListAdapter2.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/adapter/AccountListAdapter2.java	2011-06-07 17:47:24 +0000
@@ -81,12 +81,12 @@
 		v.bottomView.setText(df.format(new Date(date)));
 		
 		long amount = a.totalAmount;			
-		if (type == AccountType.CREDIT_CARD && a.limitAmount > 0) {
-			long balance = a.limitAmount + amount;
+		if (type == AccountType.CREDIT_CARD && a.limitAmount != 0) {
+			long balance = Math.abs(a.limitAmount) + amount;
 			u.setAmountText(v.rightCenterView, a.currency, amount, false);
 			u.setAmountText(v.rightView, a.currency, balance, false);
 			v.rightCenterView.setVisibility(View.VISIBLE);
-			v.progressBar.setMax((int)a.limitAmount);
+			v.progressBar.setMax((int) Math.abs(a.limitAmount));
 			v.progressBar.setProgress((int)(balance > 0 ? balance : 0));
 			v.progressBar.setVisibility(View.VISIBLE);
 		} else {