Merge pull request #115 from domdomegg/remove-sherlock

Remove sherlock

commons/app/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.google.code.gson:gson:1.4'
     compile 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     compile 'in.yuvi:http.fluent:1.3'
@@ -12,8 +11,8 @@ dependencies {
     compile 'org.mediawiki:api:1.3'
     compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
     compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
-    compile 'com.android.support:support-v4:22.1.0'
+    compile 'com.android.support:support-v4:23.4.0'
-
+    compile 'com.android.support:appcompat-v7:23.4.0'
 }
 
 android {

commons/app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         android:name=".CommonsApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/Theme.AppCompat"
         android:supportsRtl="true" >
         <activity android:name="org.acra.CrashReportDialog"
                   android:theme="@android:style/Theme.Dialog"

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

@@ -1,12 +1,12 @@
 package fr.free.nrw.commons;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockActivity;
 
-public class AboutActivity extends SherlockActivity {
+public class AboutActivity extends Activity {
     private TextView versionText;
     private TextView licenseText;
     private TextView improveText;
@@ -23,8 +23,8 @@ public class AboutActivity extends SherlockActivity {
         privacyPolicyText = (TextView) findViewById(R.id.about_privacy_policy);
         uploadsToText = (TextView) findViewById(R.id.about_uploads_to);
 
-        uploadsToText.setText(CommonsApplication.EVENTLOG_WIKI);
+        uploadsToText.setText(fr.free.nrw.commons.CommonsApplication.EVENTLOG_WIKI);
-        versionText.setText(CommonsApplication.APPLICATION_VERSION);
+        versionText.setText(fr.free.nrw.commons.CommonsApplication.APPLICATION_VERSION);
 
         // We can't use formatted strings directly because it breaks with
         // our localization tools. Grab an HTML string and turn it into

commons/app/src/main/java/main/java/fr/free/nrw/commons/SettingsActivity.java

@@ -1,19 +1,32 @@
 package fr.free.nrw.commons;
 
-
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import com.actionbarsherlock.app.SherlockPreferenceActivity;
+import android.preference.PreferenceActivity;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+    fr.free.nrw.commons.CommonsApplication app;
+
+    private AppCompatDelegate mDelegate;
 
-public class SettingsActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
-    CommonsApplication app;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        getDelegate().installViewFactory();
+        getDelegate().onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
-        ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE);
+        ListPreference licensePreference = (ListPreference) findPreference(fr.free.nrw.commons.Prefs.DEFAULT_LICENSE);
         // WARNING: ORDERING NEEDS TO MATCH FOR THE LICENSE NAMES AND DISPLAY VALUES
         licensePreference.setEntries(new String[]{
                 getString(R.string.license_name_cc0),
@@ -21,20 +34,20 @@ public class SettingsActivity extends SherlockPreferenceActivity implements Shar
                 getString(R.string.license_name_cc_by_sa)
         });
         licensePreference.setEntryValues(new String[]{
-                Prefs.Licenses.CC0,
+                fr.free.nrw.commons.Prefs.Licenses.CC0,
-                Prefs.Licenses.CC_BY,
+                fr.free.nrw.commons.Prefs.Licenses.CC_BY,
-                Prefs.Licenses.CC_BY_SA
+                fr.free.nrw.commons.Prefs.Licenses.CC_BY_SA
         });
 
-        licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue())));
+        licensePreference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor(licensePreference.getValue())));
         licensePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                preference.setSummary(getString(Utils.licenseNameFor((String)newValue)));
+                preference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor((String)newValue)));
                 return true;
             }
         });
 
-        app = (CommonsApplication)getApplicationContext();
+        app = (fr.free.nrw.commons.CommonsApplication)getApplicationContext();
     }
 
     @Override
@@ -54,4 +67,78 @@ public class SettingsActivity extends SherlockPreferenceActivity implements Shar
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
 
     }
