Skip to content

Commit

Permalink
Adds the version 3.0.0 on jcenter and migrates to Android X
Browse files Browse the repository at this point in the history
  • Loading branch information
wajahatkarim3 committed Mar 28, 2020
1 parent 507efed commit c36b520
Show file tree
Hide file tree
Showing 20 changed files with 193 additions and 61 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
134 changes: 109 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions EasyFlipView/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ext {
/*
PUBLISH_GROUP_ID = 'com.wajahatkarim3.EasyFlipView'
PUBLISH_ARTIFACT_ID = 'EasyFlipView'
PUBLISH_VERSION = '2.0.0'
PUBLISH_VERSION = '3.0.0'
*/

bintrayRepo = "EasyFlipView"
Expand All @@ -21,7 +21,7 @@ ext {
siteUrl = 'https://github.com/wajahatkarim3/EasyFlipView'
gitUrl = 'https://github.com/wajahatkarim3/EasyFlipView.git'

libraryVersion = '2.1.2'
libraryVersion = '3.0.0'

developerId = 'wajahatkarim3'
developerName = 'Wajahat Karim'
Expand All @@ -41,7 +41,7 @@ android {
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

}

Expand All @@ -59,10 +59,10 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation "com.android.support:appcompat-v7:$supportVersion"
implementation 'androidx.appcompat:appcompat:1.0.0'
testImplementation 'junit:junit:4.12'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* For more information, check http://github.com/wajahatkarim3/EasyFlipView
*
* @author Wajahat Karim (http://wajahatkarim.com)
* @version 1.0.1 01/11/2017
* @version 3.0.0 28/03/2019
*/
public class EasyFlipView extends FrameLayout {

Expand Down Expand Up @@ -132,6 +132,7 @@ protected void onFinishInflate() {

findViews();
changeCameraDistance();
setupInitializations();
}

@Override
Expand Down Expand Up @@ -192,6 +193,11 @@ private void findViews() {
}
}

private void setupInitializations()
{
mCardBackLayout.setVisibility(View.GONE);
}

private void loadAnimations() {
if (flipType.equalsIgnoreCase("horizontal")) {

Expand Down
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Changes exist in the [releases](https://github.com/wajahatkarim3/EasyFlipView/re

💻 Installation
============
Add this in your app's build.gradle file:
Add this in your app's `build.gradle` file:
```groovy
dependencies {
implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:2.1.2'
implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:3.0.0'
}
```

Expand All @@ -40,7 +40,7 @@ Or add EasyFlipView as a new dependency inside your pom.xml
<dependency>
<groupId>com.wajahatkarim3.EasyFlipView</groupId>
<artifactId>EasyFlipView</artifactId>
<version>2.1.2</version>
<version>3.0.0</version>
<type>pom</type>
</dependency>
```
Expand Down Expand Up @@ -334,6 +334,10 @@ Wajahat Karim
- [**iGio90**](https://github.com/iGio90) for adding dynamic views support [Pull Request # 10](https://github.com/wajahatkarim3/EasyFlipView/pull/10)
- [**Sachin Varma**](https://www.linkedin.com/in/sachin-varma-58b243118/) for adding vertical animations support [Pull Request # 12](https://github.com/wajahatkarim3/EasyFlipView/pull/12)
- [**Sachin Varma**](https://www.linkedin.com/in/sachin-varma-58b243118/) for adding multi-dimension animations support [Pull Request # 23](https://github.com/wajahatkarim3/EasyFlipView/pull/23)
- [**Sachin Varma**](https://www.linkedin.com/in/sachin-varma-58b243118/) for adding multi-dimension animations support [Pull Request # 23](https://github.com/wajahatkarim3/EasyFlipView/pull/23)
- [**Daniel Luque**](https://github.com/DrankoLQ) for updating the `targetSdk` to 28 [Pull Request # 30](https://github.com/wajahatkarim3/EasyFlipView/pull/30)
- [**Aditya Zope**](https://github.com/adzo261) for adding the feature to flip card only once. [Pull Request # 33](https://github.com/wajahatkarim3/EasyFlipView/pull/33)
- [**Bruno Correia**](https://github.com/bffcorreia) for removing `<application>` tag from `AndroidManifest.xml`. [Pull Request # 38](https://github.com/wajahatkarim3/EasyFlipView/pull/38) and fixing the card animation glitch issue [Pull Request # 39](https://github.com/wajahatkarim3/EasyFlipView/pull/39)


# 👍 How to Contribute
Expand Down
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
Expand All @@ -24,13 +24,13 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation "com.android.support:appcompat-v7:$supportVersion"
implementation "com.android.support:design:$supportVersion"
implementation "com.android.support:support-v4:$supportVersion"
implementation "com.android.support:cardview-v7:$supportVersion"
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
testImplementation 'junit:junit:4.12'

implementation project(":EasyFlipView")
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".SimpleViewFlipActivity" />
<activity android:name=".SimpleViewFlipActivity"
android:windowSoftInputMode="adjustResize"/>
<activity android:name=".RecyclerViewFlipActivity" />
<activity android:name=".FlipOnceExampleActivity"></activity>
</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wajahatkarim3.easyflipview.demo;

import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.wajahatkarim3.easyflipview.demo;

import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.wajahatkarim3.easyflipview.demo;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.wajahatkarim3.easyflipview.demo;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.wajahatkarim3.easyflipview.demo;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Toast;
import com.wajahatkarim3.easyflipview.EasyFlipView;
Expand All @@ -18,7 +18,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_simple_view);

final EasyFlipView easyFlipView = (EasyFlipView) findViewById(R.id.easyFlipView);
easyFlipView.setFlipDuration(1000);
easyFlipView.setFlipDuration(10000);
easyFlipView.setFlipEnabled(true);

findViewById(R.id.imgFrontCard).setOnClickListener(new View.OnClickListener() {
Expand Down Expand Up @@ -48,8 +48,9 @@ public void onViewFlipCompleted(EasyFlipView easyFlipView, EasyFlipView.FlipStat


final EasyFlipView easyFlipView2 = (EasyFlipView) findViewById(R.id.easyFlipView2);
easyFlipView2.setToVerticalType();
easyFlipView2.setFlipTypeFromBack();
easyFlipView2.setFlipDuration(10000);
easyFlipView2.setToHorizontalType();
easyFlipView2.setFlipTypeFromLeft();


}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_recyclerview_flip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
Loading

0 comments on commit c36b520

Please sign in to comment.