Skip to content

Commit

Permalink
Merge pull request #84 from ozodrukh/3.0
Browse files Browse the repository at this point in the history
Major update
  • Loading branch information
ozodrukh committed Jun 1, 2016
2 parents 0ad0b2e + 9e9dbd7 commit 1c90b26
Show file tree
Hide file tree
Showing 30 changed files with 1,129 additions and 2,516 deletions.
41 changes: 22 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 23
buildToolsVersion "23.0.3"

defaultConfig {
applicationId "io.codetail.circualrevealsample"
minSdkVersion 15
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
defaultConfig {
applicationId "io.codetail.circualrevealsample"
minSdkVersion 15
targetSdkVersion 23
versionCode 1
versionName "1.0"
}

lintOptions{
abortOnError false
}
lintOptions {
abortOnError false
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':circualreveal')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':circualreveal')

compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile 'com.android.support:design:23.4.0'

compile 'com.jakewharton:butterknife:6.0.0'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
}
34 changes: 17 additions & 17 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.codetail.circualrevealsample" >
package="io.codetail.circualrevealsample">

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name="io.codetail.circualrevealsample.MainActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<uses-permission android:name="android.permission.INTERNET"/>

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name="io.codetail.circualrevealsample.MainActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<activity android:name=".Sample2Activity" />
<activity android:name=".Sample3Activity" />
</application>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".RadialTransformationActivity"/>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.codetail.circualrevealsample;

import java.util.ArrayList;
import java.util.Collection;

/**
* A simple Path object that holds information about the points along
* a path. The API allows you to specify a move location (which essentially
* jumps from the previous point in the path to the new one), a line location
* (which creates a line segment from the previous location) and a curve
* location (which creates a cubic B�zier curve from the previous location).
*/
public class AnimatorPath {

// The points in the path
ArrayList<PathPoint> mPoints = new ArrayList<PathPoint>();

/**
* Move from the current path point to the new one
* specified by x and y. This will create a discontinuity if this point is
* neither the first point in the path nor the same as the previous point
* in the path.
*/
public void moveTo(float x, float y) {
mPoints.add(PathPoint.moveTo(x, y));
}

/**
* Create a straight line from the current path point to the new one
* specified by x and y.
*/
public void lineTo(float x, float y) {
mPoints.add(PathPoint.lineTo(x, y));
}

/**
* Create a cubic B�zier curve from the current path point to the new one
* specified by x and y. The curve uses the current path location as the first anchor
* point, the control points (c0X, c0Y) and (c1X, c1Y), and (x, y) as the end anchor point.
*/
public void curveTo(float c0X, float c0Y, float c1X, float c1Y, float x, float y) {
mPoints.add(PathPoint.curveTo(c0X, c0Y, c1X, c1Y, x, y));
}

/**
* Returns a Collection of PathPoint objects that describe all points in the path.
*/
public Collection<PathPoint> getPoints() {
return mPoints;
}
}

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1c90b26

Please sign in to comment.