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

Merge remote-tracking branch 'refs/remotes/commons-app/2.7.x-release' into 2.7.2-release

Browse source
This commit is contained in:
misaochan 2018-06-11 17:22:48 +10:00
commit a8ed9f0da9
4 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
View file

@ -144,6 +144,7 @@ public class ContributionsActivity
if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
setUploadCount(); setUploadCount();
} }
} }
@Override @Override

10
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -7,7 +7,6 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -48,8 +47,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
TextView waitingMessage; TextView waitingMessage;
@BindView(R.id.loadingContributionsProgressBar) @BindView(R.id.loadingContributionsProgressBar)
ProgressBar progressBar; ProgressBar progressBar;
@BindView(R.id.swipeRefreshLayout)
SwipeRefreshLayout swipeRefreshLayout;
@Inject @Inject
@Named("prefs") @Named("prefs")
@ -67,13 +64,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
ButterKnife.bind(this, v); ButterKnife.bind(this, v);
contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity()); contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity());
swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
((ContributionsListAdapter)contributionsList.getAdapter()).notifyDataSetChanged();
swipeRefreshLayout.setRefreshing(false);
}
});
if (savedInstanceState != null) { if (savedInstanceState != null) {
Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position")); Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position"));
contributionsList.setSelection(savedInstanceState.getInt("grid-position")); contributionsList.setSelection(savedInstanceState.getInt("grid-position"));

7
app/src/main/res/layout/fragment_contributions.xml
View file

@ -24,11 +24,6 @@
android:id="@+id/loadingContributionsProgressBar" android:id="@+id/loadingContributionsProgressBar"
/> />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<GridView <GridView
android:id="@+id/contributionsList" android:id="@+id/contributionsList"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -40,5 +35,5 @@
android:fadingEdge="none" android:fadingEdge="none"
android:fastScrollEnabled="true" android:fastScrollEnabled="true"
/> />
</android.support.v4.widget.SwipeRefreshLayout>
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/values/strings.xml
View file

@ -102,7 +102,7 @@
<string name="preference_license">Default License</string> <string name="preference_license">Default License</string>
<string name="use_previous">Use previous title/description</string> <string name="use_previous">Use previous title/description</string>
<string name="allow_gps">Automatically get current location</string> <string name="allow_gps">Automatically get current location</string>
<string name="allow_gps_summary">Retrieve current location to offer category suggestions if image is not geotagged</string> <string name="allow_gps_summary">Retrieves current location if image is not geotagged, and geotags image with it. Warning: This will reveal your current location.</string>
<string name="preference_theme">Night mode</string> <string name="preference_theme">Night mode</string>
<string name="preference_theme_summary">Use dark theme</string> <string name="preference_theme_summary">Use dark theme</string>
<string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string> <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>