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

Re-organize classes to be a bit more organized

Browse source 
Change-Id: Ie3500c4520a09be28f1856447e66265dd499a680
GitHub: https://github.com/wikimedia/apps-android-commons/pull/36
This commit is contained in:
YuviPanda 2013-07-23 13:46:53 +00:00 • committed by SuchABot
parent 3bab3be4a0
commit bbf5e5af68
11 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
commons/AndroidManifest.xml
View file

@ -39,7 +39,7 @@
android:theme="@style/NoTitle" >
</activity>
<activity
android:name=".ShareActivity"
android:name=".upload.ShareActivity"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
>
@ -53,7 +53,7 @@
</intent-filter>
</activity>
<activity
android:name=".MultipleShareActivity"
android:name=".upload.MultipleShareActivity"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
>
@ -82,7 +82,7 @@
android:label="@string/title_activity_settings"
/>
<activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
<service android:name="UploadService" >
<service android:name=".upload.UploadService" >
</service>
<service
android:name=".auth.WikiAccountAuthenticatorService"

8
commons/src/main/java/org/wikimedia/commons/api/MWApi.java Normal file
View file

@ -0,0 +1,8 @@
package org.wikimedia.commons.api;
import com.android.volley.RequestQueue;
public class MWApi {
private RequestQueue queue;
}

5
commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java → commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package org.wikimedia.commons.category;
import android.app.Activity;
import android.content.ContentProviderClient;
@ -17,6 +17,9 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import org.mediawiki.api.ApiResult;
import org.mediawiki.api.MWApi;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.category.Category;
import org.wikimedia.commons.category.CategoryContentProvider;
import org.wikimedia.commons.contributions.Contribution;

1
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
View file

@ -17,6 +17,7 @@ import com.actionbarsherlock.view.MenuItem;
import org.wikimedia.commons.*;
import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.media.*;
import org.wikimedia.commons.upload.UploadService;
public class ContributionsActivity
extends AuthenticatedActivity

2
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
View file

@ -32,6 +32,8 @@ import java.util.*;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
import org.wikimedia.commons.*;
import org.wikimedia.commons.R;
import org.wikimedia.commons.upload.ShareActivity;
import org.wikimedia.commons.upload.UploadService;
public class ContributionsListFragment extends SherlockFragment {

5
commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java → commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package org.wikimedia.commons.upload;
import java.util.*;
import java.util.concurrent.*;
@ -12,10 +12,11 @@ import android.text.*;
import android.view.*;
import android.view.inputmethod.InputMethodManager;
import android.widget.*;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import org.wikimedia.commons.*;
import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.category.CategorizationFragment;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.media.*;
import org.wikimedia.commons.modifications.CategoryModifier;

4
commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java → commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package org.wikimedia.commons.upload;
import android.content.*;
import android.graphics.*;
@ -14,6 +14,8 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import com.nostra13.universalimageloader.core.*;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.media.*;

8
commons/src/main/java/org/wikimedia/commons/ShareActivity.java → commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
View file

@ -1,18 +1,16 @@
package org.wikimedia.commons;
package org.wikimedia.commons.upload;
import android.app.*;
import android.content.*;
import android.os.*;
import android.text.*;
import android.util.Log;
import com.nostra13.universalimageloader.core.ImageLoader;
import android.net.*;
import android.support.v4.app.NavUtils;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import android.widget.*;
import android.view.*;
import org.wikimedia.commons.*;
import org.wikimedia.commons.category.CategorizationFragment;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.auth.*;
import org.wikimedia.commons.modifications.CategoryModifier;

5
commons/src/main/java/org/wikimedia/commons/SingleUploadFragment.java → commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package org.wikimedia.commons.upload;
import android.app.Activity;
import android.content.Context;
@ -21,6 +21,9 @@ import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.wikimedia.commons.Prefs;
import org.wikimedia.commons.R;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.Contribution;
public class SingleUploadFragment extends SherlockFragment {

6
commons/src/main/java/org/wikimedia/commons/StartUploadTask.java → commons/src/main/java/org/wikimedia/commons/upload/StartUploadTask.java
View file

@ -1,7 +1,6 @@
package org.wikimedia.commons;
package org.wikimedia.commons.upload;
import android.app.*;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.*;
@ -14,6 +13,9 @@ import android.webkit.MimeTypeMap;
import java.io.*;
import java.util.*;
import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.Prefs;
import org.wikimedia.commons.Utils;
import org.wikimedia.commons.contributions.*;
public class StartUploadTask extends AsyncTask<Void, Void, Contribution> {

8
commons/src/main/java/org/wikimedia/commons/UploadService.java → commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
View file

@ -1,4 +1,4 @@
package org.wikimedia.commons;
package org.wikimedia.commons.upload;
import java.io.*;
import java.util.ArrayList;
@ -8,6 +8,7 @@ import java.util.regex.Pattern;
import android.graphics.*;
import android.os.Bundle;
import android.util.EventLog;
import org.mediawiki.api.*;
import in.yuvi.http.fluent.ProgressListener;
@ -17,6 +18,7 @@ import android.support.v4.app.NotificationCompat;
import android.util.*;
import android.widget.*;
import org.wikimedia.commons.*;
import org.wikimedia.commons.contributions.*;
import org.wikimedia.commons.modifications.ModificationsContentProvider;
@ -220,7 +222,7 @@ public class UploadService extends HandlerService<Contribution> {
if(!resultStatus.equals("Success")) {
String errorCode = result.getString("/api/error/@code");
showFailedNotification(contribution);
EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
.param("username", app.getCurrentAccount().name)
.param("source", contribution.getSource())
.param("multiple", contribution.getMultiple())
@ -238,7 +240,7 @@ public class UploadService extends HandlerService<Contribution> {
contribution.setDateUploaded(dateUploaded);
contribution.save();
EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
org.wikimedia.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
.param("username", app.getCurrentAccount().name)
.param("source", contribution.getSource()) //FIXME
.param("filename", contribution.getFilename())