Skip to content

Commit ffc0e07

Browse files
author
Vivek Maskara
authored
Merge pull request commons-app#956 from psh/dependency-injection
Dependency injection with Dagger
2 parents f8b389e + 52b52c4 commit ffc0e07

File tree

69 files changed

+1319
-965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1319
-965
lines changed

‎app/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ dependencies {
6868
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
6969
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
7070
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
71+
72+
implementation 'com.google.dagger:dagger:2.11'
73+
implementation 'com.google.dagger:dagger-android-support:2.11'
74+
annotationProcessor 'com.google.dagger:dagger-compiler:2.11'
75+
annotationProcessor 'com.google.dagger:dagger-android-processor:2.11'
7176
}
7277

7378
android {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
package="fr.free.nrw.commons">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
6-
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
7-
<uses-permission android:name="android.permission.READ_SYNC_STATS"/>
8-
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
9-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
5+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
6+
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
7+
<uses-permission android:name="android.permission.READ_SYNC_STATS" />
8+
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
9+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1010
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
11-
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
12-
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
13-
<uses-permission android:name="android.permission.USE_CREDENTIALS"/>
14-
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
15-
<uses-permission android:name="android.permission.MANAGE_DOCUMENTS"/>
16-
<uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS"/>
11+
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
12+
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
13+
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
14+
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
15+
<uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
16+
<uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS" />
1717
<uses-permission android:name="android.permission.READ_LOGS"/>
1818

1919
<!-- Needed only if your app targets Android 5.0 (API level 21) or higher. -->
@@ -32,34 +32,37 @@
3232
android:finishOnTaskLaunch="true" />
3333

3434
<activity
35-
android:name=".auth.LoginActivity"
36-
>
35+
android:name="org.acra.CrashReportDialog"
36+
android:excludeFromRecents="true"
37+
android:finishOnTaskLaunch="true"
38+
android:launchMode="singleInstance"
39+
android:theme="@android:style/Theme.Dialog" />
40+
41+
<activity android:name=".auth.LoginActivity">
3742
<intent-filter>
38-
<category android:name="android.intent.category.LAUNCHER"/>
39-
<action android:name="android.intent.action.MAIN"/>
43+
<category android:name="android.intent.category.LAUNCHER" />
44+
<action android:name="android.intent.action.MAIN" />
4045
</intent-filter>
4146
</activity>
42-
<activity
43-
android:name=".WelcomeActivity"
44-
>
45-
</activity>
47+
48+
<activity android:name=".WelcomeActivity" />
49+
4650
<activity
4751
android:name=".upload.ShareActivity"
4852
android:icon="@drawable/ic_launcher"
49-
android:label="@string/app_name"
50-
>
53+
android:label="@string/app_name">
5154
<intent-filter>
5255
<action android:name="android.intent.action.SEND" />
5356
<category android:name="android.intent.category.DEFAULT" />
5457
<data android:mimeType="image/*" />
5558
<data android:mimeType="audio/ogg" />
5659
</intent-filter>
5760
</activity>
61+
5862
<activity
59-
android:name=".upload.MultipleShareActivity"
60-
android:icon="@drawable/ic_launcher"
61-
android:label="@string/app_name"
62-
>
63+
android:name=".upload.MultipleShareActivity"
64+
android:icon="@drawable/ic_launcher"
65+
android:label="@string/app_name">
6366
<intent-filter>
6467
<action android:name="android.intent.action.SEND_MULTIPLE" />
6568
<category android:name="android.intent.category.DEFAULT" />
@@ -69,33 +72,34 @@
6972
</activity>
7073

7174
<activity
72-
android:name=".contributions.ContributionsActivity"
73-
android:icon="@drawable/ic_launcher"
74-
android:label="@string/app_name"
75-
>
76-
</activity>
75+
android:name=".contributions.ContributionsActivity"
76+
android:icon="@drawable/ic_launcher"
77+
android:label="@string/app_name" />
78+
7779
<activity
7880
android:name=".settings.SettingsActivity"
79-
android:label="@string/title_activity_settings"
80-
/>
81+
android:label="@string/title_activity_settings" />
82+
8183
<activity
8284
android:name=".AboutActivity"
8385
android:label="@string/title_activity_about"
8486
android:parentActivityName=".contributions.ContributionsActivity" />
87+
8588
<activity
8689
android:name=".auth.SignupActivity"
87-
android:label="@string/title_activity_signup"/>
90+
android:label="@string/title_activity_signup" />
91+
8892
<activity
8993
android:name=".nearby.NearbyActivity"
9094
android:label="@string/title_activity_nearby"
9195
android:parentActivityName=".contributions.ContributionsActivity" />
9296

93-
<service android:name=".upload.UploadService" >
94-
</service>
97+
<service android:name=".upload.UploadService" />
98+
9599
<service
96100
android:name=".auth.WikiAccountAuthenticatorService"
97101
android:exported="true"
98-
android:process=":auth" >
102+
android:process=":auth">
99103
<intent-filter>
100104
<action android:name="android.accounts.AccountAuthenticator" />
101105
</intent-filter>
@@ -106,27 +110,25 @@
106110
</service>
107111

108112
<service
109-
android:name=".contributions.ContributionsSyncService"
110-
android:exported="true">
113+
android:name=".contributions.ContributionsSyncService"
114+
android:exported="true">
111115
<intent-filter>
112-
<action
113-
android:name="android.content.SyncAdapter" />
116+
<action android:name="android.content.SyncAdapter" />
114117
</intent-filter>
115118
<meta-data
116-
android:name="android.content.SyncAdapter"
117-
android:resource="@xml/contributions_sync_adapter" />
119+
android:name="android.content.SyncAdapter"
120+
android:resource="@xml/contributions_sync_adapter" />
118121
</service>
119122

120123
<service
121-
android:name=".modifications.ModificationsSyncService"
122-
android:exported="true">
124+
android:name=".modifications.ModificationsSyncService"
125+
android:exported="true">
123126
<intent-filter>
124-
<action
125-
android:name="android.content.SyncAdapter" />
127+
<action android:name="android.content.SyncAdapter" />
126128
</intent-filter>
127129
<meta-data
128-
android:name="android.content.SyncAdapter"
129-
android:resource="@xml/modifications_sync_adapter" />
130+
android:name="android.content.SyncAdapter"
131+
android:resource="@xml/modifications_sync_adapter" />
130132
</service>
131133

132134
<provider
@@ -136,31 +138,29 @@
136138
android:grantUriPermissions="true">
137139
<meta-data
138140
android:name="android.support.FILE_PROVIDER_PATHS"
139-
android:resource="@xml/provider_paths"/>
141+
android:resource="@xml/provider_paths" />
140142
</provider>
141143

142144
<provider
143-
android:name=".contributions.ContributionsContentProvider"
144-
android:label="@string/provider_contributions"
145-
android:syncable="true"
146-
android:authorities="fr.free.nrw.commons.contributions.contentprovider"
147-
android:exported="false">
148-
</provider>
145+
android:name=".contributions.ContributionsContentProvider"
146+
android:authorities="fr.free.nrw.commons.contributions.contentprovider"
147+
android:exported="false"
148+
android:label="@string/provider_contributions"
149+
android:syncable="true" />
149150

150151
<provider
151-
android:name=".modifications.ModificationsContentProvider"
152-
android:label="@string/provider_modifications"
153-
android:syncable="true"
154-
android:authorities="fr.free.nrw.commons.modifications.contentprovider"
155-
android:exported="false">
156-
</provider>
152+
android:name=".modifications.ModificationsContentProvider"
153+
android:authorities="fr.free.nrw.commons.modifications.contentprovider"
154+
android:exported="false"
155+
android:label="@string/provider_modifications"
156+
android:syncable="true" />
157+
157158
<provider
158-
android:name=".category.CategoryContentProvider"
159-
android:label="@string/provider_categories"
160-
android:syncable="false"
161-
android:authorities="fr.free.nrw.commons.categories.contentprovider"
162-
android:exported="false">
163-
</provider>
159+
android:name=".category.CategoryContentProvider"
160+
android:authorities="fr.free.nrw.commons.categories.contentprovider"
161+
android:exported="false"
162+
android:label="@string/provider_categories"
163+
android:syncable="false" />
164164

165165
</application>
166166

‎app/src/main/java/fr/free/nrw/commons/AboutActivity.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package fr.free.nrw.commons;
22

3-
import android.content.Context;
4-
import android.content.Intent;
53
import android.os.Bundle;
64
import android.widget.TextView;
75

0 commit comments

Comments
 (0)