Skip to content

Commit 839a61b

Browse files
authored
Change BiMap to HashMap (commons-app#3572)
* Change BiMap to HashMap * Change containsKey to containsValue and delete BiMap.java
1 parent 630f0a1 commit 839a61b

File tree

3 files changed

+6
-48
lines changed

3 files changed

+6
-48
lines changed

app/src/main/java/fr/free/nrw/commons/upload/DescriptionsAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
import androidx.recyclerview.widget.RecyclerView;
1919

2020
import java.util.ArrayList;
21+
import java.util.HashMap;
2122
import java.util.List;
2223

2324
import butterknife.BindView;
2425
import butterknife.ButterKnife;
2526
import fr.free.nrw.commons.R;
2627
import fr.free.nrw.commons.utils.AbstractTextWatcher;
27-
import fr.free.nrw.commons.utils.BiMap;
2828
import timber.log.Timber;
2929

3030
public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapter.ViewHolder> {
3131

3232
private List<Description> descriptions;
3333
private Callback callback;
3434

35-
private BiMap<AdapterView, String> selectedLanguages;
35+
private HashMap<AdapterView, String> selectedLanguages;
3636
private String savedLanguageValue;
3737

3838
public DescriptionsAdapter(String savedLanguageValue) {
3939
descriptions = new ArrayList<>();
40-
selectedLanguages = new BiMap<>();
40+
selectedLanguages = new HashMap<>();
4141
this.savedLanguageValue = savedLanguageValue;
4242
}
4343

@@ -47,7 +47,7 @@ public void setCallback(Callback callback) {
4747

4848
public void setItems(List<Description> descriptions) {
4949
this.descriptions = descriptions;
50-
selectedLanguages = new BiMap<>();
50+
selectedLanguages = new HashMap<>();
5151
notifyDataSetChanged();
5252
}
5353

app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import android.widget.ArrayAdapter
88
import androidx.annotation.LayoutRes
99
import androidx.core.os.ConfigurationCompat
1010
import fr.free.nrw.commons.R
11-
import fr.free.nrw.commons.utils.BiMap
1211
import fr.free.nrw.commons.utils.LangCodeUtils
1312
import kotlinx.android.extensions.LayoutContainer
1413
import kotlinx.android.synthetic.main.row_item_languages_spinner.*
@@ -24,7 +23,7 @@ import java.util.*
2423
*/
2524
class SpinnerLanguagesAdapter constructor(
2625
context: Context,
27-
private val selectedLanguages: BiMap<*, String>
26+
private val selectedLanguages: HashMap<*, String>
2827
) : ArrayAdapter<Any?>(context, -1) {
2928

3029
private val languageNamesList: List<String>
@@ -41,7 +40,7 @@ class SpinnerLanguagesAdapter constructor(
4140
var selectedLangCode = ""
4241

4342
override fun isEnabled(position: Int) = languageCodesList[position].let {
44-
it.isNotEmpty() && !selectedLanguages.containsKey(it) && it != selectedLangCode
43+
it.isNotEmpty() && !selectedLanguages.containsValue(it) && it != selectedLangCode
4544
}
4645

4746
override fun getCount() = languageNamesList.size

app/src/main/java/fr/free/nrw/commons/utils/BiMap.java

-41
This file was deleted.

0 commit comments

Comments
 (0)