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

Some codes

Browse source
This commit is contained in:
neslihanturan 2018-05-20 13:02:58 +03:00 • committed by maskara
parent d572e8b529
commit a7da30d01c
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java
View file

@ -196,6 +196,7 @@ public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {
String reason = input.getText().toString(); String reason = input.getText().toString();
((ReviewActivity)context).reviewController.swipeToNext(); ((ReviewActivity)context).reviewController.swipeToNext();
((ReviewActivity)context).runRandomizer();
DeleteTask deleteTask = new DeleteTask(context, media, reason); DeleteTask deleteTask = new DeleteTask(context, media, reason);
deleteTask.execute(); deleteTask.execute();

17
app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
View file

@ -1,11 +1,9 @@
package fr.free.nrw.commons.review; package fr.free.nrw.commons.review;
import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
@ -15,14 +13,12 @@ import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import com.viewpagerindicator.CirclePageIndicator; import com.viewpagerindicator.CirclePageIndicator;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@ -30,7 +26,6 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.auth.AuthenticatedActivity; import fr.free.nrw.commons.auth.AuthenticatedActivity;
import fr.free.nrw.commons.mwapi.MediaResult; import fr.free.nrw.commons.mwapi.MediaResult;
import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.mwapi.MediaWikiApi;
@ -53,7 +48,7 @@ public class ReviewActivity extends AuthenticatedActivity {
DrawerLayout drawerLayout; DrawerLayout drawerLayout;
@BindView(R.id.reviewPager) @BindView(R.id.reviewPager)
ViewPager pager; ViewPager reviewPager;
@Inject MediaWikiApi mwApi; @Inject MediaWikiApi mwApi;
@ -84,9 +79,9 @@ public class ReviewActivity extends AuthenticatedActivity {
reviewController = new ReviewController(this); reviewController = new ReviewController(this);
reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager()); reviewPagerAdapter = new ReviewPagerAdapter(getSupportFragmentManager());
pager.setAdapter(reviewPagerAdapter); reviewPager.setAdapter(reviewPagerAdapter);
reviewPagerAdapter.getItem(0); reviewPagerAdapter.getItem(0);
pagerIndicator.setViewPager(pager); pagerIndicator.setViewPager(reviewPager);
runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added
} }
@ -109,10 +104,12 @@ public class ReviewActivity extends AuthenticatedActivity {
} }
public boolean runRandomizer() { public boolean runRandomizer() {
ProgressBar progressBar = reviewPagerAdapter.reviewImageFragments[pager.getCurrentItem()].progressBar; ProgressBar progressBar = reviewPagerAdapter.reviewImageFragments[reviewPager.getCurrentItem()].progressBar;
if (progressBar != null) { if (progressBar != null) {
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
} }
reviewPager.setCurrentItem(0);
Observable.fromCallable(() -> { Observable.fromCallable(() -> {
Media result = null; Media result = null;
try { try {
@ -137,7 +134,7 @@ public class ReviewActivity extends AuthenticatedActivity {
private void updateImage(Media result) { private void updateImage(Media result) {
reviewController.onImageRefreshed(result.getFilename()); //file name is updated reviewController.onImageRefreshed(result.getFilename()); //file name is updated
reviewPagerAdapter.updateFilename(); reviewPagerAdapter.updateFilename();
pager.setCurrentItem(0); reviewPager.setCurrentItem(0);
Observable.fromCallable(() -> { Observable.fromCallable(() -> {
MediaResult media = mwApi.fetchMediaByFilename("File:" + result.getFilename()); MediaResult media = mwApi.fetchMediaByFilename("File:" + result.getFilename());
return MediaDataExtractorUtil.extractCategories(media.getWikiSource()); return MediaDataExtractorUtil.extractCategories(media.getWikiSource());

5
app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
View file

@ -5,8 +5,6 @@ import android.support.v4.view.ViewPager;
import java.util.ArrayList; import java.util.ArrayList;
import javax.inject.Inject;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.delete.DeleteTask; import fr.free.nrw.commons.delete.DeleteTask;
@ -25,7 +23,7 @@ public class ReviewController {
ReviewController(Context context) { ReviewController(Context context) {
reviewActivity = (ReviewActivity)context; reviewActivity = (ReviewActivity)context;
reviewPagerAdapter = reviewActivity.reviewPagerAdapter; reviewPagerAdapter = reviewActivity.reviewPagerAdapter;
viewPager = ((ReviewActivity)context).pager; viewPager = ((ReviewActivity)context).reviewPager;
} }
public void onImageRefreshed(String fileName) { public void onImageRefreshed(String fileName) {
@ -43,7 +41,6 @@ public class ReviewController {
viewPager.setCurrentItem(nextPos); viewPager.setCurrentItem(nextPos);
} else { } else {
reviewActivity.runRandomizer(); reviewActivity.runRandomizer();
viewPager.setCurrentItem(0);
} }
} }