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

[tlnd]

Add a preference option to show/hide the 'Credit Card Payment' checkbox in the 'New Transaction' screen.

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2012-09-28 20:06:53 +0000
+++ res/values/strings.xml	2012-10-09 11:41:21 +0000
@@ -803,5 +803,8 @@
     <string name="reconcile">Reconcile</string>
 
     <string name="file_import_utf8_warning">Please make sure that the file is in UTF-8</string>
+    
+    <string name="show_is_ccard_payment">Show \'Credit Card Payment\'</string>
+    <string name="show_is_ccard_payment_summary">Show checkbox to mark credit card payments</string>
 
 </resources>

=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	2012-09-17 17:22:44 +0000
+++ res/xml/preferences.xml	2012-10-09 11:41:21 +0000
@@ -132,6 +132,10 @@
                                     android:title="@string/show_picture"
                                     android:summary="@string/show_picture_summary"
                                     android:defaultValue="true"/>
+                <CheckBoxPreference android:key="ntsl_show_is_ccard_payment"
+                                    android:title="@string/show_is_ccard_payment"
+                                    android:summary="@string/show_is_ccard_payment_summary"
+                                    android:defaultValue="true"/>                
                 <CheckBoxPreference android:key="ntsl_show_category_in_transfer"
                                     android:title="@string/show_category_in_transfer"
                                     android:summary="@string/show_category_in_transfer_summary"

=== modified file 'src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java'
--- src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java	2012-09-14 11:08:46 +0000
+++ src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java	2012-10-09 11:41:21 +0000
@@ -109,7 +109,8 @@
 	protected boolean isRememberLastProject;
 	protected boolean isShowLocation;
 	protected boolean isShowNote;
-    protected boolean isShowTakePicture;
+	protected boolean isShowTakePicture;
+	protected boolean isShowIsCCardPayment;
 
 	protected AttributeView deleteAfterExpired;
 	
@@ -141,7 +142,8 @@
 		isRememberLastProject = isRememberLastCategory && MyPreferences.isRememberProject(this);
 		isShowLocation = MyPreferences.isShowLocation(this);
 		isShowNote = MyPreferences.isShowNote(this);
-        isShowTakePicture = MyPreferences.isShowTakePicture(this);
+		isShowTakePicture = MyPreferences.isShowTakePicture(this);
+		isShowIsCCardPayment = MyPreferences.isShowIsCCardPayment(this);
 
         categorySelector = new CategorySelector(this, db, x);
         categorySelector.setListener(this);
@@ -493,12 +495,12 @@
 		if (isShowTakePicture && transaction.isNotTemplateLike()) {
 			pictureView = x.addPictureNodeMinus(this, layout, R.id.attach_picture, R.id.delete_picture, R.string.attach_picture, R.string.new_picture);
 		}
-		// checkbox to register if the transaction is a credit card payment. 
-		// this will be used to exclude from totals in bill preview
-		ccardPayment = x.addCheckboxNode(layout,
-				R.id.is_ccard_payment, R.string.is_ccard_payment,
-				R.string.is_ccard_payment_summary, false);
-		
+		if (isShowIsCCardPayment) {
+			// checkbox to register if the transaction is a credit card payment. 
+			// this will be used to exclude from totals in bill preview
+			ccardPayment = x.addCheckboxNode(layout, R.id.is_ccard_payment,
+					R.string.is_ccard_payment, R.string.is_ccard_payment_summary, false);
+		}
 	}
 
     protected abstract void createListNodes(LinearLayout layout);
@@ -761,10 +763,12 @@
 			setRecurrence(transaction.recurrence);
 			setNotification(transaction.notificationOptions);
 		}
-        if (isShowTakePicture) {
-		    selectPicture(transaction.attachedPicture);
-        }
-		setIsCCardPayment(transaction.isCCardPayment);
+		if (isShowTakePicture) {
+			selectPicture(transaction.attachedPicture);
+		}
+		if (isShowIsCCardPayment) {
+			setIsCCardPayment(transaction.isCCardPayment);
+		}
 	}
 
 	private void setIsCCardPayment(int isCCardPaymentValue) {

=== modified file 'src/ru/orangesoftware/financisto/utils/MyPreferences.java'
--- src/ru/orangesoftware/financisto/utils/MyPreferences.java	2012-09-17 17:22:44 +0000
+++ src/ru/orangesoftware/financisto/utils/MyPreferences.java	2012-10-09 11:41:21 +0000
@@ -199,7 +199,12 @@
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 		return Integer.parseInt(sharedPreferences.getString("ntsl_show_location_order", "1"));
 	}
-	
+
+	public static boolean isShowIsCCardPayment(Context context) {
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		return sharedPreferences.getBoolean("ntsl_show_is_ccard_payment", true);
+	}
+    
 	/**
 	 * Get google docs user login registered on preferences
 	 * */