mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
Call randomizer whenever the activity is ready
This commit is contained in:
parent
76b8df2b28
commit
77639ce64f
1 changed files with 25 additions and 19 deletions
|
|
@ -87,6 +87,8 @@ public class ReviewActivity extends AuthenticatedActivity {
|
||||||
pager.setAdapter(reviewPagerAdapter);
|
pager.setAdapter(reviewPagerAdapter);
|
||||||
reviewPagerAdapter.getItem(0);
|
reviewPagerAdapter.getItem(0);
|
||||||
pagerIndicator.setViewPager(pager);
|
pagerIndicator.setViewPager(pager);
|
||||||
|
|
||||||
|
runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -100,30 +102,34 @@ public class ReviewActivity extends AuthenticatedActivity {
|
||||||
int id = item.getItemId();
|
int id = item.getItemId();
|
||||||
|
|
||||||
if (id == R.id.action_review_randomizer) {
|
if (id == R.id.action_review_randomizer) {
|
||||||
Observable.fromCallable(() -> {
|
return runRandomizer();
|
||||||
Media result = null;
|
|
||||||
try {
|
|
||||||
result = mwApi.getRecentRandomImage();
|
|
||||||
|
|
||||||
//String thumBaseUrl = Utils.makeThumbBaseUrl(result.getFilename());
|
|
||||||
//reviewPagerAdapter.currentThumbBasedUrl = thumBaseUrl;
|
|
||||||
|
|
||||||
//Log.d("review", result.getWikiSource());
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
|
||||||
Log.d("review", e.toString());
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
})
|
|
||||||
.subscribeOn(Schedulers.io())
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe(this::updateImage);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean runRandomizer() {
|
||||||
|
Observable.fromCallable(() -> {
|
||||||
|
Media result = null;
|
||||||
|
try {
|
||||||
|
result = mwApi.getRecentRandomImage();
|
||||||
|
|
||||||
|
//String thumBaseUrl = Utils.makeThumbBaseUrl(result.getFilename());
|
||||||
|
//reviewPagerAdapter.currentThumbBasedUrl = thumBaseUrl;
|
||||||
|
|
||||||
|
//Log.d("review", result.getWikiSource());
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.d("review", e.toString());
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
})
|
||||||
|
.subscribeOn(Schedulers.io())
|
||||||
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
|
.subscribe(this::updateImage);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
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();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue