From 61968ebbb63cd7685dd29f471357e1386acdfded Mon Sep 17 00:00:00 2001
From: Marmo <5788516+Marmo@users.noreply.github.com>
Date: Thu, 3 May 2018 16:37:27 +0200
Subject: [PATCH] added separate strings for hide until display in task edit
 activity

---
 .../astrid/ui/HideUntilControlSet.java        | 40 +++++++++++--------
 app/src/main/res/values/arrays.xml            |  9 ++++-
 app/src/main/res/values/strings.xml           |  6 +++
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
index 38c326899..8baf508a2 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -107,14 +107,10 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt
             HideUntilValue value = getItem(selectedItemPosition);
             if (value.setting == Task.HIDE_UNTIL_NONE) {
               clearButton.setVisibility(View.GONE);
-              tv.setText(value.label);
+              tv.setText(value.labelDisplay);
               tv.setTextColor(getColor(context, R.color.text_tertiary));
             } else {
-              String display = value.label;
-              if (value.setting != Task.HIDE_UNTIL_SPECIFIC_DAY
-                  && value.setting != Task.HIDE_UNTIL_SPECIFIC_DAY_TIME) {
-                display = display.toLowerCase();
-              }
+              String display = value.labelDisplay;
               tv.setText(getString(R.string.TEA_hideUntil_display, display));
               tv.setTextColor(getColor(context, R.color.text_primary));
             }
@@ -235,15 +231,17 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt
   private void updateSpinnerOptions(long specificDate) {
     spinnerItems.clear();
     // set up base values
-    String[] labels = getResources().getStringArray(R.array.TEA_hideUntil);
+    String[] labelsSpinner = getResources().getStringArray(R.array.TEA_hideUntil_spinner);
+    String[] labelsDisplay = getResources().getStringArray(R.array.TEA_hideUntil_display);
+
     spinnerItems.addAll(
         new ArrayList<>(
             asList(
-                new HideUntilValue(labels[0], Task.HIDE_UNTIL_DUE),
-                new HideUntilValue(labels[1], Task.HIDE_UNTIL_DUE_TIME),
-                new HideUntilValue(labels[2], Task.HIDE_UNTIL_DAY_BEFORE),
-                new HideUntilValue(labels[3], Task.HIDE_UNTIL_WEEK_BEFORE),
-                new HideUntilValue(labels[4], Task.HIDE_UNTIL_SPECIFIC_DAY, -1))));
+                new HideUntilValue(labelsSpinner[0], labelsDisplay[0], Task.HIDE_UNTIL_DUE),
+                new HideUntilValue(labelsSpinner[1], labelsDisplay[1], Task.HIDE_UNTIL_DUE_TIME),
+                new HideUntilValue(labelsSpinner[2], labelsDisplay[2], Task.HIDE_UNTIL_DAY_BEFORE),
+                new HideUntilValue(labelsSpinner[3], labelsDisplay[3], Task.HIDE_UNTIL_WEEK_BEFORE),
+                new HideUntilValue(labelsSpinner[4], "", Task.HIDE_UNTIL_SPECIFIC_DAY, -1)))); // no need for a string for display here, since the chosen day will be displayed
 
     if (specificDate > 0) {
       spinnerItems.add(0, getHideUntilValue(specificDate));
@@ -323,23 +321,33 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt
    */
   private class HideUntilValue {
 
-    final String label;
+    final String labelSpinner;
+    final String labelDisplay;
     final int setting;
     final long date;
 
     HideUntilValue(String label, int setting) {
-      this(label, setting, 0);
+      this(label, label, setting, 0);
+    }
+
+    HideUntilValue(String labelSpinner, String labelDisplay, int setting) {
+      this(labelSpinner, labelDisplay, setting, 0);
     }
 
     HideUntilValue(String label, int setting, long date) {
-      this.label = label;
+      this(label, label, setting, date);
+    }
+
+    HideUntilValue(String labelSpinner, String labelDisplay, int setting, long date) {
+      this.labelSpinner = labelSpinner;
+      this.labelDisplay = labelDisplay;
       this.setting = setting;
       this.date = date;
     }
 
     @Override
     public String toString() {
-      return label;
+      return labelSpinner;
     }
   }
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ed8a9870f..d4bd12afe 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -25,7 +25,7 @@
     <item>600</item>
   </string-array>
 
-  <string-array name="TEA_hideUntil">
+  <string-array name="TEA_hideUntil_spinner">
     <item>@string/due_date</item>
     <item>@string/due_time</item>
     <item>@string/day_before_due</item>
@@ -33,6 +33,13 @@
     <item>@string/pick_a_date_and_time</item>
   </string-array>
 
+  <string-array name="TEA_hideUntil_display">
+    <item>@string/TEA_hideUntil_due_date</item>
+    <item>@string/TEA_hideUntil_due_time</item>
+    <item>@string/TEA_hideUntil_day_before_due</item>
+    <item>@string/TEA_hideUntil_week_before_due</item>
+  </string-array>
+
   <string-array name="EPr_default_hideUntil">
     <item>@string/dont_hide</item>
     <item>@string/due_date</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1aae8ff0f..92b78ce68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,6 +169,12 @@ File %1$s contained %2$s.\n\n
   <string name="day_before_due">Day before due</string>
   <string name="week_before_due">Week before due</string>
 
+  <!--The following strings appear at the %s in TEA_hideUntil_display, thus generally mid-sentence and with different spelling than the corresponding general strings like due_date etc.-->
+  <string comment="Used for displaying the chosen hide until value in the task edit screen. Should be the same as due_date, just without capitalization." name="TEA_hideUntil_due_date">due date</string>
+  <string comment="Used for displaying the chosen hide until value in the task edit screen. Should be the same as due_time, just without capitalization." name="TEA_hideUntil_due_time">due time</string>
+  <string comment="Used for displaying the chosen hide until value in the task edit screen. Should be the same as day_before_due, just without capitalization." name="TEA_hideUntil_day_before_due">day before due</string>
+  <string comment="Used for displaying the chosen hide until value in the task edit screen. Should be the same as week_before_due, just without capitalization." name="TEA_hideUntil_week_before_due">week before due</string>
+
   <!-- Task edit control set descriptors -->
 
   <string name="TEA_control_when">When</string>