From c62f4ae0b3f3a96eb5dac0f638ee1375ddccdcc8 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 11 May 2018 13:25:33 +0200 Subject: [PATCH] Text if choose only one extension #105 --- .../dialogs/CreateFileDialogFragment.java | 12 ++++++++++++ app/src/main/res/layout/file_creation.xml | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java index 7973f2dc0..99c24ec32 100644 --- a/app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/CreateFileDialogFragment.java @@ -35,11 +35,13 @@ import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.Spinner; +import android.widget.TextView; import com.kunzisoft.keepass.R; import com.kunzisoft.keepass.fileselect.FilePickerStylishActivity; @@ -153,6 +155,16 @@ public class CreateFileDialogFragment extends DialogFragment implements AdapterV ArrayAdapter dataAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_item, fileTypes); dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinner.setAdapter(dataAdapter); + // Or text if only one item https://github.com/Kunzisoft/KeePassDX/issues/105 + if (fileTypes.length == 1) { + ViewGroup.LayoutParams params = spinner.getLayoutParams(); + spinner.setVisibility(View.GONE); + TextView extensionTextView = new TextView(getContext()); + extensionTextView.setText(extension); + extensionTextView.setLayoutParams(params); + ViewGroup parentView = (ViewGroup) spinner.getParent(); + parentView.addView(extensionTextView); + } AlertDialog dialog = builder.create(); diff --git a/app/src/main/res/layout/file_creation.xml b/app/src/main/res/layout/file_creation.xml index adab0d66e..d03d98477 100644 --- a/app/src/main/res/layout/file_creation.xml +++ b/app/src/main/res/layout/file_creation.xml @@ -49,8 +49,8 @@ android:id="@+id/filename_input_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toLeftOf="@+id/file_types" - android:layout_toStartOf="@+id/file_types"> + android:layout_toLeftOf="@+id/container_file_type" + android:layout_toStartOf="@+id/container_file_type"> - + + android:layout_alignParentEnd="true" > + + +