diff --git a/accept_images.sh b/accept_images.sh new file mode 100755 index 000000000..4a572232c --- /dev/null +++ b/accept_images.sh @@ -0,0 +1,3 @@ +#!/bin/bash +find app/build/outputs/failed/test-screenshots -name '*.expected*' -delete +rsync -av app/build/outputs/failed/test-screenshots/ app/src/androidTest/assets/ diff --git a/app/src/androidTest/assets/views-v15/common/BarChart/render.png b/app/src/androidTest/assets/views-v15/common/BarChart/render.png new file mode 100644 index 000000000..a994ddfaf Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/BarChart/render.png differ diff --git a/app/src/androidTest/assets/views-v15/common/BarChart/renderDataOffset.png b/app/src/androidTest/assets/views-v15/common/BarChart/renderDataOffset.png new file mode 100644 index 000000000..d8409a9c0 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/BarChart/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views-v15/common/BarChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v15/common/BarChart/renderDifferentSize.png new file mode 100644 index 000000000..b9a30b653 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/BarChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v15/common/BarChart/renderTransparent.png b/app/src/androidTest/assets/views-v15/common/BarChart/renderTransparent.png new file mode 100644 index 000000000..5a5b0ade9 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/BarChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v15/common/FrequencyChart/render.png b/app/src/androidTest/assets/views-v15/common/FrequencyChart/render.png new file mode 100644 index 000000000..bdd6f135c Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/FrequencyChart/render.png differ diff --git a/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderDataOffset.png b/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderDataOffset.png new file mode 100644 index 000000000..ad1ca177d Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderDifferentSize.png new file mode 100644 index 000000000..1de28ea5d Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderTransparent.png b/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderTransparent.png new file mode 100644 index 000000000..bdd6f135c Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/FrequencyChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v15/common/HistoryChart/render.png b/app/src/androidTest/assets/views-v15/common/HistoryChart/render.png new file mode 100644 index 000000000..6b250de8c Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/HistoryChart/render.png differ diff --git a/app/src/androidTest/assets/views-v15/common/HistoryChart/renderDataOffset.png b/app/src/androidTest/assets/views-v15/common/HistoryChart/renderDataOffset.png new file mode 100644 index 000000000..b436db6c3 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/HistoryChart/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views-v15/common/HistoryChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v15/common/HistoryChart/renderDifferentSize.png new file mode 100644 index 000000000..48fc4f7ed Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/HistoryChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v15/common/HistoryChart/renderTransparent.png b/app/src/androidTest/assets/views-v15/common/HistoryChart/renderTransparent.png new file mode 100644 index 000000000..4ae316a4e Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/HistoryChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v15/common/RingView/render.png b/app/src/androidTest/assets/views-v15/common/RingView/render.png new file mode 100644 index 000000000..8108a73e5 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/RingView/render.png differ diff --git a/app/src/androidTest/assets/views-v15/common/RingView/renderDifferentParams.png b/app/src/androidTest/assets/views-v15/common/RingView/renderDifferentParams.png new file mode 100644 index 000000000..4888b81d5 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/RingView/renderDifferentParams.png differ diff --git a/app/src/androidTest/assets/views-v15/common/ScoreChart/render.png b/app/src/androidTest/assets/views-v15/common/ScoreChart/render.png new file mode 100644 index 000000000..e110acdd4 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/ScoreChart/render.png differ diff --git a/app/src/androidTest/assets/views-v15/common/ScoreChart/renderDataOffset.png b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderDataOffset.png new file mode 100644 index 000000000..f2ae9ae5d Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views-v15/common/ScoreChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderDifferentSize.png new file mode 100644 index 000000000..946615f97 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v15/common/ScoreChart/renderMonthly.png b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderMonthly.png new file mode 100644 index 000000000..e7aca20ae Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderMonthly.png differ diff --git a/app/src/androidTest/assets/views-v15/common/ScoreChart/renderTransparent.png b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderTransparent.png new file mode 100644 index 000000000..e8192ea76 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v15/common/ScoreChart/renderYearly.png b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderYearly.png new file mode 100644 index 000000000..1f833d573 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/ScoreChart/renderYearly.png differ diff --git a/app/src/androidTest/assets/views-v15/common/StreakChart/render.png b/app/src/androidTest/assets/views-v15/common/StreakChart/render.png new file mode 100644 index 000000000..ba05929d3 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/StreakChart/render.png differ diff --git a/app/src/androidTest/assets/views-v15/common/StreakChart/renderSmallSize.png b/app/src/androidTest/assets/views-v15/common/StreakChart/renderSmallSize.png new file mode 100644 index 000000000..ce7b1b575 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/StreakChart/renderSmallSize.png differ diff --git a/app/src/androidTest/assets/views-v15/common/StreakChart/renderTransparent.png b/app/src/androidTest/assets/views-v15/common/StreakChart/renderTransparent.png new file mode 100644 index 000000000..ba05929d3 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/common/StreakChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_explicit_check.png b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_explicit_check.png new file mode 100644 index 000000000..b6c123983 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_explicit_check.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_implicit_check.png b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_implicit_check.png new file mode 100644 index 000000000..373a1ed4e Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_implicit_check.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_unchecked.png b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_unchecked.png new file mode 100644 index 000000000..ebae1c98d Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkButtonView/render_unchecked.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/CheckmarkPanelView/render.png b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkPanelView/render.png new file mode 100644 index 000000000..04a7f9fda Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/CheckmarkPanelView/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render.png b/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render.png new file mode 100644 index 000000000..9152afd7a Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render_changed.png b/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render_changed.png new file mode 100644 index 000000000..9152afd7a Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render_changed.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render_selected.png b/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render_selected.png new file mode 100644 index 000000000..70ca4848b Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/HabitCardView/render_selected.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/HeaderView/render.png b/app/src/androidTest/assets/views-v15/habits/list/HeaderView/render.png new file mode 100644 index 000000000..669a66573 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/HeaderView/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/HeaderView/render_reverse.png b/app/src/androidTest/assets/views-v15/habits/list/HeaderView/render_reverse.png new file mode 100644 index 000000000..a1ea1b1a9 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/HeaderView/render_reverse.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/HintView/render.png b/app/src/androidTest/assets/views-v15/habits/list/HintView/render.png new file mode 100644 index 000000000..0e77526b3 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/HintView/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_above.png b/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_above.png new file mode 100644 index 000000000..3cffcc2cf Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_above.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_below.png b/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_below.png new file mode 100644 index 000000000..1b06bee41 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_below.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_zero.png b/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_zero.png new file mode 100644 index 000000000..cce921e53 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/list/NumberButtonView/render_zero.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/show/FrequencyCard/render.png b/app/src/androidTest/assets/views-v15/habits/show/FrequencyCard/render.png new file mode 100644 index 000000000..7f39654c1 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/show/FrequencyCard/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/show/HistoryCard/render.png b/app/src/androidTest/assets/views-v15/habits/show/HistoryCard/render.png new file mode 100644 index 000000000..aa876e064 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/show/HistoryCard/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/show/OverviewCard/render.png b/app/src/androidTest/assets/views-v15/habits/show/OverviewCard/render.png new file mode 100644 index 000000000..499bbe8bd Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/show/OverviewCard/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/show/ScoreCard/render.png b/app/src/androidTest/assets/views-v15/habits/show/ScoreCard/render.png new file mode 100644 index 000000000..b8435b1c4 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/show/ScoreCard/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/show/StreakCard/render.png b/app/src/androidTest/assets/views-v15/habits/show/StreakCard/render.png new file mode 100644 index 000000000..e1139312e Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/show/StreakCard/render.png differ diff --git a/app/src/androidTest/assets/views-v15/habits/show/SubtitleCard/render.png b/app/src/androidTest/assets/views-v15/habits/show/SubtitleCard/render.png new file mode 100644 index 000000000..80c288e74 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/habits/show/SubtitleCard/render.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidget/render.png b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidget/render.png new file mode 100644 index 000000000..966957274 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/checked.png b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/checked.png new file mode 100644 index 000000000..30df27f51 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/checked.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/implicitly_checked.png b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/implicitly_checked.png new file mode 100644 index 000000000..087dd6580 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/implicitly_checked.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/large_size.png b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/large_size.png new file mode 100644 index 000000000..352d7db77 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/large_size.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/unchecked.png b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/unchecked.png new file mode 100644 index 000000000..e597e7f74 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/CheckmarkWidgetView/unchecked.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/FrequencyWidget/render.png b/app/src/androidTest/assets/views-v15/widgets/FrequencyWidget/render.png new file mode 100644 index 000000000..effbaecf7 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/FrequencyWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/HistoryWidget/render.png b/app/src/androidTest/assets/views-v15/widgets/HistoryWidget/render.png new file mode 100644 index 000000000..306c49a11 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/HistoryWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/ScoreWidget/render.png b/app/src/androidTest/assets/views-v15/widgets/ScoreWidget/render.png new file mode 100644 index 000000000..edc306993 Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/ScoreWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v15/widgets/StreakWidget/render.png b/app/src/androidTest/assets/views-v15/widgets/StreakWidget/render.png new file mode 100644 index 000000000..05950b41d Binary files /dev/null and b/app/src/androidTest/assets/views-v15/widgets/StreakWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v21/common/BarChart/render.png b/app/src/androidTest/assets/views-v21/common/BarChart/render.png new file mode 100644 index 000000000..6f3c86156 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/BarChart/render.png differ diff --git a/app/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png b/app/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png new file mode 100644 index 000000000..6dfa977bc Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/BarChart/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png new file mode 100644 index 000000000..6aaffd2f4 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/BarChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png b/app/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png new file mode 100644 index 000000000..fbc63a2e5 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/BarChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v21/common/FrequencyChart/render.png b/app/src/androidTest/assets/views-v21/common/FrequencyChart/render.png new file mode 100644 index 000000000..fbd196e8e Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/FrequencyChart/render.png differ diff --git a/app/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png b/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderDataOffset.png similarity index 100% rename from app/src/androidTest/assets/views/common/FrequencyChart/renderDataOffset.png rename to app/src/androidTest/assets/views-v21/common/FrequencyChart/renderDataOffset.png diff --git a/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png new file mode 100644 index 000000000..1096a3d29 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png b/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png new file mode 100644 index 000000000..fbd196e8e Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/FrequencyChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views/common/HistoryChart/render.png b/app/src/androidTest/assets/views-v21/common/HistoryChart/render.png similarity index 100% rename from app/src/androidTest/assets/views/common/HistoryChart/render.png rename to app/src/androidTest/assets/views-v21/common/HistoryChart/render.png diff --git a/app/src/androidTest/assets/views/common/HistoryChart/renderDataOffset.png b/app/src/androidTest/assets/views-v21/common/HistoryChart/renderDataOffset.png similarity index 100% rename from app/src/androidTest/assets/views/common/HistoryChart/renderDataOffset.png rename to app/src/androidTest/assets/views-v21/common/HistoryChart/renderDataOffset.png diff --git a/app/src/androidTest/assets/views/common/HistoryChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v21/common/HistoryChart/renderDifferentSize.png similarity index 100% rename from app/src/androidTest/assets/views/common/HistoryChart/renderDifferentSize.png rename to app/src/androidTest/assets/views-v21/common/HistoryChart/renderDifferentSize.png diff --git a/app/src/androidTest/assets/views/common/HistoryChart/renderTransparent.png b/app/src/androidTest/assets/views-v21/common/HistoryChart/renderTransparent.png similarity index 100% rename from app/src/androidTest/assets/views/common/HistoryChart/renderTransparent.png rename to app/src/androidTest/assets/views-v21/common/HistoryChart/renderTransparent.png diff --git a/app/src/androidTest/assets/views/common/RingView/render.png b/app/src/androidTest/assets/views-v21/common/RingView/render.png similarity index 100% rename from app/src/androidTest/assets/views/common/RingView/render.png rename to app/src/androidTest/assets/views-v21/common/RingView/render.png diff --git a/app/src/androidTest/assets/views/common/RingView/renderDifferentParams.png b/app/src/androidTest/assets/views-v21/common/RingView/renderDifferentParams.png similarity index 100% rename from app/src/androidTest/assets/views/common/RingView/renderDifferentParams.png rename to app/src/androidTest/assets/views-v21/common/RingView/renderDifferentParams.png diff --git a/app/src/androidTest/assets/views-v21/common/ScoreChart/render.png b/app/src/androidTest/assets/views-v21/common/ScoreChart/render.png new file mode 100644 index 000000000..00004c4b3 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/ScoreChart/render.png differ diff --git a/app/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png new file mode 100644 index 000000000..cda361921 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderDataOffset.png differ diff --git a/app/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png new file mode 100644 index 000000000..1156ebc2b Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderDifferentSize.png differ diff --git a/app/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png new file mode 100644 index 000000000..eff5e8c4e Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderMonthly.png differ diff --git a/app/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png new file mode 100644 index 000000000..baa18f736 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderTransparent.png differ diff --git a/app/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png new file mode 100644 index 000000000..a5aca0cf4 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/common/ScoreChart/renderYearly.png differ diff --git a/app/src/androidTest/assets/views/common/StreakChart/render.png b/app/src/androidTest/assets/views-v21/common/StreakChart/render.png similarity index 100% rename from app/src/androidTest/assets/views/common/StreakChart/render.png rename to app/src/androidTest/assets/views-v21/common/StreakChart/render.png diff --git a/app/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png b/app/src/androidTest/assets/views-v21/common/StreakChart/renderSmallSize.png similarity index 100% rename from app/src/androidTest/assets/views/common/StreakChart/renderSmallSize.png rename to app/src/androidTest/assets/views-v21/common/StreakChart/renderSmallSize.png diff --git a/app/src/androidTest/assets/views/common/StreakChart/renderTransparent.png b/app/src/androidTest/assets/views-v21/common/StreakChart/renderTransparent.png similarity index 100% rename from app/src/androidTest/assets/views/common/StreakChart/renderTransparent.png rename to app/src/androidTest/assets/views-v21/common/StreakChart/renderTransparent.png diff --git a/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png new file mode 100644 index 000000000..32c5d98cb Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_explicit_check.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png new file mode 100644 index 000000000..2f7529768 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_implicit_check.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png new file mode 100644 index 000000000..54f006b13 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkButtonView/render_unchecked.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png new file mode 100644 index 000000000..5201b4c94 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/CheckmarkPanelView/render.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png b/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png new file mode 100644 index 000000000..23c258a82 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png b/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png new file mode 100644 index 000000000..23c258a82 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_changed.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png b/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png new file mode 100644 index 000000000..63524c5fc Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/HabitCardView/render_selected.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png b/app/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png new file mode 100644 index 000000000..b3667220c Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/HeaderView/render.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png b/app/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png new file mode 100644 index 000000000..09460ab18 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/HeaderView/render_reverse.png differ diff --git a/app/src/androidTest/assets/views/habits/list/HintView/render.png b/app/src/androidTest/assets/views-v21/habits/list/HintView/render.png similarity index 100% rename from app/src/androidTest/assets/views/habits/list/HintView/render.png rename to app/src/androidTest/assets/views-v21/habits/list/HintView/render.png diff --git a/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png b/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png new file mode 100644 index 000000000..8d493812f Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_above.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png b/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png new file mode 100644 index 000000000..bd837a767 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_below.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png b/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png new file mode 100644 index 000000000..6bb711855 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/list/NumberButtonView/render_zero.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png b/app/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png new file mode 100644 index 000000000..275a8d489 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/show/FrequencyCard/render.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png b/app/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png new file mode 100644 index 000000000..938c30236 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/show/HistoryCard/render.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png b/app/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png new file mode 100644 index 000000000..e06037b20 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/show/OverviewCard/render.png differ diff --git a/app/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png b/app/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png new file mode 100644 index 000000000..10d008b94 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/show/ScoreCard/render.png differ diff --git a/app/src/androidTest/assets/views/habits/show/StreakCard/render.png b/app/src/androidTest/assets/views-v21/habits/show/StreakCard/render.png similarity index 100% rename from app/src/androidTest/assets/views/habits/show/StreakCard/render.png rename to app/src/androidTest/assets/views-v21/habits/show/StreakCard/render.png diff --git a/app/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png b/app/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png new file mode 100644 index 000000000..3b8138940 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/habits/show/SubtitleCard/render.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png new file mode 100644 index 000000000..00c6fc72b Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png new file mode 100644 index 000000000..6d62e5a69 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/checked.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png new file mode 100644 index 000000000..2b933181a Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/implicitly_checked.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png new file mode 100644 index 000000000..cfb423e98 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/large_size.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png new file mode 100644 index 000000000..94eaf4404 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/CheckmarkWidgetView/unchecked.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png b/app/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png new file mode 100644 index 000000000..0b15dd658 Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/FrequencyWidget/render.png differ diff --git a/app/src/androidTest/assets/views/widgets/HistoryWidget/render.png b/app/src/androidTest/assets/views-v21/widgets/HistoryWidget/render.png similarity index 100% rename from app/src/androidTest/assets/views/widgets/HistoryWidget/render.png rename to app/src/androidTest/assets/views-v21/widgets/HistoryWidget/render.png diff --git a/app/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png b/app/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png new file mode 100644 index 000000000..471611d6f Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/ScoreWidget/render.png differ diff --git a/app/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png b/app/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png new file mode 100644 index 000000000..ce2eb44ae Binary files /dev/null and b/app/src/androidTest/assets/views-v21/widgets/StreakWidget/render.png differ diff --git a/app/src/androidTest/assets/views/common/FrequencyChart/render.png b/app/src/androidTest/assets/views/common/FrequencyChart/render.png deleted file mode 100644 index 7486c9d95..000000000 Binary files a/app/src/androidTest/assets/views/common/FrequencyChart/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png b/app/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png deleted file mode 100644 index 85484946b..000000000 Binary files a/app/src/androidTest/assets/views/common/FrequencyChart/renderDifferentSize.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png b/app/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png deleted file mode 100644 index 7486c9d95..000000000 Binary files a/app/src/androidTest/assets/views/common/FrequencyChart/renderTransparent.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/ScoreChart/render.png b/app/src/androidTest/assets/views/common/ScoreChart/render.png deleted file mode 100644 index 282d77a73..000000000 Binary files a/app/src/androidTest/assets/views/common/ScoreChart/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png b/app/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png deleted file mode 100644 index 6c83dd267..000000000 Binary files a/app/src/androidTest/assets/views/common/ScoreChart/renderDataOffset.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png b/app/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png deleted file mode 100644 index 7331065f4..000000000 Binary files a/app/src/androidTest/assets/views/common/ScoreChart/renderDifferentSize.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png b/app/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png deleted file mode 100644 index 07f5f8065..000000000 Binary files a/app/src/androidTest/assets/views/common/ScoreChart/renderMonthly.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png b/app/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png deleted file mode 100644 index a8a901967..000000000 Binary files a/app/src/androidTest/assets/views/common/ScoreChart/renderTransparent.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/common/ScoreChart/renderYearly.png b/app/src/androidTest/assets/views/common/ScoreChart/renderYearly.png deleted file mode 100644 index 4a1b5c2a1..000000000 Binary files a/app/src/androidTest/assets/views/common/ScoreChart/renderYearly.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png b/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png deleted file mode 100644 index 16e6d1f04..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_explicit_check.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png b/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png deleted file mode 100644 index 25a6b0a1e..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_implicit_check.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png b/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png deleted file mode 100644 index 5a932660d..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/CheckmarkButtonView/render_unchecked.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png b/app/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png deleted file mode 100644 index 00b87e88e..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/CheckmarkPanelView/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/HabitCardView/render.png b/app/src/androidTest/assets/views/habits/list/HabitCardView/render.png deleted file mode 100644 index 420f5a7a1..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/HabitCardView/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png b/app/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png deleted file mode 100644 index 420f5a7a1..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/HabitCardView/render_changed.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png b/app/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png deleted file mode 100644 index 12c880f0b..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/HabitCardView/render_selected.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/HeaderView/render.png b/app/src/androidTest/assets/views/habits/list/HeaderView/render.png deleted file mode 100644 index 7023ecd0d..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/HeaderView/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png b/app/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png deleted file mode 100644 index 127b9becd..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/HeaderView/render_reverse.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png b/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png deleted file mode 100644 index e6f163935..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_above.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png b/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png deleted file mode 100644 index 4f6994f6b..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_below.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png b/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png deleted file mode 100644 index 5a1c2edaf..000000000 Binary files a/app/src/androidTest/assets/views/habits/list/NumberButtonView/render_zero.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/show/FrequencyCard/render.png b/app/src/androidTest/assets/views/habits/show/FrequencyCard/render.png deleted file mode 100644 index 4618f3cae..000000000 Binary files a/app/src/androidTest/assets/views/habits/show/FrequencyCard/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/show/HistoryCard/render.png b/app/src/androidTest/assets/views/habits/show/HistoryCard/render.png deleted file mode 100644 index 905274e8d..000000000 Binary files a/app/src/androidTest/assets/views/habits/show/HistoryCard/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/show/OverviewCard/render.png b/app/src/androidTest/assets/views/habits/show/OverviewCard/render.png deleted file mode 100644 index 3f064bf16..000000000 Binary files a/app/src/androidTest/assets/views/habits/show/OverviewCard/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/show/ScoreCard/render.png b/app/src/androidTest/assets/views/habits/show/ScoreCard/render.png deleted file mode 100644 index 25cb2b29c..000000000 Binary files a/app/src/androidTest/assets/views/habits/show/ScoreCard/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/habits/show/SubtitleCard/render.png b/app/src/androidTest/assets/views/habits/show/SubtitleCard/render.png deleted file mode 100644 index 7e17a10b3..000000000 Binary files a/app/src/androidTest/assets/views/habits/show/SubtitleCard/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png b/app/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png deleted file mode 100644 index c8244e281..000000000 Binary files a/app/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png b/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png deleted file mode 100644 index 0aa74bdac..000000000 Binary files a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png b/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png deleted file mode 100644 index 97fdcbd19..000000000 Binary files a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/implicitly_checked.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png b/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png deleted file mode 100644 index f4e57bd9c..000000000 Binary files a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png b/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png deleted file mode 100644 index 2f64db223..000000000 Binary files a/app/src/androidTest/assets/views/widgets/CheckmarkWidgetView/unchecked.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/FrequencyWidget/render.png b/app/src/androidTest/assets/views/widgets/FrequencyWidget/render.png deleted file mode 100644 index 541a82375..000000000 Binary files a/app/src/androidTest/assets/views/widgets/FrequencyWidget/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/ScoreWidget/render.png b/app/src/androidTest/assets/views/widgets/ScoreWidget/render.png deleted file mode 100644 index 6d7d0bb9a..000000000 Binary files a/app/src/androidTest/assets/views/widgets/ScoreWidget/render.png and /dev/null differ diff --git a/app/src/androidTest/assets/views/widgets/StreakWidget/render.png b/app/src/androidTest/assets/views/widgets/StreakWidget/render.png deleted file mode 100644 index b119b2a50..000000000 Binary files a/app/src/androidTest/assets/views/widgets/StreakWidget/render.png and /dev/null differ diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java index 11e42eab2..18ea6abc9 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java @@ -31,33 +31,41 @@ import java.io.*; import java.util.*; import static android.os.Build.VERSION.*; -import static android.os.Build.VERSION_CODES.*; import static android.view.View.MeasureSpec.*; import static junit.framework.Assert.*; public class BaseViewTest extends BaseAndroidTest { - double similarityCutoff = 0.00150; + double similarityCutoff = 0.0005; @Override public void setUp() { super.setUp(); - if (SDK_INT < LOLLIPOP) similarityCutoff = 0.00175; } protected void assertRenders(View view, String expectedImagePath) throws IOException { - expectedImagePath = "views/" + expectedImagePath; + expectedImagePath = getVersionedPath(expectedImagePath); if (view.isLayoutRequested()) measureView(view, view.getMeasuredWidth(), view.getMeasuredHeight()); view.setDrawingCacheEnabled(true); view.buildDrawingCache(); + Bitmap expected = null; Bitmap actual = view.getDrawingCache(); - Bitmap expected = getBitmapFromAssets(expectedImagePath); + try + { + expected = getBitmapFromAssets(expectedImagePath); + } + catch (Exception e) + { + String path = saveBitmap(expectedImagePath, "", actual); + fail(String.format("Could not open expected image. Actual " + + "rendered image saved to %s", path)); + } int width = actual.getWidth(); int height = actual.getHeight(); @@ -157,6 +165,15 @@ public class BaseViewTest extends BaseAndroidTest return BitmapFactory.decodeStream(stream); } + private String getVersionedPath(String path) + { + int version = SDK_INT; + if (version >= 21) version = 21; + else if (version >= 15) version = 15; + + return String.format("views-v%d/%s", version, path); + } + private String saveBitmap(String filename, String suffix, Bitmap bitmap) throws IOException { diff --git a/app/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java b/app/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java index 7a6e51281..288e45c3f 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java +++ b/app/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java @@ -24,10 +24,15 @@ import org.isoron.uhabits.utils.DateUtils; public class HabitFixtures { - public boolean NON_DAILY_HABIT_CHECKS[] = { + public boolean LONG_HABIT_CHECKS[] = { true, false, false, true, true, true, false, false, true, true }; + public int LONG_NUMERICAL_HABIT_CHECKS[] = { + 200000, 0, 150000, 137000, 0, 0, 500000, 30000, 100000, 0, 300000, + 100000, 0, 100000 + }; + private ModelFactory modelFactory; private final HabitList habitList; @@ -73,6 +78,25 @@ public class HabitFixtures return habit; } + public Habit createLongNumericalHabit() + { + Habit habit = modelFactory.buildHabit(); + habit.setName("Take a walk"); + habit.setDescription("How many steps did you walk today?"); + habit.setType(Habit.NUMBER_HABIT); + habitList.add(habit); + + long timestamp = DateUtils.getStartOfToday(); + for (int value : LONG_NUMERICAL_HABIT_CHECKS) + { + Repetition r = new Repetition(timestamp, value); + habit.getRepetitions().add(r); + timestamp -= DateUtils.millisecondsInOneDay; + } + + return habit; + } + public Habit createShortHabit() { Habit habit = modelFactory.buildHabit(); @@ -82,7 +106,7 @@ public class HabitFixtures habitList.add(habit); long timestamp = DateUtils.getStartOfToday(); - for (boolean c : NON_DAILY_HABIT_CHECKS) + for (boolean c : LONG_HABIT_CHECKS) { if (c) habit.getRepetitions().toggleTimestamp(timestamp); timestamp -= DateUtils.millisecondsInOneDay; diff --git a/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java new file mode 100644 index 000000000..c208cadff --- /dev/null +++ b/app/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2016 Álinson Santos Xavier + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +package org.isoron.uhabits.activities.common.views; + +import android.support.test.filters.*; +import android.support.test.runner.*; + +import org.isoron.uhabits.*; +import org.isoron.uhabits.models.*; +import org.isoron.uhabits.utils.*; +import org.junit.*; +import org.junit.runner.*; + +@RunWith(AndroidJUnit4.class) +@MediumTest +public class BarChartTest extends BaseViewTest +{ + private static final String BASE_PATH = "common/BarChart/"; + + private BarChart view; + + @Override + @Before + public void setUp() + { + super.setUp(); + Habit habit = fixtures.createLongNumericalHabit(); + view = new BarChart(targetContext); + long today = DateUtils.getStartOfToday(); + long day = DateUtils.millisecondsInOneDay; + CheckmarkList checkmarks = habit.getCheckmarks(); + view.setCheckmarks(checkmarks.getByInterval(today - 20 * day, today)); + view.setColor(ColorUtils.getColor(targetContext, habit.getColor())); + view.setTarget(200.0); + measureView(view, dpToPixels(300), dpToPixels(200)); + } + + @Test + public void testRender() throws Throwable + { + assertRenders(view, BASE_PATH + "render.png"); + } + + @Test + public void testRender_withDataOffset() throws Throwable + { + view.onScroll(null, null, -dpToPixels(150), 0); + view.invalidate(); + + assertRenders(view, BASE_PATH + "renderDataOffset.png"); + } + + @Test + public void testRender_withDifferentSize() throws Throwable + { + measureView(view, dpToPixels(200), dpToPixels(200)); + assertRenders(view, BASE_PATH + "renderDifferentSize.png"); + } + + @Test + public void testRender_withTransparentBackground() throws Throwable + { + view.setIsTransparencyEnabled(true); + assertRenders(view, BASE_PATH + "renderTransparent.png"); + } +} diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java index 9367ed282..83f89c64b 100644 --- a/app/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java +++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java @@ -155,8 +155,7 @@ public class BarChart extends ScrollableChart public void setIsTransparencyEnabled(boolean enabled) { this.isTransparencyEnabled = enabled; - initColors(); - requestLayout(); + postInvalidate(); } public void setTarget(double target) diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java index fe6c38b41..5bfde26ae 100644 --- a/app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java +++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java @@ -133,8 +133,7 @@ public class ScoreChart extends ScrollableChart public void setIsTransparencyEnabled(boolean enabled) { this.isTransparencyEnabled = enabled; - initColors(); - requestLayout(); + postInvalidate(); } public void setColor(int primaryColor)