show due date in the search result activity, for #569

Author: CampelloManuel

app/src/main/java/com/nononsenseapps/helpers/TimeFormatter.java

@@ -18,6 +18,7 @@
 package com.nononsenseapps.helpers;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 
 import androidx.preference.PreferenceManager;
 
@@ -182,8 +183,7 @@ public static SimpleDateFormat getDateFormatter(final Context context) {
 				context.getString(R.string.dateformat_just_date));
 	}
 
-	public static SimpleDateFormat getLocalFormatterLongDateOnly(
-			final Context context) {
+	public static SimpleDateFormat getLocalFormatterLongDateOnly(final Context context) {
 		return getLocalFormatter(
 				context,
 				PreferenceManager.getDefaultSharedPreferences(context)
@@ -211,18 +211,21 @@ public static SimpleDateFormat getLocalFormatterShort(final Context context) {
 				withSuitableTime(context, userDateFormat)); // <-- notice this
 	}
 
+	/**
+	 * Returns the format chosen by the user to show dates in the list view. For example,
+	 * a timestamp 1754752027 could be displayed as "sat 9 aug 2025" or "sat, 9 aug"
+	 */
 	public static SimpleDateFormat getLocalFormatterShortDateOnly(final Context context) {
-		return getLocalFormatter(
-				context,
-				PreferenceManager.getDefaultSharedPreferences(context)
-						.getString(context.getString(R.string.pref_locale), ""),
+
+		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
+		String userFavLocale = pref.getString(context.getString(R.string.pref_locale), "");
+		String userFavShortDateFormat = pref.getString(
+				context.getString(R.string.key_pref_dateformat_short),
+				context.getString(R.string.dateformat_short_2));
+
+		return getLocalFormatter(context, userFavLocale,
 				withSuitableDateOnly( // <-- notice this!
-						context,
-						PreferenceManager
-								.getDefaultSharedPreferences(context)
-								.getString(
-										context.getString(R.string.key_pref_dateformat_short),
-										context.getString(R.string.dateformat_short_1))));
+						context, userFavShortDateFormat));
 	}
 
 	public static SimpleDateFormat getLocalFormatterMicro(final Context context) {

app/src/main/java/com/nononsenseapps/notepad/fragments/FragmentSearch.java

@@ -213,6 +213,8 @@ protected SimpleCursorAdapter getAdapter() {
 				null,
 				new String[] { Task.Columns.TITLE, Task.Columns.NOTE, Task.Columns.DUE,
 						Task.Columns.COMPLETED, Task.Columns.LEFT, Task.Columns.RIGHT },
+				// in tasklist_idem_card_selection.xml, the due date is displayed in a DateView
+				// with ID = "date", so here Task.Columns.DUE is bound to R.id.date
 				new int[] { android.R.id.text1, android.R.id.text1, R.id.date, R.id.checkbox,
 						R.id.drag_handle, R.id.dragpadding },
 				0);
@@ -242,7 +244,7 @@ protected ViewBinder getViewBinder() {
 				// Matches order in Task.Columns.Fields
 				case 1 -> {
 					// Title
-					String sTemp = c.getString(colIndex);
+					String sTemp = c.getString(1);
 
 					// Set height of text for non-headers
 					if (rowCount == 1) {
@@ -266,8 +268,21 @@ protected ViewBinder getViewBinder() {
 					}
 					return true;
 				}
+				case 4 -> {
+					// DateView
+					if (!c.isNull(4)) {
+						// there IS a due date saved in the dabase for this note
+						long dueDate = c.getLong(4);
+						((com.nononsenseapps.ui.DateView) view).setTimeText(dueDate);
+						view.setVisibility(View.VISIBLE);
+					} else {
+						// visibility of the DateView defaults to GONE
+						// in tasklist_idem_card_selection.xml
+					}
+					return true;
+				}
 				default -> {
-					// Checkbox
+					// Checkbox, DragGripView, DragPadding; as defined in getAdapter() in this file
 					view.setVisibility(View.GONE);
 					return true;
 				}

app/src/main/java/com/nononsenseapps/ui/DateView.java

@@ -36,8 +36,7 @@
  */
 public class DateView extends AppCompatTextView {
 
-	// TODO everything in this "ui" namespace could be moved to its own
-	//  gradle module. This would speed up builds, but maybe it's harder to manage?
+	// TODO everything in this "ui" namespace should be moved to its own gradle module
 
 	private static final int SECONDS_PER_DAY = 3600;