From 16e32a7ec3b2b51ae61fe8d2d1460fa397e9a453 Mon Sep 17 00:00:00 2001 From: Negue Date: Wed, 1 Mar 2017 13:45:43 +0100 Subject: [PATCH 01/16] "my challenges" - filter --- Habitica/build.gradle | 3 + .../ic_arrow_drop_down_80000000_24dp.png | Bin 0 -> 134 bytes .../ic_arrow_drop_down_80000000_24dp.png | Bin 0 -> 103 bytes .../ic_arrow_drop_down_80000000_24dp.png | Bin 0 -> 137 bytes .../ic_arrow_drop_down_80000000_24dp.png | Bin 0 -> 168 bytes .../ic_arrow_drop_down_80000000_24dp.png | Bin 0 -> 186 bytes .../layout/activity_challenge_overview.xml | 98 ----------- .../res/layout/dialog_challenge_filter.xml | 163 ++++++++++++++++++ .../dialog_challenge_filter_group_item.xml | 22 +++ .../res/layout/fragment_challengeslist.xml | 34 +++- Habitica/res/values/dimens.xml | 3 + Habitica/res/values/strings.xml | 7 + Habitica/res/values/styles.habitica.xml | 4 + .../social/ChallengesListViewAdapter.java | 32 +++- .../ChallengesFilterRecyclerViewAdapter.java | 106 ++++++++++++ .../ChallegeFilterDialogHolder.java | 143 +++++++++++++++ .../challenges/ChallengeFilterOptions.java | 11 ++ .../challenges/ChallengeListFragment.java | 35 +++- .../ChallengesOverviewFragment.java | 1 + 19 files changed, 559 insertions(+), 103 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/ic_arrow_drop_down_80000000_24dp.png create mode 100644 Habitica/res/drawable-mdpi/ic_arrow_drop_down_80000000_24dp.png create mode 100644 Habitica/res/drawable-xhdpi/ic_arrow_drop_down_80000000_24dp.png create mode 100644 Habitica/res/drawable-xxhdpi/ic_arrow_drop_down_80000000_24dp.png create mode 100644 Habitica/res/drawable-xxxhdpi/ic_arrow_drop_down_80000000_24dp.png delete mode 100644 Habitica/res/layout/activity_challenge_overview.xml create mode 100644 Habitica/res/layout/dialog_challenge_filter.xml create mode 100644 Habitica/res/layout/dialog_challenge_filter_group_item.xml create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeFilterDialogHolder.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 1e24d535e..a1e63ba2f 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -103,6 +103,9 @@ dependencies { compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar' + // lodash/underscore + compile 'com.github.javadev:underscore:1.23' + //RxJava compile 'io.reactivex:rxandroid:1.2.1' compile 'io.reactivex:rxjava:1.2.0' diff --git a/Habitica/res/drawable-hdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-hdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5cc36610f8a21ea285b30e7a3b01489da2558e GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBd_7$pLn>~)J-3mQL4n8RV$Xy? z_@16qzOR|KL>icoqhR1v+16u4heu9If;!)5qkM_nF))*JlKWc%9MHGEM8% i5;S&S$-vN1WfdkTqxg2(r7J*#89ZJ6T-G@yGywow#4Kt6 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-mdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..94028d1a3a29c9782d45596ce9657ce9e5b66c16 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjdY&$hAr-fh6C_v{Cy4OWKVUe* z%d&x4SGRD%Qh%8Y$r!#ZJ;Lo5msoPS9aLauu&(22{Je6-MxagxPgg&ebxsLQ0Ofof Ag8%>k literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-xhdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..903aaed0c07d90543e92be8c6592d44104fac551 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt08bakkcwMxuQ+lYP!M2tm_Kd# z&ywmljw}n?+0qi;bMCSRDK5}Hf2LpUtm>sdLYe>kGVgVo=$Fk}fBF64`CeCA?oVC8 j{a-IoT8@FCVKS?OybTUY01<)D~3Qzs@pUeh5W z|J;9xQQlrdyHw68OtNV9cmy?L!V|VszJkVJA&D0t5l>e?mvv4F FO#sY$Hk|+f literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxxhdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8b60cb0373177394fb17a7e04c7ac1aa76c20370 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojh-%!Ar-gYUJ2wp;K0LraI#qD z)O%Jhp39}MB|Xr6A_G){1RCl;-z|RG%W*7TGI5Xci!rteLT!@j9*#8z9-?2 h0b!0jl6edbN4PJYI>ET+cttcw*wfX|Wt~$(6959vJv;ya literal 0 HcmV?d00001 diff --git a/Habitica/res/layout/activity_challenge_overview.xml b/Habitica/res/layout/activity_challenge_overview.xml deleted file mode 100644 index 57214e51a..000000000 --- a/Habitica/res/layout/activity_challenge_overview.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/layout/dialog_challenge_filter.xml b/Habitica/res/layout/dialog_challenge_filter.xml new file mode 100644 index 000000000..7ed2f808c --- /dev/null +++ b/Habitica/res/layout/dialog_challenge_filter.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + +