Skip to content

Fixes: #3091 Odd code in CategoryImagesListFragment #3133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 1, 2020
Merged

Fixes: #3091 Odd code in CategoryImagesListFragment #3133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71343de
Issue: #3091
rtsketo Aug 15, 2019
c18a29a
Merge branch 'master' into master
rtsketo Aug 15, 2019
300ab45
Fixes: #3091
rtsketo Aug 16, 2019
ad4b626
Merge remote-tracking branch 'origin/master'
rtsketo Sep 21, 2019
a0b2cf6
Fixes: #3091
rtsketo Oct 31, 2019
310fdb2
Merge remote-tracking branch 'origin/master'
rtsketo Oct 31, 2019
4f993cc
Merge branch 'master' into rtsketo/master
domdomegg Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes: #3091 
Created an interface for methods viewPagerNotifyDataSetChanged() and requestMoreImages() commonly used by some Activities.
  • Loading branch information
@rtsketo
rtsketo committed Aug 16, 2019
commit 300ab45e6b9664211df96558c421b87dc899c8e0
8 changes: 0 additions & 8 deletions app/src/main/java/fr/free/nrw/commons/RequestAndNotifyInterface.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.contributions.ContributionController;
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
import fr.free.nrw.commons.theme.NavigationBaseActivity;

public class BookmarksActivity extends NavigationBaseActivity
implements FragmentManager.OnBackStackChangedListener,
MediaDetailPagerFragment.MediaDetailProvider,
AdapterView.OnItemClickListener, RequestAndNotifyInterface {
AdapterView.OnItemClickListener, CategoryImagesCallback {

private FragmentManager supportFragmentManager;
private BookmarksPagerAdapter adapter;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import dagger.android.support.DaggerFragment;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.category.GridViewAdapter;
import fr.free.nrw.commons.utils.NetworkUtils;
import fr.free.nrw.commons.utils.ViewUtil;
Expand Down Expand Up @@ -97,7 +97,7 @@ public void onResume() {
gridView.setVisibility(GONE);
if (gridAdapter != null) {
gridAdapter.clear();
((RequestAndNotifyInterface) getContext()).viewPagerNotifyDataSetChanged();
((CategoryImagesCallback) getContext()).viewPagerNotifyDataSetChanged();
}
initList();
}
Expand Down Expand Up @@ -199,7 +199,7 @@ private void handleSuccess(List<Media> collection) {
return;
}
gridAdapter.addItems(collection);
((RequestAndNotifyInterface) getContext()).viewPagerNotifyDataSetChanged();
((CategoryImagesCallback) getContext()).viewPagerNotifyDataSetChanged();
}
progressBar.setVisibility(GONE);
statusTextView.setVisibility(GONE);
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.explore.ViewPagerAdapter;
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
Expand All @@ -37,7 +36,7 @@

public class CategoryDetailsActivity extends NavigationBaseActivity
implements MediaDetailPagerFragment.MediaDetailProvider,
AdapterView.OnItemClickListener, RequestAndNotifyInterface {
AdapterView.OnItemClickListener, CategoryImagesCallback {


private FragmentManager supportFragmentManager;
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/fr/free/nrw/commons/category/CategoryImagesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.content.Context;
import android.content.Intent;
import android.database.DataSetObserver;
import android.os.Bundle;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
Expand All @@ -15,7 +14,6 @@
import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.auth.AuthenticatedActivity;
import fr.free.nrw.commons.explore.SearchActivity;
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
Expand All @@ -32,7 +30,7 @@ public class CategoryImagesActivity
extends AuthenticatedActivity
implements FragmentManager.OnBackStackChangedListener,
MediaDetailPagerFragment.MediaDetailProvider,
AdapterView.OnItemClickListener, RequestAndNotifyInterface {
AdapterView.OnItemClickListener, CategoryImagesCallback {


private FragmentManager supportFragmentManager;
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/category/CategoryImagesCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package fr.free.nrw.commons.category;

public interface CategoryImagesCallback {
void viewPagerNotifyDataSetChanged();
void requestMoreImages();
}


3 changes: 1 addition & 2 deletions app/src/main/java/fr/free/nrw/commons/category/CategoryImagesListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import dagger.android.support.DaggerFragment;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.utils.NetworkUtils;
import fr.free.nrw.commons.utils.ViewUtil;
Expand Down Expand Up @@ -250,7 +249,7 @@ private void handleSuccess(List<Media> collection) {
return;
}
gridAdapter.addItems(collection);
((RequestAndNotifyInterface) getContext()).viewPagerNotifyDataSetChanged();
((CategoryImagesCallback) getContext()).viewPagerNotifyDataSetChanged();
}

progressBar.setVisibility(GONE);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.jakewharton.rxbinding2.widget.RxSearchView;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.explore.categories.SearchCategoryFragment;
import fr.free.nrw.commons.explore.images.SearchImageFragment;
import fr.free.nrw.commons.explore.recentsearches.RecentSearchesFragment;
Expand All @@ -35,7 +35,7 @@
*/

public class SearchActivity extends NavigationBaseActivity
implements MediaDetailPagerFragment.MediaDetailProvider, RequestAndNotifyInterface {
implements MediaDetailPagerFragment.MediaDetailProvider, CategoryImagesCallback {

@BindView(R.id.toolbar_search) Toolbar toolbar;
@BindView(R.id.searchHistoryContainer) FrameLayout searchHistoryContainer;
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/explore/categories/ExploreActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.content.Context;
import android.content.Intent;
import android.database.DataSetObserver;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
Expand All @@ -23,7 +22,7 @@
import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.category.CategoryImagesListFragment;
import fr.free.nrw.commons.explore.SearchActivity;
import fr.free.nrw.commons.explore.ViewPagerAdapter;
Expand All @@ -38,7 +37,7 @@
public class ExploreActivity
extends NavigationBaseActivity
implements MediaDetailPagerFragment.MediaDetailProvider,
AdapterView.OnItemClickListener, RequestAndNotifyInterface {
AdapterView.OnItemClickListener, CategoryImagesCallback {

private static final String FEATURED_IMAGES_CATEGORY = "Category:Featured_pictures_on_Wikimedia_Commons";
private static final String MOBILE_UPLOADS_CATEGORY = "Category:Uploaded_with_Mobile/Android";
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,13 @@
import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.RequestAndNotifyInterface;
import fr.free.nrw.commons.category.CategoryImagesCallback;
import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.bookmarks.Bookmark;
import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
import fr.free.nrw.commons.category.CategoryDetailsActivity;
import fr.free.nrw.commons.category.CategoryImagesActivity;
import fr.free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.SearchActivity;
import fr.free.nrw.commons.explore.categories.ExploreActivity;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.utils.ImageUtils;
Expand Down Expand Up @@ -316,7 +312,7 @@ public void onPageScrolled(int i, float v, int i2) {
return;
}
if (i+1 >= adapter.getCount())
((RequestAndNotifyInterface) getContext()).requestMoreImages();
((CategoryImagesCallback) getContext()).requestMoreImages();

getActivity().invalidateOptionsMenu();
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
Expand Down