diff --git a/README.md b/README.md index 281924f..592ee40 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,11 @@ SwipeToLoadLayout is a reusable pull-to-refresh and pull-to-load-more widget. ## Supported View Theoretically support all kinds of views. +## Update +1、add [SwipeViewFactory](https://github.com/liyzay/SwipeToLoadLayout/blob/master/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeViewFactory.java) to generate HeaderView and FooterView + +2、add default Google Style HeaderView FooterView(use [GoogleStyleSwipeViewFactory](https://github.com/liyzay/SwipeToLoadLayout/blob/master/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleStyleSwipeViewFactory.java) by default) + ## Demo [Download](https://raw.githubusercontent.com/Aspsine/SwipeToLoadLayout/master/art/demo.apk) diff --git a/README_CN.md b/README_CN.md index f439018..d17461d 100644 --- a/README_CN.md +++ b/README_CN.md @@ -5,6 +5,11 @@ SwipeToLoadLayout是一个可以帮助你实现下拉刷新和加载更多的Lay ## 支持的View 理论上支持所有的View +## 修改 +1、添加[SwipeViewFactory](https://github.com/liyzay/SwipeToLoadLayout/blob/master/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeViewFactory.java)接口，用于生成HeaderView和FooterView + +2、添加内置的Google Style的HeaderView和FooterView（默认使用[GoogleStyleSwipeViewFactory](https://github.com/liyzay/SwipeToLoadLayout/blob/master/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleStyleSwipeViewFactory.java)） + ## Demo [Download](https://raw.githubusercontent.com/Aspsine/SwipeToLoadLayout/master/art/demo.apk) diff --git a/app/build.gradle b/app/build.gradle index cf2fb9f..8e0951d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion rootProject.ext.sdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { applicationId "com.aspsine.swipetoloadlayout" minSdkVersion 10 - targetSdkVersion 25 + targetSdkVersion rootProject.ext.sdkVersion versionCode 4 versionName "1.0.4" } @@ -27,9 +27,9 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile project(':library') - compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.android.support:recyclerview-v7:25.1.0' - compile 'com.android.support:design:25.1.0' + compile "com.android.support:appcompat-v7:$supportLibVersion" + compile "com.android.support:recyclerview-v7:$supportLibVersion" + compile "com.android.support:design:$supportLibVersion" compile 'com.google.code.gson:gson:2.4' compile 'com.mcxiaoke.volley:library-aar:1.0.1' compile 'com.squareup.picasso:picasso:2.5.2' diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/GoogleStyleFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/GoogleStyleFragment.java index ff11ffe..90d7247 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/GoogleStyleFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/GoogleStyleFragment.java @@ -21,6 +21,7 @@ import com.aspsine.swipetoloadlayout.demo.R; import com.aspsine.swipetoloadlayout.demo.adapter.RecyclerCharactersAdapter; import com.aspsine.swipetoloadlayout.demo.model.SectionCharacters; +import com.aspsine.swipetoloadlayout.demo.viewfactory.GoogleRingSwipeViewFactory; /** * Created by Aspsine on 2015/9/10. @@ -67,6 +68,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + if(mType!=0){ + swipeToLoadLayout.setSwipeViewFactory(new GoogleRingSwipeViewFactory(getContext())); + } recyclerView = (RecyclerView) view.findViewById(R.id.swipe_target); recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext())); recyclerView.setAdapter(mAdapter); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavJDFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavJDFragment.java index db346c1..013d906 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavJDFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavJDFragment.java @@ -10,6 +10,7 @@ import com.aspsine.swipetoloadlayout.OnRefreshListener; import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.viewfactory.JDSwipeViewFactory; /** * A simple {@link Fragment} subclass. @@ -49,6 +50,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new JDSwipeViewFactory(getContext())); swipeToLoadLayout.setOnRefreshListener(this); } diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavYalantisFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavYalantisFragment.java index 2481245..b35bcb8 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavYalantisFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/NavYalantisFragment.java @@ -15,6 +15,7 @@ import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; import com.aspsine.swipetoloadlayout.demo.R; import com.aspsine.swipetoloadlayout.demo.adapter.BaseArrayAdapter; +import com.aspsine.swipetoloadlayout.demo.viewfactory.YalantisSwipeViewFactory; import java.util.ArrayList; import java.util.HashMap; @@ -86,6 +87,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); setTitle("Yalantis Style"); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new YalantisSwipeViewFactory(getContext())); swipeToLoadLayout.setOnRefreshListener(this); ListView listView = (ListView) view.findViewById(R.id.swipe_target); BaseArrayAdapter adapter = new SampleAdapter(); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterGridViewFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterGridViewFragment.java index d24477a..669a1a4 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterGridViewFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterGridViewFragment.java @@ -22,6 +22,7 @@ import com.aspsine.swipetoloadlayout.demo.R; import com.aspsine.swipetoloadlayout.demo.adapter.CharacterAdapter; import com.aspsine.swipetoloadlayout.demo.model.SectionCharacters; +import com.aspsine.swipetoloadlayout.demo.viewfactory.TwitterRefreshSwipeViewFactory; /** * A simple {@link Fragment} subclass. @@ -60,6 +61,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new TwitterRefreshSwipeViewFactory(getContext())); gridView = (GridView) view.findViewById(R.id.swipe_target); swipeToLoadLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterListViewFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterListViewFragment.java index b4d5d53..3ce18d3 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterListViewFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterListViewFragment.java @@ -27,6 +27,7 @@ import com.aspsine.swipetoloadlayout.demo.adapter.SectionAdapter; import com.aspsine.swipetoloadlayout.demo.model.Character; import com.aspsine.swipetoloadlayout.demo.model.SectionCharacters; +import com.aspsine.swipetoloadlayout.demo.viewfactory.TwitterRefreshSwipeViewFactory; /** * A simple {@link Fragment} subclass. @@ -72,6 +73,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); View pagerView = LayoutInflater.from(view.getContext()).inflate(R.layout.layout_viewpager, listView, false); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new TwitterRefreshSwipeViewFactory(getContext())); listView = (ListView) view.findViewById(R.id.swipe_target); viewPager = (ViewPager) pagerView.findViewById(R.id.viewPager); indicators = (ViewGroup) pagerView.findViewById(R.id.indicators); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterOtherViewFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterOtherViewFragment.java index b10f802..eae3e4a 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterOtherViewFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterOtherViewFragment.java @@ -13,6 +13,7 @@ import com.aspsine.swipetoloadlayout.OnRefreshListener; import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.viewfactory.TwitterRefreshSwipeViewFactory; import com.squareup.picasso.Picasso; /** @@ -65,6 +66,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new TwitterRefreshSwipeViewFactory(getContext())); tvTitle = (TextView) view.findViewById(R.id.tvTitle); View targetView = view.findViewById(R.id.swipe_target); swipeToLoadLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterRecyclerFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterRecyclerFragment.java index 0543312..480f8f7 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterRecyclerFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterRecyclerFragment.java @@ -12,7 +12,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ScrollView; import android.widget.Toast; import com.android.volley.Response; @@ -27,9 +26,9 @@ import com.aspsine.swipetoloadlayout.demo.adapter.OnChildItemClickListener; import com.aspsine.swipetoloadlayout.demo.adapter.OnChildItemLongClickListener; import com.aspsine.swipetoloadlayout.demo.adapter.RecyclerCharactersAdapter; -import com.aspsine.swipetoloadlayout.demo.adapter.SectionAdapter; import com.aspsine.swipetoloadlayout.demo.model.Character; import com.aspsine.swipetoloadlayout.demo.model.SectionCharacters; +import com.aspsine.swipetoloadlayout.demo.viewfactory.TwitterRefreshSwipeViewFactory; /** * A simple {@link Fragment} subclass. @@ -85,6 +84,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new TwitterRefreshSwipeViewFactory(getContext())); recyclerView = (RecyclerView) view.findViewById(R.id.swipe_target); RecyclerView.LayoutManager layoutManager = null; if (mType == TYPE_LINEAR) { diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterScrollViewFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterScrollViewFragment.java index 564333a..1079ca2 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterScrollViewFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterScrollViewFragment.java @@ -4,7 +4,6 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewCompat; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -24,6 +23,7 @@ import com.aspsine.swipetoloadlayout.demo.R; import com.aspsine.swipetoloadlayout.demo.model.Character; import com.aspsine.swipetoloadlayout.demo.model.SectionCharacters; +import com.aspsine.swipetoloadlayout.demo.viewfactory.TwitterRefreshSwipeViewFactory; import com.squareup.picasso.Picasso; import java.util.List; @@ -58,6 +58,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new TwitterRefreshSwipeViewFactory(getContext())); scrollView = (ScrollView) view.findViewById(R.id.swipe_target); tvTitle = (TextView) view.findViewById(R.id.tvTitle); ViewGroup viewGroup = (ViewGroup) view.findViewById(R.id.group); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterWebViewFragment.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterWebViewFragment.java index 0f57df9..4989768 100644 --- a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterWebViewFragment.java +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/fragment/TwitterWebViewFragment.java @@ -17,6 +17,7 @@ import com.aspsine.swipetoloadlayout.OnRefreshListener; import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.viewfactory.TwitterRefreshSwipeViewFactory; /** * A simple {@link Fragment} subclass. @@ -41,6 +42,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); swipeToLoadLayout = (SwipeToLoadLayout) view.findViewById(R.id.swipeToLoadLayout); + swipeToLoadLayout.setSwipeViewFactory(new TwitterRefreshSwipeViewFactory(getContext())); webView = (WebView) view.findViewById(R.id.swipe_target); swipeToLoadLayout.setOnRefreshListener(this); swipeToLoadLayout.setOnLoadMoreListener(this); diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/GoogleRingSwipeViewFactory.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/GoogleRingSwipeViewFactory.java new file mode 100644 index 0000000..ae0731a --- /dev/null +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/GoogleRingSwipeViewFactory.java @@ -0,0 +1,32 @@ +package com.aspsine.swipetoloadlayout.demo.viewfactory; + +import android.content.Context; +import android.view.LayoutInflater; + +import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; +import com.aspsine.swipetoloadlayout.SwipeViewFactory; +import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.view.footer.GoogleLoadMoreFooterView; +import com.aspsine.swipetoloadlayout.demo.view.header.GoogleRefreshHeaderView; + +/** + * Created by Alex on 2017/9/14. + */ + +public class GoogleRingSwipeViewFactory implements SwipeViewFactory{ + private Context mContext; + + public GoogleRingSwipeViewFactory(Context context) { + mContext = context; + } + + @Override + public GoogleRefreshHeaderView createHeaderView(SwipeToLoadLayout parent) { + return (GoogleRefreshHeaderView) LayoutInflater.from(mContext).inflate(R.layout.layout_google_header,parent,false); + } + + @Override + public GoogleLoadMoreFooterView createFooterView(SwipeToLoadLayout parent) { + return (GoogleLoadMoreFooterView) LayoutInflater.from(mContext).inflate(R.layout.layout_google_footer,parent,false); + } +} diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/JDSwipeViewFactory.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/JDSwipeViewFactory.java new file mode 100644 index 0000000..39ec965 --- /dev/null +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/JDSwipeViewFactory.java @@ -0,0 +1,32 @@ +package com.aspsine.swipetoloadlayout.demo.viewfactory; + +import android.content.Context; +import android.view.LayoutInflater; + +import com.aspsine.swipetoloadlayout.SwipeLoadMoreFooterLayout; +import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; +import com.aspsine.swipetoloadlayout.SwipeViewFactory; +import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.view.header.JdRefreshHeaderView; + +/** + * Created by Alex on 2017/9/14. + */ + +public class JDSwipeViewFactory implements SwipeViewFactory{ + private Context mContext; + + public JDSwipeViewFactory(Context context) { + mContext = context; + } + + @Override + public JdRefreshHeaderView createHeaderView(SwipeToLoadLayout parent) { + return (JdRefreshHeaderView) LayoutInflater.from(mContext).inflate(R.layout.layout_jd_header,parent,false); + } + + @Override + public SwipeLoadMoreFooterLayout createFooterView(SwipeToLoadLayout parent) { + return null; + } +} diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/TwitterRefreshSwipeViewFactory.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/TwitterRefreshSwipeViewFactory.java new file mode 100644 index 0000000..0d96b4a --- /dev/null +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/TwitterRefreshSwipeViewFactory.java @@ -0,0 +1,32 @@ +package com.aspsine.swipetoloadlayout.demo.viewfactory; + +import android.content.Context; +import android.view.LayoutInflater; + +import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; +import com.aspsine.swipetoloadlayout.SwipeViewFactory; +import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.view.footer.ClassicLoadMoreFooterView; +import com.aspsine.swipetoloadlayout.demo.view.header.TwitterRefreshHeaderView; + +/** + * Created by Alex on 2017/9/14. + */ + +public class TwitterRefreshSwipeViewFactory implements SwipeViewFactory{ + private Context mContext; + + public TwitterRefreshSwipeViewFactory(Context context) { + mContext = context; + } + + @Override + public TwitterRefreshHeaderView createHeaderView(SwipeToLoadLayout parent) { + return (TwitterRefreshHeaderView) LayoutInflater.from(mContext).inflate(R.layout.layout_twitter_header,parent,false); + } + + @Override + public ClassicLoadMoreFooterView createFooterView(SwipeToLoadLayout parent) { + return (ClassicLoadMoreFooterView) LayoutInflater.from(mContext).inflate(R.layout.layout_classic_footer,parent,false); + } +} diff --git a/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/YalantisSwipeViewFactory.java b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/YalantisSwipeViewFactory.java new file mode 100644 index 0000000..756754b --- /dev/null +++ b/app/src/main/java/com/aspsine/swipetoloadlayout/demo/viewfactory/YalantisSwipeViewFactory.java @@ -0,0 +1,32 @@ +package com.aspsine.swipetoloadlayout.demo.viewfactory; + +import android.content.Context; +import android.view.LayoutInflater; + +import com.aspsine.swipetoloadlayout.SwipeLoadMoreFooterLayout; +import com.aspsine.swipetoloadlayout.SwipeToLoadLayout; +import com.aspsine.swipetoloadlayout.SwipeViewFactory; +import com.aspsine.swipetoloadlayout.demo.R; +import com.aspsine.swipetoloadlayout.demo.view.header.YalantisPhoenixRefreshHeaderView; + +/** + * Created by Alex on 2017/9/14. + */ + +public class YalantisSwipeViewFactory implements SwipeViewFactory{ + private Context mContext; + + public YalantisSwipeViewFactory(Context context) { + mContext = context; + } + + @Override + public YalantisPhoenixRefreshHeaderView createHeaderView(SwipeToLoadLayout parent) { + return (YalantisPhoenixRefreshHeaderView) LayoutInflater.from(mContext).inflate(R.layout.layout_yalantis_header,parent,false); + } + + @Override + public SwipeLoadMoreFooterLayout createFooterView(SwipeToLoadLayout parent) { + return null; + } +} diff --git a/app/src/main/res/layout/fragment_google_style.xml b/app/src/main/res/layout/fragment_google_style.xml index c327912..db73cf0 100644 --- a/app/src/main/res/layout/fragment_google_style.xml +++ b/app/src/main/res/layout/fragment_google_style.xml @@ -13,18 +13,10 @@ app:load_more_complete_delay_duration="0" app:swipe_style="above"> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_google_style_custom.xml b/app/src/main/res/layout/fragment_google_style_custom.xml index 20c6e68..269f99a 100644 --- a/app/src/main/res/layout/fragment_google_style_custom.xml +++ b/app/src/main/res/layout/fragment_google_style_custom.xml @@ -15,18 +15,10 @@ app:refresh_trigger_offset="@dimen/refresh_trigger_offset_google" app:swipe_style="above"> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_nav_jd.xml b/app/src/main/res/layout/fragment_nav_jd.xml index 19ba08d..eaa45f9 100644 --- a/app/src/main/res/layout/fragment_nav_jd.xml +++ b/app/src/main/res/layout/fragment_nav_jd.xml @@ -5,10 +5,6 @@ android:layout_height="match_parent" tools:context="com.aspsine.swipetoloadlayout.demo.fragment.NavJDFragment"> - - - - - - - diff --git a/app/src/main/res/layout/fragment_twitter_listview.xml b/app/src/main/res/layout/fragment_twitter_listview.xml index ff0617a..dbce796 100644 --- a/app/src/main/res/layout/fragment_twitter_listview.xml +++ b/app/src/main/res/layout/fragment_twitter_listview.xml @@ -8,10 +8,6 @@ app:swipe_style="classic" tools:context="com.aspsine.swipetoloadlayout.demo.fragment.TwitterListViewFragment"> - - - diff --git a/app/src/main/res/layout/fragment_twitter_other_framelayout.xml b/app/src/main/res/layout/fragment_twitter_other_framelayout.xml index 2725802..546df75 100644 --- a/app/src/main/res/layout/fragment_twitter_other_framelayout.xml +++ b/app/src/main/res/layout/fragment_twitter_other_framelayout.xml @@ -5,10 +5,6 @@ android:layout_height="match_parent" android:background="@color/style_window_background"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_twitter_other_imageview.xml b/app/src/main/res/layout/fragment_twitter_other_imageview.xml index 710e1f9..4228931 100644 --- a/app/src/main/res/layout/fragment_twitter_other_imageview.xml +++ b/app/src/main/res/layout/fragment_twitter_other_imageview.xml @@ -5,10 +5,6 @@ android:layout_height="match_parent" android:background="@color/style_window_background"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_twitter_other_linearlayout.xml b/app/src/main/res/layout/fragment_twitter_other_linearlayout.xml index dfb52bb..defeb49 100644 --- a/app/src/main/res/layout/fragment_twitter_other_linearlayout.xml +++ b/app/src/main/res/layout/fragment_twitter_other_linearlayout.xml @@ -5,10 +5,6 @@ android:layout_height="match_parent" android:background="@color/style_window_background"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_twitter_other_relativelayout.xml b/app/src/main/res/layout/fragment_twitter_other_relativelayout.xml index d92d070..d4f23ce 100644 --- a/app/src/main/res/layout/fragment_twitter_other_relativelayout.xml +++ b/app/src/main/res/layout/fragment_twitter_other_relativelayout.xml @@ -5,10 +5,6 @@ android:layout_height="match_parent" android:background="@color/style_window_background"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_twitter_other_textview.xml b/app/src/main/res/layout/fragment_twitter_other_textview.xml index d6e425d..e3e1628 100644 --- a/app/src/main/res/layout/fragment_twitter_other_textview.xml +++ b/app/src/main/res/layout/fragment_twitter_other_textview.xml @@ -5,10 +5,6 @@ android:layout_height="match_parent" android:background="@color/style_window_background"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_twitter_recycler.xml b/app/src/main/res/layout/fragment_twitter_recycler.xml index c543e2d..0cf09ff 100644 --- a/app/src/main/res/layout/fragment_twitter_recycler.xml +++ b/app/src/main/res/layout/fragment_twitter_recycler.xml @@ -8,17 +8,9 @@ app:swipe_style="classic" tools:context="com.aspsine.swipetoloadlayout.demo.fragment.TwitterRecyclerFragment"> - - - - diff --git a/app/src/main/res/layout/fragment_twitter_scroll_view.xml b/app/src/main/res/layout/fragment_twitter_scroll_view.xml index a43c285..61140b5 100644 --- a/app/src/main/res/layout/fragment_twitter_scroll_view.xml +++ b/app/src/main/res/layout/fragment_twitter_scroll_view.xml @@ -8,10 +8,6 @@ app:swipe_style="classic" tools:context="com.aspsine.swipetoloadlayout.demo.fragment.TwitterScrollViewFragment"> - - - diff --git a/app/src/main/res/layout/fragment_twitter_web_view.xml b/app/src/main/res/layout/fragment_twitter_web_view.xml index 6cfdcc2..52c36d9 100644 --- a/app/src/main/res/layout/fragment_twitter_web_view.xml +++ b/app/src/main/res/layout/fragment_twitter_web_view.xml @@ -8,17 +8,9 @@ app:swipe_style="classic" tools:context="com.aspsine.swipetoloadlayout.demo.fragment.TwitterWebViewFragment"> - - - - diff --git a/build.gradle b/build.gradle index 74b2ab0..1ecbbf6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,6 +18,12 @@ allprojects { } } +ext{ + sdkVersion = 25 + buildToolsVersion = '25.0.2' + supportLibVersion = '25.3.1' +} + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3e1c843..2e77242 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 04 00:31:07 CST 2017 +#Mon Aug 21 10:44:44 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/library/build.gradle b/library/build.gradle index 62bd761..d2369aa 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion rootProject.ext.sdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion 9 - targetSdkVersion 25 + compileSdkVersion rootProject.ext.sdkVersion versionCode 4 versionName "1.0.4" } @@ -21,5 +21,6 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:support-compat:25.1.0' + compile "com.android.support:support-compat:$supportLibVersion" + compile project(':materialloadingprogressbar') } diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleHookLoadMoreFooterView.java b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleHookLoadMoreFooterView.java new file mode 100644 index 0000000..6c2d3c9 --- /dev/null +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleHookLoadMoreFooterView.java @@ -0,0 +1,82 @@ +package com.aspsine.swipetoloadlayout; + +import android.content.Context; +import android.support.v4.view.ViewCompat; +import android.util.AttributeSet; +import android.widget.FrameLayout; + +/** + * Created by aspsine on 16/1/27. + */ +public class GoogleCircleHookLoadMoreFooterView extends FrameLayout implements SwipeTrigger, SwipeLoadMoreTrigger { + + private GoogleCircleProgressView progressView; + + private int mTriggerOffset; + + private int mFinalOffset; + + public GoogleCircleHookLoadMoreFooterView(Context context) { + this(context, null); + } + + public GoogleCircleHookLoadMoreFooterView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public GoogleCircleHookLoadMoreFooterView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mTriggerOffset = context.getResources().getDimensionPixelOffset(R.dimen.load_more_footer_height_google); + mFinalOffset = context.getResources().getDimensionPixelOffset(R.dimen.load_more_final_offset_google); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + progressView = (GoogleCircleProgressView) findViewById(R.id.googleProgress); + progressView.setStartEndTrim(0, (float) 0.75); + } + + @Override + public void onLoadMore() { + progressView.start(); + } + + @Override + public void onPrepare() { + progressView.setStartEndTrim(0, (float) 0.75); + } + + @Override + public void onMove(int y, boolean isComplete, boolean automatic) { + float alpha = -y / (float) mTriggerOffset; + ViewCompat.setAlpha(progressView, alpha); + if (!isComplete) { + progressView.setProgressRotation(-y / (float) mFinalOffset); + } + } + + @Override + public void onRelease() { + + } + + @Override + public void onComplete() { + } + + @Override + public void onReset() { + progressView.stop(); + ViewCompat.setAlpha(progressView, 1f); + } + + public void setColorSchemeResources(int... colorResIds) { + progressView.setColorSchemeResources(colorResIds); + } + + public void setColorSchemeColors(int... colors) { + progressView.setColorSchemeColors(colors); + } + +} diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleHookRefreshHeaderView.java b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleHookRefreshHeaderView.java new file mode 100644 index 0000000..3cb774e --- /dev/null +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleHookRefreshHeaderView.java @@ -0,0 +1,88 @@ +package com.aspsine.swipetoloadlayout; + +import android.annotation.TargetApi; +import android.content.Context; +import android.os.Build; +import android.support.v4.view.ViewCompat; +import android.util.AttributeSet; +import android.widget.FrameLayout; + +/** + * Created by aspsine on 15/11/7. + */ +public class GoogleCircleHookRefreshHeaderView extends FrameLayout implements SwipeTrigger, SwipeRefreshTrigger { + private GoogleCircleProgressView progressView; + + private int mTriggerOffset; + + private int mFinalOffset; + + public GoogleCircleHookRefreshHeaderView(Context context) { + this(context, null); + } + + public GoogleCircleHookRefreshHeaderView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public GoogleCircleHookRefreshHeaderView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mTriggerOffset = context.getResources().getDimensionPixelOffset(R.dimen.refresh_header_height_google); + mFinalOffset = context.getResources().getDimensionPixelOffset(R.dimen.refresh_final_offset_google); + } + + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + progressView = (GoogleCircleProgressView) findViewById(R.id.googleProgress); + progressView.setStartEndTrim(0, (float) 0.75); + } + + @Override + public void onRefresh() { + progressView.start(); + } + + @Override + public void onPrepare() { + progressView.setStartEndTrim(0, (float) 0.75); + } + + @Override + public void onMove(int y, boolean isComplete, boolean automatic) { + float alpha = y / (float) mTriggerOffset; + ViewCompat.setAlpha(progressView, alpha); + if (!isComplete) { + progressView.setProgressRotation(y / (float) mFinalOffset); + } + } + + @Override + public void onRelease() { + + } + + @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) + @Override + public void onComplete() { + progressView.animate().scaleX(0).scaleY(0).setDuration(300); + } + + @Override + public void onReset() { + progressView.stop(); + ViewCompat.setAlpha(progressView, 1f); + ViewCompat.setScaleX(progressView, 1f); + ViewCompat.setScaleY(progressView, 1f); + } + + public void setColorSchemeResources(int... colorResIds) { + progressView.setColorSchemeResources(colorResIds); + } + + public void setColorSchemeColors(int... colors) { + progressView.setColorSchemeColors(colors); + } + +} diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleProgressView.java b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleProgressView.java new file mode 100644 index 0000000..00787bf --- /dev/null +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleCircleProgressView.java @@ -0,0 +1,418 @@ +package com.aspsine.swipetoloadlayout; + +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.RadialGradient; +import android.graphics.Shader; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.ShapeDrawable; +import android.graphics.drawable.shapes.OvalShape; +import android.net.Uri; +import android.support.annotation.ColorRes; +import android.support.v4.view.ViewCompat; +import android.util.AttributeSet; +import android.view.animation.Animation; +import android.widget.ImageView; + +import com.lsjwzh.widget.materialloadingprogressbar.MaterialProgressDrawable; + +/** + * Private class created to work around issues with AnimationListeners being + * called before the animation is actually complete and support shadows on older + * platforms. + */ +public class GoogleCircleProgressView extends ImageView { + + + private static final int KEY_SHADOW_COLOR = 0x1E000000; + private static final int FILL_SHADOW_COLOR = 0x3D000000; + // PX + private static final float X_OFFSET = 0f; + private static final float Y_OFFSET = 1.75f; + private static final float SHADOW_RADIUS = 3.5f; + private static final int SHADOW_ELEVATION = 4; + + + private static final int DEFAULT_CIRCLE_BG_LIGHT = 0xFFFAFAFA; + private static final int DEFAULT_CIRCLE_DIAMETER = 56; + private static final int STROKE_WIDTH_LARGE = 3; + public static final int DEFAULT_TEXT_SIZE = 9; + + private Animation.AnimationListener mListener; + private int mShadowRadius; + private int mBackGroundColor; + private int mProgressColor; + private int mProgressStokeWidth; + private int mArrowWidth; + private int mArrowHeight; + private int mProgress; + private int mMax; + private int mDiameter; + private int mInnerRadius; + private Paint mTextPaint; + private int mTextColor; + private int mTextSize; + private boolean mIfDrawText; + private boolean mShowArrow; + private MaterialProgressDrawable mProgressDrawable; + private ShapeDrawable mBgCircle; + private boolean mCircleBackgroundEnabled; + private int[] mColors = new int[]{Color.BLACK}; + + public GoogleCircleProgressView(Context context) { + super(context); + init(context, null, 0); + + } + + public GoogleCircleProgressView(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs, 0); + + } + + public GoogleCircleProgressView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs, defStyleAttr); + } + + private void init(Context context, AttributeSet attrs, int defStyleAttr) { + final TypedArray a = context.obtainStyledAttributes( + attrs, R.styleable.GoogleCircleProgressView, defStyleAttr, 0); + final float density = getContext().getResources().getDisplayMetrics().density; + + mBackGroundColor = a.getColor( + R.styleable.GoogleCircleProgressView_gcp_background_color, DEFAULT_CIRCLE_BG_LIGHT); + + mProgressColor = a.getColor( + R.styleable.GoogleCircleProgressView_gcp_progress_color, DEFAULT_CIRCLE_BG_LIGHT); + mColors = new int[]{mProgressColor}; + + mInnerRadius = a.getDimensionPixelOffset( + R.styleable.GoogleCircleProgressView_gcp_inner_radius, -1); + + mProgressStokeWidth = a.getDimensionPixelOffset( + R.styleable.GoogleCircleProgressView_gcp_progress_stoke_width, (int) (STROKE_WIDTH_LARGE * density)); + mArrowWidth = a.getDimensionPixelOffset( + R.styleable.GoogleCircleProgressView_gcp_arrow_width, -1); + mArrowHeight = a.getDimensionPixelOffset( + R.styleable.GoogleCircleProgressView_gcp_arrow_height, -1); + mTextSize = a.getDimensionPixelOffset( + R.styleable.GoogleCircleProgressView_gcp_progress_text_size, (int) (DEFAULT_TEXT_SIZE * density)); + mTextColor = a.getColor( + R.styleable.GoogleCircleProgressView_gcp_progress_text_color, Color.BLACK); + + mShowArrow = a.getBoolean(R.styleable.GoogleCircleProgressView_gcp_show_arrow, true); + mCircleBackgroundEnabled = a.getBoolean(R.styleable.GoogleCircleProgressView_gcp_enable_circle_background, true); + + + mProgress = a.getInt(R.styleable.GoogleCircleProgressView_gcp_progress, 0); + mMax = a.getInt(R.styleable.GoogleCircleProgressView_gcp_max, 100); + int textVisible = a.getInt(R.styleable.GoogleCircleProgressView_gcp_progress_text_visibility, 1); + if (textVisible != 1) { + mIfDrawText = true; + } + + mTextPaint = new Paint(); + mTextPaint.setStyle(Paint.Style.FILL); + mTextPaint.setColor(mTextColor); + mTextPaint.setTextSize(mTextSize); + mTextPaint.setAntiAlias(true); + a.recycle(); + mProgressDrawable = new MaterialProgressDrawable(getContext(), this); + super.setImageDrawable(mProgressDrawable); + } + + + private boolean elevationSupported() { + return android.os.Build.VERSION.SDK_INT >= 21; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + if (!elevationSupported()) { + setMeasuredDimension(getMeasuredWidth() + mShadowRadius * 2, getMeasuredHeight() + + mShadowRadius * 2); + } + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + final float density = getContext().getResources().getDisplayMetrics().density; + mDiameter = Math.min(getMeasuredWidth(), getMeasuredHeight()); + if (mDiameter <= 0) { + mDiameter = (int) density * DEFAULT_CIRCLE_DIAMETER; + } + if (getBackground() == null && mCircleBackgroundEnabled) { + final int shadowYOffset = (int) (density * Y_OFFSET); + final int shadowXOffset = (int) (density * X_OFFSET); + mShadowRadius = (int) (density * SHADOW_RADIUS); + + if (elevationSupported()) { + mBgCircle = new ShapeDrawable(new OvalShape()); + ViewCompat.setElevation(this, SHADOW_ELEVATION * density); + } else { + OvalShape oval = new OvalShadow(mShadowRadius, mDiameter - mShadowRadius * 2); + mBgCircle = new ShapeDrawable(oval); + ViewCompat.setLayerType(this, ViewCompat.LAYER_TYPE_SOFTWARE, mBgCircle.getPaint()); + mBgCircle.getPaint().setShadowLayer(mShadowRadius, shadowXOffset, shadowYOffset, + KEY_SHADOW_COLOR); + final int padding = (int) mShadowRadius; + // set padding so the inner image sits correctly within the shadow. + setPadding(padding, padding, padding, padding); + } + mBgCircle.getPaint().setColor(mBackGroundColor); + setBackgroundDrawable(mBgCircle); + } + mProgressDrawable.setBackgroundColor(mBackGroundColor); + mProgressDrawable.setColorSchemeColors(mColors); + mProgressDrawable.setSizeParameters(mDiameter, mDiameter, + mInnerRadius <= 0 ? (mDiameter - mProgressStokeWidth * 2) / 4 : mInnerRadius, + mProgressStokeWidth, + mArrowWidth < 0 ? mProgressStokeWidth * 4 : mArrowWidth, + mArrowHeight < 0 ? mProgressStokeWidth * 2 : mArrowHeight); + if (isShowArrow()) { + mProgressDrawable.showArrowOnFirstStart(true); + mProgressDrawable.setArrowScale(1f); + mProgressDrawable.showArrow(true); + } + super.setImageDrawable(null); + super.setImageDrawable(mProgressDrawable); + mProgressDrawable.setAlpha(255); + mProgressDrawable.setStartEndTrim(0f, 0.75f); + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + if (mIfDrawText) { + String text = String.format("%s%%", mProgress); + int x = getWidth() / 2 - text.length() * mTextSize / 4; + int y = getHeight() / 2 + mTextSize / 4; + canvas.drawText(text, x, y, mTextPaint); + } + } + + @Override + final public void setImageResource(int resId) { + + } + + + public boolean isShowArrow() { + return mShowArrow; + } + + public void setShowArrow(boolean showArrow) { + this.mShowArrow = showArrow; + } + + + @Override + final public void setImageURI(Uri uri) { + super.setImageURI(uri); + } + + @Override + final public void setImageDrawable(Drawable drawable) { + } + + public void setAnimationListener(Animation.AnimationListener listener) { + mListener = listener; + } + + @Override + public void onAnimationStart() { + super.onAnimationStart(); + if (mListener != null) { + mListener.onAnimationStart(getAnimation()); + } + } + + @Override + public void onAnimationEnd() { + super.onAnimationEnd(); + if (mListener != null) { + mListener.onAnimationEnd(getAnimation()); + } + } + + + /** + * Set the color resources used in the progress animation from color resources. + * The first color will also be the color of the bar that grows in response + * to a user swipe gesture. + * + * @param colorResIds + */ + public void setColorSchemeResources(int... colorResIds) { + final Resources res = getResources(); + int[] colorRes = new int[colorResIds.length]; + for (int i = 0; i < colorResIds.length; i++) { + colorRes[i] = res.getColor(colorResIds[i]); + } + setColorSchemeColors(colorRes); + } + + /** + * Set the colors used in the progress animation. The first + * color will also be the color of the bar that grows in response to a user + * swipe gesture. + * + * @param colors + */ + public void setColorSchemeColors(int... colors) { + mColors = colors; + if (mProgressDrawable != null) { + mProgressDrawable.setColorSchemeColors(colors); + } + } + + /** + * Update the background color of the mBgCircle image view. + */ + public void setBackgroundColor(@ColorRes int colorRes) { + if (getBackground() instanceof ShapeDrawable) { + final Resources res = getResources(); + ((ShapeDrawable) getBackground()).getPaint().setColor(res.getColor(colorRes)); + } + } + + public boolean isShowProgressText() { + return mIfDrawText; + } + + public void setShowProgressText(boolean mIfDrawText) { + this.mIfDrawText = mIfDrawText; + } + + public int getMax() { + return mMax; + } + + public void setMax(int max) { + mMax = max; + } + + public int getProgress() { + return mProgress; + } + + public void setProgress(int progress) { + if (getMax() > progress) { + mProgress = progress; + } + } + + public boolean isRunning(){ + return mProgressDrawable.isRunning(); + } + + public void start(){ + if (!mProgressDrawable.isRunning()){ + mProgressDrawable.start(); + } + } + + public void stop(){ + if (mProgressDrawable.isRunning()){ + mProgressDrawable.stop(); + } + } + + public void setProgressRotation(float rotation){ + if (mProgressDrawable.isRunning()){ + stop(); + } + mProgressDrawable.showArrow(true); + mProgressDrawable.showArrowOnFirstStart(true); + mProgressDrawable.setProgressRotation(rotation); + } + + public void setStartEndTrim(float start, float end){ + mProgressDrawable.setStartEndTrim(start, end); + } + + public boolean circleBackgroundEnabled() { + return mCircleBackgroundEnabled; + } + + public void setCircleBackgroundEnabled(boolean enableCircleBackground) { + this.mCircleBackgroundEnabled = enableCircleBackground; + } + + @Override + public int getVisibility() { + return super.getVisibility(); + } + + @Override + public void setVisibility(int visibility) { + super.setVisibility(visibility); + if (mProgressDrawable != null) { + mProgressDrawable.setVisible(visibility == VISIBLE, false); + if (visibility != VISIBLE) { + mProgressDrawable.stop(); + } else { + if (mProgressDrawable.isRunning()) { + mProgressDrawable.stop(); + } + } + } + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + if (mProgressDrawable != null) { + mProgressDrawable.stop(); + mProgressDrawable.setVisible(getVisibility() == VISIBLE, false); + + requestLayout(); + } + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + if (mProgressDrawable != null) { + mProgressDrawable.stop(); + mProgressDrawable.setVisible(false, false); + } + } + + + private class OvalShadow extends OvalShape { + private RadialGradient mRadialGradient; + private int mShadowRadius; + private Paint mShadowPaint; + private int mCircleDiameter; + + public OvalShadow(int shadowRadius, int circleDiameter) { + super(); + mShadowPaint = new Paint(); + mShadowRadius = shadowRadius; + mCircleDiameter = circleDiameter; + mRadialGradient = new RadialGradient(mCircleDiameter / 2, mCircleDiameter / 2, + mShadowRadius, new int[]{ + FILL_SHADOW_COLOR, Color.TRANSPARENT + }, null, Shader.TileMode.CLAMP); + mShadowPaint.setShader(mRadialGradient); + } + + @Override + public void draw(Canvas canvas, Paint paint) { + final int viewWidth = GoogleCircleProgressView.this.getWidth(); + final int viewHeight = GoogleCircleProgressView.this.getHeight(); + canvas.drawCircle(viewWidth / 2, viewHeight / 2, (mCircleDiameter / 2 + mShadowRadius), + mShadowPaint); + canvas.drawCircle(viewWidth / 2, viewHeight / 2, (mCircleDiameter / 2), paint); + } + } +} diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleStyleSwipeViewFactory.java b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleStyleSwipeViewFactory.java new file mode 100644 index 0000000..d3290cd --- /dev/null +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/GoogleStyleSwipeViewFactory.java @@ -0,0 +1,47 @@ +package com.aspsine.swipetoloadlayout; + +import android.content.Context; +import android.content.res.Resources; +import android.view.LayoutInflater; + +/** + * Created by Alex on 2017/9/12. + */ + +public class GoogleStyleSwipeViewFactory implements SwipeViewFactory{ + private Context mContext ; + private final int[] mColorResIds = { + R.color.google_blue, + R.color.google_red, + R.color.google_yellow, + R.color.google_green}; + + public GoogleStyleSwipeViewFactory(Context context) { + mContext = context; + } + + @Override + public GoogleCircleHookRefreshHeaderView createHeaderView(SwipeToLoadLayout parent) { + GoogleCircleHookRefreshHeaderView view = (GoogleCircleHookRefreshHeaderView) LayoutInflater.from(mContext) + .inflate(R.layout.layout_google_style_header,parent,false); + view.setColorSchemeColors(getColorSchemeColors()); + return view; + } + + @Override + public GoogleCircleHookLoadMoreFooterView createFooterView(SwipeToLoadLayout parent) { + GoogleCircleHookLoadMoreFooterView view = (GoogleCircleHookLoadMoreFooterView) LayoutInflater.from(mContext) + .inflate(R.layout.layout_google_style_footer,parent,false); + view.setColorSchemeColors(getColorSchemeColors()); + return view; + } + + public int[] getColorSchemeColors(){ + final Resources res = mContext.getResources(); + int[] colorRes = new int[mColorResIds.length]; + for (int i = 0; i < mColorResIds.length; i++) { + colorRes[i] = res.getColor(mColorResIds[i]); + } + return colorRes ; + } +} diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java b/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java index 6802d40..18b0cd6 100644 --- a/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeToLoadLayout.java @@ -55,6 +55,8 @@ public class SwipeToLoadLayout extends ViewGroup { private OnLoadMoreListener mLoadMoreListener; + private SwipeViewFactory mSwipeViewFactory ; + private View mHeaderView; private View mTargetView; @@ -322,6 +324,8 @@ public SwipeToLoadLayout(Context context, AttributeSet attrs, int defStyleAttr) mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop(); mAutoScroller = new AutoScroller(); + + mSwipeViewFactory = new GoogleStyleSwipeViewFactory(context); } @Override @@ -331,17 +335,18 @@ protected void onFinishInflate() { if (childNum == 0) { // no child return return; - } else if (0 < childNum && childNum < 4) { - mHeaderView = findViewById(R.id.swipe_refresh_header); - mTargetView = findViewById(R.id.swipe_target); - mFooterView = findViewById(R.id.swipe_load_more_footer); + } else if (childNum==1) { +// mHeaderView = findViewById(R.id.swipe_refresh_header); + mTargetView = getChildAt(0); +// mFooterView = findViewById(R.id.swipe_load_more_footer); } else { // more than three children: unsupported! - throw new IllegalStateException("Children num must equal or less than 3"); + throw new IllegalStateException("SwipeToLoadLayout can host only one direct child"); } if (mTargetView == null) { return; } + resetHeaderAndFooter(); if (mHeaderView != null && mHeaderView instanceof SwipeTrigger) { mHeaderView.setVisibility(GONE); } @@ -688,13 +693,36 @@ public boolean isLoadingMore() { return STATUS.isLoadingMore(mStatus); } - /** + public void setSwipeViewFactory(SwipeViewFactory swipeViewFactory) { + boolean needResetView = mSwipeViewFactory!=swipeViewFactory; + mSwipeViewFactory = swipeViewFactory; + if(needResetView){ + resetHeaderAndFooter(); + } + } + + private void resetHeaderAndFooter(){ + if(mSwipeViewFactory==null){ + return; + } + setRefreshHeaderView(mSwipeViewFactory.createHeaderView(this)); + setLoadMoreFooterView(mSwipeViewFactory.createFooterView(this)); + } + + /** * set refresh header view, the view must at lease be an implement of {@code SwipeRefreshTrigger}. * the view can also implement {@code SwipeTrigger} for more extension functions * * @param view */ public void setRefreshHeaderView(View view) { + if(view==null){ + if (mHeaderView != null) { + removeView(mHeaderView); + } + mHeaderView = null ; + return; + } if (view instanceof SwipeRefreshTrigger) { if (mHeaderView != null && mHeaderView != view) { removeView(mHeaderView); @@ -715,6 +743,13 @@ public void setRefreshHeaderView(View view) { * @param view */ public void setLoadMoreFooterView(View view) { + if(view==null){ + if (mFooterView != null) { + removeView(mFooterView); + } + mFooterView = null ; + return; + } if (view instanceof SwipeLoadMoreTrigger) { if (mFooterView != null && mFooterView != view) { removeView(mFooterView); diff --git a/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeViewFactory.java b/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeViewFactory.java new file mode 100644 index 0000000..9544004 --- /dev/null +++ b/library/src/main/java/com/aspsine/swipetoloadlayout/SwipeViewFactory.java @@ -0,0 +1,15 @@ +package com.aspsine.swipetoloadlayout; + +import android.view.View; + +/** + * Created by Alex on 2017/9/12. + */ + +public interface SwipeViewFactory{ + + H createHeaderView(SwipeToLoadLayout parent); + + F createFooterView(SwipeToLoadLayout parent); + +} diff --git a/library/src/main/res/layout/layout_google_style_footer.xml b/library/src/main/res/layout/layout_google_style_footer.xml new file mode 100644 index 0000000..65f3cc8 --- /dev/null +++ b/library/src/main/res/layout/layout_google_style_footer.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/library/src/main/res/layout/layout_google_style_header.xml b/library/src/main/res/layout/layout_google_style_header.xml new file mode 100644 index 0000000..e4c4202 --- /dev/null +++ b/library/src/main/res/layout/layout_google_style_header.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/library/src/main/res/layout/recycler_view.xml b/library/src/main/res/layout/recycler_view.xml new file mode 100644 index 0000000..00737bb --- /dev/null +++ b/library/src/main/res/layout/recycler_view.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/library/src/main/res/layout/swipe_load_recycler_view.xml b/library/src/main/res/layout/swipe_load_recycler_view.xml new file mode 100644 index 0000000..ad9a507 --- /dev/null +++ b/library/src/main/res/layout/swipe_load_recycler_view.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index bf0a634..3fc55d2 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -28,4 +28,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml new file mode 100644 index 0000000..e98dbff --- /dev/null +++ b/library/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #4285F4 + #EA4335 + #34A853 + #FBBC05 + \ No newline at end of file diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml new file mode 100644 index 0000000..ba7e620 --- /dev/null +++ b/library/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + + 72dp + 88dp + 120dp + 40dp + 100dp + 100dp + 150dp + \ No newline at end of file diff --git a/materialloadingprogressbar/.gitignore b/materialloadingprogressbar/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/materialloadingprogressbar/.gitignore @@ -0,0 +1 @@ +/build diff --git a/materialloadingprogressbar/build.gradle b/materialloadingprogressbar/build.gradle new file mode 100644 index 0000000..0ab5c13 --- /dev/null +++ b/materialloadingprogressbar/build.gradle @@ -0,0 +1,27 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion rootProject.ext.sdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + + defaultConfig { + minSdkVersion 9 + targetSdkVersion rootProject.ext.sdkVersion + versionCode 12 + versionName "0.5.8" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile "com.android.support:appcompat-v7:$supportLibVersion" +} + +//apply from: "${rootDir}/gradle-mvn-push.gradle" + diff --git a/materialloadingprogressbar/gradle.properties b/materialloadingprogressbar/gradle.properties new file mode 100644 index 0000000..b0466bf --- /dev/null +++ b/materialloadingprogressbar/gradle.properties @@ -0,0 +1,21 @@ +POM_NAME=MaterialLoadingProgressBar Core Library +POM_ARTIFACT_ID=materialloadingprogressbar +POM_PACKAGING=aar + +#RELEASE_REPOSITORY_URL=http://nexus.mofun.so:8081/nexus/content/repositories/releases/ + +VERSION_NAME=0.5.8-RELEASE +VERSION_CODE=16 +GROUP=com.lsjwzh + +POM_DESCRIPTION=MaterialLoadingProgressBar provide a styled ProgressBar which looks like SwipeRefreshLayout's loading indicator(support-v4 v21+) +POM_URL=https://github.com/lsjwzh/materialloadingprogressbar +POM_SCM_URL=https://github.com/lsjwzh/materialloadingprogressbar +POM_SCM_CONNECTION=scm:git:git://github.com/lsjwzh/materialloadingprogressbar.git +POM_SCM_DEV_CONNECTION=scm:git:git://github.com/lsjwzh/materialloadingprogressbar.git +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=lsjwzh +POM_DEVELOPER_NAME=lsjwzh +POM_DEVELOPER_EMAIL=lsjwzh@gmail.com diff --git a/materialloadingprogressbar/proguard-rules.pro b/materialloadingprogressbar/proguard-rules.pro new file mode 100644 index 0000000..c1c73e5 --- /dev/null +++ b/materialloadingprogressbar/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/panwenye/android_sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/materialloadingprogressbar/src/androidTest/java/com/lsjwzh/widget/ApplicationTest.java b/materialloadingprogressbar/src/androidTest/java/com/lsjwzh/widget/ApplicationTest.java new file mode 100644 index 0000000..bef9286 --- /dev/null +++ b/materialloadingprogressbar/src/androidTest/java/com/lsjwzh/widget/ApplicationTest.java @@ -0,0 +1,13 @@ +package com.lsjwzh.widget; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/materialloadingprogressbar/src/main/AndroidManifest.xml b/materialloadingprogressbar/src/main/AndroidManifest.xml new file mode 100644 index 0000000..edce4ed --- /dev/null +++ b/materialloadingprogressbar/src/main/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/materialloadingprogressbar/src/main/java/com/lsjwzh/widget/materialloadingprogressbar/CircleProgressBar.java b/materialloadingprogressbar/src/main/java/com/lsjwzh/widget/materialloadingprogressbar/CircleProgressBar.java new file mode 100644 index 0000000..60a6653 --- /dev/null +++ b/materialloadingprogressbar/src/main/java/com/lsjwzh/widget/materialloadingprogressbar/CircleProgressBar.java @@ -0,0 +1,425 @@ +/* + * Copyright (C) 2014 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 com.lsjwzh.widget.materialloadingprogressbar; + +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.RadialGradient; +import android.graphics.Shader; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.ShapeDrawable; +import android.graphics.drawable.shapes.OvalShape; +import android.net.Uri; +import android.support.v4.view.ViewCompat; +import android.util.AttributeSet; +import android.view.animation.Animation; +import android.widget.ImageView; + +/** + * Private class created to work around issues with AnimationListeners being + * called before the animation is actually complete and support shadows on older + * platforms. + */ +public class CircleProgressBar extends ImageView { + + private static final int KEY_SHADOW_COLOR = 0x1E000000; + private static final int FILL_SHADOW_COLOR = 0x3D000000; + // PX + private static final float X_OFFSET = 0f; + private static final float Y_OFFSET = 1.75f; + private static final float SHADOW_RADIUS = 3.5f; + private static final int SHADOW_ELEVATION = 4; + + + private static final int DEFAULT_CIRCLE_BG_LIGHT = 0xFFFAFAFA; + private static final int DEFAULT_CIRCLE_DIAMETER = 56; + private static final int STROKE_WIDTH_LARGE = 3; + public static final int DEFAULT_TEXT_SIZE = 9; + + private Animation.AnimationListener mListener; + private int mShadowRadius; + private int mBackGroundColor; + private int mProgressColor; + private int mProgressStokeWidth; + private int mArrowWidth; + private int mArrowHeight; + private int mProgress; + private int mMax; + private int mDiameter; + private int mInnerRadius; + private Paint mTextPaint; + private int mTextColor; + private int mTextSize; + private boolean mIfDrawText; + private boolean mShowArrow; + private MaterialProgressDrawable mProgressDrawable; + private ShapeDrawable mBgCircle; + private boolean mCircleBackgroundEnabled; + private int[] mColors = new int[]{Color.BLACK}; + + public CircleProgressBar(Context context) { + super(context); + init(context, null, 0); + + } + + public CircleProgressBar(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs, 0); + + } + + public CircleProgressBar(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs, defStyleAttr); + } + + private void init(Context context, AttributeSet attrs, int defStyleAttr) { + final TypedArray a = context.obtainStyledAttributes( + attrs, R.styleable.CircleProgressBar, defStyleAttr, 0); +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// + final float density = getContext().getResources().getDisplayMetrics().density; + + mBackGroundColor = a.getColor( + R.styleable.CircleProgressBar_mlpb_background_color, DEFAULT_CIRCLE_BG_LIGHT); + + mProgressColor = a.getColor( + R.styleable.CircleProgressBar_mlpb_progress_color, DEFAULT_CIRCLE_BG_LIGHT); + mColors = new int[]{mProgressColor}; + + mInnerRadius = a.getDimensionPixelOffset( + R.styleable.CircleProgressBar_mlpb_inner_radius, -1); + + mProgressStokeWidth = a.getDimensionPixelOffset( + R.styleable.CircleProgressBar_mlpb_progress_stoke_width, (int) (STROKE_WIDTH_LARGE * density)); + mArrowWidth = a.getDimensionPixelOffset( + R.styleable.CircleProgressBar_mlpb_arrow_width, -1); + mArrowHeight = a.getDimensionPixelOffset( + R.styleable.CircleProgressBar_mlpb_arrow_height, -1); + mTextSize = a.getDimensionPixelOffset( + R.styleable.CircleProgressBar_mlpb_progress_text_size, (int) (DEFAULT_TEXT_SIZE * density)); + mTextColor = a.getColor( + R.styleable.CircleProgressBar_mlpb_progress_text_color, Color.BLACK); + + mShowArrow = a.getBoolean(R.styleable.CircleProgressBar_mlpb_show_arrow, false); + mCircleBackgroundEnabled = a.getBoolean(R.styleable.CircleProgressBar_mlpb_enable_circle_background, true); + + + mProgress = a.getInt(R.styleable.CircleProgressBar_mlpb_progress, 0); + mMax = a.getInt(R.styleable.CircleProgressBar_mlpb_max, 100); + int textVisible = a.getInt(R.styleable.CircleProgressBar_mlpb_progress_text_visibility, 1); + if (textVisible != 1) { + mIfDrawText = true; + } + + mTextPaint = new Paint(); + mTextPaint.setStyle(Paint.Style.FILL); + mTextPaint.setColor(mTextColor); + mTextPaint.setTextSize(mTextSize); + mTextPaint.setAntiAlias(true); + a.recycle(); + mProgressDrawable = new MaterialProgressDrawable(getContext(), this); + super.setImageDrawable(mProgressDrawable); + } + + + private boolean elevationSupported() { + return android.os.Build.VERSION.SDK_INT >= 21; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + if (!elevationSupported()) { + setMeasuredDimension(getMeasuredWidth() + mShadowRadius * 2, getMeasuredHeight() + + mShadowRadius * 2); + } + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + final float density = getContext().getResources().getDisplayMetrics().density; + mDiameter = Math.min(getMeasuredWidth(), getMeasuredHeight()); + if (mDiameter <= 0) { + mDiameter = (int) density * DEFAULT_CIRCLE_DIAMETER; + } + if (getBackground() == null && mCircleBackgroundEnabled) { + final int shadowYOffset = (int) (density * Y_OFFSET); + final int shadowXOffset = (int) (density * X_OFFSET); + mShadowRadius = (int) (density * SHADOW_RADIUS); + + if (elevationSupported()) { + mBgCircle = new ShapeDrawable(new OvalShape()); + ViewCompat.setElevation(this, SHADOW_ELEVATION * density); + } else { + OvalShape oval = new OvalShadow(mShadowRadius, mDiameter - mShadowRadius * 2); + mBgCircle = new ShapeDrawable(oval); + ViewCompat.setLayerType(this, ViewCompat.LAYER_TYPE_SOFTWARE, mBgCircle.getPaint()); + mBgCircle.getPaint().setShadowLayer(mShadowRadius, shadowXOffset, shadowYOffset, + KEY_SHADOW_COLOR); + final int padding = (int) mShadowRadius; + // set padding so the inner image sits correctly within the shadow. + setPadding(padding, padding, padding, padding); + } + mBgCircle.getPaint().setColor(mBackGroundColor); + setBackgroundDrawable(mBgCircle); + } + mProgressDrawable.setBackgroundColor(mBackGroundColor); + mProgressDrawable.setColorSchemeColors(mColors); + mProgressDrawable.setSizeParameters(mDiameter, mDiameter, + mInnerRadius <= 0 ? (mDiameter - mProgressStokeWidth * 2) / 4 : mInnerRadius, + mProgressStokeWidth, + mArrowWidth < 0 ? mProgressStokeWidth * 4 : mArrowWidth, + mArrowHeight < 0 ? mProgressStokeWidth * 2 : mArrowHeight); + if (isShowArrow()) { + mProgressDrawable.showArrowOnFirstStart(true); + mProgressDrawable.setArrowScale(1f); + mProgressDrawable.showArrow(true); + } + super.setImageDrawable(null); + super.setImageDrawable(mProgressDrawable); + mProgressDrawable.setAlpha(255); + if(getVisibility()==VISIBLE) { + mProgressDrawable.start(); + } + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + if (mIfDrawText) { + String text = String.format("%s%%", mProgress); + int x = getWidth() / 2 - text.length() * mTextSize / 4; + int y = getHeight() / 2 + mTextSize / 4; + canvas.drawText(text, x, y, mTextPaint); + } + } + + @Override + final public void setImageResource(int resId) { + + } + + + public boolean isShowArrow() { + return mShowArrow; + } + + public void setShowArrow(boolean showArrow) { + this.mShowArrow = showArrow; + } + + + @Override + final public void setImageURI(Uri uri) { + super.setImageURI(uri); + } + + @Override + final public void setImageDrawable(Drawable drawable) { + } + + public void setAnimationListener(Animation.AnimationListener listener) { + mListener = listener; + } + + @Override + public void onAnimationStart() { + super.onAnimationStart(); + if (mListener != null) { + mListener.onAnimationStart(getAnimation()); + } + } + + @Override + public void onAnimationEnd() { + super.onAnimationEnd(); + if (mListener != null) { + mListener.onAnimationEnd(getAnimation()); + } + } + + + /** + * Set the color resources used in the progress animation from color resources. + * The first color will also be the color of the bar that grows in response + * to a user swipe gesture. + * + * @param colorResIds + */ + public void setColorSchemeResources(int... colorResIds) { + final Resources res = getResources(); + int[] colorRes = new int[colorResIds.length]; + for (int i = 0; i < colorResIds.length; i++) { + colorRes[i] = res.getColor(colorResIds[i]); + } + setColorSchemeColors(colorRes); + } + + /** + * Set the colors used in the progress animation. The first + * color will also be the color of the bar that grows in response to a user + * swipe gesture. + * + * @param colors + */ + public void setColorSchemeColors(int... colors) { + mColors = colors; + if (mProgressDrawable != null) { + mProgressDrawable.setColorSchemeColors(colors); + } + } + + /** + * Update the background color of the mBgCircle image view. + */ + public void setBackgroundColor(int colorRes) { + if (getBackground() instanceof ShapeDrawable) { + final Resources res = getResources(); + ((ShapeDrawable) getBackground()).getPaint().setColor(res.getColor(colorRes)); + } + } + + public boolean isShowProgressText() { + return mIfDrawText; + } + + public void setShowProgressText(boolean mIfDrawText) { + this.mIfDrawText = mIfDrawText; + } + + public int getMax() { + return mMax; + } + + public void setMax(int max) { + mMax = max; + } + + public int getProgress() { + return mProgress; + } + + public void setProgress(int progress) { + if (getMax() > 0) { + mProgress = progress; + } + } + + + public boolean circleBackgroundEnabled() { + return mCircleBackgroundEnabled; + } + + public void setCircleBackgroundEnabled(boolean enableCircleBackground) { + this.mCircleBackgroundEnabled = enableCircleBackground; + } + + @Override + public int getVisibility() { + return super.getVisibility(); + } + + @Override + public void setVisibility(int visibility) { + super.setVisibility(visibility); + if (mProgressDrawable != null) { + mProgressDrawable.setVisible(visibility == VISIBLE, false); + if (visibility != VISIBLE) { + mProgressDrawable.stop(); + } else { + if (mProgressDrawable.isRunning()) { + mProgressDrawable.stop(); + } + mProgressDrawable.start(); + } + } + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + if (mProgressDrawable != null) { + mProgressDrawable.stop(); + mProgressDrawable.setVisible(getVisibility() == VISIBLE, false); + + requestLayout(); + } + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + if (mProgressDrawable != null) { + mProgressDrawable.stop(); + mProgressDrawable.setVisible(false, false); + } + } + + + private class OvalShadow extends OvalShape { + private RadialGradient mRadialGradient; + private int mShadowRadius; + private Paint mShadowPaint; + private int mCircleDiameter; + + public OvalShadow(int shadowRadius, int circleDiameter) { + super(); + mShadowPaint = new Paint(); + mShadowRadius = shadowRadius; + mCircleDiameter = circleDiameter; + mRadialGradient = new RadialGradient(mCircleDiameter / 2, mCircleDiameter / 2, + mShadowRadius, new int[]{ + FILL_SHADOW_COLOR, Color.TRANSPARENT + }, null, Shader.TileMode.CLAMP); + mShadowPaint.setShader(mRadialGradient); + } + + @Override + public void draw(Canvas canvas, Paint paint) { + final int viewWidth = CircleProgressBar.this.getWidth(); + final int viewHeight = CircleProgressBar.this.getHeight(); + canvas.drawCircle(viewWidth / 2, viewHeight / 2, (mCircleDiameter / 2 + mShadowRadius), + mShadowPaint); + canvas.drawCircle(viewWidth / 2, viewHeight / 2, (mCircleDiameter / 2), paint); + } + } +} diff --git a/materialloadingprogressbar/src/main/java/com/lsjwzh/widget/materialloadingprogressbar/MaterialProgressDrawable.java b/materialloadingprogressbar/src/main/java/com/lsjwzh/widget/materialloadingprogressbar/MaterialProgressDrawable.java new file mode 100644 index 0000000..964c8c4 --- /dev/null +++ b/materialloadingprogressbar/src/main/java/com/lsjwzh/widget/materialloadingprogressbar/MaterialProgressDrawable.java @@ -0,0 +1,726 @@ +/* + * Copyright (C) 2014 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 com.lsjwzh.widget.materialloadingprogressbar; + +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.ColorFilter; +import android.graphics.Paint; +import android.graphics.Paint.Style; +import android.graphics.Path; +import android.graphics.PixelFormat; +import android.graphics.Rect; +import android.graphics.RectF; +import android.graphics.drawable.Animatable; +import android.graphics.drawable.Drawable; +import android.support.annotation.IntDef; +import android.support.annotation.NonNull; +import android.util.DisplayMetrics; +import android.util.Log; +import android.view.View; +import android.view.animation.AccelerateDecelerateInterpolator; +import android.view.animation.Animation; +import android.view.animation.Interpolator; +import android.view.animation.LinearInterpolator; +import android.view.animation.Transformation; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.ArrayList; + +/** + * Fancy progress indicator for Material theme. + * + * @hide + */ +public class MaterialProgressDrawable extends Drawable implements Animatable { + // Maps to ProgressBar.Large style + public static final int LARGE = 0; + // Maps to ProgressBar default style + public static final int DEFAULT = 1; + private static final Interpolator LINEAR_INTERPOLATOR = new LinearInterpolator(); + private static final Interpolator END_CURVE_INTERPOLATOR = new EndCurveInterpolator(); + private static final Interpolator START_CURVE_INTERPOLATOR = new StartCurveInterpolator(); + private static final Interpolator EASE_INTERPOLATOR = new AccelerateDecelerateInterpolator(); + // Maps to ProgressBar default style + private static final int CIRCLE_DIAMETER = 40; + private static final float CENTER_RADIUS = 8.75f; //should add up to 10 when + stroke_width + private static final float STROKE_WIDTH = 2.5f; + // Maps to ProgressBar.Large style + private static final int CIRCLE_DIAMETER_LARGE = 56; + private static final float CENTER_RADIUS_LARGE = 12.5f; + static final float STROKE_WIDTH_LARGE = 3f; + /** + * The duration of a single progress spin in milliseconds. + */ + private static final int ANIMATION_DURATION = 1000 * 80 / 60; + /** + * The number of points in the progress "star". + */ + private static final float NUM_POINTS = 5f; + /** + * Layout info for the arrowhead in dp + */ + private static final int ARROW_WIDTH = 10; + private static final int ARROW_HEIGHT = 5; + private static final float ARROW_OFFSET_ANGLE = 0; + /** + * Layout info for the arrowhead for the large spinner in dp + */ + static final int ARROW_WIDTH_LARGE = 12; + static final int ARROW_HEIGHT_LARGE = 6; + private static final float MAX_PROGRESS_ARC = .8f; + private final int[] COLORS = new int[]{ + Color.BLACK + }; + /** + * The list of animators operating on this drawable. + */ + private final ArrayList mAnimators = new ArrayList(); + /** + * The indicator ring, used to manage animation state. + */ + private final Ring mRing; + private final Callback mCallback = new Callback() { + @Override + public void invalidateDrawable(Drawable d) { + invalidateSelf(); + } + + @Override + public void scheduleDrawable(Drawable d, Runnable what, long when) { + scheduleSelf(what, when); + } + + @Override + public void unscheduleDrawable(Drawable d, Runnable what) { + unscheduleSelf(what); + } + }; + boolean mFinishing; + /** + * Canvas rotation in degrees. + */ + private float mRotation; + private Resources mResources; + private View mAnimExcutor; + private Animation mAnimation; + private float mRotationCount; + private double mWidth; + private double mHeight; + private boolean mShowArrowOnFirstStart = false; + + public MaterialProgressDrawable(Context context, View animExcutor) { + mAnimExcutor = animExcutor; + mResources = context.getResources(); + + mRing = new Ring(mCallback); + mRing.setColors(COLORS); + + updateSizes(DEFAULT); + setupAnimators(); + } + + public void setSizeParameters(double progressCircleWidth, double progressCircleHeight, + double centerRadius, double strokeWidth, float arrowWidth, float arrowHeight) { + final Ring ring = mRing; + mWidth = progressCircleWidth; + mHeight = progressCircleHeight ; + ring.setStrokeWidth((float) strokeWidth ); + ring.setCenterRadius(centerRadius); + ring.setColorIndex(0); + ring.setArrowDimensions(arrowWidth , arrowHeight ); + ring.setInsets((int) mWidth, (int) mHeight); + } + + /** + * Set the overall size for the progress spinner. This updates the radius + * and stroke width of the ring. + * + * @param size One of {@link MaterialProgressDrawable.LARGE} or + * {@link MaterialProgressDrawable.DEFAULT} + */ + public void updateSizes(@ProgressDrawableSize int size) { + final DisplayMetrics metrics = mResources.getDisplayMetrics(); + final float screenDensity = metrics.density; + + if (size == LARGE) { + setSizeParameters(CIRCLE_DIAMETER_LARGE*screenDensity, CIRCLE_DIAMETER_LARGE*screenDensity, CENTER_RADIUS_LARGE*screenDensity, + STROKE_WIDTH_LARGE*screenDensity, ARROW_WIDTH_LARGE*screenDensity, ARROW_HEIGHT_LARGE*screenDensity); + } else { + setSizeParameters(CIRCLE_DIAMETER*screenDensity, CIRCLE_DIAMETER*screenDensity, CENTER_RADIUS*screenDensity, STROKE_WIDTH*screenDensity, + ARROW_WIDTH*screenDensity, ARROW_HEIGHT*screenDensity); + } + } + + /** + * @param show Set to true to display the arrowhead on the progress spinner. + */ + public void showArrow(boolean show) { + mRing.setShowArrow(show); + } + + /** + * @param scale Set the scale of the arrowhead for the spinner. + */ + public void setArrowScale(float scale) { + mRing.setArrowScale(scale); + } + + /** + * Set the start and end trim for the progress spinner arc. + * + * @param startAngle start angle + * @param endAngle end angle + */ + public void setStartEndTrim(float startAngle, float endAngle) { + mRing.setStartTrim(startAngle); + mRing.setEndTrim(endAngle); + } + + /** + * Set the amount of rotation to apply to the progress spinner. + * + * @param rotation Rotation is from [0..1] + */ + public void setProgressRotation(float rotation) { + mRing.setRotation(rotation); + } + + /** + * Update the background color of the circle image view. + */ + public void setBackgroundColor(int color) { + mRing.setBackgroundColor(color); + } + + /** + * Set the colors used in the progress animation from color resources. + * The first color will also be the color of the bar that grows in response + * to a user swipe gesture. + * + * @param colors + */ + public void setColorSchemeColors(int... colors) { + mRing.setColors(colors); + mRing.setColorIndex(0); + } + + @Override + public int getIntrinsicHeight() { + return (int) mHeight; + } + + @Override + public int getIntrinsicWidth() { + return (int) mWidth; + } + + @Override + public void draw(Canvas c) { + final Rect bounds = getBounds(); + final int saveCount = c.save(); + c.rotate(mRotation, bounds.exactCenterX(), bounds.exactCenterY()); + mRing.draw(c, bounds); + c.restoreToCount(saveCount); + } + + public int getAlpha() { + return mRing.getAlpha(); + } + + @Override + public void setAlpha(int alpha) { + mRing.setAlpha(alpha); + } + + @Override + public void setColorFilter(ColorFilter colorFilter) { + mRing.setColorFilter(colorFilter); + } + + @SuppressWarnings("unused") + private float getRotation() { + return mRotation; + } + + @SuppressWarnings("unused") + void setRotation(float rotation) { + mRotation = rotation; + invalidateSelf(); + } + + @Override + public int getOpacity() { + return PixelFormat.TRANSLUCENT; + } + + @Override + public boolean isRunning() { + return this.mAnimation.hasStarted() && !this.mAnimation.hasEnded(); + } + + @Override + public void start() { + mAnimation.reset(); + mRing.storeOriginals(); + mRing.setShowArrow(mShowArrowOnFirstStart); + + // Already showing some part of the ring + if (mRing.getEndTrim() != mRing.getStartTrim()) { + mFinishing = true; + mAnimation.setDuration(ANIMATION_DURATION / 2); + mAnimExcutor.startAnimation(mAnimation); + } else { + mRing.setColorIndex(0); + mRing.resetOriginals(); + mAnimation.setDuration(ANIMATION_DURATION); + mAnimExcutor.startAnimation(mAnimation); + } + } + + @Override + public void stop() { + mAnimExcutor.clearAnimation(); + setRotation(0); + mRing.setShowArrow(false); + mRing.setColorIndex(0); + mRing.resetOriginals(); + } + + private void applyFinishTranslation(float interpolatedTime, Ring ring) { + // shrink back down and complete a full rotation before + // starting other circles + // Rotation goes between [0..1]. + float targetRotation = (float) (Math.floor(ring.getStartingRotation() / MAX_PROGRESS_ARC) + + 1f); + final float startTrim = ring.getStartingStartTrim() + + (ring.getStartingEndTrim() - ring.getStartingStartTrim()) * interpolatedTime; + ring.setStartTrim(startTrim); + final float rotation = ring.getStartingRotation() + + ((targetRotation - ring.getStartingRotation()) * interpolatedTime); + ring.setRotation(rotation); + } + + private void setupAnimators() { + final Ring ring = mRing; + final Animation animation = new Animation() { + @Override + public void applyTransformation(float interpolatedTime, Transformation t) { + if (mFinishing) { + applyFinishTranslation(interpolatedTime, ring); + } else { + // The minProgressArc is calculated from 0 to create an + // angle that + // matches the stroke width. + final float minProgressArc = (float) Math.toRadians( + ring.getStrokeWidth() / (2 * Math.PI * ring.getCenterRadius())); + final float startingEndTrim = ring.getStartingEndTrim(); + final float startingTrim = ring.getStartingStartTrim(); + final float startingRotation = ring.getStartingRotation(); + + // Offset the minProgressArc to where the endTrim is + // located. + final float minArc = MAX_PROGRESS_ARC - minProgressArc; + float endTrim = startingEndTrim + (minArc + * START_CURVE_INTERPOLATOR.getInterpolation(interpolatedTime)); + float startTrim = startingTrim + (MAX_PROGRESS_ARC + * END_CURVE_INTERPOLATOR.getInterpolation(interpolatedTime)); + + final float sweepTrim = endTrim-startTrim; + //Avoid the ring to be a full circle + if(Math.abs(sweepTrim)>=1){ + endTrim = startTrim+0.5f; + } + + ring.setEndTrim(endTrim); + + ring.setStartTrim(startTrim); + + final float rotation = startingRotation + (0.25f * interpolatedTime); + ring.setRotation(rotation); + + float groupRotation = ((720.0f / NUM_POINTS) * interpolatedTime) + + (720.0f * (mRotationCount / NUM_POINTS)); + setRotation(groupRotation); + + // If this view is removed by parent + // clear the anim + if ( mAnimExcutor.getParent() == null ) stop(); + } + } + }; + animation.setRepeatCount(Animation.INFINITE); + animation.setRepeatMode(Animation.RESTART); + animation.setInterpolator(LINEAR_INTERPOLATOR); + animation.setAnimationListener(new Animation.AnimationListener() { + + @Override + public void onAnimationStart(Animation animation) { + mRotationCount = 0; + } + + @Override + public void onAnimationEnd(Animation animation) { + // do nothing + } + + @Override + public void onAnimationRepeat(Animation animation) { + ring.storeOriginals(); + ring.goToNextColor(); + ring.setStartTrim(ring.getEndTrim()); + if (mFinishing) { + // finished closing the last ring from the swipe gesture; go + // into progress mode + mFinishing = false; + animation.setDuration(ANIMATION_DURATION); + ring.setShowArrow(false); + } else { + mRotationCount = (mRotationCount + 1) % (NUM_POINTS); + } + } + }); + mAnimation = animation; + } + + public void showArrowOnFirstStart(boolean showArrowOnFirstStart) { + this.mShowArrowOnFirstStart = showArrowOnFirstStart; + } + + @Retention(RetentionPolicy.CLASS) + @IntDef({LARGE, DEFAULT}) + public @interface ProgressDrawableSize { + } + + private static class Ring { + private final RectF mTempBounds = new RectF(); + private final Paint mPaint = new Paint(); + private final Paint mArrowPaint = new Paint(); + + private final Callback mCallback; + private final Paint mCirclePaint = new Paint(); + private float mStartTrim = 0.0f; + private float mEndTrim = 0.0f; + private float mRotation = 0.0f; + private float mStrokeWidth = 5.0f; + private float mStrokeInset = 2.5f; + private int[] mColors; + // mColorIndex represents the offset into the available mColors that the + // progress circle should currently display. As the progress circle is + // animating, the mColorIndex moves by one to the next available color. + private int mColorIndex; + private float mStartingStartTrim; + private float mStartingEndTrim; + private float mStartingRotation; + private boolean mShowArrow; + private Path mArrow; + private float mArrowScale; + private double mRingCenterRadius; + private int mArrowWidth; + private int mArrowHeight; + private int mAlpha; + private int mBackgroundColor; + + public Ring(Callback callback) { + mCallback = callback; + + mPaint.setStrokeCap(Paint.Cap.SQUARE); + mPaint.setAntiAlias(true); + mPaint.setStyle(Style.STROKE); + + mArrowPaint.setStyle(Paint.Style.FILL); + mArrowPaint.setAntiAlias(true); + } + + public void setBackgroundColor(int color) { + mBackgroundColor = color; + } + + /** + * Set the dimensions of the arrowhead. + * + * @param width Width of the hypotenuse of the arrow head + * @param height Height of the arrow point + */ + public void setArrowDimensions(float width, float height) { + mArrowWidth = (int) width; + mArrowHeight = (int) height; + } + + /** + * Draw the progress spinner + */ + public void draw(Canvas c, Rect bounds) { + final RectF arcBounds = mTempBounds; + arcBounds.set(bounds); + arcBounds.inset(mStrokeInset, mStrokeInset); + + final float startAngle = (mStartTrim + mRotation) * 360; + final float endAngle = (mEndTrim + mRotation) * 360; + float sweepAngle = endAngle - startAngle; + mPaint.setColor(mColors[mColorIndex]); + c.drawArc(arcBounds, startAngle, sweepAngle, false, mPaint); + + drawTriangle(c, startAngle, sweepAngle, bounds); + + if (mAlpha < 255) { + mCirclePaint.setColor(mBackgroundColor); + mCirclePaint.setAlpha(255 - mAlpha); + c.drawCircle(bounds.exactCenterX(), bounds.exactCenterY(), bounds.width() / 2, + mCirclePaint); + } + } + + private void drawTriangle(Canvas c, float startAngle, float sweepAngle, Rect bounds) { + if (mShowArrow) { + if (mArrow == null) { + mArrow = new android.graphics.Path(); + mArrow.setFillType(android.graphics.Path.FillType.EVEN_ODD); + } else { + mArrow.reset(); + } + + // Adjust the position of the triangle so that it is inset as + // much as the arc, but also centered on the arc. + float x = (float) (mRingCenterRadius * Math.cos(0) + bounds.exactCenterX()); + float y = (float) (mRingCenterRadius * Math.sin(0) + bounds.exactCenterY()); + + // Update the path each time. This works around an issue in SKIA + // where concatenating a rotation matrix to a scale matrix + // ignored a starting negative rotation. This appears to have + // been fixed as of API 21. + mArrow.moveTo(0, 0); + mArrow.lineTo((mArrowWidth) * mArrowScale, 0); + mArrow.lineTo(((mArrowWidth) * mArrowScale / 2), (mArrowHeight + * mArrowScale)); + mArrow.offset(x-((mArrowWidth) * mArrowScale / 2), y); + mArrow.close(); + // draw a triangle + mArrowPaint.setColor(mColors[mColorIndex]); + //when sweepAngle < 0 adjust the position of the arrow + c.rotate(startAngle + (sweepAngle<0?0:sweepAngle) - ARROW_OFFSET_ANGLE, bounds.exactCenterX(), + bounds.exactCenterY()); + c.drawPath(mArrow, mArrowPaint); + } + } + + /** + * Set the colors the progress spinner alternates between. + * + * @param colors Array of integers describing the colors. Must be non-null. + */ + public void setColors(@NonNull int[] colors) { + mColors = colors; + // if colors are reset, make sure to reset the color index as well + setColorIndex(0); + } + + /** + * @param index Index into the color array of the color to display in + * the progress spinner. + */ + public void setColorIndex(int index) { + mColorIndex = index; + } + + /** + * Proceed to the next available ring color. This will automatically + * wrap back to the beginning of colors. + */ + public void goToNextColor() { + mColorIndex = (mColorIndex + 1) % (mColors.length); + } + + public void setColorFilter(ColorFilter filter) { + mPaint.setColorFilter(filter); + invalidateSelf(); + } + + /** + * @return Current alpha of the progress spinner and arrowhead. + */ + public int getAlpha() { + return mAlpha; + } + + /** + * @param alpha Set the alpha of the progress spinner and associated arrowhead. + */ + public void setAlpha(int alpha) { + mAlpha = alpha; + } + + @SuppressWarnings("unused") + public float getStrokeWidth() { + return mStrokeWidth; + } + + /** + * @param strokeWidth Set the stroke width of the progress spinner in pixels. + */ + public void setStrokeWidth(float strokeWidth) { + mStrokeWidth = strokeWidth; + mPaint.setStrokeWidth(strokeWidth); + invalidateSelf(); + } + + @SuppressWarnings("unused") + public float getStartTrim() { + return mStartTrim; + } + + @SuppressWarnings("unused") + public void setStartTrim(float startTrim) { + mStartTrim = startTrim; + invalidateSelf(); + } + + public float getStartingStartTrim() { + return mStartingStartTrim; + } + + public float getStartingEndTrim() { + return mStartingEndTrim; + } + + @SuppressWarnings("unused") + public float getEndTrim() { + return mEndTrim; + } + + @SuppressWarnings("unused") + public void setEndTrim(float endTrim) { + mEndTrim = endTrim; + invalidateSelf(); + } + + @SuppressWarnings("unused") + public float getRotation() { + return mRotation; + } + + @SuppressWarnings("unused") + public void setRotation(float rotation) { + mRotation = rotation; + invalidateSelf(); + } + + public void setInsets(int width, int height) { + final float minEdge = (float) Math.min(width, height); + float insets; + if (mRingCenterRadius <= 0 || minEdge < 0) { + insets = (float) Math.ceil(mStrokeWidth / 2.0f); + } else { + insets = (float) (minEdge / 2.0f - mRingCenterRadius); + } + mStrokeInset = insets; + } + + @SuppressWarnings("unused") + public float getInsets() { + return mStrokeInset; + } + + public double getCenterRadius() { + return mRingCenterRadius; + } + + /** + * @param centerRadius Inner radius in px of the circle the progress + * spinner arc traces. + */ + public void setCenterRadius(double centerRadius) { + mRingCenterRadius = centerRadius; + } + + /** + * @param show Set to true to show the arrow head on the progress spinner. + */ + public void setShowArrow(boolean show) { + if (mShowArrow != show) { + mShowArrow = show; + invalidateSelf(); + } + } + + /** + * @param scale Set the scale of the arrowhead for the spinner. + */ + public void setArrowScale(float scale) { + if (scale != mArrowScale) { + mArrowScale = scale; + invalidateSelf(); + } + } + + /** + * @return The amount the progress spinner is currently rotated, between [0..1]. + */ + public float getStartingRotation() { + return mStartingRotation; + } + + /** + * If the start / end trim are offset to begin with, store them so that + * animation starts from that offset. + */ + public void storeOriginals() { + mStartingStartTrim = mStartTrim; + mStartingEndTrim = mEndTrim; + mStartingRotation = mRotation; + } + + /** + * Reset the progress spinner to default rotation, start and end angles. + */ + public void resetOriginals() { + mStartingStartTrim = 0; + mStartingEndTrim = 0; + mStartingRotation = 0; + setStartTrim(0); + setEndTrim(0); + setRotation(0); + } + + private void invalidateSelf() { + mCallback.invalidateDrawable(null); + } + } + + /** + * Squishes the interpolation curve into the second half of the animation. + */ + private static class EndCurveInterpolator extends AccelerateDecelerateInterpolator { + @Override + public float getInterpolation(float input) { + return super.getInterpolation(Math.max(0, (input - 0.5f) * 2.0f)); + } + } + + /** + * Squishes the interpolation curve into the first half of the animation. + */ + private static class StartCurveInterpolator extends AccelerateDecelerateInterpolator { + @Override + public float getInterpolation(float input) { + return super.getInterpolation(Math.min(1, input * 2.0f)); + } + } +} diff --git a/materialloadingprogressbar/src/main/res/values/attrs.xml b/materialloadingprogressbar/src/main/res/values/attrs.xml new file mode 100644 index 0000000..3fdaff0 --- /dev/null +++ b/materialloadingprogressbar/src/main/res/values/attrs.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/materialloadingprogressbar/src/main/res/values/strings.xml b/materialloadingprogressbar/src/main/res/values/strings.xml new file mode 100644 index 0000000..8542005 --- /dev/null +++ b/materialloadingprogressbar/src/main/res/values/strings.xml @@ -0,0 +1,2 @@ + + diff --git a/settings.gradle b/settings.gradle index 3306997..566529c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':library' +include ':app', ':library', ':materialloadingprogressbar'