Merge branch 'master' into directNearbyUploadsNew

This commit is contained in:
Vivek Maskara 2018-03-21 17:54:03 +05:30 committed by GitHub
commit 50d9cff8c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
152 changed files with 2687 additions and 945 deletions

View file

@ -9,7 +9,10 @@ import dagger.android.support.AndroidSupportInjectionModule;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.auth.LoginActivity;
import fr.free.nrw.commons.contributions.Contribution;
import fr.free.nrw.commons.contributions.ContributionsActivity;
import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
import fr.free.nrw.commons.delete.DeleteTask;
import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
import fr.free.nrw.commons.settings.SettingsFragment;
import fr.free.nrw.commons.nearby.PlaceRenderer;
@ -35,6 +38,8 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
void inject(LoginActivity activity);
void inject(DeleteTask deleteTask);
void inject(SettingsFragment fragment);
@Override