From b6e6ecf0275df7e336135b36f1b66cdbb2b0c020 Mon Sep 17 00:00:00 2001 From: Christophe Beyls Date: Mon, 31 Mar 2014 22:30:34 +0200 Subject: [PATCH] Replaced PagerSlidingTabStrip with a slightly improved version of Android's example SlidingTabLayout. --- README.md | 1 - res/drawable/background_tab.xml | 8 - res/layout/fragment_live.xml | 7 +- res/layout/fragment_tracks.xml | 7 +- res/values/attrs.xml | 14 - res/values/colors.xml | 1 - res/values/strings.xml | 2 +- res/values/styles.xml | 1 + .../fosdem/fragments/LiveFragment.java | 7 +- .../fosdem/fragments/TracksFragment.java | 12 +- src/com/astuetz/PagerSlidingTabStrip.java | 578 ------------------ .../android/common/view/SlidingTabLayout.java | 324 ++++++++++ .../android/common/view/SlidingTabStrip.java | 200 ++++++ 13 files changed, 543 insertions(+), 619 deletions(-) delete mode 100644 res/drawable/background_tab.xml delete mode 100644 src/com/astuetz/PagerSlidingTabStrip.java create mode 100644 src/com/example/android/common/view/SlidingTabLayout.java create mode 100644 src/com/example/android/common/view/SlidingTabStrip.java diff --git a/README.md b/README.md index fe4c763..545e5bf 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ gradle build ## Used libraries * [Android Support Library](http://developer.android.com/tools/support-library/) by The Android Open Source Project -* [PagerSlidingTabStrip](https://github.com/astuetz/PagerSlidingTabStrip) by Andreas Stuetz * [ViewPagerIndicator](http://viewpagerindicator.com/) by Jake Wharton * [PhotoView](https://github.com/chrisbanes/PhotoView) by Chris Banes diff --git a/res/drawable/background_tab.xml b/res/drawable/background_tab.xml deleted file mode 100644 index 0d11a79..0000000 --- a/res/drawable/background_tab.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/fragment_live.xml b/res/layout/fragment_live.xml index f3ae57f..674cb4a 100644 --- a/res/layout/fragment_live.xml +++ b/res/layout/fragment_live.xml @@ -5,11 +5,10 @@ android:layout_height="match_parent" android:orientation="vertical" > - + android:layout_height="wrap_content" /> - + android:layout_height="wrap_content" /> - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index b132c98..44399a2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -2,7 +2,6 @@ #a91991 - #80a91991 #f0fafafa #29000000 #29000000 diff --git a/res/values/strings.xml b/res/values/strings.xml index 9bf6953..84fd4ff 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -112,6 +112,6 @@ \nThe name FOSDEM and the gear logo are registered trademarks of FOSDEM VZW. Used with permission. \n \nThis application makes use of the following libraries: -\n- Android Support Library by The Android Open Source Project\n- PagerSlidingTabStrip by Andreas Stuetz\n- ViewPagerIndicator by Jake Wharton\n- PhotoView by Chris Banes +\n- Android Support Library by The Android Open Source Project\n- ViewPagerIndicator by Jake Wharton\n- PhotoView by Chris Banes \ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index eb2267b..13149ce 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -11,6 +11,7 @@ @style/TextView.Fosdem @style/ListView.Fosdem @drawable/activated_background + @drawable/selectable_background