organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Added closed days as a last week schedule item.

Browse source 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2021-11-23 13:00:30 +02:00
parent e42622dbd9
commit 7972c2cd0e
Signed by: strump
GPG key ID: C622E5563CAC205D
2 changed files with 44 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java
View file

@ -42,7 +42,11 @@ public class TimeFormatUtils
public static String formatWeekdays(@NonNull Timetable timetable)
{
refreshWithCurrentLocale();
final int[] weekdays = timetable.weekdays;
return formatWeekdays(timetable.weekdays);
}
public static String formatWeekdays(@NonNull int[] weekdays)
{
if (weekdays.length == 0)
return "";

42
android/src/com/mapswithme/maps/widget/placepage/PlaceOpeningHoursAdapter.java
View file

@ -15,11 +15,14 @@ import com.mapswithme.maps.editor.data.Timespan;
import com.mapswithme.maps.editor.data.Timetable;
import com.mapswithme.util.UiUtils;
import java.util.Locale;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class PlaceOpeningHoursAdapter extends RecyclerView.Adapter<PlaceOpeningHoursAdapter.ViewHolder>
{
private Timetable[] mTimetables = {};
private int[] closedDays = null;
public PlaceOpeningHoursAdapter() {}
@ -31,9 +34,31 @@ public class PlaceOpeningHoursAdapter extends RecyclerView.Adapter<PlaceOpeningH
public void setTimetables(Timetable[] timetables)
{
mTimetables = timetables;
closedDays = findUnhandledDays(timetables);
notifyDataSetChanged();
}
private int[] findUnhandledDays(Timetable[] timetables)
{
List<Integer> unhandledDays = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7));
for(Timetable tt : timetables) {
for(int weekDay: tt.weekdays) {
unhandledDays.remove(Integer.valueOf(weekDay));
}
}
if (unhandledDays.isEmpty())
return null;
// Convert List<Integer> to int[].
int[] days = new int[unhandledDays.size()];
for(int i = 0; i<days.length; i++)
days[i] = unhandledDays.get(i);
return days;
}
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
@ -45,8 +70,19 @@ public class PlaceOpeningHoursAdapter extends RecyclerView.Adapter<PlaceOpeningH
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position)
{
if (mTimetables == null || position >= mTimetables.length || position < 0)
if (mTimetables == null || position > mTimetables.length || position < 0)
return;
if (position == mTimetables.length)
{
if (closedDays == null)
return;
holder.setWeekdays(formatWeekdays(closedDays));
holder.hideNonBusinessTime();
holder.setOpenTime(holder.itemView.getResources().getString(R.string.day_off));
return;
}
final Timetable tt = mTimetables[position];
final String weekdays = formatWeekdays(tt);
@ -71,7 +107,7 @@ public class PlaceOpeningHoursAdapter extends RecyclerView.Adapter<PlaceOpeningH
@Override
public int getItemCount()
{
return mTimetables != null ? mTimetables.length : 0;
return (mTimetables != null ? mTimetables.length : 0) + (closedDays == null ? 0 : 1);
}
public static class ViewHolder extends RecyclerView.ViewHolder