#110 - Rename SearchableSpinner into SearchableSpinnerView

app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java

@@ -81,7 +81,7 @@
 import org.gnucash.android.ui.util.RecurrenceViewClickListener;
 import org.gnucash.android.ui.util.widget.CalculatorEditText;
 import org.gnucash.android.ui.util.widget.TransactionTypeSwitch;
-import org.gnucash.android.ui.util.widget.searchablespinner.SearchableSpinner;
+import org.gnucash.android.ui.util.widget.searchablespinner.SearchableSpinnerView;
 import org.gnucash.android.util.QualifiedAccountNameCursorAdapter;
 
 import java.math.BigDecimal;
@@ -181,7 +181,7 @@ public class TransactionFormFragment extends Fragment implements
 	 * Spinner for selecting the transfer account
 	 */
     @BindView(R.id.input_transfer_account_spinner)
-    SearchableSpinner mTransferAccountSpinner;
+    SearchableSpinnerView mTransferAccountSpinnerView;
 
     /**
      * Checkbox indicating if this transaction should be saved as a template or not
@@ -271,7 +271,7 @@ public void onClick(View v) {
      */
     private void startTransferFunds() {
         Commodity fromCommodity = Commodity.getInstance((mTransactionsDbAdapter.getAccountCurrencyCode(mAccountUID)));
-        long id = mTransferAccountSpinner.getSelectedItemId();
+        long id = mTransferAccountSpinnerView.getSelectedItemId();
         String targetCurrencyCode = mAccountsDbAdapter.getCurrencyCode(mAccountsDbAdapter.getUID(id));
 
         if (fromCommodity.equals(Commodity.getInstance(targetCurrencyCode))
@@ -323,7 +323,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         //updateTransferAccountsList must only be called after initializing mAccountsDbAdapter
         updateTransferAccountsList();
 
-        mTransferAccountSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        mTransferAccountSpinnerView.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             /**
              * Flag for ignoring first call to this listener.
              * The first call is during layout, but we want it called only in response to user interaction
@@ -367,8 +367,8 @@ public void onNothingSelected(AdapterView<?> adapterView) {
             }
         });
 
-        mTransferAccountSpinner.setTitle(getString(R.string.select_transfer_account));
-        mTransferAccountSpinner.setPositiveButton(getString(R.string.alert_dialog_cancel));
+        mTransferAccountSpinnerView.setTitle(getString(R.string.select_transfer_account));
+        mTransferAccountSpinnerView.setPositiveButton(getString(R.string.alert_dialog_cancel));
 
         ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
         assert actionBar != null;
@@ -604,11 +604,14 @@ private void updateTransferAccountsList(){
         if (mCursor != null) {
             mCursor.close();
         }
-		mCursor = mAccountsDbAdapter.fetchAccountsOrderedByFavoriteAndFullName(conditions, new String[]{mAccountUID, AccountType.ROOT.name()});
+        mCursor = mAccountsDbAdapter.fetchAccountsOrderedByFavoriteAndFullName(conditions,
+                                                                               new String[]{mAccountUID,
+                                                                                            AccountType.ROOT.name()});
 
-        mAccountCursorAdapter = new QualifiedAccountNameCursorAdapter(getActivity(), mCursor);
+        mAccountCursorAdapter = new QualifiedAccountNameCursorAdapter(getActivity(),
+                                                                      mCursor);
 
-        mTransferAccountSpinner.setAdapter(mAccountCursorAdapter);
+        mTransferAccountSpinnerView.setAdapter(mAccountCursorAdapter);
 	}
 
     /**
@@ -706,7 +709,7 @@ public void onClick(View v) {
 	private void setSelectedTransferAccount(long accountId){
         int position = mAccountCursorAdapter.getPosition(mAccountsDbAdapter.getUID(accountId));
         if (position >= 0)
-            mTransferAccountSpinner.setSelection(position);
+            mTransferAccountSpinnerView.setSelection(position);
 	}
 
     /**
@@ -778,7 +781,7 @@ private List<Split> extractSplitsFromView(){
     private @NonNull String getTransferAccountUID() {
         String transferAcctUID;
         if (mUseDoubleEntry) {
-            long transferAcctId = mTransferAccountSpinner.getSelectedItemId();
+            long transferAcctId = mTransferAccountSpinnerView.getSelectedItemId();
             transferAcctUID = mAccountsDbAdapter.getUID(transferAcctId);
         } else {
             Commodity baseCommodity = mAccountsDbAdapter.getRecord(mAccountUID).getCommodity();
@@ -835,7 +838,7 @@ private boolean isMultiCurrencyTransaction(){
         if (!mUseDoubleEntry)
             return false;
 
-        String transferAcctUID = mAccountsDbAdapter.getUID(mTransferAccountSpinner.getSelectedItemId());
+        String transferAcctUID = mAccountsDbAdapter.getUID(mTransferAccountSpinnerView.getSelectedItemId());
         String currencyCode = mAccountsDbAdapter.getAccountCurrencyCode(mAccountUID);
         String transferCurrencyCode = mAccountsDbAdapter.getCurrencyCode(transferAcctUID);
 
@@ -961,7 +964,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 if (mAmountEditText.getValue() == null) {
                     Toast.makeText(getActivity(), R.string.toast_transanction_amount_required, Toast.LENGTH_SHORT).show();
                 }
-                if (mUseDoubleEntry && mTransferAccountSpinner.getCount() == 0){
+                if (mUseDoubleEntry && mTransferAccountSpinnerView.getCount() == 0){
                     Toast.makeText(getActivity(),
                             R.string.toast_disable_double_entry_to_save_transaction,
                             Toast.LENGTH_LONG).show();
@@ -981,7 +984,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
      */
     private boolean canSave(){
         return (mUseDoubleEntry && mAmountEditText.isInputValid()
-                                && mTransferAccountSpinner.getCount() > 0)
+                && mTransferAccountSpinnerView.getCount() > 0)
                || (!mUseDoubleEntry && mAmountEditText.isInputValid());
     }
 

app/src/main/java/org/gnucash/android/ui/util/widget/searchablespinner/SearchableSpinner.java → app/src/main/java/org/gnucash/android/ui/util/widget/searchablespinner/SearchableSpinnerView.java

@@ -5,27 +5,24 @@
 import android.content.ContextWrapper;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
-import android.database.Cursor;
 import android.support.v4.widget.CursorAdapter;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.SpinnerAdapter;
 
 import org.gnucash.android.R;
-import org.gnucash.android.db.DatabaseSchema;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class SearchableSpinner
+public class SearchableSpinnerView
         extends android.support.v7.widget.AppCompatSpinner
         implements View.OnTouchListener,
-                   SearchableListDialog.OnSearchableItemClickedListener {
+                   SearchableListDialogFragment.OnSearchableItemClickedListener {
 
     public static final int                  NO_ITEM_SELECTED = -1;
 
@@ -35,47 +32,47 @@ public class SearchableSpinner
     private             List                 _items;
     private             List                 _allItems;
 
-    private             SearchableListDialog _searchableListDialog;
+    private SearchableListDialogFragment _searchableListDialogFragment;
 
     private boolean       _isDirty;
 
-    // Adpater for Spinner based on data in a DB Cursor
-    private CursorAdapter _cursorAdapter;
+//    // Adpater for Spinner based on data in a DB Cursor
+//    private CursorAdapter _cursorAdapter;
 
     private String        _strHintText;
     private boolean       _isFromInit;
 
-    public SearchableSpinner(Context context) {
+    public SearchableSpinnerView(Context context) {
 
         super(context);
         this._context = context;
         init();
     }
 
-    public SearchableSpinner(Context context,
-                             AttributeSet attrs) {
+    public SearchableSpinnerView(Context context,
+                                 AttributeSet attrs) {
 
         super(context,
               attrs);
 
         this._context = context;
 
         TypedArray a = context.obtainStyledAttributes(attrs,
-                                                      R.styleable.SearchableSpinner);
+                                                      R.styleable.SearchableSpinnerView);
         final int N = a.getIndexCount();
         for (int i = 0; i < N; ++i) {
             int attr = a.getIndex(i);
-            if (attr == R.styleable.SearchableSpinner_hintText) {
+            if (attr == R.styleable.SearchableSpinnerView_hintText) {
                 _strHintText = a.getString(attr);
             }
         }
         a.recycle();
         init();
     }
 
-    public SearchableSpinner(Context context,
-                             AttributeSet attrs,
-                             int defStyleAttr) {
+    public SearchableSpinnerView(Context context,
+                                 AttributeSet attrs,
+                                 int defStyleAttr) {
 
         super(context,
               attrs,
@@ -92,10 +89,11 @@ private void init() {
         _items = new ArrayList();
 
         // Create Dialog instance
-        _searchableListDialog = SearchableListDialog.newInstance(_items);
+        // TODO TW C 2020-01-25 : Supprimer _items
+        _searchableListDialogFragment = SearchableListDialogFragment.makeInstance(this, _items);
 
         // S'abonner aux clicks sur un item
-        _searchableListDialog.setOnSearchableItemClickListener(this);
+        _searchableListDialogFragment.setOnSearchableItemClickListener(this);
 
         // S'abonner aux évènements onTouch
         setOnTouchListener(this);
@@ -116,47 +114,50 @@ private void init() {
     public boolean onTouch(View v,
                            MotionEvent event) {
 
-        if (_searchableListDialog.isAdded()) {
+        if (_searchableListDialogFragment.isAdded()) {
+            // dialog is already visible
 
             // NTD
 
         } else {
             // dialog is not visible
 
             if (event.getAction() == MotionEvent.ACTION_UP) {
-
-                if (null != _cursorAdapter) {
-
-                    // Refresh content #6
-                    // Change Start
-                    // Description: The items were only set initially, not reloading the data in the
-                    // spinner every time it is loaded with items in the adapter.
-                    _items.clear();
-                    _allItems.clear();
-
-                    //
-                    // Add items from DB Cursor
-                    //
-
-                    for (int i = 0; i < _cursorAdapter.getCount(); i++) {
-
-                        Cursor cursorOnRow = (Cursor) _cursorAdapter.getItem(i);
-
-                        final String accountFullName = cursorOnRow.getString(cursorOnRow.getColumnIndexOrThrow(DatabaseSchema.AccountEntry.COLUMN_FULL_NAME));
-
-                        // TODO TW C 2020-01-17 : Ajouter l'étoile pour les Favoris
-
-                        _items.add(accountFullName);
-
-                    } // for
-
-                    // Create a copy of the items
-                    _allItems.addAll(_items);
-
-                    // Display SearchableListDialog
-                    _searchableListDialog.show(scanForActivity(_context).getFragmentManager(),
-                                               "TAG");
-                }
+                // User has just clicked on the spinner
+
+//                if (null != _cursorAdapter) {
+//
+//                    //
+//                    // Open Search & List Dialog
+//                    //
+//
+//                    // Refresh content #6
+//                    // Change Start
+//                    // Description: The items were only set initially, not reloading the data in the
+//                    // spinner every time it is loaded with items in the adapter.
+//                    _items.clear();
+//                    _allItems.clear();
+//
+//                    // Create items from DB Cursor
+//                    for (int i = 0; i < _cursorAdapter.getCount(); i++) {
+//
+//                        Cursor cursorOnRow = (Cursor) _cursorAdapter.getItem(i);
+//
+//                        final String accountFullName = cursorOnRow.getString(cursorOnRow.getColumnIndexOrThrow(DatabaseSchema.AccountEntry.COLUMN_FULL_NAME));
+//
+//                        // TODO TW C 2020-01-17 : Ajouter l'étoile pour les Favoris
+//
+//                        _items.add(accountFullName);
+//
+//                    } // for
+//
+//                    // Create a copy of the items
+//                    _allItems.addAll(_items);
+
+                    // Display SearchableListDialogFragment
+                    _searchableListDialogFragment.show(scanForActivity(_context).getFragmentManager(),
+                                                       "TAG");
+//                }
             }
         }
 
@@ -170,64 +171,68 @@ public void onSearchableItemClicked(Object item,
 //        String accountFullName = (String) item;
 
 //        setSelection(_items.indexOf(item));
-        setSelection(_allItems.indexOf(item));
-
-        if (!_isDirty) {
-            _isDirty = true;
-            setAdapter(_cursorAdapter);
-//            setSelection(_items.indexOf(item));
-            setSelection(_allItems.indexOf(item));
-        }
+//        setSelection(_allItems.indexOf(item));
+        setSelection(position);
+
+//        if (!_isDirty) {
+//            _isDirty = true;
+//            setAdapter(_cursorAdapter);
+////            setSelection(_items.indexOf(item));
+//            setSelection(_allItems.indexOf(item));
+//        }
     }
 
 
     @Override
     public void setAdapter(SpinnerAdapter adapter) {
 
-        _cursorAdapter = (CursorAdapter) adapter;
-
-        if (!_isFromInit) {
-
-            // TODO TW C 2020-01-17 : Supprimer la partie ArrayAdapter
-            if (!TextUtils.isEmpty(_strHintText) && !_isDirty) {
-                //
-
-                //
-                ArrayAdapter arrayAdapter = new ArrayAdapter(_context,
-                                                             android.R.layout.simple_list_item_1,
-                                                             new String[]{_strHintText});
-                super.setAdapter(arrayAdapter);
-
-            } else {
-                super.setAdapter(adapter);
-            }
-
-        } else {
-            _isFromInit = false;
-            super.setAdapter(adapter);
-        }
+        super.setAdapter(adapter);
+
+//        _cursorAdapter = (CursorAdapter) adapter;
+//        _searchableListDialogFragment.setCursorAdapter((CursorAdapter) adapter);
+
+//        if (!_isFromInit) {
+//
+//            // TODO TW C 2020-01-17 : Supprimer la partie ArrayAdapter
+//            if (!TextUtils.isEmpty(_strHintText) && !_isDirty) {
+//                //
+//
+//                //
+//                ArrayAdapter arrayAdapter = new ArrayAdapter(_context,
+//                                                             android.R.layout.simple_list_item_1,
+//                                                             new String[]{_strHintText});
+//                super.setAdapter(arrayAdapter);
+//
+//            } else {
+//                super.setAdapter(adapter);
+//            }
+//
+//        } else {
+//            _isFromInit = false;
+//            super.setAdapter(adapter);
+//        }
     }
 
     public void setTitle(String strTitle) {
 
-        _searchableListDialog.setTitle(strTitle);
+        _searchableListDialogFragment.setTitle(strTitle);
     }
 
     public void setPositiveButton(String strPositiveButtonText) {
 
-        _searchableListDialog.setPositiveButton(strPositiveButtonText);
+        _searchableListDialogFragment.setPositiveButton(strPositiveButtonText);
     }
 
     public void setPositiveButton(String strPositiveButtonText,
                                   DialogInterface.OnClickListener onPositiveBtnClickListener) {
 
-        _searchableListDialog.setPositiveButton(strPositiveButtonText,
-                                                onPositiveBtnClickListener);
+        _searchableListDialogFragment.setPositiveButton(strPositiveButtonText,
+                                                        onPositiveBtnClickListener);
     }
 
-    public void setOnSearchTextChangedListener(SearchableListDialog.OnSearchTextChangedListener onSearchTextChangedListener) {
+    public void setOnSearchTextChangedListener(SearchableListDialogFragment.OnSearchTextChangedListener onSearchTextChangedListener) {
 
-        _searchableListDialog.setOnSearchTextChangedListener(onSearchTextChangedListener);
+        _searchableListDialogFragment.setOnSearchTextChangedListener(onSearchTextChangedListener);
     }
 
     private Activity scanForActivity(Context cont) {

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

@@ -101,7 +101,7 @@
                 <ImageView style="@style/FormIcon"
                     android:src="@drawable/ic_action_forward"/>
 
-                <org.gnucash.android.ui.util.widget.searchablespinner.SearchableSpinner
+                <org.gnucash.android.ui.util.widget.searchablespinner.SearchableSpinnerView
                     android:id="@+id/input_transfer_account_spinner"
                     android:layout_width="0dp"
                     android:layout_weight="5"

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

@@ -19,7 +19,7 @@
         <attr name="keyboardKeysLayout" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="SearchableSpinner">
+    <declare-styleable name="SearchableSpinnerView">
         <attr name="hintText" format="string"/>
     </declare-styleable>