Skip to content

Commit cf874dd

Browse files
author
Alexey Chernenko
committed
updated graddle files, and replaced AppBar activity with AppCompat
1 parent c271fb6 commit cf874dd

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ repositories {
55
}
66
}
77
android {
8-
compileSdkVersion 21
9-
buildToolsVersion "21.1.2"
8+
compileSdkVersion 23
9+
buildToolsVersion "23.0.2"
1010

1111
defaultConfig {
1212
minSdkVersion 15
13-
targetSdkVersion 21
13+
targetSdkVersion 23
1414
versionCode 1
1515
versionName "1.0"
1616
}
@@ -25,6 +25,6 @@ android {
2525
dependencies {
2626
compile project(':library')
2727
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
compile 'com.android.support:appcompat-v7:21.0.3'
28+
compile 'com.android.support:appcompat-v7:23.1.1'
2929
compile 'com.github.ozodrukh:CircularReveal:1.0.4'
3030
}

app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.support.v4.widget.DrawerLayout;
88
import android.support.v7.app.ActionBarActivity;
99
import android.support.v7.app.ActionBarDrawerToggle;
10+
import android.support.v7.app.AppCompatActivity;
1011
import android.support.v7.widget.Toolbar;
1112
import android.view.Menu;
1213
import android.view.MenuItem;
@@ -26,7 +27,7 @@
2627
import yalantis.com.sidemenu.util.ViewAnimator;
2728

2829

29-
public class MainActivity extends ActionBarActivity implements ViewAnimator.ViewAnimatorListener {
30+
public class MainActivity extends AppCompatActivity implements ViewAnimator.ViewAnimatorListener {
3031
private DrawerLayout drawerLayout;
3132
private ActionBarDrawerToggle drawerToggle;
3233
private List<SlideMenuItem> list = new ArrayList<>();

library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
minSdkVersion 15
9-
targetSdkVersion 21
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -18,6 +18,6 @@ android {
1818
}
1919
}
2020
dependencies {
21-
compile 'com.android.support:appcompat-v7:21.0.3'
21+
compile 'com.android.support:appcompat-v7:23.1.1'
2222
}
2323
apply from: '../mavenpush.gradle'

library/src/main/java/yalantis/com/sidemenu/util/ViewAnimator.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.os.Handler;
44
import android.support.v4.widget.DrawerLayout;
55
import android.support.v7.app.ActionBarActivity;
6+
import android.support.v7.app.AppCompatActivity;
67
import android.view.View;
78
import android.view.animation.AccelerateInterpolator;
89
import android.view.animation.Animation;
@@ -23,20 +24,20 @@ public class ViewAnimator<T extends Resourceble> {
2324
private final int ANIMATION_DURATION = 175;
2425
public static final int CIRCULAR_REVEAL_ANIMATION_DURATION = 500;
2526

26-
private ActionBarActivity actionBarActivity;
27+
private AppCompatActivity appCompatActivity;
2728
private List<T> list;
2829

2930
private List<View> viewList = new ArrayList<>();
3031
private ScreenShotable screenShotable;
3132
private DrawerLayout drawerLayout;
3233
private ViewAnimatorListener animatorListener;
3334

34-
public ViewAnimator(ActionBarActivity activity,
35+
public ViewAnimator(AppCompatActivity activity,
3536
List<T> items,
3637
ScreenShotable screenShotable,
3738
final DrawerLayout drawerLayout,
3839
ViewAnimatorListener animatorListener) {
39-
this.actionBarActivity = activity;
40+
this.appCompatActivity = activity;
4041
this.list = items;
4142
this.screenShotable = screenShotable;
4243
this.drawerLayout = drawerLayout;
@@ -48,7 +49,7 @@ public void showMenuContent() {
4849
viewList.clear();
4950
double size = list.size();
5051
for (int i = 0; i < size; i++) {
51-
View viewMenu = actionBarActivity.getLayoutInflater().inflate(R.layout.menu_list_item, null);
52+
View viewMenu = appCompatActivity.getLayoutInflater().inflate(R.layout.menu_list_item, null);
5253
final int finalI = i;
5354
viewMenu.setOnClickListener(new View.OnClickListener() {
5455
@Override

0 commit comments

Comments
 (0)