Merge pull request #200 from bloder/resource-adapter

New function in adapter implemented and some .ideas files deleted
florent37 · Dec 24, 2015 · 8b7081b · 8b7081b
2 parents fb06e8a + 9b717f7
commit 8b7081b
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 268 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/android_observablescrollview_1_5_2.xml b/.idea/libraries/android_observablescrollview_1_5_2.xml
diff --git a/.idea/libraries/answers_1_2_2.xml b/.idea/libraries/answers_1_2_2.xml
diff --git a/.idea/libraries/appcompat_v7_22_2_1.xml b/.idea/libraries/appcompat_v7_22_2_1.xml
diff --git a/.idea/libraries/beta_1_1_3.xml b/.idea/libraries/beta_1_1_3.xml
diff --git a/.idea/libraries/blurry_0_0_3.xml b/.idea/libraries/blurry_0_0_3.xml
diff --git a/.idea/libraries/cardview_v7_22_2_1.xml b/.idea/libraries/cardview_v7_22_2_1.xml
diff --git a/.idea/libraries/carpaccio_1_0_1.xml b/.idea/libraries/carpaccio_1_0_1.xml
diff --git a/.idea/libraries/circleimageview_1_3_0.xml b/.idea/libraries/circleimageview_1_3_0.xml
diff --git a/.idea/libraries/crashlytics_2_4_0.xml b/.idea/libraries/crashlytics_2_4_0.xml
diff --git a/.idea/libraries/crashlytics_core_2_3_3.xml b/.idea/libraries/crashlytics_core_2_3_3.xml
diff --git a/.idea/libraries/fabric_1_3_4.xml b/.idea/libraries/fabric_1_3_4.xml
diff --git a/.idea/libraries/kenburnsview_1_0_6.xml b/.idea/libraries/kenburnsview_1_0_6.xml
diff --git a/.idea/libraries/library_1_1_0.xml b/.idea/libraries/library_1_1_0.xml
diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml
diff --git a/.idea/libraries/materialimageloading_1_0_1.xml b/.idea/libraries/materialimageloading_1_0_1.xml
diff --git a/.idea/libraries/materialviewpager_1_1_2.xml b/.idea/libraries/materialviewpager_1_1_2.xml
diff --git a/.idea/libraries/picasso_2_5_2.xml b/.idea/libraries/picasso_2_5_2.xml
diff --git a/.idea/libraries/recyclerview_v7_22_2_1.xml b/.idea/libraries/recyclerview_v7_22_2_1.xml
diff --git a/.idea/libraries/support_annotations_22_2_1.xml b/.idea/libraries/support_annotations_22_2_1.xml
diff --git a/.idea/libraries/support_v4_22_2_1.xml b/.idea/libraries/support_v4_22_2_1.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml