mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-31 14:53:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring based on comments

Browse source
This commit is contained in:
maskara 2018-01-13 23:59:45 +05:30
parent e1afa6081e
commit eb3e448452
17 changed files with 51 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/di/ApplicationContext.java
View file

@ -1,10 +0,0 @@
package fr.free.nrw.commons.di;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import javax.inject.Qualifier;
@Qualifier
@Retention(RetentionPolicy.RUNTIME)
public @interface ApplicationContext {}

18
app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java
View file

@ -29,18 +29,12 @@ public class ApplicationlessInjection
private static ApplicationlessInjection instance = null;
@Inject
DispatchingAndroidInjector<Activity> activityInjector;
@Inject
DispatchingAndroidInjector<BroadcastReceiver> broadcastReceiverInjector;
@Inject
DispatchingAndroidInjector<android.app.Fragment> fragmentInjector;
@Inject
DispatchingAndroidInjector<Fragment> supportFragmentInjector;
@Inject
DispatchingAndroidInjector<Service> serviceInjector;
@Inject
DispatchingAndroidInjector<ContentProvider> contentProviderInjector;
@Inject DispatchingAndroidInjector<Activity> activityInjector;
@Inject DispatchingAndroidInjector<BroadcastReceiver> broadcastReceiverInjector;
@Inject DispatchingAndroidInjector<android.app.Fragment> fragmentInjector;
@Inject DispatchingAndroidInjector<Fragment> supportFragmentInjector;
@Inject DispatchingAndroidInjector<Service> serviceInjector;
@Inject DispatchingAndroidInjector<ContentProvider> contentProviderInjector;
private CommonsApplicationComponent commonsApplicationComponent;

2
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerAppCompatActivity.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java
View file

@ -12,7 +12,7 @@ import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.support.HasSupportFragmentInjector;
public abstract class FixedDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector {
public abstract class CommonsDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector {
@Inject
DispatchingAndroidInjector<Fragment> supportFragmentInjector;

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerBroadcastReceiver.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java
View file

@ -6,9 +6,9 @@ import android.content.Intent;
import dagger.android.AndroidInjector;
public abstract class FixedDaggerBroadcastReceiver extends BroadcastReceiver {
public abstract class CommonsDaggerBroadcastReceiver extends BroadcastReceiver {
public FixedDaggerBroadcastReceiver() {
public CommonsDaggerBroadcastReceiver() {
super();
}

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerContentProvider.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java
View file

@ -5,9 +5,9 @@ import android.content.ContentProvider;
import dagger.android.AndroidInjector;
public abstract class FixedDaggerContentProvider extends ContentProvider {
public abstract class CommonsDaggerContentProvider extends ContentProvider {
public FixedDaggerContentProvider() {
public CommonsDaggerContentProvider() {
super();
}

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerIntentService.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java
View file

@ -5,9 +5,9 @@ import android.app.Service;
import dagger.android.AndroidInjector;
public abstract class FixedDaggerIntentService extends IntentService {
public abstract class CommonsDaggerIntentService extends IntentService {
public FixedDaggerIntentService(String name) {
public CommonsDaggerIntentService(String name) {
super(name);
}

4
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerService.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java
View file

@ -4,9 +4,9 @@ import android.app.Service;
import dagger.android.AndroidInjector;
public abstract class FixedDaggerService extends Service {
public abstract class CommonsDaggerService extends Service {
public FixedDaggerService() {
public CommonsDaggerService() {
super();
}

2
app/src/main/java/fr/free/nrw/commons/di/FixedDaggerFragment.java → app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java
View file

@ -10,7 +10,7 @@ import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.support.HasSupportFragmentInjector;
public abstract class FixedDaggerFragment extends Fragment implements HasSupportFragmentInjector {
public abstract class CommonsDaggerSupportFragment extends Fragment implements HasSupportFragmentInjector {
@Inject
DispatchingAndroidInjector<Fragment> childFragmentInjector;