Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated code to match new version of gradle and butter, can now run o… #59

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updated code to match new version of gradle and butter, can now run o… #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions FlycoDialog_Lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ apply plugin: 'com.android.library'
// 这个version是区分library版本的，因此当我们需要更新library时记得修改这个version
version = "1.3.2"
android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 27
buildToolsVersion "27.0.3"
resourcePrefix "FlycoDialog_" //这个随便填
defaultConfig {
minSdkVersion 11
targetSdkVersion 23
minSdkVersion 14
targetSdkVersion 27
versionCode 132
versionName version
}
Expand All @@ -23,7 +23,7 @@ android {
}

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

//def siteUrl = 'https://github.com/H07000223' // 项目的主页
Expand Down
19 changes: 10 additions & 9 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 27
buildToolsVersion "27.0.3"

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
minSdkVersion 14
targetSdkVersion 27
versionCode 110
versionName "1.1.0"
}
Expand All @@ -19,12 +19,13 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.jakewharton:butterknife:7.0.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation project(':FlycoDialog_Lib')

implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

compile project(':FlycoDialog_Lib')

// After 1.3.0
// compile 'com.flyco.dialog:FlycoDialog_Lib:1.3.2@aar'

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/flyco/dialogsamples/extra/CustomBaseDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import com.flyco.dialog.widget.base.BaseDialog;
import com.flyco.dialogsamples.R;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class CustomBaseDialog extends BaseDialog<CustomBaseDialog> {
@Bind(R.id.tv_cancel) TextView mTvCancel;
@Bind(R.id.tv_exit) TextView mTvExit;
@BindView(R.id.tv_cancel) TextView mTvCancel;
@BindView(R.id.tv_exit) TextView mTvExit;

public CustomBaseDialog(Context context) {
super(context);
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/flyco/dialogsamples/extra/IOSTaoBaoDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
import com.flyco.dialogsamples.R;
import com.flyco.dialogsamples.utils.T;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class IOSTaoBaoDialog extends BottomBaseDialog<IOSTaoBaoDialog> {
@Bind(R.id.ll_wechat_friend_circle) LinearLayout mLlWechatFriendCircle;
@Bind(R.id.ll_wechat_friend) LinearLayout mLlWechatFriend;
@Bind(R.id.ll_qq) LinearLayout mLlQq;
@Bind(R.id.ll_sms) LinearLayout mLlSms;
@BindView(R.id.ll_wechat_friend_circle) LinearLayout mLlWechatFriendCircle;
@BindView(R.id.ll_wechat_friend) LinearLayout mLlWechatFriend;
@BindView(R.id.ll_qq) LinearLayout mLlQq;
@BindView(R.id.ll_sms) LinearLayout mLlSms;

public IOSTaoBaoDialog(Context context, View animateView) {
super(context, animateView);
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/flyco/dialogsamples/extra/ShareBottomDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.flyco.dialogsamples.R;
import com.flyco.dialogsamples.utils.T;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class ShareBottomDialog extends BottomBaseDialog<ShareBottomDialog> {
@Bind(R.id.ll_wechat_friend_circle) LinearLayout mLlWechatFriendCircle;
@Bind(R.id.ll_wechat_friend) LinearLayout mLlWechatFriend;
@Bind(R.id.ll_qq) LinearLayout mLlQq;
@Bind(R.id.ll_sms) LinearLayout mLlSms;
@BindView(R.id.ll_wechat_friend_circle) LinearLayout mLlWechatFriendCircle;
@BindView(R.id.ll_wechat_friend) LinearLayout mLlWechatFriend;
@BindView(R.id.ll_qq) LinearLayout mLlQq;
@BindView(R.id.ll_sms) LinearLayout mLlSms;

public ShareBottomDialog(Context context, View animateView) {
super(context, animateView);
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/flyco/dialogsamples/extra/ShareTopDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.flyco.dialogsamples.R;
import com.flyco.dialogsamples.utils.T;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class ShareTopDialog extends TopBaseDialog<ShareTopDialog> {
@Bind(R.id.ll_wechat_friend_circle) LinearLayout mLlWechatFriendCircle;
@Bind(R.id.ll_wechat_friend) LinearLayout mLlWechatFriend;
@Bind(R.id.ll_qq) LinearLayout mLlQq;
@Bind(R.id.ll_sms) LinearLayout mLlSms;
@BindView(R.id.ll_wechat_friend_circle) LinearLayout mLlWechatFriendCircle;
@BindView(R.id.ll_wechat_friend) LinearLayout mLlWechatFriend;
@BindView(R.id.ll_qq) LinearLayout mLlQq;
@BindView(R.id.ll_sms) LinearLayout mLlSms;

public ShareTopDialog(Context context, View animateView) {
super(context, animateView);
Expand Down
15 changes: 6 additions & 9 deletions app/src/main/java/com/flyco/dialogsamples/ui/BubblePopupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,31 @@
import android.support.v7.app.AppCompatActivity;
import android.view.Gravity;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;

import com.flyco.animation.BounceEnter.BounceRightEnter;
import com.flyco.animation.BounceEnter.BounceTopEnter;
import com.flyco.animation.SlideEnter.SlideBottomEnter;
import com.flyco.animation.SlideExit.SlideBottomExit;
import com.flyco.animation.SlideExit.SlideLeftExit;
import com.flyco.animation.SlideExit.SlideTopExit;
import com.flyco.dialog.widget.popup.BubblePopup;
import com.flyco.dialogsamples.R;
import com.flyco.dialogsamples.extra.CustomBubblePopup;
import com.flyco.dialogsamples.utils.T;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class BubblePopupActivity extends AppCompatActivity {
@Bind(R.id.tv_top_left)
@BindView(R.id.tv_top_left)
TextView mTvTopLeft;
@Bind(R.id.tv_top_right)
@BindView(R.id.tv_top_right)
TextView mTvTopRight;
@Bind(R.id.tv_bottom_left)
@BindView(R.id.tv_bottom_left)
TextView mTvBottomLeft;
@Bind(R.id.tv_bottom_right)
@BindView(R.id.tv_bottom_right)
TextView mTvBottomRight;
@Bind(R.id.tv_center)
@BindView(R.id.tv_center)
TextView mTvCenter;
private Context mContext = this;

Expand Down
21 changes: 10 additions & 11 deletions app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.support.v7.app.AppCompatActivity;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.flyco.animation.BounceEnter.BounceBottomEnter;
Expand All @@ -17,20 +16,20 @@
import com.flyco.dialogsamples.R;
import com.flyco.dialogsamples.utils.T;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class CustomPopupActivity extends AppCompatActivity {
@Bind(R.id.tv_top_left)
@BindView(R.id.tv_top_left)
TextView mTvTopLeft;
@Bind(R.id.tv_top_right)
@BindView(R.id.tv_top_right)
TextView mTvTopRight;
@Bind(R.id.tv_bottom_left)
@BindView(R.id.tv_bottom_left)
TextView mTvBottomLeft;
@Bind(R.id.tv_bottom_right)
@BindView(R.id.tv_bottom_right)
TextView mTvBottomRight;
@Bind(R.id.tv_center)
@BindView(R.id.tv_center)
TextView mTvCenter;
private Context mContext = this;
private SimpleCustomPop mQuickCustomPopup;
Expand Down Expand Up @@ -109,10 +108,10 @@ void clickBottomRightBtn() {

class SimpleCustomPop extends BasePopup<SimpleCustomPop> {

@Bind(R.id.tv_item_1) TextView mTvItem1;
@Bind(R.id.tv_item_2) TextView mTvItem2;
@Bind(R.id.tv_item_3) TextView mTvItem3;
@Bind(R.id.tv_item_4) TextView mTvItem4;
@BindView(R.id.tv_item_1) TextView mTvItem1;
@BindView(R.id.tv_item_2) TextView mTvItem2;
@BindView(R.id.tv_item_3) TextView mTvItem3;
@BindView(R.id.tv_item_4) TextView mTvItem4;

public SimpleCustomPop(Context context) {
super(context);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/flyco/dialogsamples/ui/DialogHomeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

import java.util.ArrayList;

import butterknife.Bind;
import butterknife.BindView;
import butterknife.ButterKnife;

public class DialogHomeActivity extends AppCompatActivity implements ExpandableListView.OnChildClickListener {
@Bind(R.id.elv) ExpandableListView mElv;
@BindView(R.id.elv) ExpandableListView mElv;
private Context mContext = this;
public static String[] mGroups = {"Default Inner Dialog", "Custom Dialog", "Default Inner Anim", "Custom Anim"};
public static String[][] mChilds = {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<style name="myDialogAnim" parent="android:Animation">

<!-- 进入时的动画 -->
<item name="@android:windowEnterAnimation">@anim/dialog_enter</item>
<item name="android:windowEnterAnimation">@anim/dialog_enter</item>
<!-- 退出时的动画 -->
<item name="@android:windowExitAnimation">@anim/dialog_exit</item>
<item name="android:windowExitAnimation">@anim/dialog_exit</item>
</style>


Expand Down
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:3.1.2'
// classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -19,5 +20,6 @@ allprojects {
// maven {
// url "http://dl.bintray.com/h07000223/maven"
// }
google()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Fri Apr 27 05:27:56 BRT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip