Hide CSV export separator label when another export format is selected

qyqx · Feb 27, 2018 · 034bf52 · 034bf52
1 parent 0aae30a
commit 034bf52
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/app/src/main/java/org/gnucash/android/export/csv/CsvTransactionsExporter.java b/app/src/main/java/org/gnucash/android/export/csv/CsvTransactionsExporter.java
@@ -16,14 +16,14 @@
 
 package org.gnucash.android.export.csv;
 
-import android.database.sqlite.SQLiteDatabase;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
 import com.crashlytics.android.Crashlytics;
 
 import org.gnucash.android.export.ExportParams;
 import org.gnucash.android.export.Exporter;
 import org.gnucash.android.model.Account;
-import org.gnucash.android.model.Commodity;
 import org.gnucash.android.model.Money;
 import org.gnucash.android.model.Split;
 import org.gnucash.android.model.Transaction;
@@ -40,6 +40,7 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Creates a GnuCash CSV transactions representation of the accounts and transactions
@@ -50,7 +51,7 @@ public class CsvTransactionsExporter extends Exporter{
 
     private char mCsvSeparator;
 
-    private DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+    private DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy", Locale.US);
 
     private Comparator<Split> splitComparator = new Comparator<Split>() {
         @Override

diff --git a/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java b/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java
@@ -144,6 +144,7 @@ public class ExportFormFragment extends Fragment implements
 	@BindView(R.id.radio_separator_comma_format) RadioButton mSeparatorCommaButton;
 	@BindView(R.id.radio_separator_colon_format) RadioButton mSeparatorColonButton;
 	@BindView(R.id.radio_separator_semicolon_format) RadioButton mSeparatorSemicolonButton;
+	@BindView(R.id.layout_csv_options) LinearLayout mCsvOptionsLayout;
 
 	@BindView(R.id.recurrence_options) View mRecurrenceOptionsView;
 	/**
@@ -207,27 +208,27 @@ private void onRadioButtonClicked(View view){
                     mExportWarningTextView.setVisibility(View.GONE);
                 }
 				mExportDateLayout.setVisibility(View.VISIBLE);
-				mExportSeparatorLayout.setVisibility(View.GONE);
+				mCsvOptionsLayout.setVisibility(View.GONE);
 				break;
 
 			case R.id.radio_xml_format:
 				mExportFormat = ExportFormat.XML;
 				mExportWarningTextView.setText(R.string.export_warning_xml);
 				mExportDateLayout.setVisibility(View.GONE);
-				mExportSeparatorLayout.setVisibility(View.GONE);
+				mCsvOptionsLayout.setVisibility(View.GONE);
 				break;
 
 			case R.id.radio_csv_accounts_format:
 				mExportFormat = ExportFormat.CSVA;
 				mExportWarningTextView.setText("");
 				mExportDateLayout.setVisibility(View.GONE);
-				mExportSeparatorLayout.setVisibility(View.VISIBLE);
+				mCsvOptionsLayout.setVisibility(View.VISIBLE);
 				break;
 			case R.id.radio_csv_transactions_format:
 				mExportFormat = ExportFormat.CSVT;
 				mExportWarningTextView.setText("");
 				mExportDateLayout.setVisibility(View.GONE);
-				mExportSeparatorLayout.setVisibility(View.VISIBLE);
+				mCsvOptionsLayout.setVisibility(View.VISIBLE);
 				break;
 
 			case R.id.radio_separator_comma_format:

diff --git a/app/src/main/res/layout/fragment_export_form.xml b/app/src/main/res/layout/fragment_export_form.xml
@@ -105,7 +105,9 @@
                     android:text="CSV-trans"/>
             </RadioGroup>
         </LinearLayout>
-        <LinearLayout android:orientation="horizontal"
+        <LinearLayout
+            android:id="@+id/layout_csv_options"
+            android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"