+
+    // All the stuff below is just to get a actionbar that says settings...
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        getDelegate().onPostCreate(savedInstanceState);
+    }
+
+    @Override
+    public MenuInflater getMenuInflater() {
+        return getDelegate().getMenuInflater();
+    }
+
+    @Override
+    public void setContentView(@LayoutRes int layoutResID) {
+        getDelegate().setContentView(layoutResID);
+    }
+
+    @Override
+    public void setContentView(View view) {
+        getDelegate().setContentView(view);
+    }
+
+    @Override
+    public void setContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().setContentView(view, params);
+    }
+
+    @Override
+    public void addContentView(View view, ViewGroup.LayoutParams params) {
+        getDelegate().addContentView(view, params);
+    }
+
+    @Override
+    protected void onPostResume() {
+        super.onPostResume();
+        getDelegate().onPostResume();
+    }
+
+    @Override
+    protected void onTitleChanged(CharSequence title, int color) {
+        super.onTitleChanged(title, color);
+        getDelegate().setTitle(title);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        getDelegate().onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        getDelegate().onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getDelegate().onDestroy();
+    }
+
+    public void invalidateOptionsMenu() {
+        getDelegate().invalidateOptionsMenu();
+    }
+
+    private AppCompatDelegate getDelegate() {
+        if (mDelegate == null) {
+            mDelegate = AppCompatDelegate.create(this, null);
+        }
+        return mDelegate;
+    }
 }

commons/app/src/main/java/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java

@@ -3,15 +3,15 @@ package fr.free.nrw.commons.auth;
 import java.io.IOException;
 
 import android.accounts.OperationCanceledException;
-import com.actionbarsherlock.app.*;
 
 import android.accounts.*;
 import android.os.*;
