From a839631aae33d894fad4e77b60f2de7cf0beff05 Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Fri, 7 Dec 2018 05:59:54 -0600 Subject: [PATCH] Fix previews in Layout Editor --- .../activities/common/views/FrequencyChart.java | 13 +++++++++++-- .../activities/common/views/HistoryChart.java | 12 ++++++++++-- .../activities/common/views/ScoreChart.java | 16 +++++++++++++--- .../activities/common/views/StreakChart.java | 2 +- .../activities/habits/show/views/BarCard.java | 10 ++++++++++ .../src/main/res/layout/show_habit_preview.xml | 12 ++++++------ 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java index 0b47cc000..8b6437638 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java @@ -300,8 +300,16 @@ public class FrequencyChart extends ScrollableChart private void initDateFormats() { - dfMonth = AndroidDateFormats.fromSkeleton("MMM"); - dfYear = AndroidDateFormats.fromSkeleton("yyyy"); + if (isInEditMode()) + { + dfMonth = new SimpleDateFormat("MMM", Locale.getDefault()); + dfYear = new SimpleDateFormat("yyyy", Locale.getDefault()); + } + else + { + dfMonth = AndroidDateFormats.fromSkeleton("MMM"); + dfYear = AndroidDateFormats.fromSkeleton("yyyy"); + } } private void initRects() @@ -326,5 +334,6 @@ public class FrequencyChart extends ScrollableChart frequency.put(new Timestamp(date), values); date.add(Calendar.MONTH, -1); } + maxFreq = getMaxFreq(frequency); } } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java index 9c6bde1d3..f2f0f3414 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java @@ -428,8 +428,16 @@ public class HistoryChart extends ScrollableChart private void initDateFormats() { - dfMonth = AndroidDateFormats.fromSkeleton("MMM"); - dfYear = AndroidDateFormats.fromSkeleton("yyyy"); + if (isInEditMode()) + { + dfMonth = new SimpleDateFormat("MMM", Locale.getDefault()); + dfYear = new SimpleDateFormat("yyyy", Locale.getDefault()); + } + else + { + dfMonth = AndroidDateFormats.fromSkeleton("MMM"); + dfYear = AndroidDateFormats.fromSkeleton("yyyy"); + } } private void initRects() diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java index 3aff9dab5..54975059b 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java @@ -410,9 +410,19 @@ public class ScoreChart extends ScrollableChart private void initDateFormats() { - dfYear = AndroidDateFormats.fromSkeleton("yyyy"); - dfMonth = AndroidDateFormats.fromSkeleton("MMM"); - dfDay = AndroidDateFormats.fromSkeleton("d"); + if (isInEditMode()) + { + dfMonth = new SimpleDateFormat("MMM", Locale.getDefault()); + dfYear = new SimpleDateFormat("yyyy", Locale.getDefault()); + dfDay = new SimpleDateFormat("d", Locale.getDefault()); + + } + else + { + dfMonth = AndroidDateFormats.fromSkeleton("MMM"); + dfYear = AndroidDateFormats.fromSkeleton("yyyy"); + dfDay = AndroidDateFormats.fromSkeleton("d"); + } } private void initPaints() diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java index 3a3b8130e..5020f85a4 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java @@ -234,7 +234,7 @@ public class StreakChart extends View streaks = Collections.emptyList(); dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM); - dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); + if (!isInEditMode()) dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); rect = new RectF(); baseSize = getResources().getDimensionPixelSize(R.dimen.baseSize); } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java index 8c0d05d42..135dc0a23 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java @@ -107,6 +107,16 @@ public class BarCard extends HabitCard HabitsApplication app = (HabitsApplication) appContext; taskRunner = app.getComponent().getTaskRunner(); } + + if (isInEditMode()) initEditMode(); + } + + private void initEditMode() + { + int color = PaletteUtils.getAndroidTestColor(1); + title.setTextColor(color); + chart.setColor(color); + chart.populateWithRandomData(); } private class RefreshTask implements Task diff --git a/uhabits-android/src/main/res/layout/show_habit_preview.xml b/uhabits-android/src/main/res/layout/show_habit_preview.xml index a40822a36..84eaa4a51 100644 --- a/uhabits-android/src/main/res/layout/show_habit_preview.xml +++ b/uhabits-android/src/main/res/layout/show_habit_preview.xml @@ -18,14 +18,14 @@ ~ with this program. If not, see . --> - + android:orientation="vertical"> - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" /> \ No newline at end of file