mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '2.11-release'

Browse source
This commit is contained in:
Josephine Lim 2019-07-29 21:45:27 +10:00
commit 016022547c
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,5 +1,12 @@
# Wikimedia Commons for Android # Wikimedia Commons for Android
## v2.11.0
- Refactored upload process, explore/media details, and peer review to use MVP architecture
- Refactored all AsyncTasks to use RxAndroid
- Partial migration to Retrofit
- Allow users to remove EXIF tags from their uploads if desired
- Multiple crash and bug fixes
## v2.10.2 ## v2.10.2
- Fixed remaining issues with date image taken - Fixed remaining issues with date image taken
- Fixed database crash - Fixed database crash

4
app/build.gradle
View file

@ -108,8 +108,8 @@ android {
defaultConfig { defaultConfig {
applicationId 'fr.free.nrw.commons' applicationId 'fr.free.nrw.commons'
versionCode 243 versionCode 475
versionName '2.10.2' versionName '2.11.0'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion 19 minSdkVersion 19

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

@ -147,7 +147,6 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
spinnerDescriptionLanguages.getContext(), spinnerDescriptionLanguages.getContext(),
R.layout.row_item_languages_spinner, selectedLanguages, R.layout.row_item_languages_spinner, selectedLanguages,
savedLanguageValue); savedLanguageValue);
languagesAdapter.notifyDataSetChanged();
spinnerDescriptionLanguages.setAdapter(languagesAdapter); spinnerDescriptionLanguages.setAdapter(languagesAdapter);
spinnerDescriptionLanguages.setOnItemSelectedListener(new OnItemSelectedListener() { spinnerDescriptionLanguages.setOnItemSelectedListener(new OnItemSelectedListener() {
@ -162,6 +161,7 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
selectedLanguages.put(adapterView, languageCode); selectedLanguages.put(adapterView, languageCode);
((SpinnerLanguagesAdapter) adapterView ((SpinnerLanguagesAdapter) adapterView
.getAdapter()).selectedLangCode = languageCode; .getAdapter()).selectedLangCode = languageCode;
spinnerDescriptionLanguages.setSelection(position);
Timber.d("Description language code is: "+languageCode); Timber.d("Description language code is: "+languageCode);
} }
@ -171,7 +171,7 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
}); });
if (description.getSelectedLanguageIndex() == -1) { if (description.getSelectedLanguageIndex() == -1) {
if (savedLanguageValue != null) { if (!TextUtils.isEmpty(savedLanguageValue)) {
// If user has chosen a default language from settings activity savedLanguageValue is not null // If user has chosen a default language from settings activity savedLanguageValue is not null
spinnerDescriptionLanguages.setSelection(languagesAdapter.getIndexOfLanguageCode(savedLanguageValue)); spinnerDescriptionLanguages.setSelection(languagesAdapter.getIndexOfLanguageCode(savedLanguageValue));
} else { } else {
@ -180,7 +180,7 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
.getIndexOfUserDefaultLocale(spinnerDescriptionLanguages.getContext()); .getIndexOfUserDefaultLocale(spinnerDescriptionLanguages.getContext());
spinnerDescriptionLanguages.setSelection(defaultLocaleIndex, true); spinnerDescriptionLanguages.setSelection(defaultLocaleIndex, true);
} else { } else {
spinnerDescriptionLanguages.setSelection(0); spinnerDescriptionLanguages.setSelection(0,true);
} }
} }

7
app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java
View file

@ -139,14 +139,7 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
String languageCode = LangCodeUtils.fixLanguageCode(languageCodesList.get(position)); String languageCode = LangCodeUtils.fixLanguageCode(languageCodesList.get(position));
final String languageName = StringUtils.capitalize(languageNamesList.get(position)); final String languageName = StringUtils.capitalize(languageNamesList.get(position));
if(savedLanguageValue.equals("")){
savedLanguageValue = Locale.getDefault().getLanguage();
}
if (!isDropDownView) { if (!isDropDownView) {
if( !dropDownClicked){
languageCode = LangCodeUtils.fixLanguageCode(savedLanguageValue);
}
view.setVisibility(View.GONE); view.setVisibility(View.GONE);
if (languageCode.length() > 2) if (languageCode.length() > 2)
tvLanguage.setText(languageCode.substring(0, 2)); tvLanguage.setText(languageCode.substring(0, 2));