diff options
| author | Roman Romanov <rromanov@65gb.net> | 2016-10-04 07:04:52 +0300 |
|---|---|---|
| committer | Roman Romanov <rromanov@65gb.net> | 2016-10-04 07:04:52 +0300 |
| commit | bd882b80fce44a651ba3cff7b2e579e011fdd815 (patch) | |
| tree | 0360bc039defe3f5f3ce3a22605144b03425e532 | |
| parent | 027c34d8704113704c2c248bd09ec8b08a6415d6 (diff) | |
[android] Review fixes
| -rw-r--r-- | android/jni/com/mapswithme/maps/SponsoredHotel.cpp | 3 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java | 2 | ||||
| -rw-r--r-- | std/chrono.hpp | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android/jni/com/mapswithme/maps/SponsoredHotel.cpp b/android/jni/com/mapswithme/maps/SponsoredHotel.cpp index 1eb94e0e1b..cabe3fe119 100644 --- a/android/jni/com/mapswithme/maps/SponsoredHotel.cpp +++ b/android/jni/com/mapswithme/maps/SponsoredHotel.cpp @@ -6,8 +6,7 @@ #include "map/place_page_info.hpp" #include "std/bind.hpp" - -using namespace std::chrono; +#include "std/chrono.hpp" namespace { diff --git a/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java index a7ec45ea17..ffcce5c2fd 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java @@ -57,7 +57,7 @@ class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.ViewHolder> public void onBindViewHolder(ViewHolder holder, int position) { Item item = mLoadedItems.get(position); - item.setShowMore(position == MAX_COUNT - 1); + item.setShowMore(position == MAX_COUNT - 1 && mItems.size() > MAX_COUNT); holder.bind(item, position); } diff --git a/std/chrono.hpp b/std/chrono.hpp index 1ac4f3f731..3aadbf8ae6 100644 --- a/std/chrono.hpp +++ b/std/chrono.hpp @@ -17,6 +17,7 @@ using std::chrono::seconds; using std::chrono::steady_clock; using std::chrono::system_clock; using std::chrono::time_point; +using std::chrono::time_point_cast; #ifdef DEBUG_NEW #define new DEBUG_NEW |