Skip to content

Commit 034bf52

Browse files
committed
Hide CSV export separator label when another export format is selected
1 parent 0aae30a commit 034bf52

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

app/src/main/java/org/gnucash/android/export/csv/CsvTransactionsExporter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package org.gnucash.android.export.csv;
1818

19-
import android.database.sqlite.SQLiteDatabase;
2019
import android.database.Cursor;
20+
import android.database.sqlite.SQLiteDatabase;
21+
2122
import com.crashlytics.android.Crashlytics;
2223

2324
import org.gnucash.android.export.ExportParams;
2425
import org.gnucash.android.export.Exporter;
2526
import org.gnucash.android.model.Account;
26-
import org.gnucash.android.model.Commodity;
2727
import org.gnucash.android.model.Money;
2828
import org.gnucash.android.model.Split;
2929
import org.gnucash.android.model.Transaction;
@@ -40,6 +40,7 @@
4040
import java.util.Comparator;
4141
import java.util.Date;
4242
import java.util.List;
43+
import java.util.Locale;
4344

4445
/**
4546
* Creates a GnuCash CSV transactions representation of the accounts and transactions
@@ -50,7 +51,7 @@ public class CsvTransactionsExporter extends Exporter{
5051

5152
private char mCsvSeparator;
5253

53-
private DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
54+
private DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy", Locale.US);
5455

5556
private Comparator<Split> splitComparator = new Comparator<Split>() {
5657
@Override

app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public class ExportFormFragment extends Fragment implements
144144
@BindView(R.id.radio_separator_comma_format) RadioButton mSeparatorCommaButton;
145145
@BindView(R.id.radio_separator_colon_format) RadioButton mSeparatorColonButton;
146146
@BindView(R.id.radio_separator_semicolon_format) RadioButton mSeparatorSemicolonButton;
147+
@BindView(R.id.layout_csv_options) LinearLayout mCsvOptionsLayout;
147148

148149
@BindView(R.id.recurrence_options) View mRecurrenceOptionsView;
149150
/**
@@ -207,27 +208,27 @@ private void onRadioButtonClicked(View view){
207208
mExportWarningTextView.setVisibility(View.GONE);
208209
}
209210
mExportDateLayout.setVisibility(View.VISIBLE);
210-
mExportSeparatorLayout.setVisibility(View.GONE);
211+
mCsvOptionsLayout.setVisibility(View.GONE);
211212
break;
212213

213214
case R.id.radio_xml_format:
214215
mExportFormat = ExportFormat.XML;
215216
mExportWarningTextView.setText(R.string.export_warning_xml);
216217
mExportDateLayout.setVisibility(View.GONE);
217-
mExportSeparatorLayout.setVisibility(View.GONE);
218+
mCsvOptionsLayout.setVisibility(View.GONE);
218219
break;
219220

220221
case R.id.radio_csv_accounts_format:
221222
mExportFormat = ExportFormat.CSVA;
222223
mExportWarningTextView.setText("");
223224
mExportDateLayout.setVisibility(View.GONE);
224-
mExportSeparatorLayout.setVisibility(View.VISIBLE);
225+
mCsvOptionsLayout.setVisibility(View.VISIBLE);
225226
break;
226227
case R.id.radio_csv_transactions_format:
227228
mExportFormat = ExportFormat.CSVT;
228229
mExportWarningTextView.setText("");
229230
mExportDateLayout.setVisibility(View.GONE);
230-
mExportSeparatorLayout.setVisibility(View.VISIBLE);
231+
mCsvOptionsLayout.setVisibility(View.VISIBLE);
231232
break;
232233

233234
case R.id.radio_separator_comma_format:

app/src/main/res/layout/fragment_export_form.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
android:text="CSV-trans"/>
106106
</RadioGroup>
107107
</LinearLayout>
108-
<LinearLayout android:orientation="horizontal"
108+
<LinearLayout
109+
android:id="@+id/layout_csv_options"
110+
android:orientation="horizontal"
109111
android:layout_width="match_parent"
110112
android:layout_height="wrap_content"
111113
android:gravity="center_vertical"

0 commit comments

Comments
 (0)