From 78fb143a7901288395d5cc70b0aa4e0b9ff707fc Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Fri, 26 Feb 2016 19:55:57 +0300
Subject: [PATCH] [android] Review fixes.

---
 .../com/mapswithme/maps/editor/OpeningHours.cpp |  2 +-
 android/res/layout/item_opening_hours.xml       |  7 ++-----
 .../maps/editor/data/HoursMinutes.java          |  2 +-
 .../maps/widget/placepage/PlacePageView.java    | 17 ++++++++---------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/editor/OpeningHours.cpp b/android/jni/com/mapswithme/maps/editor/OpeningHours.cpp
index d01b88168f..82910b10e2 100644
--- a/android/jni/com/mapswithme/maps/editor/OpeningHours.cpp
+++ b/android/jni/com/mapswithme/maps/editor/OpeningHours.cpp
@@ -300,7 +300,7 @@ Java_com_mapswithme_maps_editor_OpeningHours_nativeTimetablesFromString(JNIEnv *
 {
   TimeTableSet tts;
   string const source = jni::ToNativeString(env, jSource);
-  if (source.length() != 0 && MakeTimeTableSet(OpeningHours(source), tts))
+  if (!source.empty()  && MakeTimeTableSet(OpeningHours(source), tts))
     return JavaTimetables(env, tts);
 
   return nullptr;
diff --git a/android/res/layout/item_opening_hours.xml b/android/res/layout/item_opening_hours.xml
index 8b29521844..c186452516 100644
--- a/android/res/layout/item_opening_hours.xml
+++ b/android/res/layout/item_opening_hours.xml
@@ -58,9 +58,7 @@
     android:background="?clickableBackground"
     android:lineSpacingExtra="@dimen/margin_base"
     android:textAppearance="@style/MwmTextAppearance.PlacePage"
-    android:visibility="visible"
-    tools:text="Mo-Fr 16:00-18.00\nSu 16:00-18.00"
-    tools:visibility="visible"/>
+    tools:text="Mo-Fr 16:00-18.00\nSu 16:00-18.00"/>
 
   <TextView
     android:id="@+id/edit_opening_hours"
@@ -73,7 +71,6 @@
     android:text="@string/edit_opening_hours"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"
-    android:visibility="gone"/>
+    android:textColor="?colorAccent"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java b/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java
index 508aa2e187..fe3280f72d 100644
--- a/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java
+++ b/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java
@@ -26,7 +26,7 @@ public class HoursMinutes implements Parcelable
   @Override
   public String toString()
   {
-    return String.format(Locale.getDefault(), "%02d:%02d", hours, minutes);
+    return String.format(Locale.US, "%02d:%02d", hours, minutes);
   }
 
   @Override
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index c0e06875b8..ae066a55e2 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -465,9 +465,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
     final Resources resources = getResources();
     if (timetables[0].isFullWeek())
     {
-      refreshTodayOh((timetables[0].isFullday ? resources.getString(R.string.twentyfour_seven)
-                                              : resources.getString(R.string.daily) + " " + timetables[0].workingTimespan),
-                     ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary));
+      refreshTodayOpeningHours((timetables[0].isFullday ? resources.getString(R.string.twentyfour_seven)
+                                                        : resources.getString(R.string.daily) + " " + timetables[0].workingTimespan),
+                               ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary));
       UiUtils.hide(mFullOpeningHours);
       return;
     }
@@ -479,21 +479,20 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
       if (tt.containsWeekday(currentDay))
       {
         containsCurrentWeekday = true;
-        refreshTodayOh(resources.getString(R.string.today) + " " + tt.workingTimespan,
-                       ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary));
+        refreshTodayOpeningHours(resources.getString(R.string.today) + " " + tt.workingTimespan,
+                                 ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary));
         break;
       }
     }
 
     UiUtils.setTextAndShow(mFullOpeningHours, TimeFormatUtils.formatTimetables(timetables));
     if (!containsCurrentWeekday)
-      refreshTodayOh(resources.getString(R.string.day_off_today), resources.getColor(R.color.base_red));
+      refreshTodayOpeningHours(resources.getString(R.string.day_off_today), resources.getColor(R.color.base_red));
   }
 
-  private void refreshTodayOh(String text, @ColorInt int color)
+  private void refreshTodayOpeningHours(String text, @ColorInt int color)
   {
-    UiUtils.show(mTodayOpeningHours);
-    mTodayOpeningHours.setText(text);
+    UiUtils.setTextAndShow(mTodayOpeningHours, text);
     mTodayOpeningHours.setTextColor(color);
   }