Adjustments to date strings.

ocariot · Jan 29, 2020 · c3cdf24 · c3cdf24
1 parent 87a4b13
commit c3cdf24
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 57 deletions.
diff --git a/app/src/main/java/br/edu/uepb/nutes/ocariot/view/ui/activity/PhysicalActivityDetail.java b/app/src/main/java/br/edu/uepb/nutes/ocariot/view/ui/activity/PhysicalActivityDetail.java
@@ -22,7 +22,6 @@
 import br.edu.uepb.nutes.ocariot.utils.DateUtils;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import timber.log.Timber;
 
 /**
  * A fragment to see the details of a physical physicalActivity.
@@ -115,6 +114,58 @@ private void initComponents() {
         populateView(physicalActivity);
     }
 
+    private void initToolbar() {
+        ActionBar mActionBar = getSupportActionBar();
+        if (mActionBar == null) return;
+
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+        mActionBar.setDisplayShowTitleEnabled(true);
+        mActionBar.setHomeAsUpIndicator(R.drawable.ic_close_dark);
+        mActionBar.setTitle(physicalActivity.getName());
+        mActionBar.setSubtitle(childSeelcted.getUsername());
+    }
+
+    private void populateView(PhysicalActivity a) {
+        dateStartDetailsTextView.setText(DateUtils.convertDateTimeUTCToLocale(a.getStartTime(),
+                getResources().getString(R.string.date_time_abb3), null));
+
+        rangeDurationTextView.setText(getResources().getString(
+                R.string.activity_range_time,
+                DateUtils.convertDateTimeUTCToLocale(a.getStartTime(), getString(R.string.hour_format2)),
+                DateUtils.convertDateTimeUTCToLocale(a.getEndTime(), getString(R.string.hour_format2))
+        ));
+
+        int duration = (int) (a.getDuration() / (60 * 1000));
+        durationTextView.setText(getResources().getString(R.string.duration_min, duration));
+        stepsTextView.setText(String.valueOf(a.getSteps()));
+        caloriesTextView.setText(String.valueOf(a.getCalories()));
+
+        if (duration > 0) {
+            caloriesMinuteTextView.setText(String.valueOf(a.getCalories() / duration));
+        }
+
+        // levels
+        populateLevels(a.getLevels());
+
+        // heart rate
+        boxHRZones.setVisibility(View.GONE);
+        if (a.getHeartRate() != null && a.getHeartRate().getAverage() > 0) {
+            boxHRZones.setVisibility(View.VISIBLE);
+            avgHeartRate.setText(String.valueOf(a.getHeartRate().getAverage()));
+        }
+
+        // distance
+        if (a.getDistance() != null && a.getDistance() > 0) {
+            double distance = a.getDistance() / 1000;
+            double distanceRest = a.getDistance() % 1000;
+            if (distanceRest > 0) {
+                distanceTextView.setText(String.format(Locale.getDefault(), "%.2f", distance));
+            } else {
+                distanceTextView.setText(String.format(Locale.getDefault(), "%d", (int) distance));
+            }
+        }
+    }
+
     private void populateLevels(List<ActivityLevel> levels) {
         boxLevels.setVisibility(View.GONE);
         if (levels == null || levels.isEmpty()) return;
@@ -178,56 +229,4 @@ private void populateLevels(List<ActivityLevel> levels) {
             }
         }
     }
-
-    private void populateView(PhysicalActivity a) {
-        dateStartDetailsTextView.setText(DateUtils.convertDateTimeUTCToLocale(a.getStartTime(),
-                getResources().getString(R.string.date_time_abb3), null));
-
-        rangeDurationTextView.setText(getResources().getString(
-                R.string.activity_range_time,
-                DateUtils.convertDateTimeUTCToLocale(a.getStartTime(), getString(R.string.hour_format2)),
-                DateUtils.convertDateTimeUTCToLocale(a.getEndTime(), getString(R.string.hour_format2))
-        ));
-
-        int duration = (int) (a.getDuration() / (60 * 1000));
-        durationTextView.setText(getResources().getString(R.string.duration_min, duration));
-        stepsTextView.setText(String.valueOf(a.getSteps()));
-        caloriesTextView.setText(String.valueOf(a.getCalories()));
-
-        if (duration > 0) {
-            caloriesMinuteTextView.setText(String.valueOf(a.getCalories() / duration));
-        }
-
-        // levels
-        populateLevels(a.getLevels());
-
-        // heart rate
-        boxHRZones.setVisibility(View.GONE);
-        if (a.getHeartRate() != null && a.getHeartRate().getAverage() > 0) {
-            boxHRZones.setVisibility(View.VISIBLE);
-            avgHeartRate.setText(String.valueOf(a.getHeartRate().getAverage()));
-        }
-
-        // distance
-        if (a.getDistance() != null && a.getDistance() > 0) {
-            double distance = a.getDistance() / 1000;
-            double distanceRest = a.getDistance() % 1000;
-            if (distanceRest > 0) {
-                distanceTextView.setText(String.format(Locale.getDefault(), "%.2f", distance));
-            } else {
-                distanceTextView.setText(String.format(Locale.getDefault(), "%d", (int) distance));
-            }
-        }
-    }
-
-    private void initToolbar() {
-        ActionBar mActionBar = getSupportActionBar();
-        if (mActionBar == null) return;
-
-        mActionBar.setDisplayHomeAsUpEnabled(true);
-        mActionBar.setDisplayShowTitleEnabled(true);
-        mActionBar.setHomeAsUpIndicator(R.drawable.ic_close_dark);
-        mActionBar.setTitle(physicalActivity.getName());
-        mActionBar.setSubtitle(childSeelcted.getUsername());
-    }
 }
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -53,7 +53,7 @@
     <string name="img_desc_clock">Απεικόνιση ρολογιού</string>
     <string name="img_desc_calories">Απεικόνιση θερμίδων</string>
     <string name="hr_avg">Μέσος καρδιακός ρυθμός</string>
-    <string name="activity_range_time">%s στο %s</string>
+    <string name="activity_range_time">%s - %s</string>
     <string name="img_desc_distance">Απεικόνιση Απόστασης</string>
 
     <!-- SLEEP -->

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -53,7 +53,7 @@
     <string name="img_desc_clock">Imagen del reloj</string>
     <string name="img_desc_calories">Imagen de calória</string>
     <string name="hr_avg">Frecuencia cardíaca media</string>
-    <string name="activity_range_time">%s en %s</string>
+    <string name="activity_range_time">%s - %s</string>
     <string name="img_desc_distance">Imagen de distancia</string>
 
     <!-- SLEEP -->

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -53,7 +53,7 @@
     <string name="img_desc_clock">Imagem do relógio</string>
     <string name="img_desc_calories">Imagem da caloria</string>
     <string name="hr_avg">Frequência cardíaca média</string>
-    <string name="activity_range_time">%s às %s</string>
+    <string name="activity_range_time">%s - %s</string>
     <string name="img_desc_distance">Imagem de distância</string>
 
     <!-- SLEEP -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -54,7 +54,7 @@
     <string name="img_desc_clock">Clock image</string>
     <string name="img_desc_calories">Calories image</string>
     <string name="hr_avg">Average Heart Rate</string>
-    <string name="activity_range_time">%s at %s</string>
+    <string name="activity_range_time">%s - %s</string>
     <string name="img_desc_distance">Distance image</string>
 
     <!-- SLEEP -->