Skip to content

Commit 6788412

Browse files
committed
Remove CSV accounts exports from the UI - only transactions will be exported
1 parent 5764f86 commit 6788412

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ public class ExportFormFragment extends Fragment implements
139139
@BindView(R.id.radio_ofx_format) RadioButton mOfxRadioButton;
140140
@BindView(R.id.radio_qif_format) RadioButton mQifRadioButton;
141141
@BindView(R.id.radio_xml_format) RadioButton mXmlRadioButton;
142-
@BindView(R.id.radio_csv_accounts_format) RadioButton mCsvAccountsRadioButton;
143142
@BindView(R.id.radio_csv_transactions_format) RadioButton mCsvTransactionsRadioButton;
144143

145144
@BindView(R.id.radio_separator_comma_format) RadioButton mSeparatorCommaButton;
@@ -219,15 +218,9 @@ private void onRadioButtonClicked(View view){
219218
mCsvOptionsLayout.setVisibility(View.GONE);
220219
break;
221220

222-
case R.id.radio_csv_accounts_format:
223-
mExportFormat = ExportFormat.CSVA;
224-
mExportWarningTextView.setText("");
225-
mExportDateLayout.setVisibility(View.GONE);
226-
mCsvOptionsLayout.setVisibility(View.VISIBLE);
227-
break;
228221
case R.id.radio_csv_transactions_format:
229222
mExportFormat = ExportFormat.CSVT;
230-
mExportWarningTextView.setText("");
223+
mExportWarningTextView.setText("Exports registered transactions as CSV");
231224
mExportDateLayout.setVisibility(View.GONE);
232225
mCsvOptionsLayout.setVisibility(View.VISIBLE);
233226
break;
@@ -254,8 +247,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
254247
bindViewListeners();
255248

256249
String[] export_format_strings = getResources().getStringArray(R.array.export_formats);
257-
mCsvAccountsRadioButton.setText(export_format_strings[3]);
258-
mCsvTransactionsRadioButton.setText(export_format_strings[4]);
250+
mCsvTransactionsRadioButton.setText(export_format_strings[3]);
259251

260252
return view;
261253
}
@@ -506,7 +498,6 @@ public void onClick(View view) {
506498
mOfxRadioButton.setOnClickListener(radioClickListener);
507499
mQifRadioButton.setOnClickListener(radioClickListener);
508500
mXmlRadioButton.setOnClickListener(radioClickListener);
509-
mCsvAccountsRadioButton.setOnClickListener(radioClickListener);
510501
mCsvTransactionsRadioButton.setOnClickListener(radioClickListener);
511502

512503
mSeparatorCommaButton.setOnClickListener(radioClickListener);
@@ -518,7 +509,6 @@ public void onClick(View view) {
518509
case QIF: mQifRadioButton.performClick(); break;
519510
case OFX: mOfxRadioButton.performClick(); break;
520511
case XML: mXmlRadioButton.performClick(); break;
521-
case CSVA: mCsvAccountsRadioButton.performClick(); break;
522512
case CSVT: mCsvTransactionsRadioButton.performClick(); break;
523513
}
524514

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
android:layout_height="wrap_content"
7474
android:layout_marginLeft="35dp"
7575
android:gravity="center_vertical"
76-
android:orientation="vertical">
76+
android:orientation="horizontal">
7777

7878
<RadioButton android:id="@+id/radio_qif_format"
7979
android:layout_width="wrap_content"
@@ -93,16 +93,11 @@
9393
android:layout_height="wrap_content"
9494
android:layout_marginRight="20dp"
9595
android:text="XML"/>
96-
<RadioButton android:id="@+id/radio_csv_accounts_format"
97-
android:layout_width="wrap_content"
98-
android:layout_height="wrap_content"
99-
android:layout_marginRight="20dp"
100-
android:text="CSV-acc"/>
10196
<RadioButton android:id="@+id/radio_csv_transactions_format"
10297
android:layout_width="wrap_content"
10398
android:layout_height="wrap_content"
10499
android:layout_marginRight="20dp"
105-
android:text="CSV-trans"/>
100+
android:text="CSV"/>
106101
</RadioGroup>
107102
</LinearLayout>
108103
<LinearLayout

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@
178178
<item>QIF</item>
179179
<item>OFX</item>
180180
<item>XML</item>
181-
<item>CSV-accounts</item>
182-
<item>CSV-transactions</item>
181+
<item>CSV</item>
183182
</string-array>
184183
<!-- Default title for color picker dialog [CHAR LIMIT=30] -->
185184
<string name="color_picker_default_title">Select a Color</string>

0 commit comments

Comments
 (0)