From 1adb052705f397d6c0cced60c357e0009e4074b2 Mon Sep 17 00:00:00 2001 From: Josephine Lim Date: Mon, 11 Jun 2018 16:53:23 +1000 Subject: [PATCH 1/2] Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails" (#1609) * Revert "Modify allow_gps_summary string (#1608)" This reverts commit 3b6c94c8d62e846faf83564a76a23b0b134cfbbb. * Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails" This reverts commit 5aba7459bdd71082410b3bb4cf9977d95ebc584e. --- .../commons/contributions/ContributionsActivity.java | 1 + .../contributions/ContributionsListFragment.java | 10 ---------- app/src/main/res/layout/fragment_contributions.xml | 7 +------ 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 312839a24..ad6cff606 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -144,6 +144,7 @@ public class ContributionsActivity if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ setUploadCount(); } + } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 2b6c56c43..ff400a8dd 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -7,7 +7,6 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; -import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.Menu; @@ -48,8 +47,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { TextView waitingMessage; @BindView(R.id.loadingContributionsProgressBar) ProgressBar progressBar; - @BindView(R.id.swipeRefreshLayout) - SwipeRefreshLayout swipeRefreshLayout; @Inject @Named("prefs") @@ -67,13 +64,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { ButterKnife.bind(this, v); contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity()); - swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - ((ContributionsListAdapter)contributionsList.getAdapter()).notifyDataSetChanged(); - swipeRefreshLayout.setRefreshing(false); - } - }); if (savedInstanceState != null) { Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position")); contributionsList.setSelection(savedInstanceState.getInt("grid-position")); diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml index d089c7053..fa53d9721 100644 --- a/app/src/main/res/layout/fragment_contributions.xml +++ b/app/src/main/res/layout/fragment_contributions.xml @@ -24,11 +24,6 @@ android:id="@+id/loadingContributionsProgressBar" /> - - - + \ No newline at end of file From 89defc5a33de6a29f73377c18b5e56c7c548a150 Mon Sep 17 00:00:00 2001 From: Josephine Lim Date: Mon, 11 Jun 2018 17:29:29 +1000 Subject: [PATCH 2/2] Versioning and changelog for v2.7.2 (#1610) * Versioning for v2.7.2 * Update changelog.md --- CHANGELOG.md | 3 +++ app/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c77174cf..1688b3b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Wikimedia Commons for Android +## v2.7.2 +- Modified subtext for "automatically get current location" setting to emphasize that it will reveal user's location + ## v2.7.1 - Fixed UI and permission issues with Nearby - Fixed issue with My Recent Uploads being empty diff --git a/app/build.gradle b/app/build.gradle index cbdc83468..a19fa9eae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,8 +91,8 @@ android { defaultConfig { applicationId 'fr.free.nrw.commons' - versionCode 84 - versionName '2.7.1' + versionCode 85 + versionName '2.7.2' setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) minSdkVersion project.minSdkVersion