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 index 3d6a2d6ab..e883305e2 100644 --- a/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java +++ b/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java @@ -139,7 +139,6 @@ public class ExportFormFragment extends Fragment implements @BindView(R.id.radio_ofx_format) RadioButton mOfxRadioButton; @BindView(R.id.radio_qif_format) RadioButton mQifRadioButton; @BindView(R.id.radio_xml_format) RadioButton mXmlRadioButton; - @BindView(R.id.radio_csv_accounts_format) RadioButton mCsvAccountsRadioButton; @BindView(R.id.radio_csv_transactions_format) RadioButton mCsvTransactionsRadioButton; @BindView(R.id.radio_separator_comma_format) RadioButton mSeparatorCommaButton; @@ -219,15 +218,9 @@ private void onRadioButtonClicked(View view){ mCsvOptionsLayout.setVisibility(View.GONE); break; - case R.id.radio_csv_accounts_format: - mExportFormat = ExportFormat.CSVA; - mExportWarningTextView.setText(""); - mExportDateLayout.setVisibility(View.GONE); - mCsvOptionsLayout.setVisibility(View.VISIBLE); - break; case R.id.radio_csv_transactions_format: mExportFormat = ExportFormat.CSVT; - mExportWarningTextView.setText(""); + mExportWarningTextView.setText("Exports registered transactions as CSV"); mExportDateLayout.setVisibility(View.GONE); mCsvOptionsLayout.setVisibility(View.VISIBLE); break; @@ -254,8 +247,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, bindViewListeners(); String[] export_format_strings = getResources().getStringArray(R.array.export_formats); - mCsvAccountsRadioButton.setText(export_format_strings[3]); - mCsvTransactionsRadioButton.setText(export_format_strings[4]); + mCsvTransactionsRadioButton.setText(export_format_strings[3]); return view; } @@ -506,7 +498,6 @@ public void onClick(View view) { mOfxRadioButton.setOnClickListener(radioClickListener); mQifRadioButton.setOnClickListener(radioClickListener); mXmlRadioButton.setOnClickListener(radioClickListener); - mCsvAccountsRadioButton.setOnClickListener(radioClickListener); mCsvTransactionsRadioButton.setOnClickListener(radioClickListener); mSeparatorCommaButton.setOnClickListener(radioClickListener); @@ -518,7 +509,6 @@ public void onClick(View view) { case QIF: mQifRadioButton.performClick(); break; case OFX: mOfxRadioButton.performClick(); break; case XML: mXmlRadioButton.performClick(); break; - case CSVA: mCsvAccountsRadioButton.performClick(); break; case CSVT: mCsvTransactionsRadioButton.performClick(); break; } diff --git a/app/src/main/res/layout/fragment_export_form.xml b/app/src/main/res/layout/fragment_export_form.xml index 5844a2300..aa3c8d3bd 100644 --- a/app/src/main/res/layout/fragment_export_form.xml +++ b/app/src/main/res/layout/fragment_export_form.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="35dp" android:gravity="center_vertical" - android:orientation="vertical"> + android:orientation="horizontal"> - + android:text="CSV"/> QIF OFX XML - CSV-accounts - CSV-transactions + CSV Select a Color