Skip to content

Commit 8c806a7

Browse files
kotya341kotya341
committed
Merge branch 'release/replace_animation_util_with_android_library_project'
2 parents 9b0b93a + 23f5511 commit 8c806a7

45 files changed

Lines changed: 114 additions & 56 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ android {
55
buildToolsVersion "21.1.2"
66

77
defaultConfig {
8-
applicationId "yalantis.com.sidemenu"
98
minSdkVersion 15
109
targetSdkVersion 21
1110
versionCode 1
@@ -20,7 +19,8 @@ android {
2019
}
2120

2221
dependencies {
23-
compile project(':lib:CircularReveal:circualreveal')
22+
compile project(':lib:CircularReveal:circualreveal')
23+
compile project(':library')
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
2525
compile 'com.android.support:appcompat-v7:21.0.3'
2626
}

app/src/androidTest/java/yalantis/com/sidemenu/ApplicationTest.java renamed to app/src/androidTest/java/yalantis/com/sidemenu/sample/ApplicationTest.java

File renamed without changes.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="yalantis.com.sidemenu" >
3+
package="yalantis.com.sidemenu.sample">
44

55
<application
66
android:allowBackup="true"
77
android:icon="@drawable/ic_launcher"
88
android:label="@string/app_name"
9-
android:theme="@style/AppTheme" >
9+
android:theme="@style/AppTheme">
1010
<activity
1111
android:name=".MainActivity"
12-
android:label="@string/app_name" >
12+
android:label="@string/app_name">
1313
<intent-filter>
14-
<action android:name="android.intent.action.MAIN" />
14+
<action android:name="android.intent.action.MAIN"/>
1515

16-
<category android:name="android.intent.category.LAUNCHER" />
16+
<category android:name="android.intent.category.LAUNCHER"/>
1717
</intent-filter>
1818
</activity>
1919
</application>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package yalantis.com.sidemenu;
1+
package yalantis.com.sidemenu.sample;
22

33
import android.content.res.Configuration;
44
import android.graphics.Color;
@@ -19,10 +19,10 @@
1919

2020
import io.codetail.animation.SupportAnimator;
2121
import io.codetail.animation.ViewAnimationUtils;
22-
import yalantis.com.sidemenu.fragment.ContentFragment;
2322
import yalantis.com.sidemenu.interfaces.Resourceble;
2423
import yalantis.com.sidemenu.interfaces.ScreenShotable;
2524
import yalantis.com.sidemenu.model.SlideMenuItem;
25+
import yalantis.com.sidemenu.sample.fragment.ContentFragment;
2626
import yalantis.com.sidemenu.util.ViewAnimator;
2727

2828

app/src/main/java/yalantis/com/sidemenu/fragment/ContentFragment.java renamed to app/src/main/java/yalantis/com/sidemenu/sample/fragment/ContentFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package yalantis.com.sidemenu.fragment;
1+
package yalantis.com.sidemenu.sample.fragment;
22

33
import android.graphics.Bitmap;
44
import android.graphics.Canvas;
@@ -10,8 +10,8 @@
1010
import android.view.ViewGroup;
1111
import android.widget.ImageView;
1212

13-
import yalantis.com.sidemenu.R;
1413
import yalantis.com.sidemenu.interfaces.ScreenShotable;
14+
import yalantis.com.sidemenu.sample.R;
1515

1616
/**
1717
* Created by Konstantin on 22.12.2014.

‎app/src/main/res/anim/layout_bottom_to_top_slide.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎app/src/main/res/anim/rotate.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/res/anim/slide_right.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎app/src/main/res/drawable-hdpi/ic_launcher.png‎

-7.14 KB

‎app/src/main/res/drawable-mdpi/ic_launcher.png‎

-3.68 KB

0 commit comments

Comments
 (0)