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

Manual injection into PlaceRenderer constructor to allow dependency injection

Browse source
This commit is contained in:
misaochan 2018-02-07 19:43:31 +10:00 • committed by maskara
parent 65b0b52b01
commit 119c4fb782
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
View file

@ -13,6 +13,7 @@ import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
import fr.free.nrw.commons.modifications.ModificationsSyncAdapter; import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
import fr.free.nrw.commons.settings.SettingsFragment; import fr.free.nrw.commons.settings.SettingsFragment;
import fr.free.nrw.commons.nearby.DirectUpload; import fr.free.nrw.commons.nearby.DirectUpload;
import fr.free.nrw.commons.nearby.PlaceRenderer;
@Singleton @Singleton
@Component(modules = { @Component(modules = {
@ -40,6 +41,7 @@ public interface CommonsApplicationComponent extends AndroidInjector<Application
@Override @Override
void inject(ApplicationlessInjection instance); void inject(ApplicationlessInjection instance);
void inject(DirectUpload directUpload); void inject(DirectUpload directUpload);
void inject(PlaceRenderer placeRenderer);
@Component.Builder @Component.Builder
@SuppressWarnings({"WeakerAccess", "unused"}) @SuppressWarnings({"WeakerAccess", "unused"})

1
app/src/main/java/fr/free/nrw/commons/di/FragmentBuilderModule.java
View file

@ -47,4 +47,5 @@ public abstract class FragmentBuilderModule {
@ContributesAndroidInjector @ContributesAndroidInjector
abstract SingleUploadFragment bindSingleUploadFragment(); abstract SingleUploadFragment bindSingleUploadFragment();
} }

21
app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
View file

@ -24,11 +24,12 @@ import javax.inject.Named;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.contributions.ContributionController; import fr.free.nrw.commons.contributions.ContributionController;
import timber.log.Timber; import timber.log.Timber;
class PlaceRenderer extends Renderer<Place> { public class PlaceRenderer extends Renderer<Place> {
@BindView(R.id.tvName) TextView tvName; @BindView(R.id.tvName) TextView tvName;
@BindView(R.id.tvDesc) TextView tvDesc; @BindView(R.id.tvDesc) TextView tvDesc;
@ -54,12 +55,22 @@ class PlaceRenderer extends Renderer<Place> {
@Inject @Named("prefs") SharedPreferences prefs; @Inject @Named("prefs") SharedPreferences prefs;
@Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs; @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
PlaceRenderer(){ public PlaceRenderer(){
openedItems = new ArrayList<>(); openedItems = new ArrayList<>();
} }
PlaceRenderer(Fragment fragment) { /**
@Inject
PlaceRenderer(@Named("prefs") SharedPreferences prefs, @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs, Fragment fragment) {
this.fragment = fragment; this.fragment = fragment;
this.prefs = prefs;
this.directPrefs = directPrefs;
openedItems = new ArrayList<>();
}
*/
public PlaceRenderer(Fragment fragment) {
this.fragment = fragment;
((CommonsApplication) getContext().getApplicationContext()).injector().inject(this);
openedItems = new ArrayList<>(); openedItems = new ArrayList<>();
} }
@ -103,7 +114,7 @@ class PlaceRenderer extends Renderer<Place> {
Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
controller = new ContributionController(fragment); controller = new ContributionController(fragment);
DirectUpload directUpload = new DirectUpload(fragment, controller); DirectUpload directUpload = new DirectUpload(fragment, controller);
storeSharedPrefs(); //storeSharedPrefs();
directUpload.initiateCameraUpload(); directUpload.initiateCameraUpload();
}); });
@ -111,7 +122,7 @@ class PlaceRenderer extends Renderer<Place> {
Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
controller = new ContributionController(fragment); controller = new ContributionController(fragment);
DirectUpload directUpload = new DirectUpload(fragment, controller); DirectUpload directUpload = new DirectUpload(fragment, controller);
storeSharedPrefs(); //storeSharedPrefs();
directUpload.initiateGalleryUpload(); directUpload.initiateGalleryUpload();
}); });
} }