Adds daterange picker for case search #2508
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24.0" | ||
| android:viewportHeight="24.0"> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package org.commcare.utils; | ||
|
|
||
| import java.text.ParseException; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.Date; | ||
| import java.util.Locale; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import androidx.core.util.Pair; | ||
|
|
||
| /** | ||
| * Utility functions for DateRangePicker widget | ||
| */ | ||
| public class DateRangeUtils { | ||
|
|
||
| // Changing this will require changing this format on ES end as well | ||
| public static final String DATE_RANGE_ANSWER_PREFIX = "__range__"; | ||
| public static final String DATE_RANGE_ANSWER_DELIMITER = "__"; | ||
| public static final String DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER = " to "; | ||
| private static final String DATE_FORMAT = "yyyy-MM-dd"; | ||
|
|
||
| /** | ||
| * @param humanReadableDateRange human readable fomat for date range as 'startDate to endDate' | ||
| * @return a Pair of start time and end time that can be supplied to MaterialDatePicker to set a date range, | ||
| * @throws ParseException if the given humanReadableDateRange is not in 'yyyy-mm-dd to yyyy-mm-dd' format | ||
| */ | ||
| @Nullable | ||
| public static Pair<Long, Long> parseHumanReadableDate(String humanReadableDateRange) throws ParseException { | ||
| if (humanReadableDateRange.contains(DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER)) { | ||
| String[] humanReadableDateRangeSplit = humanReadableDateRange.split(DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER); | ||
| if (humanReadableDateRangeSplit.length == 2) { | ||
| SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT, Locale.US); | ||
| Date startDate = sdf.parse(humanReadableDateRangeSplit[0]); | ||
| Date endDate = sdf.parse(humanReadableDateRangeSplit[1]); | ||
| return new Pair<>(getTimeFromDateOffsettingTz(startDate), getTimeFromDateOffsettingTz(endDate)); | ||
| } | ||
| } | ||
| throw new ParseException("Argument " + humanReadableDateRange + " should be formatted as 'yyyy-mm-dd to yyyy-mm-dd'", 0); | ||
| } | ||
|
|
||
| private static Long getTimeFromDateOffsettingTz(Date date) { | ||
|
There was a problem hiding this comment. I'm not sure what it returns? Can you see whether a similar utility exists in DataUtils? There was a problem hiding this comment. I wasn't able to find it anywhere else. It removes the timezone offset from the date in millis and return the date. This is because when we set the date to the daterange widget we are setting time in milliseconds without any indication of timezone and the date widget itself doesn't offset the timezone from it to arrive at the offsetted date. |
||
| return date.getTime() - date.getTimezoneOffset() * 60 * 1000; | ||
| } | ||
|
|
||
| /** | ||
| * Formats __range__startDate__endDate as 'startDate to EndDate' | ||
| * | ||
| * @param dateRangeAnswer A date range value in form of '__range__startDate__endDate' | ||
| * @return human readable format 'startDate to EndDate' for given dateRangeAnswer | ||
| */ | ||
| public static String getHumanReadableDateRange(String dateRangeAnswer) { | ||
| if (dateRangeAnswer != null && dateRangeAnswer.startsWith(DATE_RANGE_ANSWER_PREFIX)) { | ||
| String[] dateRangeSplit = dateRangeAnswer.split(DATE_RANGE_ANSWER_DELIMITER); | ||
| if (dateRangeSplit.length == 3) { | ||
| return getHumanReadableDateRange(dateRangeSplit[2], dateRangeSplit[3]); | ||
| } | ||
| } | ||
| return dateRangeAnswer; | ||
| } | ||
|
|
||
|
|
||
| // Formats as 'startDate to endDate' | ||
| public static String getHumanReadableDateRange(String startDate, String endDate) { | ||
| return startDate + DATE_RANGE_ANSWER_HUMAN_READABLE_DELIMITER + endDate; | ||
| } | ||
|
|
||
| // Formats as '__range__startDate__endDate' | ||
| public static String formatDateRangeAnswer(String startDate, String endDate) { | ||
| return DATE_RANGE_ANSWER_PREFIX + startDate + DATE_RANGE_ANSWER_DELIMITER + endDate; | ||
| } | ||
|
|
||
| // Convers given time as yyyy-mm-dd | ||
| public static String getDateFromTime(Long time) { | ||
| return new SimpleDateFormat(DATE_FORMAT, Locale.US).format(new Date(time)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.commcare.utils; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import java.text.ParseException; | ||
|
|
||
| import androidx.core.util.Pair; | ||
|
|
||
| public class DateRangeUtilsTest { | ||
|
|
||
| @Test | ||
| public void testDateConversion() throws ParseException { | ||
| String dateRange = "2020-02-15 to 2021-03-18"; | ||
| Pair<Long, Long> selection = DateRangeUtils.parseHumanReadableDate(dateRange); | ||
| String startDate = DateRangeUtils.getDateFromTime(selection.first); | ||
| String endDate = DateRangeUtils.getDateFromTime(selection.second); | ||
| String humanReadableDateRange = DateRangeUtils.getHumanReadableDateRange(startDate, endDate); | ||
| assert dateRange.contentEquals(humanReadableDateRange); | ||
| assert DateRangeUtils.formatDateRangeAnswer(startDate, endDate).contentEquals("__range__2020-02-15__2021-03-18"); | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice,
Bridgeis the reason why it's working on pre-lollipop right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No not really, Bridge theme is just a workaround for apps not comfortable with changing their theme to a MaterialComponent theme. Bridge theme inherits from the AppCompat Theme and adds any properties defined by the MaterialComponent theme in it. So it has nothing to do with device compatibility. The library support the 14+ devices by default.