Skip to content

Commit 6744940

Browse files
committed
Implemented Statistics
1 parent e028658 commit 6744940

File tree

7 files changed

+1504
-311
lines changed

7 files changed

+1504
-311
lines changed

app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dependencies {
2121
implementation 'info.debatty:java-string-similarity:0.24'
2222
implementation 'com.borjabravo:readmoretextview:2.1.0'
2323
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
24-
implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar'){
25-
transitive=true
24+
implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar') {
25+
transitive = true
2626
}
2727

2828
implementation "com.github.deano2390:MaterialShowcaseView:1.2.0"
@@ -116,7 +116,8 @@ android {
116116

117117
buildTypes {
118118
release {
119-
minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient.
119+
minifyEnabled false
120+
// See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient.
120121
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
121122
}
122123
debug {

app/src/main/AndroidManifest.xml

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23
package="fr.free.nrw.commons">
34

@@ -14,7 +15,7 @@
1415
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
1516
<uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
1617
<uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS" />
17-
<uses-permission android:name="android.permission.READ_LOGS"/>
18+
<uses-permission android:name="android.permission.READ_LOGS" />
1819

1920
<!-- Needed only if your app targets Android 5.0 (API level 21) or higher. -->
2021
<uses-feature android:name="android.hardware.location.gps" />
@@ -23,81 +24,81 @@
2324
android:name=".CommonsApplication"
2425
android:icon="@drawable/ic_launcher"
2526
android:label="@string/app_name"
26-
android:theme="@style/LightAppTheme"
27-
android:supportsRtl="true" >
28-
<activity android:name="org.acra.CrashReportDialog"
29-
android:theme="@android:style/Theme.Dialog"
30-
android:launchMode="singleInstance"
31-
android:excludeFromRecents="true"
32-
android:finishOnTaskLaunch="true" />
33-
27+
android:supportsRtl="true"
28+
android:theme="@style/LightAppTheme">
29+
<activity
30+
android:name="org.acra.CrashReportDialog"
31+
android:excludeFromRecents="true"
32+
android:finishOnTaskLaunch="true"
33+
android:launchMode="singleInstance"
34+
android:theme="@android:style/Theme.Dialog" />
3435
<activity android:name=".auth.LoginActivity">
35-
<intent-filter>
36-
<category android:name="android.intent.category.LAUNCHER" />
37-
<action android:name="android.intent.action.MAIN" />
38-
</intent-filter>
39-
</activity>
4036

37+
</activity>
4138
<activity android:name=".WelcomeActivity" />
42-
4339
<activity
4440
android:name=".upload.ShareActivity"
4541
android:icon="@drawable/ic_launcher"
4642
android:label="@string/app_name">
4743
<intent-filter>
4844
<action android:name="android.intent.action.SEND" />
45+
4946
<category android:name="android.intent.category.DEFAULT" />
47+
5048
<data android:mimeType="image/*" />
5149
<data android:mimeType="audio/ogg" />
5250
</intent-filter>
5351
</activity>
54-
5552
<activity
5653
android:name=".upload.MultipleShareActivity"
5754
android:icon="@drawable/ic_launcher"
5855
android:label="@string/app_name">
5956
<intent-filter>
6057
<action android:name="android.intent.action.SEND_MULTIPLE" />
58+
6159
<category android:name="android.intent.category.DEFAULT" />
60+
6261
<data android:mimeType="image/*" />
6362
<data android:mimeType="audio/ogg" />
6463
</intent-filter>
6564
</activity>
66-
6765
<activity
6866
android:name=".contributions.ContributionsActivity"
6967
android:icon="@drawable/ic_launcher"
7068
android:label="@string/app_name" />
71-
7269
<activity
7370
android:name=".settings.SettingsActivity"
7471
android:label="@string/title_activity_settings" />
75-
7672
<activity
7773
android:name=".AboutActivity"
7874
android:label="@string/title_activity_about"
7975
android:parentActivityName=".contributions.ContributionsActivity" />
80-
8176
<activity
8277
android:name=".auth.SignupActivity"
8378
android:label="@string/title_activity_signup" />
84-
8579
<activity
8680
android:name=".nearby.NearbyActivity"
8781
android:label="@string/title_activity_nearby"
8882
android:parentActivityName=".contributions.ContributionsActivity" />
89-
9083
<activity
9184
android:name=".notification.NotificationActivity"
9285
android:label="@string/navigation_item_notification" />
93-
9486
<activity
9587
android:name=".category.CategoryImagesActivity"
9688
android:label="@string/title_activity_featured_images"
9789
android:parentActivityName=".contributions.ContributionsActivity" />
9890

99-
<service android:name=".upload.UploadService" />
91+
<activity
92+
android:name=".Achievements"
93+
android:label="@string/Achievements">
94+
<intent-filter>
95+
<category android:name="android.intent.category.LAUNCHER" />
96+
97+
<action android:name="android.intent.action.MAIN" />
98+
</intent-filter>
99+
</activity>
100100

101+
<service android:name=".upload.UploadService" />
101102
<service
102103
android:name=".auth.WikiAccountAuthenticatorService"
103104
android:exported="true"
@@ -110,24 +111,24 @@
110111
android:name="android.accounts.AccountAuthenticator"
111112
android:resource="@xml/authenticator" />
112113
</service>
113-
114114
<service
115115
android:name=".contributions.ContributionsSyncService"
116116
android:exported="true">
117117
<intent-filter>
118118
<action android:name="android.content.SyncAdapter" />
119119
</intent-filter>
120+
120121
<meta-data
121122
android:name="android.content.SyncAdapter"
122123
android:resource="@xml/contributions_sync_adapter" />
123124
</service>
124-
125125
<service
126126
android:name=".modifications.ModificationsSyncService"
127127
android:exported="true">
128128
<intent-filter>
129129
<action android:name="android.content.SyncAdapter" />
130130
</intent-filter>
131+
131132
<meta-data
132133
android:name="android.content.SyncAdapter"
133134
android:resource="@xml/modifications_sync_adapter" />
@@ -142,21 +143,18 @@
142143
android:name="android.support.FILE_PROVIDER_PATHS"
143144
android:resource="@xml/provider_paths" />
144145
</provider>
145-
146146
<provider
147147
android:name=".contributions.ContributionsContentProvider"
148148
android:authorities="fr.free.nrw.commons.contributions.contentprovider"
149149
android:exported="false"
150150
android:label="@string/provider_contributions"
151151
android:syncable="true" />
152-
153152
<provider
154153
android:name=".modifications.ModificationsContentProvider"
155154
android:authorities="fr.free.nrw.commons.modifications.contentprovider"
156155
android:exported="false"
157156
android:label="@string/provider_modifications"
158157
android:syncable="true" />
159-
160158
<provider
161159
android:name=".category.CategoryContentProvider"
162160
android:authorities="fr.free.nrw.commons.categories.contentprovider"
@@ -166,4 +164,4 @@
166164

167165
</application>
168166

169-
</manifest>
167+
</manifest>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package fr.free.nrw.commons;
2+
3+
import android.support.v7.app.AppCompatActivity;
4+
import android.os.Bundle;
5+
import android.view.Menu;
6+
import android.view.MenuInflater;
7+
import android.view.View;
8+
import android.widget.ImageView;
9+
10+
public class Achievements extends AppCompatActivity {
11+
12+
@Override
13+
protected void onCreate(Bundle savedInstanceState) {
14+
super.onCreate(savedInstanceState);
15+
setContentView(R.layout.activity_achievements);
16+
17+
18+
}
19+
20+
}

0 commit comments

Comments
 (0)