Replace ActionBarSherlock with AppCompat in Flickr

6 files changed, 11 insertions, 9 deletions

diff --git a/samples/flickr/ActionBarSherlock b/samples/flickr/ActionBarSherlock
deleted file mode 160000
-Subproject 90939dc3925ffaaa0de269bbbe1b35e274968ea
diff --git a/samples/flickr/AndroidManifest.xml b/samples/flickr/AndroidManifest.xml
index 826efc55..b8891abb 100644
--- a/samples/flickr/AndroidManifest.xml
+++ b/samples/flickr/AndroidManifest.xml
@@ -11,7 +11,7 @@
 
   <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"
     android:hardwareAccelerated="true"
-    android:theme="@style/Theme.Sherlock">
+    android:theme="@style/Theme.AppCompat">
 
       <activity android:name=".FlickrSearchActivity"
         android:label="@string/app_name"
diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle
index ff261bf1..4fb9be80 100644
--- a/samples/flickr/build.gradle
+++ b/samples/flickr/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
 dependencies {
     compile project(':library')
 
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.android.support:support-v4:19.1.+'
+    compile 'com.android.support:appcompat-v7:18.0.+'
     compile 'com.mcxiaoke.volley:library:1.0.+'
 }
 
diff --git a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java
index 3b9b1c64..574de20b 100644
--- a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java
+++ b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoGrid.java
@@ -1,13 +1,14 @@
 package com.bumptech.glide.samples.flickr;
 
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
-import com.actionbarsherlock.app.SherlockFragment;
+
 import com.bumptech.glide.GenericRequestBuilder;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.ListPreloader;
@@ -23,7 +24,7 @@ import java.util.List;
  * A fragment that shows square image thumbnails whose size is determined by the framgent's arguments in a grid
  * pattern.
  */
-public class FlickrPhotoGrid extends SherlockFragment implements PhotoViewer {
+public class FlickrPhotoGrid extends Fragment implements PhotoViewer {
     private static final String STATE_POSITION_INDEX = "state_position_index";
 
     private static final String IMAGE_SIZE_KEY = "image_size";
diff --git a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java
index 5facfee0..584044c1 100644
--- a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java
+++ b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrPhotoList.java
@@ -3,6 +3,7 @@ package com.bumptech.glide.samples.flickr;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +11,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockFragment;
+
 import com.bumptech.glide.GenericRequestBuilder;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.ListPreloader;
@@ -24,7 +25,7 @@ import java.util.List;
 /**
  * A fragment that shows cropped image thumbnails half the width of the screen in a scrolling list.
  */
-public class FlickrPhotoList extends SherlockFragment implements PhotoViewer {
+public class FlickrPhotoList extends Fragment implements PhotoViewer {
     private static final String STATE_POSITION_INDEX = "state_position_index";
     private static final String STATE_POSITION_OFFSET = "state_position_offset";
     private FlickrPhotoListAdapter adapter;
diff --git a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java
index f877ef18..a6a0ca9c 100644
--- a/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java
+++ b/samples/flickr/src/main/java/com/bumptech/glide/samples/flickr/FlickrSearchActivity.java
@@ -12,6 +12,8 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -22,8 +24,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.FutureTarget;
 import com.bumptech.glide.samples.flickr.api.Api;
@@ -43,7 +43,7 @@ import java.util.concurrent.ExecutionException;
  * An activity that allows users to search for images on Flickr and that contains a series of fragments that display
  * retrieved image thumbnails.
  */
-public class FlickrSearchActivity extends SherlockFragmentActivity {
+public class FlickrSearchActivity extends ActionBarActivity {
     private static final String TAG = "FlickrSearchActivity";
     private static final String STATE_SEARCH_STRING = "state_search_string";