+import android.support.v7.app.AppCompatActivity;
 
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 
-public class AuthenticatedActivity extends SherlockFragmentActivity {
+public class AuthenticatedActivity extends AppCompatActivity {
     
     
     String accountType;

commons/app/src/main/java/main/java/fr/free/nrw/commons/category/CategorizationFragment.java

@@ -4,25 +4,29 @@ import android.app.Activity;
 import android.content.ContentProviderClient;
 import android.content.Context;
 import android.database.Cursor;
-import android.os.*;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.*;
+import android.view.LayoutInflater;
-import android.widget.*;
+import android.view.Menu;
-import com.actionbarsherlock.app.SherlockFragment;
+import android.view.MenuItem;
-import com.actionbarsherlock.view.Menu;
+import android.view.View;
-import com.actionbarsherlock.view.MenuItem;
+import android.view.ViewGroup;
-import fr.free.nrw.commons.Utils;
+import android.widget.AdapterView;
-import org.mediawiki.api.ApiResult;
+import android.widget.BaseAdapter;
-import org.mediawiki.api.MWApi;
+import android.widget.CheckedTextView;
-import fr.free.nrw.commons.CommonsApplication;
+import android.widget.EditText;
-import fr.free.nrw.commons.R;
+import android.widget.ListView;
-import fr.free.nrw.commons.upload.MwVolleyApi;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
-import java.io.IOException;
-import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -33,10 +37,14 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.upload.MwVolleyApi;
+
 /**
  * Displays the category suggestion and selection screen. Category search is initiated here.
  */
-public class CategorizationFragment extends SherlockFragment{
+public class CategorizationFragment extends Fragment {
     public static interface OnCategoriesSaveHandler {
         public void onCategoriesSave(ArrayList<String> categories);
     }
@@ -56,8 +64,8 @@ public class CategorizationFragment extends SherlockFragment{
 
     // LHS guarantees ordered insertions, allowing for prioritized method A results
     private final Set<String> results = new LinkedHashSet<String>();
-    PrefixUpdater prefixUpdaterSub;
+    fr.free.nrw.commons.category.PrefixUpdater prefixUpdaterSub;
-    MethodAUpdater methodAUpdaterSub;
+    fr.free.nrw.commons.category.MethodAUpdater methodAUpdaterSub;
 
     private ContentProviderClient client;
 
@@ -108,14 +116,14 @@ public class CategorizationFragment extends SherlockFragment{
 
         try {
             Cursor cursor = client.query(
-                    CategoryContentProvider.BASE_URI,
+                    fr.free.nrw.commons.category.CategoryContentProvider.BASE_URI,
-                    Category.Table.ALL_FIELDS,
+                    fr.free.nrw.commons.category.Category.Table.ALL_FIELDS,
                     null,
                     new String[]{},
-                    Category.Table.COLUMN_LAST_USED + " DESC");
+                    fr.free.nrw.commons.category.Category.Table.COLUMN_LAST_USED + " DESC");
             // fixme add a limit on the original query instead of falling out of the loop?
             while (cursor.moveToNext() && cursor.getPosition() < SEARCH_CATS_LIMIT) {
-                Category cat = Category.fromCursor(cursor);
+                fr.free.nrw.commons.category.Category cat = fr.free.nrw.commons.category.Category.fromCursor(cursor);
                 items.add(cat.getName());
             }
             cursor.close();
@@ -216,7 +224,7 @@ public class CategorizationFragment extends SherlockFragment{
             CheckedTextView checkedView;
 
             if(view == null) {
-                checkedView = (CheckedTextView) getSherlockActivity().getLayoutInflater().inflate(R.layout.layout_categories_item, null);
+                checkedView = (CheckedTextView) getActivity().getLayoutInflater().inflate(R.layout.layout_categories_item, null);
 
             } else {
                 checkedView = (CheckedTextView) view;
@@ -241,16 +249,16 @@ public class CategorizationFragment extends SherlockFragment{
         return count;
     }
 
-    private Category lookupCategory(String name) {
+    private fr.free.nrw.commons.category.Category lookupCategory(String name) {
         try {
             Cursor cursor = client.query(
-                    CategoryContentProvider.BASE_URI,
+                    fr.free.nrw.commons.category.CategoryContentProvider.BASE_URI,
-                    Category.Table.ALL_FIELDS,
+                    fr.free.nrw.commons.category.Category.Table.ALL_FIELDS,
-                    Category.Table.COLUMN_NAME + "=?",
+                    fr.free.nrw.commons.category.Category.Table.COLUMN_NAME + "=?",
                     new String[] {name},
                     null);
             if (cursor.moveToFirst()) {
-                Category cat = Category.fromCursor(cursor);
+                fr.free.nrw.commons.category.Category cat = fr.free.nrw.commons.category.Category.fromCursor(cursor);
                 return cat;
             }
         } catch (RemoteException e) {
@@ -259,7 +267,7 @@ public class CategorizationFragment extends SherlockFragment{
         }
 
         // Newly used category...
-        Category cat = new Category();
+        fr.free.nrw.commons.category.Category cat = new fr.free.nrw.commons.category.Category();
         cat.setName(name);
         cat.setLastUsed(new Date());
         cat.setTimesUsed(0);
@@ -276,7 +284,7 @@ public class CategorizationFragment extends SherlockFragment{
 
         @Override
         protected Void doInBackground(Void... voids) {
-            Category cat = lookupCategory(name);
+            fr.free.nrw.commons.category.Category cat = lookupCategory(name);
             cat.incTimesUsed();
 
             cat.setContentProviderClient(client);
@@ -358,7 +366,7 @@ public class CategorizationFragment extends SherlockFragment{
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        prefixUpdaterSub = new PrefixUpdater(this) {
+        prefixUpdaterSub = new fr.free.nrw.commons.category.PrefixUpdater(this) {
             @Override
             protected ArrayList<String> doInBackground(Void... voids) {
                 ArrayList<String> result = new ArrayList<String>();
@@ -390,7 +398,7 @@ public class CategorizationFragment extends SherlockFragment{
             }
         };
 
-        methodAUpdaterSub = new MethodAUpdater(this) {
+        methodAUpdaterSub = new fr.free.nrw.commons.category.MethodAUpdater(this) {
             @Override
             protected void onPostExecute(ArrayList<String> result) {
                 results.clear();
@@ -421,7 +429,7 @@ public class CategorizationFragment extends SherlockFragment{
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater inflater) {
+    public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) {
         menu.clear();
         inflater.inflate(R.menu.fragment_categorization, menu);
     }
@@ -431,7 +439,7 @@ public class CategorizationFragment extends SherlockFragment{
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
         getActivity().setTitle(R.string.categories_activity_title);
-        client = getActivity().getContentResolver().acquireContentProviderClient(CategoryContentProvider.AUTHORITY);
+        client = getActivity().getContentResolver().acquireContentProviderClient(fr.free.nrw.commons.category.CategoryContentProvider.AUTHORITY);
     }
 
     @Override

commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -1,16 +1,22 @@
 package fr.free.nrw.commons.contributions;
 
-import java.text.*;
+import android.content.ContentProviderClient;
-import java.util.*;
+import android.content.ContentValues;
-
-import android.content.*;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.net.*;
+import android.net.Uri;
-import android.os.*;
+import android.os.Parcel;
-import android.text.*;
+import android.os.RemoteException;
+import android.text.TextUtils;
 
-import fr.free.nrw.commons.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.EventLog;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.Prefs;
+import fr.free.nrw.commons.Utils;
 
 public class Contribution extends Media {
 
@@ -150,7 +156,7 @@ public class Contribution extends Media {
     public void save() {
         try {
             if(contentUri == null) {
-                contentUri = client.insert(ContributionsContentProvider.BASE_URI, this.toContentValues());
+                contentUri = client.insert(fr.free.nrw.commons.contributions.ContributionsContentProvider.BASE_URI, this.toContentValues());
             } else {
                 client.update(contentUri, toContentValues(), null, null);
             }
@@ -215,7 +221,7 @@ public class Contribution extends Media {
     public static Contribution fromCursor(Cursor cursor) {
         // Hardcoding column positions!
         Contribution c = new Contribution();
-        c.contentUri = ContributionsContentProvider.uriForId(cursor.getInt(0));
+        c.contentUri = fr.free.nrw.commons.contributions.ContributionsContentProvider.uriForId(cursor.getInt(0));
         c.filename = cursor.getString(1);
         c.localUri = TextUtils.isEmpty(cursor.getString(2)) ? null : Uri.parse(cursor.getString(2));
         c.imageUrl = cursor.getString(3);

commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -1,28 +1,29 @@
 package fr.free.nrw.commons.contributions;
 
-import android.app.*;
+import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
+import android.support.v4.app.Fragment;
 import android.util.Log;
-import com.actionbarsherlock.app.SherlockFragment;
-import fr.free.nrw.commons.upload.ShareActivity;
-import fr.free.nrw.commons.upload.UploadService;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
 
+import fr.free.nrw.commons.upload.ShareActivity;
+import fr.free.nrw.commons.upload.UploadService;
+
 public class ContributionController {
-    private SherlockFragment fragment;
+    private Fragment fragment;
     private Activity activity;
 
     private final static int SELECT_FROM_GALLERY = 1;
     private final static int SELECT_FROM_CAMERA = 2;
 
-    public ContributionController(SherlockFragment fragment) {
+    public ContributionController(Fragment fragment) {
         this.fragment = fragment;
         this.activity = fragment.getActivity();
     }
@@ -72,12 +73,12 @@ public class ContributionController {
             case SELECT_FROM_GALLERY:
                 shareIntent.setType(activity.getContentResolver().getType(data.getData()));
                 shareIntent.putExtra(Intent.EXTRA_STREAM, data.getData());
-                shareIntent.putExtra(UploadService.EXTRA_SOURCE, Contribution.SOURCE_GALLERY);
+                shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY);
                 break;
             case SELECT_FROM_CAMERA:
                 shareIntent.setType("image/jpeg"); //FIXME: Find out appropriate mime type
                 shareIntent.putExtra(Intent.EXTRA_STREAM, lastGeneratedCaptureURI);
-                shareIntent.putExtra(UploadService.EXTRA_SOURCE, Contribution.SOURCE_CAMERA);
+                shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_CAMERA);
                 break;
         }
         Log.i("Image", "Image selected");

commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java

@@ -1,32 +1,36 @@
 package fr.free.nrw.commons.contributions;
 
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.database.Cursor;
 import android.database.DataSetObserver;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
-import android.content.*;
-import android.database.Cursor;
-import android.os.Bundle;
 import android.support.v4.widget.CursorAdapter;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.Adapter;
-import com.actionbarsherlock.view.Menu;
+import android.widget.AdapterView;
-import com.actionbarsherlock.view.MenuItem;
+
+import java.util.ArrayList;
 
-import fr.free.nrw.commons.*;
-import fr.free.nrw.commons.auth.*;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.HandlerService;
 import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.auth.*;
 import fr.free.nrw.commons.media.*;
 import fr.free.nrw.commons.upload.UploadService;
 
-import java.util.ArrayList;
-
 public  class       ContributionsActivity
         extends     AuthenticatedActivity
         implements  LoaderManager.LoaderCallbacks<Object>,
@@ -35,7 +39,6 @@ public  class       ContributionsActivity
                     FragmentManager.OnBackStackChangedListener,
                     ContributionsListFragment.SourceRefresher {
 
-
     private Cursor allContributions;
     private ContributionsListFragment contributionsList;
     private MediaDetailPagerFragment mediaDetails;

commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

@@ -9,19 +9,21 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.AdapterView;
-import com.actionbarsherlock.app.SherlockFragment;
+import android.widget.GridView;
-import com.actionbarsherlock.view.Menu;
+import android.widget.ListAdapter;
-import com.actionbarsherlock.view.MenuInflater;
+import android.widget.TextView;
-import com.actionbarsherlock.view.MenuItem;
+import android.support.v4.app.Fragment;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 
-
-import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.SettingsActivity;
 
-public class ContributionsListFragment extends SherlockFragment {
+public class ContributionsListFragment extends Fragment {
 
 
 
@@ -33,11 +35,29 @@ public class ContributionsListFragment extends SherlockFragment {
     private TextView waitingMessage;
     private TextView emptyMessage;
 
-    private ContributionController controller;
+    private fr.free.nrw.commons.contributions.ContributionController controller;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_contributions, container, false);
+        View v = inflater.inflate(R.layout.fragment_contributions, container, false);
+
+        contributionsList = (GridView) v.findViewById(R.id.contributionsList);
+        waitingMessage = (TextView) v.findViewById(R.id.waitingMessage);
+        emptyMessage = (TextView) v.findViewById(R.id.waitingMessage);
+
+        contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener)getActivity());
+        if(savedInstanceState != null) {
+            Log.d("Commons", "Scrolling to " + savedInstanceState.getInt("grid-position"));
+            contributionsList.setSelection(savedInstanceState.getInt("grid-position"));
+        }
+
+        SharedPreferences prefs = this.getActivity().getSharedPreferences("prefs", Context.MODE_PRIVATE);
+        String lastModified = prefs.getString("lastSyncTimestamp", "");
+        if (lastModified.equals("")) {
+            waitingMessage.setVisibility(View.VISIBLE);
+        }
+
+        return v;
     }
 
     public ListAdapter getAdapter() {
@@ -125,24 +145,8 @@ public class ContributionsListFragment extends SherlockFragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        controller = new ContributionController(this);
+        controller = new fr.free.nrw.commons.contributions.ContributionController(this);
         controller.loadState(savedInstanceState);
-
-        contributionsList = (GridView)getView().findViewById(R.id.contributionsList);
-        waitingMessage = (TextView)getView().findViewById(R.id.waitingMessage);
-        emptyMessage = (TextView)getView().findViewById(R.id.waitingMessage);
-
-        contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener)getActivity());
-        if(savedInstanceState != null) {
-            Log.d("Commons", "Scrolling to " + savedInstanceState.getInt("grid-position"));
-            contributionsList.setSelection(savedInstanceState.getInt("grid-position"));
-        }
-
-        SharedPreferences prefs = this.getActivity().getSharedPreferences("prefs", Context.MODE_PRIVATE);
-        String lastModified = prefs.getString("lastSyncTimestamp", "");
-        if (lastModified.equals("")) {
-            waitingMessage.setVisibility(View.VISIBLE);
-        }
     }
 
     private void clearSyncMessage() {

commons/app/src/main/java/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -2,30 +2,45 @@ package fr.free.nrw.commons.media;
 
 import android.content.Intent;
 import android.database.DataSetObserver;
-import android.graphics.*;
+import android.graphics.Bitmap;
-import android.os.*;
+import android.os.AsyncTask;
-import android.text.*;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.*;
+import android.view.LayoutInflater;
-import android.widget.*;
+import android.view.View;
-import com.actionbarsherlock.app.SherlockFragment;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.android.volley.toolbox.ImageLoader;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 
-import com.android.volley.toolbox.*;
-
-import fr.free.nrw.commons.*;
-
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class MediaDetailFragment extends SherlockFragment {
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.License;
+import fr.free.nrw.commons.LicenseList;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.MediaDataExtractor;
+import fr.free.nrw.commons.MediaWikiImageView;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+
+public class MediaDetailFragment extends Fragment {
 
     private boolean editable;
     private DisplayImageOptions displayOptions;
-    private MediaDetailPagerFragment.MediaDetailProvider detailProvider;
+    private fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider detailProvider;
     private int index;
 
     public static MediaDetailFragment forMedia(int index) {
@@ -50,7 +65,7 @@ public class MediaDetailFragment extends SherlockFragment {
     //private EditText title;
     private ProgressBar loadingProgress;
     private ImageView loadingFailed;
-    private MediaDetailSpacer spacer;
+    private fr.free.nrw.commons.media.MediaDetailSpacer spacer;
     private int initialListTop = 0;
 
     private TextView title;
@@ -84,7 +99,7 @@ public class MediaDetailFragment extends SherlockFragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        detailProvider = (MediaDetailPagerFragment.MediaDetailProvider)getActivity();
+        detailProvider = (fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider)getActivity();
 
         if(savedInstanceState != null) {
             editable = savedInstanceState.getBoolean("editable");
@@ -106,7 +121,7 @@ public class MediaDetailFragment extends SherlockFragment {
         scrollView = (ScrollView) view.findViewById(R.id.mediaDetailScrollView);
 
         // Detail consists of a list view with main pane in header view, plus category list.
-        spacer = (MediaDetailSpacer) view.findViewById(R.id.mediaDetailSpacer);
+        spacer = (fr.free.nrw.commons.media.MediaDetailSpacer) view.findViewById(R.id.mediaDetailSpacer);
         title = (TextView) view.findViewById(R.id.mediaDetailTitle);
         desc = (TextView) view.findViewById(R.id.mediaDetailDesc);
         license = (TextView) view.findViewById(R.id.mediaDetailLicense);

commons/app/src/main/java/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

@@ -1,36 +1,42 @@
 package fr.free.nrw.commons.media;
 
 import android.app.DownloadManager;
-import android.content.*;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.database.Cursor;
 import android.database.DataSetObserver;
-import android.net.*;
+import android.net.Uri;
-import android.os.*;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.Log;
-import android.view.*;
+import android.view.LayoutInflater;
-import com.actionbarsherlock.app.SherlockFragment;
+import android.view.Menu;
-import com.actionbarsherlock.view.Menu;
+import android.view.MenuInflater;
-import com.actionbarsherlock.view.MenuInflater;
+import android.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 
-import fr.free.nrw.commons.*;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.EventLog;
 import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 
-public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener {
+public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPageChangeListener {
     private ViewPager pager;
     private Boolean editable;
     private CommonsApplication app;
 
     public void onPageScrolled(int i, float v, int i2) {
-        getSherlockActivity().supportInvalidateOptionsMenu();
+        getActivity().supportInvalidateOptionsMenu();
     }
 
     public void onPageSelected(int i) {
@@ -59,11 +65,11 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa
                 // See bug https://code.google.com/p/android/issues/detail?id=27526
                 pager.postDelayed(new Runnable() {
                     public void run() {
-                        getSherlockActivity().supportInvalidateOptionsMenu();
+                        getActivity().supportInvalidateOptionsMenu();
                     }
                 }, 5);
             }
-            return MediaDetailFragment.forMedia(i, editable);
+            return fr.free.nrw.commons.media.MediaDetailFragment.forMedia(i, editable);
         }
 
         @Override
@@ -93,7 +99,7 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa
                 public void run() {
                     pager.setAdapter(new MediaDetailAdapter(getChildFragmentManager()));
                     pager.setCurrentItem(pageNumber, false);
-                    getSherlockActivity().supportInvalidateOptionsMenu();
+                    getActivity().supportInvalidateOptionsMenu();
                 }
             }, 100);
         } else {
@@ -121,7 +127,7 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        MediaDetailProvider provider = (MediaDetailProvider)getSherlockActivity();
+        MediaDetailProvider provider = (MediaDetailProvider)getActivity();
         Media m = provider.getMediaAtPosition(pager.getCurrentItem());
         switch(item.getItemId()) {
             case R.id.menu_share_current_image:
@@ -147,12 +153,12 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa
             case R.id.menu_retry_current_image:
                 // Is this... sane? :)
                 ((ContributionsActivity)getActivity()).retryUpload(pager.getCurrentItem());
-                getSherlockActivity().getSupportFragmentManager().popBackStack();
+                getActivity().getSupportFragmentManager().popBackStack();
                 return true;
             case R.id.menu_cancel_current_image:
                 // todo: delete image
                 ((ContributionsActivity)getActivity()).deleteUpload(pager.getCurrentItem());
-                getSherlockActivity().getSupportFragmentManager().popBackStack();
+                getActivity().getSupportFragmentManager().popBackStack();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -233,7 +239,7 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa
             menu.clear(); // see http://stackoverflow.com/a/8495697/17865
             inflater.inflate(R.menu.fragment_image_detail, menu);
             if(pager != null) {
-                MediaDetailProvider provider = (MediaDetailProvider)getSherlockActivity();
+                MediaDetailProvider provider = (MediaDetailProvider)getActivity();
                 Media m = provider.getMediaAtPosition(pager.getCurrentItem());
                 if(m != null) {
                     // Enable default set of actions, then re-enable different set of actions only if it is a failed contrib

commons/app/src/main/java/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java

@@ -8,10 +8,10 @@ import android.database.DataSetObserver;
 import android.net.*;
 import android.os.*;
 import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.*;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
-import com.actionbarsherlock.view.MenuItem;
 
 import fr.free.nrw.commons.*;
 import fr.free.nrw.commons.auth.*;

commons/app/src/main/java/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java

@@ -4,14 +4,12 @@ import android.content.*;
 import android.graphics.*;
 import android.net.*;
 import android.os.*;
+import android.support.v4.app.Fragment;
 import android.text.*;
 import android.util.*;
 import android.view.*;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
 import com.nostra13.universalimageloader.core.*;
 
 import fr.free.nrw.commons.R;
@@ -20,7 +18,7 @@ import fr.free.nrw.commons.contributions.*;
 import fr.free.nrw.commons.media.*;
 
 
-public class MultipleUploadListFragment extends SherlockFragment {
+public class MultipleUploadListFragment extends Fragment {
 
     public interface OnMultipleUploadInitiatedHandler {
         public void OnMultipleUploadInitiated();
@@ -183,7 +181,7 @@ public class MultipleUploadListFragment extends SherlockFragment {
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater inflater) {
+    public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         menu.clear();
         inflater.inflate(R.menu.fragment_multiple_upload_list, menu);

commons/app/src/main/java/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -1,32 +1,32 @@
 package fr.free.nrw.commons.upload;
 
-import android.content.*;
+import android.content.ContentResolver;
-import android.database.Cursor;
+import android.content.Intent;
-import android.os.*;
+import android.net.Uri;
-import com.nostra13.universalimageloader.core.ImageLoader;
+import android.os.Bundle;
-import android.net.*;
+import android.os.Environment;
-import android.provider.MediaStore;
 import android.support.v4.app.NavUtils;
-import com.actionbarsherlock.view.MenuItem;
-
 import android.util.Log;
-import android.widget.*;
+import android.view.MenuItem;
+import android.widget.ImageView;
+import android.widget.Toast;
 
-import fr.free.nrw.commons.*;
+import com.nostra13.universalimageloader.core.ImageLoader;
-import fr.free.nrw.commons.caching.CacheController;
-import fr.free.nrw.commons.modifications.CategoryModifier;
-import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
-import fr.free.nrw.commons.CommonsApplication;
-import fr.free.nrw.commons.EventLog;
-import fr.free.nrw.commons.category.CategorizationFragment;
-import fr.free.nrw.commons.contributions.*;
-import fr.free.nrw.commons.auth.*;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
-import fr.free.nrw.commons.modifications.ModifierSequence;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.EventLog;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.auth.*;
+import fr.free.nrw.commons.category.CategorizationFragment;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.modifications.CategoryModifier;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
+import fr.free.nrw.commons.modifications.ModifierSequence;
+import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
+
 /**
  * Activity for the title/desc screen after image is selected. Also starts processing image
  * GPS coordinates or user location (if enabled in Settings) for category suggestions.

commons/app/src/main/java/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

@@ -7,24 +7,25 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockFragment;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import fr.free.nrw.commons.Prefs;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.R;
 
-public class SingleUploadFragment extends SherlockFragment {
+import fr.free.nrw.commons.Prefs;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+
+public class SingleUploadFragment extends Fragment {
 
     public interface OnUploadActionInitiated {
         void uploadActionInitiated(String title, String description);
@@ -69,8 +70,8 @@ public class SingleUploadFragment extends SherlockFragment {
             public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {}
 
             public void afterTextChanged(Editable editable) {
-                if(getSherlockActivity() != null) {
+                if(getActivity() != null) {
-                    getSherlockActivity().invalidateOptionsMenu();
+                    getActivity().invalidateOptionsMenu();
                 }
             }
         };

commons/app/src/main/res/menu/activity_login.xml

@@ -1,6 +1,7 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_settings"
         android:title="@string/menu_settings"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        app:showAsAction="never" />
 </menu>

commons/app/src/main/res/menu/activity_share.xml

@@ -1,7 +1,8 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_upload_single"
         android:title="@string/menu_upload_single"
         android:icon="@drawable/social_send_now"
         android:enabled="false"
-        android:showAsAction="always" />
+        app:showAsAction="always" />
 </menu>

commons/app/src/main/res/menu/fragment_categorization.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_save_categories"
           android:title="@string/menu_save_categories"
           android:icon="@android:drawable/ic_menu_save"
-          android:showAsAction="always" />
+          app:showAsAction="always" />
 </menu>

commons/app/src/main/res/menu/fragment_contributions_list.xml

@@ -1,34 +1,35 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_from_camera"
           android:title="@string/menu_from_camera"
           android:orderInCategory="100"
-          android:showAsAction="always|withText"
+          app:showAsAction="ifRoom|withText"
           android:icon="@android:drawable/ic_menu_camera"
             />
     <item android:id="@+id/menu_from_gallery"
         android:title="@string/menu_from_gallery"
         android:orderInCategory="200"
-        android:showAsAction="always|withText"
+        app:showAsAction="ifRoom|withText"
         android:icon="@android:drawable/ic_menu_gallery"
             />
     <item android:id="@+id/menu_settings"
           android:title="@string/menu_settings"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:icon="@android:drawable/ic_menu_preferences"
           />
     <item android:id="@+id/menu_about"
           android:title="@string/menu_about"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:icon="@android:drawable/ic_menu_info_details"
           />
     <item android:id="@+id/menu_feedback"
           android:title="@string/menu_feedback"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:icon="@android:drawable/ic_menu_send"
             />
     <item android:id="@+id/menu_refresh"
           android:title="@string/menu_refresh"
-          android:showAsAction="never"
+          app:showAsAction="never"
           />
 
 </menu>

commons/app/src/main/res/menu/fragment_image_detail.xml

@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_share_current_image"
-          android:showAsAction="ifRoom|withText"
+          app:showAsAction="ifRoom|withText"
           android:icon="@android:drawable/ic_menu_share"
           android:title="@string/menu_share"
           />
     <item android:id="@+id/menu_browser_current_image"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:icon="@android:drawable/ic_menu_view"
           android:title="@string/menu_open_in_browser"
             />
     <item android:id="@+id/menu_download_current_image"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:icon="@drawable/ic_menu_download"
           android:title="@string/menu_download"
           />
     <item android:id="@+id/menu_retry_current_image"
-          android:showAsAction="ifRoom|withText"
+          app:showAsAction="ifRoom|withText"
           android:icon="@android:drawable/ic_menu_revert"
           android:title="@string/menu_retry_upload"
           android:visible="false"
           android:enabled="false"
             />
     <item android:id="@+id/menu_cancel_current_image"
-          android:showAsAction="never"
+          app:showAsAction="never"
           android:icon="@android:drawable/ic_menu_delete"
           android:title="@string/menu_cancel_upload"
           android:visible="false"

commons/app/src/main/res/menu/fragment_multiple_upload_list.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_upload_multiple"
           android:title="@string/share_upload_button"
-          android:showAsAction="always|withText"
+          app:showAsAction="always|withText"
           android:icon="@android:drawable/ic_menu_send"
         />
 </menu>

commons/app/src/main/res/values/styles.xml

@@ -1,12 +1,12 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.Sherlock" />
+    <style name="AppTheme" parent="Theme.AppCompat" />
 
     <style name="NoTitle" parent="AppTheme">
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="LightNoTitle" parent="Theme.Sherlock.Light.NoActionBar"></style>
+    <style name="LightNoTitle" parent="Theme.AppCompat.Light.NoActionBar"/>
 
     <style name="NotificationText" parent="android:TextAppearance.DeviceDefault.Small">
         <item name="android:textColor">?android:attr/textColorPrimary</item>