diff --git a/FlycoDialog_Lib/build.gradle b/FlycoDialog_Lib/build.gradle index 4032914..12d9f13 100644 --- a/FlycoDialog_Lib/build.gradle +++ b/FlycoDialog_Lib/build.gradle @@ -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 } @@ -23,7 +23,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } //def siteUrl = 'https://github.com/H07000223' // 项目的主页 diff --git a/app/build.gradle b/app/build.gradle index 6158d3a..b66c157 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" } @@ -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' diff --git a/app/src/main/java/com/flyco/dialogsamples/extra/CustomBaseDialog.java b/app/src/main/java/com/flyco/dialogsamples/extra/CustomBaseDialog.java index c736347..3a3e9ec 100644 --- a/app/src/main/java/com/flyco/dialogsamples/extra/CustomBaseDialog.java +++ b/app/src/main/java/com/flyco/dialogsamples/extra/CustomBaseDialog.java @@ -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 { - @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); diff --git a/app/src/main/java/com/flyco/dialogsamples/extra/IOSTaoBaoDialog.java b/app/src/main/java/com/flyco/dialogsamples/extra/IOSTaoBaoDialog.java index b2e3b7c..6a4366b 100644 --- a/app/src/main/java/com/flyco/dialogsamples/extra/IOSTaoBaoDialog.java +++ b/app/src/main/java/com/flyco/dialogsamples/extra/IOSTaoBaoDialog.java @@ -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 { - @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); diff --git a/app/src/main/java/com/flyco/dialogsamples/extra/ShareBottomDialog.java b/app/src/main/java/com/flyco/dialogsamples/extra/ShareBottomDialog.java index 6dacb49..823166d 100644 --- a/app/src/main/java/com/flyco/dialogsamples/extra/ShareBottomDialog.java +++ b/app/src/main/java/com/flyco/dialogsamples/extra/ShareBottomDialog.java @@ -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 { - @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); diff --git a/app/src/main/java/com/flyco/dialogsamples/extra/ShareTopDialog.java b/app/src/main/java/com/flyco/dialogsamples/extra/ShareTopDialog.java index e329636..c5de1e6 100644 --- a/app/src/main/java/com/flyco/dialogsamples/extra/ShareTopDialog.java +++ b/app/src/main/java/com/flyco/dialogsamples/extra/ShareTopDialog.java @@ -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 { - @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); diff --git a/app/src/main/java/com/flyco/dialogsamples/ui/BubblePopupActivity.java b/app/src/main/java/com/flyco/dialogsamples/ui/BubblePopupActivity.java index 014deec..23516a1 100644 --- a/app/src/main/java/com/flyco/dialogsamples/ui/BubblePopupActivity.java +++ b/app/src/main/java/com/flyco/dialogsamples/ui/BubblePopupActivity.java @@ -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; diff --git a/app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java b/app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java index 2efa0d0..81c1c5e 100644 --- a/app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java +++ b/app/src/main/java/com/flyco/dialogsamples/ui/CustomPopupActivity.java @@ -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; @@ -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; @@ -109,10 +108,10 @@ void clickBottomRightBtn() { class SimpleCustomPop extends BasePopup { - @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); diff --git a/app/src/main/java/com/flyco/dialogsamples/ui/DialogHomeActivity.java b/app/src/main/java/com/flyco/dialogsamples/ui/DialogHomeActivity.java index dcf3215..15141bf 100644 --- a/app/src/main/java/com/flyco/dialogsamples/ui/DialogHomeActivity.java +++ b/app/src/main/java/com/flyco/dialogsamples/ui/DialogHomeActivity.java @@ -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 = { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0395972..a9590cf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,9 +12,9 @@ diff --git a/build.gradle b/build.gradle index e0e9e5e..5e28d3a 100644 --- a/build.gradle +++ b/build.gradle @@ -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 @@ -19,5 +20,6 @@ allprojects { // maven { // url "http://dl.bintray.com/h07000223/maven" // } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d570517..6c2cc73 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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