jenkins-bot has submitted this change and it was merged. Change subject: Generalize Announcement cards a bit. ......................................................................
Generalize Announcement cards a bit. The previous (first) version of announcement cards didn't actually make use of the "caption_HTML" or "image" parameters that are part of the announcement endpoint of the Content Service, which are meant to represent the footer verbiage and the header image, respectively. This patch updates our logic to make use of these fields, which means that we no longer need to maintain any hard-coded images or strings for this purpose. We will still, however, keep around the separate classes of SurveyCard and FundraisingCard, since this distinction is necessary for analytics purposes. But aside from that, the card is now fully customizable by the endpoint content. (Also update the Test to be a more general test of AnnouncementCardView.) Change-Id: I8e77fc7bcbdd9ed020127f40c1996ff772fff097 --- A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testNoImage-320dp-en-ltr-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png A app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png D app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png A app/src/androidTest/java/org/wikipedia/feed/announcement/AnnouncementCardViewTest.java D app/src/androidTest/java/org/wikipedia/feed/announcement/FundraisingCardViewTest.java D app/src/androidTest/java/org/wikipedia/feed/announcement/SurveyCardViewTest.java M app/src/main/java/org/wikipedia/feed/announcement/Announcement.java M app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCard.java M app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.java D app/src/main/java/org/wikipedia/feed/announcement/FundraisingCardView.java D app/src/main/java/org/wikipedia/feed/announcement/SurveyCardView.java M app/src/main/java/org/wikipedia/feed/model/CardType.java D app/src/main/res/drawable/ic_fundraising_header_2016.xml M app/src/main/res/layout/view_card_announcement.xml M app/src/test/java/org/wikipedia/feed/announcement/AnnouncementClientTest.java M app/src/test/res/raw/announce_2016_11_21.json 44 files changed, 172 insertions(+), 252 deletions(-) Approvals: Mholloway: Looks good to me, but someone else must approve jenkins-bot: Verified Niedzielski: Looks good to me, approved diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png new file mode 100644 index 0000000..f7dd84d --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png new file mode 100644 index 0000000..acc63c1 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png new file mode 100644 index 0000000..f696af3 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png new file mode 100644 index 0000000..f987403 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testNoImage-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testNoImage-320dp-en-ltr-font1.0x-light.png new file mode 100644 index 0000000..9a85584 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testNoImage-320dp-en-ltr-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png new file mode 100644 index 0000000..3557890 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png new file mode 100644 index 0000000..f696af3 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png new file mode 100644 index 0000000..f696af3 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png new file mode 100644 index 0000000..150f405 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png new file mode 100644 index 0000000..1c5bfd3 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png new file mode 100644 index 0000000..d21cab6 --- /dev/null +++ b/app/screenshots-ref/org.wikipedia.feed.announcement.AnnouncementCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png deleted file mode 100644 index 7d531cd..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 4dd71e2..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 475a932..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png deleted file mode 100644 index 56ca453..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png deleted file mode 100644 index eda77bc..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 475a932..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 475a932..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png deleted file mode 100644 index d79e30a..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 2af97e4..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png deleted file mode 100644 index baa45ad..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.FundraisingCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png deleted file mode 100644 index 8c51a9a..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-dark.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 6960016..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testFocus-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 2e38ee2..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png deleted file mode 100644 index 3b9e4f4..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testLayoutDirection-320dp-en-rtl-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png deleted file mode 100644 index 46118fa..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-dark.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 2e38ee2..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testTheme-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png deleted file mode 100644 index 2e38ee2..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png deleted file mode 100644 index 85284c6..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-320dp-en-ltr-font1.5x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png deleted file mode 100644 index ff3b0dd..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.0x-light.png +++ /dev/null Binary files differ diff --git a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png b/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png deleted file mode 100644 index b1af2fc..0000000 --- a/app/screenshots-ref/org.wikipedia.feed.announcement.SurveyCardViewTest.testWidth-480dp-en-ltr-font1.5x-light.png +++ /dev/null Binary files differ diff --git a/app/src/androidTest/java/org/wikipedia/feed/announcement/AnnouncementCardViewTest.java b/app/src/androidTest/java/org/wikipedia/feed/announcement/AnnouncementCardViewTest.java new file mode 100644 index 0000000..41f97dd --- /dev/null +++ b/app/src/androidTest/java/org/wikipedia/feed/announcement/AnnouncementCardViewTest.java @@ -0,0 +1,76 @@ +package org.wikipedia.feed.announcement; + +import android.net.Uri; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.test.filters.SmallTest; + +import org.junit.experimental.theories.Theory; +import org.junit.experimental.theories.suppliers.TestedOn; +import org.wikipedia.feed.model.CardType; +import org.wikipedia.test.view.FontScale; +import org.wikipedia.test.view.LayoutDirection; +import org.wikipedia.test.view.ViewTest; +import org.wikipedia.theme.Theme; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +@SmallTest public class AnnouncementCardViewTest extends ViewTest { + private static final String TEXT = "Hey Android readers,<br /><br /><strong>This is an announcement</strong>. Click the button below to execute the action that this announcement calls for."; + private static final String ACTION = "Click here"; + private static final String FOOTER = "Here's a link to our <a href=\"https://wikimediafoundation.org/wiki/Survey_Privacy_Statement\">Privacy statement</a>."; + private static final String IMAGE = "https://fake.url"; + private AnnouncementCardView subject; + + @Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) int widthDp, + @NonNull FontScale fontScale) { + setUp(widthDp, LayoutDirection.LOCALE, fontScale, Theme.LIGHT, IMAGE); + snap(subject); + } + + @Theory public void testLayoutDirection(@NonNull LayoutDirection direction) { + setUp(WIDTH_DP_M, direction, FontScale.DEFAULT, Theme.LIGHT, IMAGE); + snap(subject); + } + + @Theory public void testTheme(@NonNull Theme theme) { + setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, theme, IMAGE); + snap(subject); + } + + @Theory public void testFocus(@NonNull Theme theme) { + setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, theme, IMAGE); + requestFocus(subject); + snap(subject); + } + + @Theory public void testNoImage() { + setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, Theme.LIGHT, null); + snap(subject); + } + + protected void setUp(int widthDp, @NonNull LayoutDirection layoutDirection, + @NonNull FontScale fontScale, @NonNull Theme theme, + @Nullable String imageUrl) { + super.setUp(widthDp, layoutDirection, fontScale, theme); + subject = new AnnouncementCardView(ctx()); + subject.setCard(mockAnnouncementCard(TEXT, ACTION, FOOTER, imageUrl)); + } + + @NonNull private AnnouncementCard mockAnnouncementCard(@NonNull String text, + @NonNull String action, + @NonNull String footer, + @Nullable String imageUrl) { + SurveyCard card = mock(SurveyCard.class); + when(card.type()).thenReturn(CardType.ANNOUNCEMENT); + when(card.actionTitle()).thenReturn(action); + when(card.hasAction()).thenReturn(true); + when(card.extract()).thenReturn(text); + when(card.hasFooterCaption()).thenReturn(true); + when(card.footerCaption()).thenReturn(footer); + when(card.hasImage()).thenReturn(imageUrl != null); + when(card.image()).thenReturn(imageUrl != null ? Uri.parse(imageUrl) : null); + return card; + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/org/wikipedia/feed/announcement/FundraisingCardViewTest.java b/app/src/androidTest/java/org/wikipedia/feed/announcement/FundraisingCardViewTest.java deleted file mode 100644 index bed5482..0000000 --- a/app/src/androidTest/java/org/wikipedia/feed/announcement/FundraisingCardViewTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.wikipedia.feed.announcement; - -import android.support.annotation.NonNull; -import android.support.test.filters.SmallTest; - -import org.junit.experimental.theories.Theory; -import org.junit.experimental.theories.suppliers.TestedOn; -import org.wikipedia.feed.model.CardType; -import org.wikipedia.test.view.FontScale; -import org.wikipedia.test.view.LayoutDirection; -import org.wikipedia.test.view.ViewTest; -import org.wikipedia.theme.Theme; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@SmallTest public class FundraisingCardViewTest extends ViewTest { - private static final String FUNDRAISING_TEXT = "Hey Android readers,<br /><br /><strong>Today we ask you to help Wikipedia</strong>. To protect our independence, we’ll never run ads. We believe everyone should have access to knowledge—for free, without restriction, without limitation. Please help us end the fundraiser and improve Wikipedia."; - private static final String FUNDRAISING_ACTION = "Donate"; - private FundraisingCardView subject; - - @Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) int widthDp, - @NonNull FontScale fontScale) { - setUp(widthDp, LayoutDirection.LOCALE, fontScale, Theme.LIGHT); - snap(subject); - } - - @Theory public void testLayoutDirection(@NonNull LayoutDirection direction) { - setUp(WIDTH_DP_M, direction, FontScale.DEFAULT, Theme.LIGHT); - snap(subject); - } - - @Theory public void testTheme(@NonNull Theme theme) { - setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, theme); - snap(subject); - } - - @Theory public void testFocus(@NonNull Theme theme) { - setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, theme); - requestFocus(subject); - snap(subject); - } - - @Override - protected void setUp(int widthDp, @NonNull LayoutDirection layoutDirection, - @NonNull FontScale fontScale, @NonNull Theme theme) { - super.setUp(widthDp, layoutDirection, fontScale, theme); - subject = new FundraisingCardView(ctx()); - subject.setCard(mockFundraisingCard(FUNDRAISING_TEXT, FUNDRAISING_ACTION)); - } - - @NonNull private FundraisingCard mockFundraisingCard(String text, String action) { - FundraisingCard card = mock(FundraisingCard.class); - when(card.type()).thenReturn(CardType.FUNDRAISING); - when(card.title()).thenReturn("fundraising"); - when(card.actionTitle()).thenReturn(action); - when(card.hasAction()).thenReturn(true); - when(card.extract()).thenReturn(text); - return card; - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/org/wikipedia/feed/announcement/SurveyCardViewTest.java b/app/src/androidTest/java/org/wikipedia/feed/announcement/SurveyCardViewTest.java deleted file mode 100644 index 19c3907..0000000 --- a/app/src/androidTest/java/org/wikipedia/feed/announcement/SurveyCardViewTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.wikipedia.feed.announcement; - -import android.support.annotation.NonNull; -import android.support.test.filters.SmallTest; - -import org.junit.experimental.theories.Theory; -import org.junit.experimental.theories.suppliers.TestedOn; -import org.wikipedia.feed.model.CardType; -import org.wikipedia.test.view.FontScale; -import org.wikipedia.test.view.LayoutDirection; -import org.wikipedia.test.view.ViewTest; -import org.wikipedia.theme.Theme; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@SmallTest public class SurveyCardViewTest extends ViewTest { - private static final String SURVEY_TEXT = "Answer three questions and help us improve Wikipedia."; - private static final String SURVEY_ACTION = "Take survey"; - private SurveyCardView subject; - - @Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) int widthDp, - @NonNull FontScale fontScale) { - setUp(widthDp, LayoutDirection.LOCALE, fontScale, Theme.LIGHT); - snap(subject); - } - - @Theory public void testLayoutDirection(@NonNull LayoutDirection direction) { - setUp(WIDTH_DP_M, direction, FontScale.DEFAULT, Theme.LIGHT); - snap(subject); - } - - @Theory public void testTheme(@NonNull Theme theme) { - setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, theme); - snap(subject); - } - - @Theory public void testFocus(@NonNull Theme theme) { - setUp(WIDTH_DP_M, LayoutDirection.LOCALE, FontScale.DEFAULT, theme); - requestFocus(subject); - snap(subject); - } - - @Override - protected void setUp(int widthDp, @NonNull LayoutDirection layoutDirection, - @NonNull FontScale fontScale, @NonNull Theme theme) { - super.setUp(widthDp, layoutDirection, fontScale, theme); - subject = new SurveyCardView(ctx()); - subject.setCard(mockSurveyCard(SURVEY_TEXT, SURVEY_ACTION)); - } - - @NonNull private SurveyCard mockSurveyCard(String text, String action) { - SurveyCard card = mock(SurveyCard.class); - when(card.type()).thenReturn(CardType.SURVEY); - when(card.title()).thenReturn("survey"); - when(card.actionTitle()).thenReturn(action); - when(card.hasAction()).thenReturn(true); - when(card.extract()).thenReturn(text); - return card; - } -} \ No newline at end of file diff --git a/app/src/main/java/org/wikipedia/feed/announcement/Announcement.java b/app/src/main/java/org/wikipedia/feed/announcement/Announcement.java index dfa173f..a69bf61 100644 --- a/app/src/main/java/org/wikipedia/feed/announcement/Announcement.java +++ b/app/src/main/java/org/wikipedia/feed/announcement/Announcement.java @@ -2,12 +2,14 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.text.TextUtils; import com.google.gson.annotations.SerializedName; import org.wikipedia.json.annotations.Required; import org.wikipedia.model.BaseModel; import org.wikipedia.util.DateUtil; +import org.wikipedia.util.StringUtil; import java.text.ParseException; import java.util.Collections; @@ -24,6 +26,8 @@ @SuppressWarnings("unused,NullableProblems") @SerializedName("end_time") @Required @NonNull private String endTime; @SuppressWarnings("unused") @NonNull private List<String> platforms = Collections.emptyList(); @SuppressWarnings("unused") @NonNull private List<String> countries = Collections.emptyList(); + @SuppressWarnings("unused") @SerializedName("caption_HTML") @Nullable private String footerCaption; + @SuppressWarnings("unused") @SerializedName("image") @Nullable private String imageUrl; @SuppressWarnings("unused,NullableProblems") @Required @NonNull private String text; @SuppressWarnings("unused") @Nullable private Action action; @@ -76,6 +80,22 @@ return action.url(); } + boolean hasFooterCaption() { + return !TextUtils.isEmpty(footerCaption); + } + + @NonNull String footerCaption() { + return StringUtil.emptyIfNull(footerCaption); + } + + boolean hasImageUrl() { + return !TextUtils.isEmpty(imageUrl); + } + + @NonNull String imageUrl() { + return StringUtil.emptyIfNull(imageUrl); + } + static class Action { @SuppressWarnings("unused,NullableProblems") @Required @NonNull private String title; @SuppressWarnings("unused,NullableProblems") @Required @NonNull private String url; diff --git a/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCard.java b/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCard.java index 96d242c..4c22a43 100644 --- a/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCard.java +++ b/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCard.java @@ -14,15 +14,11 @@ this.announcement = announcement; } - @Override - @NonNull - public String title() { + @Override @NonNull public String title() { return announcement.type(); } - @Nullable - @Override - public String extract() { + @Nullable @Override public String extract() { return announcement.text(); } @@ -30,24 +26,35 @@ return announcement.hasAction(); } - @NonNull - public String actionTitle() { + @NonNull public String actionTitle() { return announcement.actionTitle(); } - @NonNull - public Uri actionUri() { + @NonNull public Uri actionUri() { return Uri.parse(announcement.actionUrl()); } - @NonNull - @Override - public CardType type() { + public boolean hasFooterCaption() { + return announcement.hasFooterCaption(); + } + + @NonNull public String footerCaption() { + return announcement.footerCaption(); + } + + public boolean hasImage() { + return announcement.hasImageUrl(); + } + + @NonNull @Override public Uri image() { + return Uri.parse(announcement.imageUrl()); + } + + @NonNull @Override public CardType type() { return CardType.ANNOUNCEMENT; } - @Override - protected int dismissHashCode() { + @Override protected int dismissHashCode() { return announcement.id().hashCode(); } } diff --git a/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.java b/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.java index bd70b5d..57f3327 100644 --- a/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.java +++ b/app/src/main/java/org/wikipedia/feed/announcement/AnnouncementCardView.java @@ -2,18 +2,16 @@ import android.content.Context; import android.net.Uri; -import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.text.method.LinkMovementMethod; -import android.widget.ImageView; import android.widget.TextView; import org.wikipedia.R; import org.wikipedia.feed.model.Card; import org.wikipedia.feed.view.DefaultFeedCardView; import org.wikipedia.util.StringUtil; +import org.wikipedia.views.FaceAndColorDetectImageView; import org.wikipedia.views.ItemTouchHelperSwipeAdapter; import butterknife.BindView; @@ -27,7 +25,7 @@ void onAnnouncementNegativeAction(@NonNull Card card); } - @BindView(R.id.view_announcement_header_image) ImageView headerImageView; + @BindView(R.id.view_announcement_header_image) FaceAndColorDetectImageView headerImageView; @BindView(R.id.view_announcement_text) TextView textView; @BindView(R.id.view_announcement_action_positive) TextView actionViewPositive; @BindView(R.id.view_announcement_action_negative) TextView actionViewNegative; @@ -38,8 +36,7 @@ inflate(context, R.layout.view_card_announcement, this); ButterKnife.bind(this); - setHeaderImageVisible(false); - setNegativeActionVisible(false); + setNegativeActionVisible(true); footerTextView.setMovementMethod(new LinkMovementMethod()); } @@ -57,6 +54,17 @@ actionViewPositive.setVisibility(VISIBLE); actionViewNegative.setVisibility(VISIBLE); actionViewPositive.setText(card.actionTitle()); + } + + if (card.hasImage()) { + headerImageView.setVisibility(VISIBLE); + headerImageView.loadImage(card.image()); + } else { + headerImageView.setVisibility(GONE); + } + + if (card.hasFooterCaption()) { + footerTextView.setText(StringUtil.fromHtml(card.footerCaption())); } } @@ -76,17 +84,5 @@ protected void setNegativeActionVisible(boolean visible) { actionViewNegative.setVisibility(visible ? VISIBLE : GONE); - } - - protected void setHeaderImageVisible(boolean visible) { - headerImageView.setVisibility(visible ? VISIBLE : GONE); - } - - protected void setHeaderImage(@DrawableRes int id) { - headerImageView.setImageDrawable(ContextCompat.getDrawable(getContext(), id)); - } - - protected void setFooterText(@NonNull String text) { - footerTextView.setText(StringUtil.fromHtml(text)); } } diff --git a/app/src/main/java/org/wikipedia/feed/announcement/FundraisingCardView.java b/app/src/main/java/org/wikipedia/feed/announcement/FundraisingCardView.java deleted file mode 100644 index 0a4abd0..0000000 --- a/app/src/main/java/org/wikipedia/feed/announcement/FundraisingCardView.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.wikipedia.feed.announcement; - -import android.content.Context; -import android.support.annotation.NonNull; - -import org.wikipedia.R; -import org.wikipedia.WikipediaApp; -import org.wikipedia.util.GeoUtil; - -public class FundraisingCardView extends AnnouncementCardView { - public FundraisingCardView(@NonNull Context context) { - super(context); - setNegativeActionVisible(true); - setHeaderImageVisible(true); - setHeaderImage(R.drawable.ic_fundraising_header_2016); - - String footerStr = String.format(context.getString(R.string.view_fundraising_card_footer), - GeoUtil.getGeoIPCountry(), - WikipediaApp.getInstance().getWikiSite().languageCode()); - - setFooterText(footerStr); - } -} diff --git a/app/src/main/java/org/wikipedia/feed/announcement/SurveyCardView.java b/app/src/main/java/org/wikipedia/feed/announcement/SurveyCardView.java deleted file mode 100644 index 3334c17..0000000 --- a/app/src/main/java/org/wikipedia/feed/announcement/SurveyCardView.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.wikipedia.feed.announcement; - -import android.content.Context; -import android.support.annotation.NonNull; - -import org.wikipedia.R; - -public class SurveyCardView extends AnnouncementCardView { - public SurveyCardView(@NonNull Context context) { - super(context); - setNegativeActionVisible(true); - setHeaderImageVisible(false); - setFooterText(context.getString(R.string.view_survey_card_footer)); - } -} diff --git a/app/src/main/java/org/wikipedia/feed/model/CardType.java b/app/src/main/java/org/wikipedia/feed/model/CardType.java index e635fc6..4d0a315 100644 --- a/app/src/main/java/org/wikipedia/feed/model/CardType.java +++ b/app/src/main/java/org/wikipedia/feed/model/CardType.java @@ -4,8 +4,6 @@ import android.support.annotation.NonNull; import org.wikipedia.feed.announcement.AnnouncementCardView; -import org.wikipedia.feed.announcement.FundraisingCardView; -import org.wikipedia.feed.announcement.SurveyCardView; import org.wikipedia.feed.becauseyouread.BecauseYouReadCardView; import org.wikipedia.feed.continuereading.ContinueReadingCardView; import org.wikipedia.feed.featured.FeaturedArticleCardView; @@ -77,12 +75,12 @@ }, SURVEY(14) { @NonNull @Override public FeedCardView<?> newView(@NonNull Context ctx) { - return new SurveyCardView(ctx); + return new AnnouncementCardView(ctx); } }, FUNDRAISING(15) { @NonNull @Override public FeedCardView<?> newView(@NonNull Context ctx) { - return new FundraisingCardView(ctx); + return new AnnouncementCardView(ctx); } }, PROGRESS(99) { diff --git a/app/src/main/res/drawable/ic_fundraising_header_2016.xml b/app/src/main/res/drawable/ic_fundraising_header_2016.xml deleted file mode 100644 index ae3fa90..0000000 --- a/app/src/main/res/drawable/ic_fundraising_header_2016.xml +++ /dev/null @@ -1,46 +0,0 @@ -<vector android:height="24dp" android:viewportHeight="344.0" - android:viewportWidth="344.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillAlpha="1" android:fillColor="#f0f0f0" - android:pathData="M-0.4,-1.3h347.7v346.5h-347.7z" - android:strokeAlpha="1" android:strokeColor="#ffffff" - android:strokeLineJoin="round" android:strokeWidth="1.6194917"/> - <path android:fillColor="#dd3333" - android:pathData="m128.7,147.5c-4.8,-12.5 -21.3,-18.8 -33.1,-12.3 -9.3,4.7 -13.6,16.3 -10.7,26.1 3.4,11.2 12.2,19.5 20.1,27.6 7.9,7.7 15.9,15.2 23.7,23.1 11.7,-12.1 24.7,-22.9 35.5,-35.8 6.1,-7.2 10.9,-16.8 8.6,-26.4 -1.9,-9.8 -11.3,-17.2 -21.2,-17.1 -9.7,-0.2 -19.4,5.8 -22.9,14.9z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#ffffff" - android:pathData="m210.1,147.7c0,-0.6 -0.4,-1.2 -0.4,-1.2l-0,-0.1c0,0 -0.5,-0.9 -1.2,-1.1 -0.8,-0.3 -1.4,0.3 -1.4,0.3 0,0 -0.1,0.1 -0.4,0.5 -0.3,0.3 -0.5,0.6 -1.1,0.9 -0.6,0.3 -1.3,0.2 -1.6,0 -0.3,-0.2 -0.4,-0.5 -0.4,-0.5 0,0 -0.2,-0.7 -0.3,-1 -0.1,-0.3 -0.3,-1.6 -0.3,-1.6 0,0 -0.5,-2.5 -0.5,-3.1 0,0 1.4,-0.1 3.4,-0.7 2.1,-0.6 2.8,-1.1 2.8,-1.1 0,0 -0.4,-0.1 -0.4,-0.6 -0,-0.5 -0.1,-1.1 -0.1,-1.1 0,0 -0.1,-0.5 0.4,-1.1 0.5,-0.6 1.3,-0.8 1.6,-0.9 0.4,-0.1 1.2,-0.2 1.9,-0.1 0.8,0 1.2,0.1 1.5,0.3 0.3,0.2 0.3,0.6 0.3,0.6l-0,1.1c0,0 -0,0.4 0.2,0.5 0,0 0.5,0.3 2,0.1 0,0 0.7,-0.1 1.7,-0.4 1,-0.3 3.8,-1.1 4.2,-1.2 0.4,-0.1 0.9,-0.3 1.5,-0.4 0.6,-0.2 1.9,-0.6 2.1,-0.7 0.2,-0.1 1.7,-0.6 2.7,-0.7 1,-0.2 2.1,-0.2 2.6,0.1 0,0 0.3,0.3 0.5,0.6 0.2,0.3 0.4,0.8 0.9,1 0.4,0.2 0.7,0.3 1.7,0.3 0,0 0.1,0 0.5,-0.3 0.2,-0.5 -0,-0.8 -0.2,-1.3l-1.2,-1.4c0,0 0,-0.2 0.5,-0.2 0.5,-0.1 1,-0.1 1.6,-0.3 0.6,-0.2 0.7,-0.3 0.7,-0.3l0.5,0.2c0,0 3.3,2.6 4.3,3.3l0.2,-0.2c0,0 0.4,0 0.8,0.2 0.4,0.1 0.9,0.5 0.9,0.5 0,0 1.5,1.2 1.9,2l0.2,0.6 -0.1,0.1c0,0 0.9,1.2 1.9,2.4 0,0 1.1,1.5 1.6,1.9 0,0 -0.1,-0.4 -0.2,-0.8l0.3,-0.2 0.2,-0.1 0.6,0.2c3.3,4.4 6,9.6 7.5,15.1l-0.1,0.4 0.4,0.5c1,3.9 1.6,8 1.6,12.2 0,1 -0,2.1 -0.1,3.1l-0.3,0.5 0.2,0.5c-2.1,24.1 -22.3,43.1 -47.1,43.1 -17.1,0 -32.1,-9.1 -40.4,-22.8l-0.3,-0.5C167.7,189.6 165.5,183.6 164.7,177.2L164.6,176.3c-0.2,-1.8 -0.3,-3.5 -0.3,-5.3 0,-2.8 0.2,-5.5 0.7,-8.1L165.2,162.3 165.1,162C166.2,156.4 168.2,151.2 171.1,146.5l0.6,-0.4 0.1,0c0,0 0.2,-0.2 0.3,-0.2l0.1,-0c0,0 1.1,-1.8 1.5,-2.4 0,0 0.5,-0.3 0.7,-0.4 0,0 0.1,-0 0.2,0.1 0,0 0.5,-0.4 1.6,-1.9 0,-0 0,-0 0,-0 0,0 -0.1,-0.1 -0.1,-0.2 -0,-0.1 0.1,-0.5 0.2,-0.7 0.1,-0.1 0.1,-0.1 0.1,-0.1 0,0 1.6,-1.9 2.9,-3 0,0 0.2,-0.2 0.6,-0.2 0,0 1.4,-0.6 3,-2 0,0 0,-0.3 0.4,-0.8 0.4,-0.5 1.3,-1.1 2.1,-1.2 0.7,-0.2 0.8,-0 0.8,-0l0.1,0.1 0.5,0.7c0,0 0.5,-0.3 1.3,-0.6 0.8,-0.3 0.9,-0.2 0.9,-0.2l0.8,1.2 -0.9,1.8c0,0 -0.6,1.3 -1.5,2 0,0 -0.4,0.3 -1,0.1 -0.6,-0.1 -1,0.3 -1,0.3l-0.2,0.1c0,0 0.1,-0 0.3,-0.1 0,0 0.1,0.1 0.3,0.2 0.1,0.1 0.8,1.1 0.8,1.1 0,0 0,0.8 -0.4,1.8 -0.4,1 -1.4,2.7 -1.4,2.7 0,0 -0.7,1.3 -1,2.1 -0.3,0.8 -0.5,1.6 -0.5,2.1 0,0 0.2,0.1 0.7,-0.2 0.6,-0.3 1,0 1,0 0,0 0.7,0.5 1,0.8 0.2,0.3 0.7,1.6 0.2,3 0,0 -0.4,0.9 -1.3,1.6 0,0 -0.2,0.3 -1.4,0.2 -0.3,-0 -0.5,-0.3 -1.3,-0.2 -0.7,0.1 -1.1,0.8 -1.1,0.8l0,-0c-0.6,0.9 -1.1,2.3 -1.1,2.3l-0.1,0.2c0,0 -0.2,0.5 -0.3,1.6 -0,1.2 0.3,2.9 0.3,2.9 0,0 7.3,-1.3 9.2,-0.1l0.5,0.5c0,0 0,0.2 -0,0.3 -0.1,0.2 -0.3,0.6 -0.9,1 -0.6,0.4 -1.1,1.5 -0.3,2.1 1,0.8 1.6,0.7 3.2,0.4 1.6,-0.3 2.7,-1.2 2.7,-1.2 0,0 0.9,-0.7 0.7,-1.5 -0.2,-0.8 -0.9,-1.1 -0.9,-1.1 0,0 -0.6,-0.4 -0.1,-1.1 0,0 0.1,-0.6 2.4,-1.2 2.2,-0.6 6.3,-1.4 9.8,-1.8 0,0 -2.4,-7.6 -0.7,-8.6 0,0 0.4,-0.3 1.1,-0.4l0.7,-0c0.1,-0 0.3,0 0.7,0 0.4,0 0.9,0.1 1.6,-0.4 0.6,-0.5 0.6,-0.8 0.6,-0.8" - android:strokeColor="#000000" android:strokeWidth="1.79104483"/> - <path android:fillColor="#000000" - android:pathData="m240.3,205.3 l0.4,0.2c-0,0.1 -0.1,0.1 -0.1,0.2 -0.8,1.5 -0.9,1.8 -1.3,2.1 -0.4,0.3 -0.5,0.5 -1.3,0.6 -0.8,0.1 -1.6,1.1 -1.6,1.1 0,0 -0.8,0.8 -0.4,0.8 0.4,0 1.1,-0.6 1.1,-0.6 0,0 0.5,-0.3 0.6,-0.2 0.1,0.1 -0.5,0.7 -0.5,0.7 0,0 -1.1,1.1 -2.3,1.8l-0.4,0.2c0,0 1.7,-1.3 2.6,-2.2 0,0 0.2,-0.3 -0.2,0.1 -0.3,0.3 -1.2,0.8 -1.6,0.8 -0.4,0 0,-0.5 0,-0.5 0,0 0.6,-0.7 1.7,-1.6 1.1,-0.9 2.1,-0.9 2.1,-0.9 0,0 0.2,0 0.2,-0.2 0,-0.3 0.3,-0.8 0.3,-0.8 0,0 0.4,-1 1.5,-2.5 1.1,-1.6 1.6,-2 1.6,-2 0,0 1.5,-1.5 2.2,-3 0,0 0.5,-0.9 -0.3,-0.2 -0.9,0.7 -2,1.6 -3.2,1.9 -1.1,0.3 -1.2,-0.8 -1.2,-0.8 0,0 -0.3,-1.7 1,-3.1 1.1,-1.2 2.3,-1.2 3.4,-1.3 1.1,-0.1 2,-1.5 2,-1.5 0,0 0.8,-0.9 1.2,-3.5 0.2,-1.2 0.1,-2.1 -0.1,-2.6l0,-0.6 -0.3,-0c-0.1,-0.1 -0.1,-0.1 -0.1,-0.1 0,0 -0.3,-0.3 -0.6,-0.5 -0.3,-0.2 -0.6,-0.6 -1,-1.3 0,0 -0.9,-2 -0.7,-4.8 0.2,-2.8 2.6,-2.6 2.6,-2.6 0,0 1.4,0.1 1.6,-0.3 0.3,-0.4 0.5,-0.9 0.6,-2.1 0.1,-1.1 -0.4,-2.2 -0.4,-2.2 0,0 -0.2,-0.6 -1,-0.7 -0.8,-0.1 -1,0.2 -1,0.2 0,0 -0.2,0.1 -0.7,1 -0.4,0.9 -0.7,1.4 -1.5,1.6 -0.8,0.2 -1.9,0.1 -2.4,-0.9 -0.5,-1 -1.6,-3.4 -2.2,-5.3l0.1,-0.7 -0.3,-0.4c-0.1,-0.4 -0.1,-0.8 -0.1,-1.1 -0,-0.9 -0.3,-1.9 -0.6,-3 -0.3,-1 -1.4,-2.7 -1.5,-3.1 -0.3,-0.6 -0.6,-0.9 -0.9,-0.8 -0.4,0.1 -0.3,0.1 -0.5,0.1 -0.2,0 -0.2,0.2 -0.3,0.4 -0,0.2 -0.3,1.2 -1,1.7 -0.7,0.5 -1.1,0.7 -2.3,0.8 0,0 -1.4,0.1 -2.5,-1.9 -1.1,-2 -0.8,-3.3 -0.7,-3.8 0.1,-0.5 0.5,-1.2 1.1,-1.3 0.6,-0.1 1,-0.2 1,-0.2 0,0 1,-0 1.5,-0.1 0.5,-0.1 0.3,-0.9 0.3,-0.9 0,0 -0.3,-2.2 -2.2,-4l-0.1,-0.5 -0.7,-0.4c-1.7,-1.9 -4,-5 -4,-5 0,0 -1,-1 -0.2,-2.3 0,0 0.4,-0.9 1.6,-0.7 0.4,0.1 0.4,0.1 0.8,0.2 0.4,0.1 0.9,0.2 1.4,-0.4 0,0 0.4,-0.7 -0.3,-1.7 -0.7,-0.9 -0.9,-1.6 -1.7,-1.6 0,0 -0.4,-0.1 -0.7,0.4 -0.4,0.4 -1.3,0.7 -1.9,0.7 -0.6,0.1 -2.1,-0.5 -2.9,-1.9C222.7,137.1 222.4,136.6 222.3,136.4l0.2,-0.3 0.7,0.1c0.2,0.3 0.5,1 0.9,1.7 0.5,0.9 1,1 1.3,1.2 0.3,0.1 1,-0.1 1.3,-0.3 0.4,-0.2 0.7,-0.6 1.3,-0.7 0.6,-0 1.5,0.1 2.1,0.7 0.6,0.7 1.4,2.1 1.4,2.7 -0.1,0.7 -0.1,1.3 -1,1.6 -0.9,0.3 -1.2,0 -1.7,-0.1 -0.5,-0.1 -0.8,-0.1 -1,0.2 -0.2,0.3 -0.5,0.8 -0.4,1.1 0.1,0.2 0.2,0.4 0.7,1.2 0.5,0.7 3.2,3.9 3.7,4.4l-0.1,0.6 0.9,0.2c0.6,0.7 1.3,1.5 1.6,2.1 0.5,0.8 0.7,2.2 0.7,2.8 0,0.6 -0.3,0.9 -0.3,0.9 0,0 -0.3,0.5 -1.9,0.5 -1.4,0 -1.5,0.3 -1.5,0.3 0,0 -0.4,0.4 -0.3,1.5 0.1,1.1 0.6,2.2 1.4,3.1 0.7,0.8 2.1,-0 2.5,-0.3 0.5,-0.3 0.8,-1.2 0.8,-1.2 0,0 0.1,-1.1 1.3,-1.1 1.3,0 1.8,1.2 1.8,1.2 0,0 0.9,1.2 1.8,3.8 0.4,1.3 0.5,2.1 0.5,2.1l0.1,1.5 -0.5,0.8 0.7,0.3c0.1,0.5 0.3,1.1 0.6,1.9 0,0 0.9,2.2 1.3,3 0.4,0.8 0.8,0.7 1.2,0.7 0,0 0.8,0.1 1.1,-0.3 0.3,-0.4 0.6,-1 0.6,-1 0,0 0.6,-1.7 2,-1.5 1.4,0.1 1.7,1 1.9,2 0.2,1 0.3,3 -0.4,4.2 -0.7,1.2 -1.6,1 -1.6,1 0,0 -1.7,-0.2 -2.1,0.2 -0.4,0.4 -0.6,0.7 -0.6,1.5 -0.1,0.8 0,2.2 0.7,3.8 0.6,1.4 1.1,1.3 1.3,1.6 0.3,0.3 1.1,1.1 1,3 -0.1,1.9 -0.7,3.8 -1.5,5 -0.7,1.2 -1.9,1.9 -1.9,1.9 0,0 -0.3,0.2 -1,0.3 -0.7,0.1 -1.7,0.1 -2.3,0.5 -0.7,0.4 -0.9,1.4 -1,1.8 -0.1,0.4 -0.1,1.4 0.9,1.3 1,-0.1 2.4,-1.3 2.4,-1.3 0,0 1.4,-1 1.6,-0.7 0.2,0.3 -0.6,1.7 -0.6,1.7 0,0 -1,1.4 -1.8,2.3 -0.7,0.7 -1.5,1.7 -2.3,2.9l-0.8,0.4 0,0z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#00000000" - android:pathData="m185.6,153c-0,0 -0,0 -0,0 0,-0 0,-0 0,-0z" - android:strokeColor="#000000" android:strokeWidth="1.09219646"/> - <path android:fillColor="#000000" - android:pathData="m199.3,215 l0.2,0c-0.2,-0.1 -0.3,-0.3 -0.6,-0.4 -0.6,-0.3 -3.5,-2.2 -4.3,-2.8 -0.9,-0.6 -2.4,-1.6 -3.1,-1.4 -0.5,0.2 -0.4,0.4 -0.7,0.5 -0.3,0.1 -0.6,0 -1.4,-0.4 -0.8,-0.4 -1.3,-0.7 -2.8,-2.1 -1.2,-1.1 1.5,-0.1 1.5,-0.1 0,0 0.6,0.2 0.3,-0.4 -0.3,-0.6 -1.6,-2.2 -2.8,-3.4 -1,-1 -1.6,-1.7 -2.3,-2.7l-0.5,-0.6 0,-0.2c-0,-0 -0,-0 -0,-0.1 0,0 -1.7,-3.1 -1.6,-4.3 0,0 0.1,-0.8 1.1,-1.1 0.8,-0.2 0.7,0.5 2.9,0.9 0,0 1.9,0.5 2.4,-0.9 0.5,-1.4 -0.5,-3.1 -0.5,-3.1 0,0 -1.3,-2.5 -3,-2.6 -0.9,-0 -0.6,0.5 -2,0.9 0,0 -1.8,0.2 -2.3,-0.9 -0.7,-1.3 -1,-2.7 -0.9,-3.7 0,-0.9 0.1,-1 0.1,-1.3 0,-0.2 0.2,-0.5 0.2,-1l-0.1,-0.6 0.2,-0.5c0,-0.2 -0,-0.5 -0,-0.8 -0.1,-1.5 -0.2,-3.9 -0.4,-5.3 -0.2,-1.4 -0.6,-3.5 -1.8,-3.6 0,0 -0.6,-0 -1.5,0.8C174.7,174.9 173.9,173.4 173.9,172.5 173.8,171.5 174,170.4 174.3,169.9 174.5,169.4 175.2,169.4 175.4,169.4c0.1,0 0.5,0.2 1,0.4 0.5,0.3 1.1,0.3 1.4,-0.1 0.4,-0.4 0.9,-0.8 1.1,-2.4 0.2,-1.6 0.2,-3.3 0,-5.3L178.7,161.7 179.9,161.4c-0,-0 -0,-0.1 -0,-0.2l0,-0c-0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1l0,-0c-0,-0 -0,-0 -0,-0.1 0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1l0,-0c-0,-0 -0,-0 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1l0,-0c-0,-0 -0,-0.1 -0,-0.1 0,-0 0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 0,-0 0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1 -0,-0 -0,-0 -0,-0 -0,-0 -0,-0.1 -0,-0.1l0,-0c-0,-0 -0,-0.1 -0,-0.1l0,-0c0,-0 0,-0.1 -0,-0.1l0,-0 0,-0.1c0,-0 0,-0 0,-0 0,-0 0,-0.1 0,-0.1l0,-0c0,-0 0,-0.1 0,-0.1 0,-1.2 0.3,-1.6 0.3,-1.6l0.1,-0.2c0,0 0.4,-1.3 1.1,-2.3l-0,0c0,0 0.4,-0.7 1.1,-0.8 0.7,-0.1 0.9,0.1 1.3,0.2 0,0 0.1,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0 0,0 0,0 0,0 0,0 0,0 0.1,0l0,0c0,0 0,0 0.1,0 0,0 0,0 0,0l0,0 0,0 0,0c0,0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,0 0,-0 0,-0 0,0 0,0 0,-0 0,-0 0,-0 0,-0 0,0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,0 0,0 0,-0 0,-0 0,-0 0,-0l0,0c0,-0 0.1,-0 0.1,-0 0,0 0,0 0,-0 0,-0 0,-0 0,-0 0,0 0,0 0,-0 0,-0 0,-0 0,-0 0,0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0l0,0c0,-0 0,-0 0,-0l0,-0c0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0.3,-0.2 0.5,-0.5 0.7,-0.7 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,0 0,0 0,-0 0,-0 0.1,-0.1 0.1,-0.1 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0l0,-0c0,-0 0,-0.1 0,-0.1 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0,-0 0.1,-0.1 0.1,-0.2 0.1,-0.2 0.6,-1.3 0,-2.7 -0.2,-3 -0.3,-0.3 -1,-0.8 -1,-0.8 0,0 -0.4,-0.3 -1,-0 -0.5,0.2 -0.7,0.2 -0.7,0.2 -0,-0.5 0.1,-1.3 0.5,-2.1 0.3,-0.8 1,-2.1 1,-2.1 0,0 1,-1.7 1.4,-2.7 0.4,-1 0.4,-1.8 0.4,-1.8 0,0 -0.7,-0.9 -0.8,-1.1 -0.1,-0.1 -0.3,-0.2 -0.3,-0.2 -0.2,0.1 -0.3,0.1 -0.3,0.1l0.2,-0.1c0,0 0.4,-0.5 1,-0.3 0.6,0.1 1,-0.1 1,-0.1C188.2,137.4 188.8,136.1 188.8,136.1L189.7,134.2 189,133c0,0 -0.1,-0 -0.9,0.2 0,0 -0.7,1.8 -1.6,2.9 0,0 -0.3,0.5 -0.6,0.4 -0.3,-0.1 -0.6,-0.1 -0.8,-0.1 -0.3,0.1 -1.1,0.3 -1.8,1.3 -0.7,1 -0.8,1.7 -0.4,1.9 0.4,0.2 1,-0.1 1.3,-0.4 0.3,-0.3 0.6,-0.4 0.7,-0.4 0.1,0 0.1,0.3 0.1,0.4 -0,0.1 -0.1,1.3 -1.5,3.6 -0.3,0.6 -0.8,1.5 -1,1.9l0.6,0.4 -0.9,0.5c-0.2,0.7 -0.6,1.8 -0.4,2.4 0.2,0.9 1.1,0.9 1.1,0.9 0,0 0.6,0 1.2,-0.3 0.7,-0.3 0.8,1.1 0.8,1.4 0,0.2 -0,1.6 -0.9,2.3 0,0 -0.4,0.3 -0.9,0.3 -0.5,0 -0.9,-0.2 -0.9,-0.2 0,0 -0.9,-0.3 -1.5,0.1 -0.6,0.3 -1.2,1 -1.8,2 -0.5,1 -1,2.8 -0.9,4.1 0,1 0.2,2 0.3,2.7l0.6,0.4 -0.5,0.6c0.1,1.1 0.2,3.1 0.1,3.8 -0,0.8 -0.1,2.6 -1,3 0,0 -0.3,0.2 -0.8,-0.2C176,168.5 175.4,168.5 175.2,168.5c-0.1,-0 -0.2,0 -0.4,0.1 -0.4,0.1 -0.9,0.4 -1.2,1.2 -0.4,1.1 -0.3,2.5 -0.3,3.3 0.1,0.8 0.8,2.2 1.8,2.2 0,0 0.4,0.1 0.9,-0.4 0.5,-0.5 0.8,-0.6 1.1,-0.6 0.2,0 0.7,0.3 1,2.6 0.3,2.3 0.5,4.2 0.5,6.2l0.5,0.3 -0.7,0.7c-0,0.2 -0.1,0.4 -0.1,0.6 -0.2,0.6 -0.2,1.3 -0,2.4 0.1,1.1 0.8,3.4 1.6,4 1.2,0.8 1.9,0.8 2.7,0.7 0.8,-0.1 1.3,-0.7 1.3,-0.7 0,0 0.3,-0.3 0.6,-0.2 0.3,0.1 1.2,0.6 1.9,1.9 0.7,1.3 0.8,2.8 -0.3,3 -1.1,0.3 -3,-0.8 -3,-0.8 0,0 -1.1,-0.6 -2,0.1 -0.9,0.7 -0.9,1.7 -0.5,2.9 0.2,0.7 0.7,1.8 1.4,2.9l0.7,0.3 -0.2,0.5c0.5,0.7 1,1.4 1.6,1.9 0,0 2.3,2.5 3.6,4.1 0,0 0.1,0.1 -0.1,0 -0.2,-0.1 -1.2,-0.6 -1.7,-0.5 -0.5,0 -0.4,0.4 -0.4,0.4 0,0 0.2,1.2 3.7,3.1 0,0 1.3,0.7 2.1,0.7 0,0 0.3,0 0.6,-0.3 0.3,-0.4 0.4,-0.3 0.6,-0.2 0.2,0.1 0.5,0.2 1.6,1 1.1,0.8 3.2,2 4,2.5 0.8,0.5 0.7,0.6 0.6,1 -0.2,0.4 0.5,0.6 0.5,0.6 0,0 1.8,0.8 2.7,0.8 1,-0 1.4,-0.1 1.9,0 0.6,0.1 1.2,0.3 1.2,0.3 0.1,0 -0.3,0 -0.3,0 0,0 -2.2,-0.3 -2.3,-0.2 -0.1,0.1 0,0.2 0.9,0.4l0,0c1.2,0.2 2.3,0.4 3.5,0.5 -0.5,-0.1 -2.3,-0.3 -3.5,-0.7 0,0 -0.1,-0.1 0.2,-0 0.3,0.1 1.9,0.2 2.3,0.1 0.4,-0.1 -0.1,-0.3 -0.1,-0.3 0,0 -0.8,-0.4 -2.7,-0.5 0,0 -0.7,-0 -1.4,0 -0.6,0.1 -1.3,-0.2 -1.3,-0.2 0,0 -1,-0.3 -0.7,-0.6 0.1,-0.2 0.1,-0.3 0.1,-0.5l-0.4,-0.3 0,0z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m221.7,211.7 l-0.4,0.6c0.1,0.6 -0.1,0.8 -0.2,1 -0.1,0.2 -0.5,0.5 -0.3,1.1 0.2,0.5 1.6,0.4 2.3,0.1 0.8,-0.2 1.5,-0.5 2,-0.6 0.5,-0.2 0.7,0.1 0.7,0.1 0,0 0.2,0.2 -0.5,0.6 -0.8,0.4 -2.2,0.6 -2.8,0.7 -0.7,0.1 -0.5,-0 -1.5,0.3 -1,0.3 -0.1,0.7 -0.1,0.7 2.3,0.6 3.9,0.1 3.9,0.1l0.3,-0.1c0.2,-0.1 0.5,-0.1 0.7,-0.2 -1.9,0.4 -3.1,0.1 -3.5,0.1 -0.4,-0.1 -0.7,-0.1 -0.8,-0.3 -0.1,-0.2 0.4,-0.2 0.4,-0.2 0,0 1.6,-0.2 3,-0.6 1.4,-0.5 1.8,-0.9 1.7,-1.2 -0.1,-0.3 -0.8,-0.3 -1.7,-0 -0.9,0.3 -2.2,0.7 -2.5,0.8 -0.3,0.1 -0.6,0.1 -0.8,-0.1 -0.1,-0.2 -0.2,-0.5 0.1,-0.8 0.3,-0.3 0.4,-0.6 0.4,-0.6 0.1,-0.2 0.1,-0.5 0,-0.7l-0.6,-0.3 0.5,-0.1c-0.3,-1 -1,-2.1 -1.2,-2.4 -0.3,-0.5 -0.8,-0.7 -2.2,-0.5 -1.4,0.2 -3.1,1 -3.1,1 0,0 -1.7,0.9 -3.1,0.7 -1.3,-0.2 -1.6,-1.5 -1.6,-1.9 0,-0.4 0.3,-0.8 1,-1 0.7,-0.3 2.3,-0.6 4.6,-0.7 2.3,-0.1 3.2,-1.6 3.2,-1.6 0.3,-0.4 0.9,-1.4 -0.5,-2.2 -1.3,-0.7 -1.3,-0.5 -2,-1 -0.6,-0.5 -1.3,-1.1 -1.6,-1.9 -0,-0.1 -0.1,-0.2 -0.1,-0.3l-0.8,-0.5 0.4,-0.3c-0.3,-0.6 -0.6,-1.2 -0.6,-1.2 0,0 -1.2,-1.8 -0.2,-3.4 1,-1.7 2.5,-2.2 2.5,-2.2 0,0 1.4,-0.3 2.8,0 1.3,0.3 2,-0.2 2,-0.2 0,0 0.8,-0.3 1,-1.9 0.2,-1.6 -0,-4.6 -2.1,-5.2 -2.1,-0.6 -3.3,0.5 -3.3,0.5 0,0 -1.1,1.3 -1.5,1.5 -0.4,0.2 -0.9,0.5 -0.9,0.5 0,0 -0.8,0.5 -1.3,0.6C213.2,188 211.9,186.3 211.8,184.9 211.6,183.7 211.4,182.7 211.5,180.2L211,179.6 211.5,179.1c0.1,-2.8 -0.4,-4.7 -1.1,-6 -0.7,-1.3 -2,-2 -2.6,-2.3 -0.6,-0.3 -2,-0.4 -2.9,-0.1 -0.9,0.3 -1.1,0.6 -1.5,1.2 -0.3,0.6 -0.8,0.6 -0.8,0.6 0,0 -1.3,0 -1.7,-2 -0.6,-2.8 0.3,-3.7 0.3,-3.7 0,0 0.3,-0.4 1.3,-0.6 1,-0.1 1.6,0.1 2.4,0.3 0.7,0.2 1.3,0.1 2.2,-0.3 0.9,-0.5 1.3,-1.2 1.1,-2.5 -0.2,-1.3 -0.2,-1.6 -1.4,-5.5l-0.8,-0.4 0.5,-0.5c-1.1,-4 -1.2,-6.4 -1.2,-6.4 -0.1,-0.9 0,-1.2 0.6,-1.4 0.5,-0.2 1,-0.2 1.8,-0.1 0.8,0 1.3,-0.1 1.7,-0.3 0.4,-0.2 1.5,-0.8 1.4,-2 -0.1,-1.2 -1,-2.6 -1.8,-3.1 -0.8,-0.5 -1.8,-0.3 -2.4,0.1 -0.6,0.4 -0.8,1 -1.1,1.1 -0.3,0.2 -0.8,0.6 -1.3,0.4 -0.5,-0.1 -0.5,-1.3 -0.8,-2.6 -0.1,-0.8 -0.3,-1.5 -0.3,-1.8l-0.6,-0.2c0,0.5 0.5,3.1 0.5,3.1 0,0 0.2,1.3 0.3,1.6 0.1,0.3 0.3,1 0.3,1 0,0 0.1,0.3 0.4,0.5 0.3,0.2 1,0.2 1.6,-0 0.6,-0.3 0.8,-0.5 1.1,-0.9 0.3,-0.3 0.4,-0.5 0.4,-0.5 0,0 0.6,-0.6 1.4,-0.3 0.8,0.3 1.2,1.1 1.2,1.1l0,0.1c0,0 0.4,0.6 0.4,1.2l0,-0.1c0,0 -0,0.3 -0.6,0.8 -0.6,0.5 -1.1,0.4 -1.6,0.4 -0.4,-0 -0.6,-0.1 -0.7,-0l-0.7,0c-0.7,0.1 -1.1,0.4 -1.1,0.4 -1.7,1 0.7,8.6 0.7,8.6l0,0 -0.3,0.6c0,0 0.5,1.9 0.8,3.1 0.4,1.2 0.5,2.4 0.6,2.7 0.1,0.3 0,0.7 -0.3,1 -0.3,0.3 -1.1,0.5 -1.3,0.5 -0.2,0 -0.5,-0 -0.9,-0.2 -0.4,-0.1 -0.9,-0.2 -0.9,-0.2 0,0 -1,-0.2 -2.1,0.2 -1.1,0.3 -1.9,1.5 -2,2.9 -0.1,1.4 -0.1,2.1 0.5,3.3 0.5,1.2 1.5,1.9 2.3,2 0.7,0 1.4,-0.4 1.8,-1 0.4,-0.6 0.5,-0.7 0.5,-0.7 0.5,-0.3 1.8,-0.4 2.5,-0.2 0.7,0.2 1.9,1 2.5,2.5 0.5,1.2 0.7,2.5 0.7,5l0.5,0.4 -0.6,0.7c-0,0.2 -0,0.5 -0,0.7 -0.1,3.6 0.7,5.4 0.7,5.4 0.5,1 0.9,1.7 1.6,2.1 0.7,0.5 1.6,0.1 1.9,0 0.3,-0.1 1.1,-0.5 1.8,-1 0.7,-0.4 0.7,-0.6 1.5,-1.4 0.8,-0.8 1.9,-0.6 1.9,-0.6 0,0 1,0 1.6,1.2 0.6,1.2 0.5,2.9 0.3,3.5 -0.1,0.6 -0.4,1 -1,0.9 -0.6,-0.1 -1.5,-0.2 -1.9,-0.2 -0.3,-0 -1.3,-0 -2.2,0.2 -0.9,0.2 -2,0.9 -3.2,2.7 -0.9,1.4 -0.4,2.8 -0.2,3.3 0.2,0.4 0.6,1 1,1.8l0.7,0.2 -0.3,0.6c0.4,0.9 0.6,1.4 1.2,2 0.6,0.7 1.5,1.2 2.7,1.6 1.1,0.4 0.6,1.2 0.6,1.2 -0.6,1.4 -2.5,1.4 -3.1,1.5 -0.6,0.1 -1.7,0.2 -2.8,0.4 -1.1,0.2 -2.1,0.4 -2.7,1.1 -0.6,0.7 -0.4,1.4 -0,2.2 0.4,0.8 1.3,1.2 2.6,1.1 1.3,-0.1 2.2,-0.4 3,-0.8 0.8,-0.3 2.2,-0.7 2.6,-0.9 0.4,-0.1 1,-0.4 1.4,0.2 0.4,0.6 0.9,1.6 1.1,2.3l0.5,-0.1 0,0z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillAlpha="0.96" android:fillColor="#000000" - android:pathData="m214.9,199.2 l0.4,-0.3c-0.3,-0.6 -0.6,-1.2 -0.6,-1.2 0,0 -1.2,-1.8 -0.2,-3.4 1,-1.7 2.5,-2.2 2.5,-2.2 0,0 1.4,-0.3 2.8,0 1.3,0.3 2,-0.2 2,-0.2 0,0 0.8,-0.3 1,-1.9 0.2,-1.6 -0,-4.6 -2.1,-5.2 -2.1,-0.6 -3.3,0.5 -3.3,0.5 0,0 -1.1,1.3 -1.5,1.5 -0.4,0.2 -0.9,0.5 -0.9,0.5 0,0 -0.8,0.5 -1.3,0.6 -0.4,0.1 -1.7,-1.6 -1.8,-3 -0.1,-1.2 -0.4,-2.2 -0.3,-4.7l0,-0 -0.5,-0.6 0.5,-0.5c0.1,-2.8 -0.4,-4.7 -1.1,-6 -0.7,-1.3 -2,-2 -2.6,-2.3 -0.6,-0.3 -2,-0.4 -2.9,-0.1 -0.9,0.3 -1.1,0.6 -1.5,1.2 -0.3,0.6 -0.8,0.6 -0.8,0.6 0,0 -1.3,0 -1.8,-2 -0.6,-2.8 0.3,-3.7 0.3,-3.7 0,0 0.3,-0.4 1.3,-0.6 1,-0.1 1.6,0.1 2.3,0.3 0.7,0.2 1.3,0.1 2.2,-0.3 0.9,-0.5 1.3,-1.2 1.1,-2.5 -0.2,-1.3 -0.2,-1.6 -1.4,-5.5l-0.8,-0.4 0.5,-0.5c-1.1,-4 -1.2,-6.4 -1.2,-6.4 -0.1,-0.9 0,-1.2 0.6,-1.4 0.5,-0.2 1,-0.2 1.8,-0.1 0.8,0 1.3,-0.1 1.7,-0.3 0.4,-0.2 1.5,-0.8 1.4,-2 -0.1,-1.2 -1,-2.6 -1.8,-3.1 -0.8,-0.5 -1.8,-0.3 -2.4,0.1 -0.6,0.4 -0.8,1 -1.1,1.1 -0.3,0.2 -0.8,0.6 -1.3,0.4 -0.5,-0.1 -0.5,-1.3 -0.8,-2.6 -0.1,-0.8 -0.3,-1.5 -0.3,-1.8L202.5,140.9c0,0.5 0.5,3.1 0.5,3.1l0.3,1.5 0,0c0,0 0,0 0,0 0,0.1 0,0.2 0.1,0.3 0.1,0.2 0.3,0.4 0.9,0.5 1,0.1 1.6,-0.4 1.9,-0.7 0.2,-0.2 0.8,-0.8 0.8,-0.8 0,0 0.3,-0.6 1.2,-0.5 0.9,0.1 1.1,0.7 1.3,0.9 0.2,0.2 1.5,1.8 0.6,2.6 -0,0 -0.1,0.1 -0.1,0.1 -0.1,0.1 -0.2,0.2 -0.4,0.4 -0.6,0.5 -1.1,0.4 -1.6,0.4 -0.4,-0 -0.6,-0.1 -0.7,-0l-0.7,0c-0.7,0.1 -1.1,0.4 -1.1,0.4 -1.7,1 0.7,8.6 0.7,8.6 0,0 0.6,1.9 0.9,2.8 0.3,0.9 0.5,1.5 0.7,3 0.3,1.5 -0.2,1.9 -0.5,2.1 -0.3,0.1 -0.9,0.5 -1.6,0.6 -0.7,0 -1,-0.3 -2.2,-0.4 -1.2,-0.1 -2.1,0.3 -2.5,0.8 -0.4,0.5 -0.8,1.7 -0.6,3.1 0.2,1.4 0.5,1.9 1,2.5 0.5,0.6 1.1,0.9 1.8,0.6 0.7,-0.2 0.7,-0.7 1.1,-1.1 0.5,-0.5 0.8,-0.7 1.9,-0.8 1.1,-0 1.8,0.3 2.4,0.7 0.6,0.5 1.8,1.5 2.1,3.1 0.3,1.6 0.4,2.1 0.4,3.4 0,1.3 -0.1,2.8 -0.1,4.1 0,1.3 0.2,2.6 0.5,3.5 0.4,0.9 0.9,1.6 1.3,2 0.4,0.4 0.8,0.4 1.3,0.2 0.4,-0.2 1.4,-0.7 2.2,-1.2 0.8,-0.5 0.7,-0.9 1.5,-1.4 0.8,-0.5 1.7,-0.6 2.3,-0.5 0.6,0.1 1.6,0.6 1.9,1.7 0.4,1.2 0.3,2.5 0.3,2.5 0,0 0,1.1 -0.4,1.7 -0.4,0.6 -1.2,0.6 -1.5,0.5 -0.3,-0.1 -1,-0.1 -1,-0.1 0,0 -1.3,-0.2 -2.4,0.1 -1,0.2 -1.9,1 -2.5,1.8 -0.6,0.8 -0.9,1.5 -0.9,2 -0,0.5 0,1.5 0.6,2.4 0.6,0.9 0.7,1.3 1.3,2.6 0.6,1.3 2,2 2,2 0,0 1.3,0.5 1.8,0.9 0.5,0.4 0.5,0.8 0.4,1.1 -0.1,0.4 -0.4,1 -1.5,1.5 -1.1,0.5 -2.4,0.5 -3.2,0.6 -0.8,0.1 -2.5,0.3 -3.4,0.8 -1,0.5 -0.9,1.3 -0.9,1.3 0,0 -0,1.4 1.2,1.8 1.3,0.4 2.4,0 3,-0.2 0.5,-0.2 1.4,-0.5 1.4,-0.5 0,0 1.7,-0.6 2.5,-0.8 0.9,-0.2 1.4,-0.3 2,0.8 0.6,1.1 0.9,1.7 1,2.4 0.1,0.7 -0.2,1.1 -0.4,1.3 -0.2,0.3 -0.2,0.4 -0.2,0.4 -0.1,0.8 1.1,0.7 1.1,0.7 0,0 0,-0 0.1,-0 -0.2,0 -0.5,-0 -0.5,-0.2 -0.1,-0.2 -0.2,-0.5 0.1,-0.8 0.3,-0.3 0.4,-0.6 0.4,-0.6 0.3,-1.3 -1,-3.1 -1.3,-3.6 -0.3,-0.5 -0.8,-0.7 -2.2,-0.5 -1.4,0.2 -3.1,1 -3.1,1 0,0 -1.7,0.9 -3.1,0.7 -1.3,-0.2 -1.6,-1.5 -1.6,-1.9 0,-0.4 0.3,-0.8 1,-1 0.7,-0.3 2.3,-0.6 4.6,-0.7 2.3,-0.1 3.2,-1.6 3.2,-1.6 0.3,-0.4 0.9,-1.4 -0.5,-2.2 -1.3,-0.7 -1.3,-0.5 -2,-1 -0.6,-0.5 -1.3,-1.1 -1.6,-1.9 -0,-0.1 -0.1,-0.2 -0.1,-0.3l-0.8,-0.5 0,0z" - android:strokeAlpha="0.96" android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m240.3,205.3 l0.4,0.2c1,-0.6 1.4,-0.7 1.6,-0.9 1.1,-0.7 2.4,-1.4 2.7,-1.7 0,0 0.7,-0.5 0.1,0.2 -0.6,0.7 -0.9,0.9 -0.9,0.9 0,0 -0.6,0.6 -0.4,0.7 0,0 0.2,0.2 1.1,-0.6 0.9,-0.9 2,-2.1 2.1,-2.3 0.1,-0.2 0.1,-0.3 0.1,-0.3 0,0 0.1,-0.2 0.3,-0.4 0.1,-0.1 1.3,-1.4 1.8,-2 0,0 0,0 0,0 0.3,-0.3 0.5,-0.7 0.7,-1 -0.3,0.4 -1.6,1.7 -2.3,2.5 0,0 -0.7,0.7 -0.9,1 -0.2,0.3 -0.2,0.4 -0.2,0.4 0,0 -0.1,0.2 -0.4,0.5 -0.3,0.3 -1.1,1.1 -1.1,1.1 0,0 -0.5,0.4 -0.7,0.4 -0.2,0 0.4,-0.5 0.4,-0.5 0,0 0.5,-0.6 0.9,-1 0.4,-0.5 0.1,-0.4 0.1,-0.4 0,0 -0.2,-0 -0.9,0.4 -0.7,0.5 -1.3,0.8 -1.3,0.8 0,0 -1.6,0.9 -2.6,1.5 -1,0.6 -3.3,1.8 -4.7,2.3 -1.3,0.5 -2,0.7 -1.9,0.5 0.1,-0.2 0.4,-0.4 0.4,-0.4 0,0 0.4,-0.4 0.4,-0.7 0,0 0.1,-0.5 -1.5,-0.2 -1.6,0.3 -3,1.1 -3,1.1 0,0 -2.4,1.1 -1.8,1.7 0,0 0.1,0.2 0.6,0.3 0.5,0.2 -0.9,0.6 -0.9,0.6 -1.3,0.4 -2.2,0.6 -3.5,0.9 -1.8,0.4 -3.3,0.7 -3.9,0.8 -0.2,0 -0.2,0.1 -0.2,0.1 0,0 -1.1,0.3 -3,1 -1.9,0.7 -5.5,1.3 -5.5,1.3 0,0 -2.4,0.3 -2.6,0.6 -0.2,0.3 0.2,0.5 0.2,0.5 0,0 0.3,0.2 1.5,0.3 0,0 0.4,0 0.4,0 0,0 0,0.1 -0.2,0.1 -0.3,0.1 -0.8,0.3 -2.6,0.5 -1.8,0.2 -1.8,-0.1 -1.8,-0.1 0,0 -0,-0.1 0.1,-0.2 0.1,-0.1 0,-0.3 -0.3,-0.5 0,0 -0.4,-0.3 -1.7,-0.2 -1.3,0 -3.9,0 -6.3,-0.1 -2.2,-0.1 -5.2,-0.5 -5.7,-0.6 0,0 -0.1,-0 -0.2,-0.1 -0.1,-0.1 -0.6,-0.4 -1.1,-0.7 -0.5,-0.3 -1.9,-0.8 -1.9,-0.8 0,0 -1.9,-0.7 -1.8,-0.5 0,0.1 0.1,0.1 0.2,0.2 0.3,0.2 0.7,0.3 1,0.5l0,-0c0,0 -0.7,-0.4 -0.5,-0.4 0.2,0 0.4,0.1 0.4,0.1 0,0 1.1,0.3 1.8,0.6 0.7,0.3 1.3,0.8 1.3,0.8 0,0 0.9,0.5 2.1,0.7 1.2,0.2 2.9,0.4 3.5,0.4l0.6,-0.3 0.4,0.3c1,0.1 2.4,0.1 2.4,0.1 0,0 2.8,0.1 4.3,-0 0.7,-0.1 0.5,0.3 0.5,0.3 0,0 -0.2,0.3 0.2,0.5 0,0 0.7,0.4 3.1,0.1 2.4,-0.3 2.9,-0.8 2.9,-0.8 0,0 0.3,-0.3 -0.3,-0.4 -0.5,-0.1 -0.5,-0 -1.1,-0.1 -0.6,-0.1 -0.9,-0.2 -0.5,-0.3 0.4,-0.1 1.1,-0.2 1.1,-0.2 0,0 2.1,-0.3 3.8,-0.7 0,0 1.8,-0.4 3.6,-1 0.7,-0.2 1.3,-0.4 1.7,-0.6l0.4,-0.6 0.6,0.3c0.1,-0 0.1,-0 0.1,-0 0,0 2.1,-0.5 3,-0.7 0.9,-0.2 2.9,-0.6 3.8,-1 0.9,-0.4 1.3,-0.7 1.4,-1 0.1,-0.3 -0.4,-0.4 -0.4,-0.4 0,0 -0.5,-0.1 -0.5,-0.3 0.1,-0.2 0.3,-0.4 1.1,-0.7 0.9,-0.4 1.9,-0.8 3,-1.1 1.1,-0.3 0.7,0.2 0.7,0.2 0,0 -0.6,0.7 -0.7,0.9 -0.1,0.3 0,0.3 0.1,0.3 0.1,0 0.6,0 0.9,-0.1 0.4,-0.1 3.2,-1.2 4.9,-2.2 0,-0 0.1,-0 0.1,-0.1l0.4,-0.6 0,0z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m247.7,187.4 l-0.3,-0c-1.7,1.4 -2.2,1.8 -3.5,2.7 0,0 -1.5,1.1 -3.2,2 -1.7,0.9 -3.6,0.8 -3.6,0.8 0,0 -0.5,-0.1 -0.3,-0.4 0.3,-0.4 0.6,-1.3 0.7,-1.8 0.1,-0.5 0.4,-1.7 -0.6,-2.1 -1,-0.4 -2.8,0.2 -2.8,0.2 0,0 -4.2,1.1 -5.9,3 -1.7,1.8 -0.3,2.6 -0.3,2.6 0,0 0.7,0.5 1.3,0.7 0.6,0.2 0.5,0.4 0.3,0.5 0,0 -1.9,1.2 -4.1,1.8 0,0 -3,0.9 -6,1.1 -2.9,0.2 -4.2,0.3 -4.2,0.3l-0.4,0.3 -0.7,-0.2c-1.2,0.1 -3.2,0.4 -5.2,0.9 -2.4,0.6 -4.7,1.1 -6.4,2.1 0,0 -1.2,0.8 -0.5,1.6 0.7,0.8 1.4,1.1 1.4,1.1 0,0 0.4,0.2 0.4,0.3 -0,0.2 -0,0.3 -0.3,0.5 0,0 -1.3,0.8 -3.8,0.8 -2.5,0 -3.6,0 -4.4,-0.6 -0.6,-0.5 0.2,-1.7 0.2,-1.7 0,0 0.3,-0.6 0,-1.3 -0.3,-0.8 -2.1,-0.8 -2.1,-0.8L191.2,201.7C188.3,201.7 184.5,201.3 182.8,201.1c0,0 -0,-0 -0,-0l-0,0.2 -0.7,-0.3c-1.1,-0.2 -3,-0.6 -3.8,-1 -0.7,-0.4 -1.1,-0.3 -1,-1 0.1,-0.7 -0.7,-1.7 -0.7,-1.7 0,0 -1.1,-1.2 -2.1,-1.9 -1,-0.7 -1.4,-0.5 -1.4,-0.5 0,0 -0.4,0.2 -0,1.2 0.4,1 0.8,1.3 0.8,1.3 0,0 0.2,0.2 0.1,0.3C173.9,197.6 173.5,197.4 173.3,197.1 173,196.9 171.5,195.5 171,195l0.1,0.3c0,0 0,0.1 0,0.1 0.2,0.3 0.8,1.2 2,2.1 1.4,1.1 1.4,0.7 1.4,0.7 0,0 0.1,-0.4 -0.3,-0.8C174,197 173.4,196.2 173.6,195.9 173.7,195.6 173.8,195.6 173.8,195.6c0,0 0.1,-0 0.6,0.3 0.4,0.3 1.4,1 1.9,1.6 0.5,0.6 0.4,1.1 0.4,1.1 0,0 -0.1,0.5 0.4,1.1 0.5,0.6 1.6,1.6 5.4,2.2 0,0 0,0 0.1,0l0.2,-0.5 0.5,0.6c3.3,0.5 5.1,0.5 5.1,0.5 0,0 4.4,0.2 5.5,0.2 1.2,0 1,0.6 1,0.6 0,0 -0.1,0.3 -0.2,0.6 -0.1,0.3 -0.5,1.3 -0.1,1.8 0,0 0.5,1.3 4.1,1.4 0,0 3.1,0.2 5.2,-0.6 2.1,-0.9 0.2,-2.1 0.2,-2.1 0,0 -0.7,-0.4 -1,-0.7 -0.3,-0.2 -0.2,-0.4 -0.1,-0.6 0.1,-0.1 0.3,-0.3 0.5,-0.5 0.2,-0.1 1.1,-0.6 5,-1.6 3.8,-1 6.1,-1.1 6.1,-1.1 0,0 0,-0 0.1,-0l0.3,-0.6 0.8,0.5c0.7,-0.1 1.6,-0.1 2.3,-0.2 1.6,-0.1 4,-0.4 5.4,-0.7 1.4,-0.3 3.6,-1 5.2,-1.8 1.6,-0.8 1.7,-1.4 1.7,-1.4 0,0 0.3,-0.4 -0.4,-0.9 -0.7,-0.5 -1,-0.4 -1.5,-0.9 -0.6,-0.6 0.5,-1.5 0.5,-1.5 0,0 0.6,-0.8 3.7,-2 3.2,-1.2 3.7,-0.8 3.8,-0.7 0.2,0.1 0.2,0.6 0.1,0.9 -0.1,0.3 -0.5,1.3 -0.7,1.9 -0.2,0.5 -0.3,1.3 0.6,1.5 0.9,0.2 2.1,-0 3.2,-0.4 2.7,-1 3.5,-2.1 7.9,-5.3 0,-0 0,-0 0,-0l0,-0.6 0.6,0.1c1.8,-1.5 3.6,-3.3 3.6,-3.3 0,0 1.2,-1.2 1.7,-2.2 0.6,-1 0,0.8 0,0.8 0,0 -0.3,1.4 0.2,1.9 0.4,0.4 1.4,-0.7 1.4,-0.7 0,0 0.6,-0.7 0.9,-1.9 0.4,-1.7 0.2,-2.1 0.2,-2.1 0,0 -0.2,-0.4 -0.1,-0.8 0.1,-0.4 1.1,-2.8 1.8,-3.7l0.5,-0.5c0,-0 0,-0 0,-0l-0.2,-0.5 0.3,-0.5c0,0 -0.3,0.3 -1.3,2 -1.2,1.9 -1.4,3.5 -1.4,3.5 0,0 -0.1,0.6 -0,1 0.1,0.3 0.2,0.5 0.2,0.6 0,0.1 -0.1,0.9 -0.5,1.6 -0.4,0.8 -0.8,1 -0.8,1 0,0 -0.7,0.5 -0.8,0.1 -0.1,-0.4 -0.1,-0.7 -0,-0.9 0,-0.2 0.3,-1.5 0.2,-1.9 -0,-0.5 -0.4,-0.1 -0.4,-0.1 0,0 -0.1,0.1 -0.3,0.3 -0.2,0.2 -1.2,1.5 -1.6,2 -0.9,1.1 -1.7,1.8 -4,3.6 -0,0 -0,0 -0,0l-0.3,0.6 0,0z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m165,176.9 l0.1,0.9c0.2,0.3 0.5,0.6 1,1.1 1,1 1.3,0.4 1.3,0.4 0,0 0.2,-0.7 -0.1,-1.8 -0.3,-1.2 -0.2,-1.9 0.3,-1.9 0.5,0 2.1,0.3 2.6,1.6 0,0 0.2,0.6 0,1.4 -0.2,0.8 -0.2,1.5 -0,2.1 0.1,0.7 0.7,1.3 1.4,1.8 0.7,0.5 2.5,1.4 4.4,1.5 1.8,0.1 2.4,0 2.4,0l0.7,-0.7 0.1,0.6c0.8,-0.1 2,-0.2 3.4,-0.4 2.3,-0.3 3.9,-0.5 5.4,-0.3 1.5,0.2 1.9,1.4 1.9,1.4 0,0 0.1,0.3 -0.2,0.5 -0.3,0.2 -0.7,0.5 -0.9,0.8 -0.2,0.3 -0.4,1 0.1,1.9 0.5,0.9 2,1.5 3.2,1.3 1.2,-0.1 3.1,-0.6 4.2,-0.9 1.2,-0.3 2.2,-0.9 2.4,-1.8 0.1,-0.9 -1.4,-2.1 -1.4,-2.1 0,0 -0.8,-0.6 -0.8,-0.7 -0.1,-0.1 0.1,-0.2 0.1,-0.2 0,0 0.9,-0.2 1.3,-0.4 0.4,-0.2 1.4,-0.6 3.1,-1.1 1.7,-0.5 5.2,-1.2 5.2,-1.2 0,0 1.9,-0.3 4.3,-0.5l0.6,-0.7 0.4,0.6c0.4,-0 0.8,-0 1.2,-0.1 3.3,-0.1 4.9,-0.5 6.7,-0.9 1.8,-0.4 4.2,-1.8 4.6,-2.1 0.4,-0.3 1.1,-0.6 1.3,-1.8 0.2,-1.2 -1.3,-2 -1.3,-2 0,0 -1.1,-0.6 -1.4,-0.9 -0.2,-0.3 -0,-0.5 -0,-0.5 0,0 0.6,-1.4 2.7,-2.2 2,-0.8 3.4,-1 4.3,-1.1 0.9,-0.1 1.2,0.2 1.3,0.4 0.1,0.1 0.1,0.4 0,0.8 -0.1,0.3 -0.4,1 -0.6,1.3 -0.2,0.3 -0.5,1.1 -0.3,1.5 0.2,0.4 0.8,0.5 1.5,0.4 0.8,-0.1 2.8,-0.7 4.5,-1.4 1.8,-0.7 4.7,-2.2 4.7,-2.2 0,0 0,-0 0,-0l0.1,-0.7 0.7,0.3c0.9,-0.5 2.6,-1.5 3.7,-2.4 1.7,-1.5 3.4,-3 3.9,-3.4 0.4,-0.4 0.8,-0.7 1.2,-0.7 0.4,0 0.7,0.3 0.9,1.3 0.2,1 0.3,1.9 0.4,2.4 0.1,0.5 0.3,1.1 0.9,1.2 0.6,0.1 1.4,-0.4 1.7,-0.7 0.3,-0.3 0.9,-1.1 0.8,-2.2 0,0 0.1,-1.5 -0.7,-2.9 0,0 -0.3,-0.6 -0.4,-0.7 -0.1,-0.1 -0.1,-0.2 -0,-0.5 0.1,-0.3 0.4,-0.8 1,-1.1 0.4,-0.2 0.8,-0.3 1,-0.4 0,0 0.3,-0.1 0.6,-0.2l-0.1,-0.4 0.3,0.3c0.4,-0.2 0.6,0 0.6,0l-0.4,-0.5 0.1,-0.4c0,0 -0.3,-0.2 -0.6,-0.1 -0.4,0.1 -0.4,0.3 -0.9,0.4 -0.5,0.1 -1.2,0.3 -1.8,1.2 -0.6,0.9 0,2.1 0,2.1 0,0 0.3,0.5 0.5,0.8 0.2,0.3 1,2 0,3.3 0,0 -0.5,0.6 -1.4,0.8 -0.8,0.2 -0.6,-0.8 -0.7,-1.3 0,0 -0.1,-2.1 -1.1,-3.3 -0.9,-1.1 -2.5,0.8 -3.4,1.4 -0.8,0.6 -3,2.9 -6.2,4.6l-0.5,0.8 -0.3,-0.4c-1.5,0.8 -5,2.5 -7.3,3.3 0,0 -1.7,0.7 -2.4,0.7 0,0 -0.2,0 -0,-0.2 0.1,-0.2 0.3,-0.3 0.5,-0.7 0.2,-0.4 0.6,-1.3 0.6,-2.2 0,-0.9 -1,-1.8 -2.5,-1.6 -1.4,0.2 -2.8,0.6 -4.5,1.2 -1.7,0.6 -3.1,2 -3.3,3.1 -0.2,1.1 1,1.8 1,1.8 0,0 1.4,0.7 1.5,1.1 0.2,0.4 0,0.7 0,0.7 0,0 -0.1,0.4 -0.7,0.7 -0.6,0.3 -2.2,1.2 -2.2,1.2 0,0 -2,1.1 -5.2,1.4 0,0 -2.8,0.2 -4.5,0.3 -0,0 -0,0 -0.1,0L211,179.6 210.4,179.2c-1.5,0.1 -3.3,0.3 -3.3,0.3 0,0 -4,0.6 -7.6,1.7 -3.1,1 -3.7,1.5 -3.7,1.5 0,0 -0.7,0.6 -0.1,1.3 0,0 0.3,0.5 1,1 0.6,0.5 1.1,1 1.1,1.2 -0.1,0.2 -0.3,0.4 -0.3,0.4 0,0 -0.9,0.8 -4.5,1.4 0,0 -2.3,0.5 -3.1,-0.3 -0.7,-0.7 -0.4,-1.2 -0.4,-1.2 0,0 0,-0.2 0.6,-0.5 0,0 0.9,-0.6 0.6,-1.6 -0.3,-1 -2,-2.4 -3.8,-2.3 0,0 -2.1,0 -7.6,0.7 0,0 -0,0 -0,0l-0.2,0.5 -0.6,-0.4c-0.3,0 -0.7,0.1 -1,0.1 -0.9,0.1 -2.3,-0.1 -4,-0.6 -1.7,-0.5 -2.7,-1.4 -2.9,-2 -0.1,-0.4 0,-0.9 0,-0.9 0,0 0.3,-1.2 0.1,-2.2 -0.2,-1 -0.5,-1.8 -1.5,-2.4 -1,-0.6 -1.5,-0.5 -1.5,-0.5 0,0 -0.9,-0.1 -0.8,1.3 0,1.5 0.2,2.1 0.2,2.1 0,0 0.2,0.5 -0.1,0.6 -0.3,0.1 -0.7,-0.3 -0.7,-0.3 0,0 -0.9,-0.9 -1.5,-1.6l0,0.1 -0.2,0.5c0,0 0.1,0.1 0.2,0.3l0.1,-0.7z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m248.3,142.8 l0.2,0.8c0,0 -0.5,0.3 -1.6,0.6 -1,0.3 -2,0.7 -2,0.7 0,0 -0.8,0.3 -0.5,0.9 0.3,0.7 0.8,1 0.8,1 0,0 0.7,0.6 0.7,1.1 0,0.5 -0.2,0.7 -0.7,1 -0.5,0.3 -1,0.3 -1,0.3 0,0 -1.2,0.2 -1.9,-0.4 -0.6,-0.6 -0.7,-1.5 -0.7,-1.5 0,0 -0,-0.8 -1.1,-1.2 -1,-0.3 -2.3,0.4 -2.3,0.4 0,0 -1,0.5 -2,1.2 -1.1,0.7 -3,1.5 -4.3,2l-0.1,0.6 -0.7,-0.4c-1.3,0.5 -3,1 -3,1 0,0 -2.3,0.9 -3.9,1.1 -1.5,0.2 -1.9,-0 -2.1,-0.2 -0.2,-0.2 0,-0.9 0,-0.9 0,0 0.6,-1.3 0.3,-1.9 -0.3,-0.7 -2.3,-0.8 -2.3,-0.8 -0,0 -2.1,-0.2 -4.1,0.9 -1.8,1 -2,1.5 -2,1.5 0,0 -0.6,0.9 0.1,1.7 0.7,1 1.7,1.1 1.7,1.1 0,0 0.9,0.1 1.2,0.4 0.2,0.3 0.1,0.6 0.1,0.6 0,0 -0.3,0.9 -2.1,1.2 0,0 -2.9,0.9 -8.4,1.6l-0.5,0.5c-3.5,0.4 -7.5,1.3 -9.8,1.8 -2.2,0.6 -2.4,1.2 -2.4,1.2 -0.5,0.8 0.1,1.1 0.1,1.1 0,0 0.8,0.3 0.9,1.1 0.2,0.8 -0.7,1.5 -0.7,1.5 0,0 -1.1,0.9 -2.7,1.2 -1.6,0.3 -2.2,0.3 -3.2,-0.4 -0.8,-0.7 -0.3,-1.7 0.3,-2.1 0.6,-0.4 0.8,-0.8 0.9,-1 0.1,-0.2 0,-0.3 0,-0.3l-0.5,-0.5c-1.9,-1.2 -9.2,0.1 -9.2,0.1 0,0 0,0 0,0l-1.2,0.3 -0.6,-0.4c0,0 -2.1,0.6 -4.5,0.5 -2.5,-0 -1.2,-2 -1.2,-2 0,0 0.6,-1 0.7,-1.6 0,0 0.2,-1.6 -1.3,-1.5 -1.5,0.1 -1.8,1.4 -1.8,1.4 0,0 -0.1,0.7 -0.1,1.3 0,0.5 -0,1.7 -0.7,2.4 -0.7,0.7 -1.4,0.5 -1.4,0.5 0,0 -1.2,-0.5 -1.5,-0.7 -0.3,-0.1 -0.5,-0.1 -0.7,-0.1 -0,0 -0,0 -0.1,0l-0.2,0.7 0,-0.6c-0.1,0.2 -0.3,0.4 -0.3,0.4l0.1,0.3 -0.2,0.5c-0,0 -0,0 -0,0l0,0c0,0 0.1,-0.2 0.2,-0.3L165.3,162.2 165.3,162.4c0.1,-0 0.1,-0.1 0.2,-0.1 0.3,-0 0.6,0.1 0.6,0.1 0,0 1.1,0.6 1.5,0.7 0.5,0.1 0.8,-0.1 1.1,-0.3 0.5,-0.3 1.1,-1 1.3,-1.7 0.2,-0.6 0.3,-2.2 0.3,-2.2l0,0c0,0 0,-0.4 -0,-0.5 -0,-0.1 -0.1,-0.5 0.2,-0.7 0.3,-0.2 0.4,-0.3 1.1,-0.3 0.6,-0 0.8,0.4 0.8,0.4 0,0 0.2,0.3 0.2,0.5 0,0.2 -0.1,0.3 -0.1,0.3 0,0 -0.3,0.6 -0.5,0.9 -0.1,0.3 -0.6,1.2 -0.5,2 0.1,0.8 1.4,1.2 1.4,1.2 0,0 1,0.2 2.4,0l2.9,-0.5 0.5,-0.6 0.2,0.4c0.7,-0.1 2,-0.3 3.3,-0.5 2.2,-0.2 4.4,-0.2 5.4,-0.1 0,0 0.4,0.1 0.4,0.2 -0.1,0.1 -0.4,0.4 -0.4,0.4 0,0 -0.1,0.1 -0.6,0.6 -0.5,0.5 -0.6,1.1 -0.6,1.5 -0,0.5 0.5,1.8 2.2,2.2 1.8,0.4 3.8,-0.3 3.8,-0.3 0,0 1.3,-0.3 2.6,-1.5 1.3,-1.3 0,-2.9 0,-2.9 0,0 -0.2,-0.3 -0.6,-0.4 0,0 -0.2,-0 -0.1,-0.2 0.1,-0.1 0.3,-0.6 1.3,-0.8 0.9,-0.2 3.7,-1.1 10.3,-2l0.3,-0.6 0.8,0.4c2.5,-0.3 4.2,-0.6 7.3,-1.3 0,0 2.8,-0.5 3.4,-1.5 0.3,-0.6 1,-1.4 -0,-2.3 0,0 -0.1,-0.1 -0.7,-0.3 -0.6,-0.1 -1.1,-0.2 -1.6,-0.6 -0.5,-0.4 -0.5,-0.8 -0.5,-0.8 0,0 -0,-0.4 0.8,-0.9 0,0 0.8,-0.6 2.4,-1.1 1.6,-0.5 3.4,-0.3 3.4,-0.3 0,0 0.8,0.1 0.6,0.6 -0.1,0.5 -0.6,1.4 -0.6,1.8 -0,0.4 0,0.9 0.9,1.3 0.9,0.4 2.1,0.2 2.1,0.2 0,0 1.3,-0.1 3.4,-0.7 2.1,-0.7 4.3,-1.5 4.3,-1.5l-0.1,-0.4 0.9,0.2c0.5,-0.2 1.3,-0.5 2.1,-0.9 1.7,-0.7 2.5,-1.4 3.2,-1.8 0,0 1.7,-1 2.7,-1 0,0 0.2,-0 0.3,0.3 0,0.3 0.1,0.8 0.2,1 0.1,0.3 0.7,1.7 2.5,1.9 1.8,0.2 2.6,-1 2.6,-1 0,0 0.6,-1 -0.5,-2.1 0,0 -0.9,-1 -0.9,-1 0,0 -0.1,-0.1 0.2,-0.2 0.2,-0.1 2.9,-0.8 4,-1.3 0,0 0,-0 0,-0l-0.3,-0.4 0.5,0.3c0.2,-0.1 0.4,-0.2 0.5,-0.4 0.2,-0.3 -0,-0.7 -0,-0.7l0,-0c-0.1,-0.2 -0.2,-0.3 -0.4,-0.5l-0.6,-0.2 -0.1,0 -0.4,0.3" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m171.4,147.1 l-0.3,0.4c0.1,-0 0.2,-0.1 0.2,-0.1 0,0 0.4,-0.1 1,0.1 0.8,0.2 1.9,-0.5 1.9,-0.5 0,0 0.8,-0.5 1.2,-1.3l0.3,-0.9c0,0 0.3,-0.9 1,-1.2 0,0 0.3,-0.2 0.8,-0.2 0.5,-0 0.4,0.3 0.4,0.3 0,0 -0.1,0.2 -0.5,0.8 -0.5,0.6 -0.6,1.1 -0.6,1.1 0,0 -0.3,0.7 0.2,0.9 0,0 0.2,0.1 0.9,-0.1 0.6,-0.2 2.8,-0.8 4.1,-1l0.9,-0.5c-0.3,-0.2 -0.6,-0.4 -0.6,-0.4 -2.2,0.4 -3.9,0.9 -4.4,1.1 -0.6,0.2 -0.6,0.1 -0.6,0.1 -0.2,-0.2 0.4,-0.9 0.4,-0.9 0,0 0.6,-0.8 0.8,-1.6 0.2,-0.8 -0.8,-0.7 -0.8,-0.7 -0.7,0.1 -1.2,0.4 -1.8,1.1 -0.5,0.5 -0.7,1.3 -0.8,1.7 -0.1,0.2 -0.2,0.5 -0.2,0.5 0,0 -0.1,0.2 -0.4,0.3 -0.4,0.2 -1.1,0.4 -1.1,0.4 0,0 -0.5,0 -0.9,-0.1 -0.2,-0.1 -0.8,0 -0.8,0l0.1,-0.5 -0.1,-0 -0.6,0.4c-0.1,0.2 -0.2,0.4 -0.3,0.5 -0.1,0.1 -0.2,0.4 0,0.5 0,0 0.1,0 0.2,0l0.4,-0.4 0,0z" - android:strokeColor="#00000000" android:strokeWidth="1"/> - <path android:fillColor="#000000" - android:pathData="m179.8,139.6 l0.1,0c-0.1,0.4 -0.7,1.1 -1,1.5 -0.1,0.2 -0.2,0.5 -0.4,0.7 0,0 -0,0 0,0 0.1,0 0.8,-0.1 0.9,-0.2 0.1,0 0.1,0 0.1,0 0,0.1 -0.4,0.9 -0.6,1l0,0c0.2,-0 0.5,-0.1 0.6,-0.1 0.4,-0.3 0.4,-0.9 0.7,-1.2 -0,-0.1 -0,-0.1 -0,-0.2 -0.2,-0 -0.6,0 -0.8,0.1l-0,0c0.1,-0.4 0.8,-1.2 1.1,-1.6 0.4,-0.6 0.8,-1.2 1.2,-1.8 0.2,-0.3 0.5,-0.6 0.8,-0.9 0.3,-0.3 0.5,-0.8 0.9,-1l0,-0.1 -0.1,0c-0.2,0.1 -0.6,0.2 -0.8,0.3 0,0.1 0,0.1 0.1,0.1 -0.1,0.4 -0.6,0.6 -0.8,0.9 -0.3,0.5 -0.7,0.9 -1.1,1.4 -0.1,0.2 -0.2,0.4 -0.3,0.5 -0.2,0.2 -0.8,0.2 -1.1,0.4l-0.1,0c0.1,-0.3 0.8,-1.3 1.1,-1.5l0,-0c-0.4,0.1 -0.7,0.3 -0.9,0.4 0,0.1 0,0.1 0.1,0.1 -0.1,0.2 -0.3,0.4 -0.5,0.6 -0.2,0.3 -0.3,0.6 -0.5,0.8 0,0 0,0.1 0,0.1 0.2,-0 1.2,-0.3 1.4,-0.4zM212,144.5c0.2,0.1 0.4,0.1 0.6,0.2 0.1,0 0.3,-0 0.4,-0 -0,-0.6 -0.3,-0.8 -0.5,-1.2 -0.1,-0.2 -0.2,-0.5 -0.3,-0.6 0.1,-0.2 0.7,-0.3 0.9,-0.4 0.6,-0.2 1.3,-0.4 1.9,-0.6 0.3,-0.1 0.6,-0.1 0.8,-0.2 0.1,0 0.2,0 0.3,0.1 0.1,0.2 0.2,1.5 0.1,1.9 -0.4,1.5 -0.8,2.7 -1.8,3.7l0,0c0.4,-0.1 0.5,-0.4 0.8,-0.6 1,-0.7 1.6,-1.8 2,-3.2 0.2,-0.8 -0.1,-1.6 0.2,-2.3l-0,0c-0.1,-0.2 -1,-0.5 -1.3,-0.5 -0.2,0.2 -0.4,0.4 -0.6,0.5 -0.3,0.1 -0.8,0.1 -1.1,0.3 -0.3,-0 -0.5,-0.5 -0.3,-0.7 -0,-0.1 -0,-0.1 -0,-0.1 -0.2,-0.2 -0.8,-0.2 -1.2,-0.1 -0.1,0.1 -0.2,0.1 -0.3,0.3l-0,0c-0,0.1 0,0 0,0.1 0,0 0.2,-0 0.2,0 0.4,0 0.4,0.5 0.6,0.8 -0,0.1 -0,0 -0,0.1 -0.1,0.1 -1.2,0.4 -1.4,0.5 -0.2,0 -0.4,-0.1 -0.5,-0.1 -0.3,-0 -0.6,0.1 -0.8,0.3 0.1,0.1 0.4,0.1 0.5,0.3 0.4,0.5 0.6,1.2 0.9,1.8l0,0zM219.3,144c0.2,0.1 0.2,0.3 0.3,0.5 0.2,0.3 0.4,0.8 0.5,1.1l0,0.3c0.1,0.2 0.4,0.3 0.6,0.4 0.1,-0 0.2,-0.1 0.3,-0.1 -0.1,-0.7 -0.5,-1.3 -0.7,-1.8 -0.1,-0.2 -0.2,-0.4 -0.2,-0.6 -0,-0.1 0.1,-0.2 0,-0.3 -0,-0.1 -0.1,-0.1 -0.1,-0.1 -0.1,-0 -0,-0 0,-0.1 0.1,-0.1 0.2,-0.3 0.3,-0.4 0.1,-0.3 0.1,-0.5 0.4,-0.7 -0,-0.4 -0.6,-0.4 -1,-0.4 -0.1,0 -0.1,0.1 -0.2,0.1 0,0.1 0.1,0.1 0.2,0.1 0.1,1.1 -0.6,2.1 -1.1,2.7 -0.2,0.3 -0.5,0.4 -0.7,0.7l-0,0 0,0c0.5,-0.1 1.5,-1.1 1.8,-1.5l0,0zM175.4,153.1c-0.1,0 -0.1,0 -0.1,0 -0.3,0.1 -0.7,1.3 -1.2,1 -0.3,0 -0.3,-0.1 -0.4,-0.1 0,-0.3 0.6,-1 0.8,-1.1 0,-0.6 0.2,-1.2 0.1,-1.7 -0,-0 -0.1,-0 -0.1,-0 -0.1,-0 -0.2,0.2 -0.3,0.3 -0.3,0.3 -0.6,0.6 -0.8,0.9 -0.3,-0 -1.3,-0 -1.5,0.1l-0.1,0c0.1,-0.2 0.8,-1 0.6,-1.4 -0,-0 -0,-0.1 -0,-0.1 -0.7,0 -1.5,1.2 -1.7,1.7 -0.1,0.2 -0.1,0.5 -0.3,0.7l0,0c0.5,-0.1 1,-0.1 1.5,-0.2 0.2,-0 0.5,0 0.6,-0l0.5,0c0.1,-0.1 0.2,-0.2 0.3,-0.3 0.3,-0.3 0.7,-0.6 1,-1l0.1,0 0,0.5c-0.3,0.3 -0.7,0.6 -0.8,1l0,0.3c-0.2,0.8 0.2,1.2 0.9,1.2 0.5,-0.4 1.2,-0.8 1.1,-1.6 -0,-0 -0,0 -0,-0l0,0zM171.1,152.4 L170.9,152.4c0.1,-0.4 0.5,-0.9 1,-0.9l0,0.2c-0.2,0.2 -0.3,0.4 -0.5,0.7 -0.1,-0 -0.2,-0 -0.3,0l0,0zM250.1,152.6c-0.2,-0.4 -0.3,-0.7 -0.4,-1 -0.3,-0.5 -0.6,-1.3 -1.4,-1.3 -0.2,0.2 -0.4,0.3 -0.5,0.5 -0.7,1.6 0.8,3.5 1.4,4.4 0.2,0.3 0.5,0.7 0.9,0.8 -0.1,1.3 -1.2,1.7 -2.3,1.2 -0.8,-0.4 -1.5,-1.1 -2,-1.8 -0.2,-0.2 -0.4,-0.4 -0.6,-0.7 -0.2,-0.2 -0.3,-0.5 -0.5,-0.7l0,-0 -0.1,0c0.1,0.4 0.3,0.8 0.5,1.1 0.6,1.4 1.4,2.4 2.6,3.3 0.6,0.4 1.5,1 2.3,0.4 1.4,-1 0.7,-4.8 0.1,-6.2l0,0zM250,154.4c-0.1,0.1 -0.5,-0.4 -0.6,-0.5 -0.4,-0.4 -1.2,-1.1 -0.8,-1.8l0.2,0c0.4,0.4 0.7,0.7 0.9,1.2 0.1,0.3 0.1,0.7 0.3,1 -0,0.1 -0,0 -0,0.1zM225.7,161.7 L225.7,161.3c0.2,-0.7 0.1,-1.6 0.3,-2.4 0.2,-1 -0.1,-2 0.9,-2.2 0,-0.1 0.1,-0.1 0,-0.2 -0,-0.1 -0,-0 -0,-0.1 -0,-0 -0,-0 -0.1,-0 -0.3,0.2 -1,0.3 -1.4,0.4 -0.3,0.1 -0.6,0 -0.8,0.1 -0,0 -0.1,0 -0.1,0 0,0.1 0,0.1 0,0.2 0.4,0.1 0.8,-0 1,0.3 0.1,0.2 0.1,1.1 0,1.4 -0.2,1.1 -0.1,2.3 -0.4,3.4 -0.1,0.4 0,1.1 -0.1,1.4l0,0.1c-0.2,-0.1 -0.4,-0.4 -0.5,-0.6 -0.3,-0.4 -0.8,-0.8 -1.1,-1.2 -0.2,-0.3 -0.4,-0.6 -0.7,-0.8 0,-0.7 0.2,-1.4 0.4,-2.1 0.1,-0.5 0.1,-0.9 0.4,-1.3 0.1,-0.2 0.5,-0.3 0.7,-0.4 -0,-0.1 -0,-0.1 -0,-0.2 -0,-0 -0,-0.1 -0,-0.1 -0.5,0.1 -0.9,0.3 -1.4,0.4 -0.4,0.1 -0.8,0.1 -1.2,0.3 0,0.1 0,0.1 0,0.1 0,0 0,0.1 0,0.1 1.3,-0.1 1.1,0.6 0.8,1.6 -0.1,0.3 -0,0.7 -0.2,1l0,0.1 -0,0c-0.3,-0.4 -0.7,-0.8 -1,-1.1 -0.1,-0.1 -0.3,-0.2 -0.4,-0.4 -0.1,-0.1 -0.1,-0.3 -0.3,-0.4 0,-0.4 0.4,-0.5 0.7,-0.6 -0,-0.2 -0,-0.2 -0.1,-0.3 -1,0.1 -1.8,0.7 -2.9,0.7l0,0 -0,0c0,0.1 0,0.1 0,0.2l0,0.1c0.2,0 0.5,-0 0.8,0 0.4,0.1 0.8,0.6 1,0.9 0.4,0.5 0.9,0.9 1.3,1.4 0.2,0.3 0.4,0.6 0.7,0.8 -0,0.6 -0.2,1.3 -0.4,1.9 -0.1,0.3 -0,0.7 -0.2,0.9 -0,0.1 -0,0 -0,0.1 -0.3,-0.7 -1,-1.2 -1.5,-1.8 -0.8,-1.1 -1.8,-2.1 -2.7,-3.3 0,-0.2 0,-0.2 0.1,-0.3 0.1,-0.2 0.3,-0.4 0.6,-0.4 0,-0.1 0,-0.1 -0,-0.2 -0,-0 -0,-0.1 -0,-0.1 -0.7,0.1 -1.4,0.5 -2.1,0.7 -0.4,0.1 -0.9,0.1 -1.1,0.3 -0,0 -0.1,0 -0.1,0 0,0.1 0.1,0.2 0.1,0.3 0.3,-0 0.6,-0.1 0.9,0 0.7,0.2 1.3,1.1 1.7,1.6 0.2,0.2 0.5,0.4 0.7,0.7 0.8,1 1.7,2 2.5,3 0.3,0.4 0.7,0.8 1,1.2 0.2,-0 0.2,-0 0.3,-0.1 0.2,-0.9 0.3,-1.7 0.6,-2.6 0.1,-0.4 0.2,-0.9 0.3,-1.3 0.3,0.1 0.5,0.6 0.7,0.8 0.6,0.8 1.4,1.4 1.9,2.2 0.2,-0 0.2,-0 0.3,-0.1 0.2,-1.2 0.3,-2.5 0.5,-3.7l0,0zM167.9,168c-0,2.3 -0.1,5.8 1.6,6.3 0.6,0.2 1,-0.3 1.2,-0.6 0.7,-1.1 0.5,-3.2 -0.2,-4.1 -0.3,0 -0.8,0.8 -0.9,1 -0.1,-0 -0.1,-0 -0.1,-0 -0.1,-0 -0.1,-0.1 -0.1,-0.1 -0.1,-0.9 0.1,-1.7 0.1,-2.5 1,0.1 1.8,0.6 2.8,0.7 -0,-0.2 0,-0.4 0.1,-0.5 -0,-0.1 -0,-0.1 -0,-0.1 -0.1,-0.1 -0.9,-0.3 -1.1,-0.3l0,-0 -0,0C171.4,166.6 171,165.8 170.3,165.5 169.9,165.4 169.5,165.3 169.1,165.2 168.8,165.2 168.7,165 168.6,164.9 168.5,164.5 168.5,164.1 168.7,163.9 168.7,163.8 168.7,163.8 168.6,163.7l0,-0 -0,0c-0.1,0.2 -0.2,0.5 -0.3,0.7 -0.2,0.9 0.3,1.7 0.8,1.9 0.4,0.1 0.7,0.1 1.1,0.2 0.3,0.1 0.4,0.4 0.6,0.6 -0,0.5 -0.5,0.5 -0.8,0.4 -0.6,-0.2 -1.2,-0.3 -1.8,-0.5 -0.2,-0.1 -0.3,-0.2 -0.5,-0.2 -0,0.2 -0.1,0.5 -0.1,0.7 0.5,0.2 1,0.3 1.5,0.5 -0,1.3 -0.5,2.8 0.1,3.8 0.1,0 0.1,0 0.2,0.1 0.7,-0 0.9,-0.6 1.2,-1 0.3,0.8 0.1,2.1 -0.6,2.3 -0.3,0.2 -0.7,-0.1 -0.9,-0.2 -0.6,-0.6 -0.7,-1.4 -1,-2.3 -0.1,-0.3 0,-1 -0.1,-1.2 0,-0.4 0.1,-1 -0.1,-1.2l0,-0 -0.1,0 0,0zM255.9,174.1c-0.1,-0.6 0.1,-1.4 -0.1,-1.9l0,-0.6c-0.1,-0.4 -0.1,-1 -0.1,-1.4 -0.2,-0.8 -0,-1.8 -0.3,-2.5 -0.2,-0 -0.4,-0.1 -0.6,-0.1 -0.1,0.1 -0.2,0.1 -0.1,0.3 0.1,0.3 0.5,0.4 0.6,0.7 0,0.2 0,0.3 0,0.5 0.1,0.5 0.1,1.2 0.2,1.7l0,0.4c0.1,0.3 0.2,1 0.1,1.2 -0.1,0.4 -0.5,0.7 -0.8,1 -0.7,0.7 -1.5,1.6 -2.8,1.7 -0,0.1 -0,0 -0,0.1 0,0.5 0.4,0.4 0.7,0.5 0.1,-0 0.1,-0 0.2,-0 0.1,-0.1 0.2,-0.2 0.3,-0.3 0.2,-0.2 0.5,-0.4 0.7,-0.6l0,0c0,1.1 0,2.4 0,3.4l0.1,0c0.3,-1.1 0.2,-2.4 0.2,-3.7 0.5,-0.4 0.8,-1.1 1.3,-1.5l0,-0.1 0,0c0,1.2 0,2.3 0,3.5 0,0.4 -0.1,1.3 0,1.4l0,0.2 0.1,0c0.1,-0.4 0.1,-0.9 0.2,-1.4l0,-0.6c0.1,-0.5 0.1,-1.4 0,-1.9l0,0zM190.1,176.4c-0.3,-0.1 -0.7,-0.4 -0.9,-0.7 -0.6,-0.8 -1.2,-2.7 -0.8,-4.2 0.4,-1.2 1.1,-2 2.3,-2.3 0.6,-0.2 1.3,0.1 1.7,0.3 1.1,0.6 1.6,1.4 1.9,2.7 0.4,1.7 -0.1,3.3 -1.3,3.9 0.1,0.7 0.1,1.4 0.2,2.1 0.4,-0 0.8,-0.1 1.1,-0.2 0.6,-0.1 1.2,-0.2 1.7,-0.3 0.4,-0.1 1,-0 1.3,-0.2 0.1,-0.2 -0.2,-1.2 -0.3,-1.5 -0.1,-0.2 -0,-0.4 -0.1,-0.6l0,-0.1c-0.1,0 -0.2,0 -0.3,0 0,1.1 -0.8,1 -1.6,1.2 -0.4,0.1 -1,0.2 -1.5,0.3 0,-0.2 0,-0.3 -0,-0.5 0,-0.1 0.7,-0.4 0.8,-0.4 0.4,-0.3 0.9,-0.8 1.1,-1.2 0.2,-0.3 0.3,-0.7 0.4,-1.1 0.1,-0.5 0.1,-1.1 0,-1.5 -0.1,-0.3 -0,-0.6 -0.1,-0.8 -0.4,-1.1 -1.2,-1.9 -2.3,-2.3 -0.5,-0.2 -1,-0.2 -1.6,-0.3 -0.5,-0.1 -1.4,0.1 -1.8,0.2 -1.8,0.5 -3,1.4 -3.5,3.1 -0.2,0.7 -0.2,1.6 0,2.2 0.4,1.4 1.6,2.8 3.4,2.8l0,0c0.1,0.1 0.1,0.2 0.1,0.3 -0,0.1 -0,0 -0,0.1 -0.2,0.1 -0.4,0.1 -0.6,0.1 -0.4,0.1 -1.8,0.5 -2.2,0.1 -0.2,-0.1 -0.3,-0.3 -0.4,-0.6 -0.1,0 -0.1,0 -0.2,0l-0.1,0c0.1,0.7 0.3,1.4 0.4,2.1l0,0 0,0C188.7,179.1 190,178.9 191.3,178.7 191.1,178 190.9,177.3 190.8,176.7 190.7,176.5 190.3,176.5 190.1,176.4l0,0zM252.8,172.4c0.1,0.2 0.2,0.5 0.4,0.7 0.1,0.1 0.1,0 0.2,0.1 1.2,0.1 1.7,-2 1.2,-3.2 -0.1,-0.2 -0.5,-0.8 -0.8,-0.6l-0.1,0c0,-0.1 0,-0 0,-0.1 -0,-0.2 -0,-0.2 -0.1,-0.3 -0.1,-0 -0.1,-0 -0.2,-0 -0,0 -0,0 -0.1,0 0,0.2 0.1,0.2 0.1,0.5 -0.6,0.5 -1.1,1.8 -0.7,2.9l0,0zM253.2,170.4c0.1,-0.2 0.2,-0.3 0.4,-0.5 0.1,-0 0.1,-0 0.1,-0 0.3,-0 0.4,0.1 0.5,0.1 0.3,0.7 0.3,1.8 -0.1,2.3 -0.1,0.1 -0.2,0.1 -0.3,0.2 -0.8,-0.1 -0.8,-1.5 -0.6,-2.1l0,0zM236.2,184.9c-0.4,-0.3 -0.5,-1.5 -0.6,-2.1 -0.3,-1.1 -0.4,-2.3 -0.8,-3.4 -0.2,-0.7 -0.5,-1.5 -0.4,-2.4 0.1,-0.1 0.2,-0.3 0.4,-0.4 0.2,-0.1 0.5,-0.2 0.7,-0.4 0,-0 -0,-0.1 -0,-0.2 -0.4,0.1 -0.8,0.3 -1.2,0.5 -0.7,0.3 -1.5,0.5 -2.2,0.8 -0.2,0.1 -0.5,0.3 -0.8,0.3l0,0.2c0,0 0,0 0.1,0 0,0 1,-0.4 1.2,-0.1 0.3,0.1 0.3,0.5 0.5,0.8 -0.1,0.6 -0.6,1.4 -0.8,1.9 -0.5,1.2 -1.1,2.4 -1.7,3.5 -0.2,0.4 -0.5,1.2 -0.8,1.6l0,0c-0.2,-0.3 -0.2,-1 -0.3,-1.4 -0.3,-1.1 -0.5,-2.4 -0.9,-3.5 -0.1,-0.2 -0.3,-1.2 -0.1,-1.4 0,-0.5 0.8,-0.7 1.2,-0.9 -0,-0.1 -0,-0.2 -0,-0.3 -0.7,0.1 -1.3,0.4 -1.9,0.7 -0.6,0.2 -1.1,0.3 -1.6,0.5 -0.3,0.1 -0.6,0.3 -0.9,0.3l0,0 -0,0c0,0.1 0,0.2 0.1,0.2 0.1,0.1 1,-0.3 1.3,-0.1 0.5,0.2 0.5,1 0.7,1.5 0.4,1.5 0.7,3.1 1.1,4.6 0.1,0.4 0.4,1.6 0.1,1.9 -0.1,0.4 -0.8,0.6 -1.2,0.7 0,0.1 0,0.1 0,0.2 0.6,-0.1 1.1,-0.3 1.6,-0.5 1,-0.3 1.9,-0.6 2.9,-1 -0,-0.1 -0,-0.2 -0,-0.3 -0.4,0.1 -0.7,0.2 -1.3,0.2 -0.1,-0.1 -0.1,-0.1 -0.2,-0.2 -0.1,-0.2 -0.1,-0.4 -0.2,-0.6 0,-0.5 0.6,-1.3 0.8,-1.7 0.6,-1.2 1.2,-2.4 1.7,-3.7 0.2,-0.5 0.7,-1.2 0.8,-1.7 0.2,0.1 0.1,0.4 0.2,0.6 0.1,0.4 0.2,0.9 0.3,1.4 0.3,0.9 0.4,1.9 0.6,2.9 0.1,0.4 0.2,1 0.1,1.4 -0.2,0.4 -0.8,0.6 -1.2,0.8 0,0.1 0,0.2 0.1,0.2 0,0 0.8,-0.3 1,-0.3 1,-0.4 2.1,-0.9 3.1,-1.3 -0,-0.1 -0,-0.2 -0,-0.3 -0.3,0.1 -0.9,0.4 -1.2,0.2l0,0zM253.6,187.9c-0.1,0.1 -0.3,0.2 -0.5,0.3 -0.5,0.3 -0.9,0.9 -1.3,1.4 -0.3,0.4 -0.5,0.8 -0.7,1.2 -0.1,0.2 -0.1,0.4 -0.3,0.5l0,0.1c0.3,-0.1 0.5,-0.3 0.7,-0.4 0.6,-0.4 1.2,-0.7 1.7,-1.1 0.3,-0.2 0.5,-0.5 0.8,-0.7 0,-0.4 0.1,-0.8 -0.1,-1.1 -0.1,-0 -0.2,-0 -0.4,-0zM253.1,189.3c-0.2,0.2 -0.4,0.4 -0.7,0.6 -0.2,0.1 -0.4,0.2 -0.6,0.4l-0,0c0.1,-0.4 0.8,-1 1.1,-1.2 0.2,-0.1 0.4,-0.1 0.5,-0.3l0.1,0c0,0 0,0 0.1,0.1 -0,0.3 -0.3,0.4 -0.5,0.5l0,0zM173.9,190.7c-0.2,-0.5 -0.3,-0.9 -0.4,-1.4 -0.1,-0.2 -0.1,-0.5 -0.2,-0.7l0,-0.1c0.2,0.1 0.6,0.1 0.8,0.2l0.2,0c-0,-0.2 -0.1,-0.5 -0.2,-0.7 -0.1,-0.2 -0.8,-0.2 -1,-0.3 -0.3,-0.2 -0.6,-0.9 -0.8,-1.2 -0.5,-0.8 -1.2,-1.7 -2,-2.3 -0.4,-0.3 -0.7,-0.6 -1.4,-0.6 -0.1,0.1 -0.2,0.1 -0.3,0.2 -0.2,0.7 0.1,2.1 0.5,2.4l0,0.1C169.1,186.3 168.9,186.2 168.8,186.1l-0,0c0,0.2 0,0.5 0.1,0.6 0,0.2 0.3,0.3 0.5,0.4 0.2,1 0.5,1.9 0.9,2.8 0.3,0.7 0.4,1.4 0.7,2 0.1,0.3 0.5,0.6 0.6,0.9l0.1,0c-0.1,-0.3 -0.3,-0.6 -0.4,-0.9C171,191.2 170.7,190.3 170.4,189.5 170.3,189 170.1,188.5 170,187.9 169.9,187.7 169.9,187.5 169.8,187.4l0,-0c0.2,0 0.4,0.2 0.6,0.3 0.4,0.2 0.8,0.3 1.3,0.4 0.3,0.1 0.7,0.3 1.1,0.4 0,0.3 0.2,1.2 0.4,1.4l0,0.1c-0.6,-0.4 -0.5,-0.9 -1.5,-0.8 -0.1,0.1 -0.1,0.1 -0.2,0.1 -0.1,0.2 -0.1,0.6 0,0.8 0.2,0.6 1,1.8 1.6,2 0.2,0.2 0.6,-0 0.7,-0.2 0.2,0.1 0.3,0.6 0.4,0.9 0.2,0.5 0.5,1.2 1,1.4l0,0 0.1,0c-0.1,-0.4 -0.3,-0.8 -0.4,-1.1 -0.3,-0.8 -0.6,-1.6 -0.8,-2.4l0,0zM172.9,187.7C172.5,187.7 172.2,187.5 171.8,187.4 171,187.1 170.3,186.9 169.5,186.5 169.4,186.2 168.8,185 169.2,184.6c0,-0 0,-0.1 0.1,-0.1 0.1,-0 0.1,-0 0.1,-0 1.1,0.1 2.3,1.5 2.8,2.3 0.2,0.3 0.4,0.7 0.7,1l0,0.1zM173.5,190.9c-0.1,0.1 -0.2,0.3 -0.3,0.4 -0.1,0.1 -0.2,0.1 -0.3,0.2 -0.6,-0 -0.7,-0.6 -0.9,-1 0,-0.4 0.1,-0.4 0.3,-0.6 0.1,-0 0.1,-0 0.1,-0 0.6,0 0.7,0.3 1,0.5 0.1,0.2 0.1,0.3 0.1,0.5zM195,196.5c-0.2,-0.3 -0.5,-0.3 -0.7,-0.5 -0.1,-0 -0,-0 -0.1,-0 0.5,-0.2 1,-0.5 1.5,-0.7 0.1,0.1 0.7,0.7 1,0.6 0,-0 0.1,-0 0.1,-0 -0,-0.2 -0,-0.4 -0,-0.6 -0.5,-0.5 -1.1,-0.8 -1.9,-1l0,0 -0,0c0.1,0.3 0.4,0.5 0.6,0.6l0,0.1c-0.4,0.1 -0.8,0.3 -1.2,0.4 -0.3,0.1 -0.6,0.1 -0.8,0.2l-0.1,0c0.2,-0.4 0.7,-0.8 1,-1.2 0.5,-0.7 1,-1.6 1.8,-2 -0,-0.3 -1,-1 -1.4,-0.8 -0.1,0 -0,-0 -0.1,0.1 -0.1,0.1 0.1,0.3 0.1,0.5 -0.1,0.3 -0.8,1.6 -1,1.8l0,0c-0.4,-0.1 -0.7,-0.5 -1,-0.7 0.1,-0.3 0.3,-0.6 0.5,-0.8 0.4,-0.6 0.8,-1.2 1.4,-1.6 -0,-0.5 -0.8,-1 -1.3,-1 0,0.2 0.1,0.4 0.1,0.5 -0.1,0.6 -0.4,1.2 -0.6,1.7 -0.1,0.3 -0.2,0.7 -0.4,1 -0.1,0 -0.5,-0 -0.6,-0.1 -0.1,-0 -0.3,0 -0.4,0l0,0.1c0.6,0.6 1.3,0.8 2.1,1.2 -0.1,0.6 -0.7,1 -1,1.5 -0.2,0 -0.3,-0 -0.4,-0.1 -0.1,0 -0.1,0 -0.1,0 0,0.5 0.5,1 0.9,1.1 0.3,-0.3 0.7,-0.5 1.1,-0.7 0.4,0.4 0.5,1.1 0.7,1.8 0.1,0.3 -0,0.6 0,0.9 0.1,0.5 0.4,0.6 0.6,0.9l0.3,0c0.2,-0.9 -0.2,-1.7 -0.4,-2.4 -0.1,-0.3 -0.1,-0.6 -0.2,-0.9l0,0zM252.9,190.4c-0.2,0.2 -0.5,0.3 -0.8,0.4 -0.4,0.3 -0.7,0.6 -1.1,0.9 -0.2,0.1 -0.4,0.2 -0.5,0.4 -0.2,0.3 -0.1,0.7 -0.4,1l0,0.1c0.3,-0.1 0.4,-0.4 0.7,-0.6 0.3,-0.2 0.5,-0.5 0.8,-0.7 0.2,-0.1 0.4,-0.2 0.6,-0.3 0.1,0 0.1,0 0.2,0.1 -0,0.9 -0.5,1.6 -0.8,2.3 -0.1,0.2 -0.1,0.5 -0.3,0.7 -0.1,0.1 -0.2,0.1 -0.3,0.1 -0.2,0.3 -0.5,0.5 -0.7,0.8 -0.2,0.3 -0.3,0.7 -0.6,1.1 -0,0.1 -0,0.2 0,0.3 0,0 0.1,0.1 0.1,0.1 0.5,-0.4 0.9,-0.8 1.3,-1.4 0.6,-0.8 0.9,-1.9 1.4,-2.9 0.3,-0.6 0.7,-1.3 0.7,-2.2 -0,-0 -0.1,-0.1 -0.1,-0.1l-0.2,0 0,0zM250.4,196.1 L250.4,196.2 250.3,196.2c0.1,-0.4 0.4,-0.6 0.6,-0.9l0.1,0c-0,0.4 -0.3,0.7 -0.6,0.8l0,0zM195.6,196.7c-0.1,0.3 0.7,1 1,1.2 0.1,0.1 0.3,0.3 0.5,0.2 0.1,-0 0.1,-0 0.2,-0 0,-0.1 0.1,-0.2 0,-0.3 -0,-0.5 -1.2,-1 -1.6,-1.1zM199.1,199.5c0.1,0 0.1,0 0.2,-0 0.1,-0.1 0.1,-0.3 0.1,-0.4 0.2,-0.1 0.6,-0.1 0.8,-0.2 0.7,-0.2 1.6,-0.2 2.5,-0.4 0.4,-0.1 1,0.1 1.4,-0 0,-0 0.1,-0 0.1,-0 -0,-0.5 -0.9,-0.7 -1.4,-0.5 -0.2,0.1 -0.5,0.2 -0.7,0.3 -0.2,0 -0.3,0 -0.5,0 -0.1,-0.6 -0.4,-1.1 -0.4,-1.7 0.6,-0 1.2,-0.1 1.6,-0.3 -0,-0.2 -0,-0.2 -0.1,-0.3 -0.4,-0.1 -1.1,-0.1 -1.5,0.1 -0.1,-0 -0.1,-0 -0.2,-0 -0.2,-0.3 -0.1,-0.8 -0.3,-1.1l0,-0.1c0.4,-0.1 1,-0.2 1.2,-0.4 0,-0 0,-0 0,-0.1 -0,-0 -0,-0.1 -0.1,-0.1 -0.6,-0.1 -0.8,-0 -1.3,0.1 -0.2,-0.5 0,-0.9 -0.5,-1 0.1,-0.2 0.5,-0.2 0.7,-0.3 0.4,-0.1 0.8,-0.3 1.1,-0.4 0,-0.1 0,-0 0,-0.1 -0,-0.2 -0.1,-0.2 -0.1,-0.3 -0.5,-0 -1,0 -1.2,0.3l-0.1,0c0,-0.3 0.2,-0.7 0.4,-0.9 0.1,-0.1 0.3,-0.1 0.4,-0.3l0,0 0,-0c-0.1,-0.1 -0.1,-0.2 -0.2,-0.3 -0.2,-0.1 -0.4,-0.1 -0.6,-0.3 -0.2,-0 -0.5,-0 -0.6,0.1 0,0.1 0.1,0.2 0.1,0.3 0.1,0.4 -0.3,1.5 -0.4,1.7 -0.1,0.1 -1.4,0.6 -1.8,0.5 -0.1,-0 -0.3,-0.2 -0.4,-0.2 -0,-0 -0,-0 -0,-0.1 0.5,-0.5 0.9,-1.6 1.6,-1.8 0,-0.1 0,-0.1 0,-0.2 -0.2,-0.2 -1.1,-1.1 -1.5,-0.8 -0,0 -0.1,0 -0.1,0 0,0.3 0.2,0.5 0.1,0.9 -0.2,0.7 -0.5,1.4 -0.9,2 -0.2,0.3 -0.6,0.7 -0.7,1.1 0.6,-0.1 0.7,-0.7 1.2,-0.8 0.1,0.1 0.3,0.2 0.4,0.4 0.2,0.3 0.2,0.7 0.3,1.1 0.2,0.8 0.3,1.6 0.5,2.4 0,0.4 0,0.8 0.1,1.2 0.1,0.4 0.4,1 0.8,1.1l0,0zM200.2,196.8c0,0.3 0.2,1.3 0.4,1.5 0,0 0,0 0,0.1 -0.4,0.1 -0.9,0.2 -1.4,0.2 -0.1,-0.5 -0.3,-1 -0.3,-1.5 0.6,-0 0.9,-0.2 1.3,-0.3zM198.1,193.7c0.1,-0.1 1,-0.3 1.1,-0.2 0.4,0.2 0.3,0.8 0.5,1.1 -0.1,0.2 -1,0.5 -1.2,0.5 -0,-0.4 -0.1,-1.2 -0.4,-1.4l0,0zM199.8,195.1 L199.8,195.1c0.1,0.3 0.1,0.9 0.3,1.2 -0.1,0.3 -0.9,0.3 -1.2,0.5 -0.1,-0.1 -0.3,-1 -0.3,-1.2 0.3,-0 1,-0.3 1.2,-0.4l0,0zM193.5,197.2c-0.1,0.1 -0,0.3 -0.1,0.5 -0.3,0.8 -0.4,0.9 0.1,1.7 0.2,0 0.2,-0 0.4,-0.1 0.1,-0.6 0.2,-1.8 -0.3,-2l0,0zM235.3,197.4c-1.1,-0.3 -2,0.3 -3.1,0.2 -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 -0.8,0 -1.6,1.7 -0.8,2.3 0.4,0.3 1.6,0.1 2.1,0 0.3,-0.1 0.7,-0.1 1,0 0.3,0.2 0.3,1.1 0.1,1.6 -0.1,0.9 -0.2,1.8 -0.4,2.7 -0.1,0.5 -0.2,1.1 -0.3,1.6 0.6,-0 1.1,-0.6 1.2,-1 0.1,-0.2 0,-0.5 0.1,-0.7 0.2,-0.8 0.2,-1.7 0.4,-2.5 0.1,-0.5 0,-1 0.1,-1.5 0.1,-0.4 0.1,-1.6 0,-1.9 -0.1,-0.2 -0.2,-0.3 -0.3,-0.5l0,0zM185.1,208.5c-0.1,-0.1 -0.2,-0.3 -0.3,-0.4 -0.4,-0.4 -1,-0.8 -1.4,-1.1 -0.4,-0.3 -0.9,-0.4 -1.3,-0.8 -0,-0.1 0.1,-0.3 0,-0.5 -0.3,-0.8 -1.5,-1.8 -2.2,-2.2 -0.3,-0.2 -0.9,-0.3 -1.2,-0.5 -0.2,-0 -0.3,-0 -0.4,0.1 -0.1,0.2 0.2,0.5 0.3,0.6 0.3,0.4 0.5,0.8 0.9,1 0.3,0.2 0.5,0.4 0.8,0.6l0.1,0c-0.1,-0.4 -0.6,-0.6 -0.9,-0.8 -0.3,-0.2 -0.4,-0.6 -0.7,-0.8 0,-0.1 0,-0.1 0.1,-0.2 1,0 1.7,0.9 2.1,1.5 0.2,0.3 0.5,0.4 0.6,0.9 -0.1,0 -0.2,0 -0.3,-0l-0.1,0c0.2,0.5 0.8,0.4 1.2,0.7 0.8,0.5 1.5,1.3 2.2,1.9 0.2,0.2 0.7,0.4 0.7,0.8 -0.5,-0 -0.8,-0.3 -1.2,-0.5 -0.6,-0.4 -1.5,-1 -1.9,-1.5 -0.1,-0.1 -0.1,-0.2 -0.2,-0.3 -0.1,-0.1 -0.2,-0.1 -0.3,-0.3l-0.1,0c-0,0.4 0.4,0.7 0.6,0.9 0.8,0.7 1.6,1.3 2.5,1.8 0.3,0.2 1,0.5 1.4,0.3 -0.1,-0.5 -0.7,-0.9 -1,-1.2l0,0zM207.7,210.9c-1.9,-1.3 -4.6,-2.6 -7.8,-2.5 -0.2,0.1 -0.5,0 -0.7,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -0,0.9 1.3,1.4 2.1,1.6 0.4,0.1 0.8,-0.1 1.1,-0.2 0.2,-0.8 -0.7,-0.9 -1.1,-1.2l-0.1,0 0,-0c2.8,-0.1 4.9,0.7 6.5,1.9 0.4,0.3 0.9,0.7 1.1,1.2 0.1,0.2 0.1,0.5 0,0.6 -0.1,0.4 -0.6,0.4 -1.1,0.5 -1.1,0.2 -2.6,-0.4 -3,-0.8 -0.1,0.2 0,0.4 -0.1,0.6 -0.2,0.4 -0.7,0.3 -1.2,0.4 -0.8,0.2 -2.2,-0.3 -2.7,-0.6 -0.1,-0.1 -0.2,-0.3 -0.4,-0.4 -0,-0.1 -0,-0.1 -0,-0.2 0.1,-0.1 0.2,-0.2 0.2,-0.3 1.1,-0.1 1.6,-0 2.2,0.5 -0,0.1 -0,0.1 -0,0.1 -0.1,0.1 -0.2,0.2 -0.4,0.1l0,0.1c0.4,0 0.5,-0.1 0.8,-0.2 0,-0.1 0,-0.1 0,-0.2 -0.1,-0.1 -0.2,-0.3 -0.4,-0.4 -0.6,-0.4 -1.8,-0.6 -2.5,-0.1 -0.1,0.5 0.2,0.8 0.5,1 0.6,0.5 1.1,0.7 1.9,1 0.3,0.1 0.5,0 0.8,0.1 0.3,0.1 0.7,0.1 1,0 0.5,-0.1 1.1,-0.6 0.6,-1.2l0,-0c0.3,0.1 0.5,0.4 0.8,0.5 0.7,0.4 1.9,0.7 2.9,0.4 0.5,-0.1 1.1,-0.1 1.2,-0.6 0.2,-0.3 -0.1,-0.6 -0.1,-0.8 -0.3,-0.6 -0.8,-1 -1.4,-1.4l0,0zM200.9,209.2c0.1,0.1 0.2,0.3 0.3,0.4 -0,0.1 -0,0.1 -0,0.2 -0.2,0.6 -1.6,0.2 -1.9,-0.1 -0.1,-0.1 -0.1,-0.2 -0.2,-0.3 0,-0.1 0,-0.1 0,-0.1 0.1,-0.3 0.4,-0.2 0.6,-0.3 0.5,0 0.9,0.1 1.2,0.3zM234.9,209.6 L234.5,209.6c-0.2,0.2 -0.6,0.2 -0.9,0.4 -0.2,0.1 -0.5,0.3 -0.8,0.5 -0.2,0.1 -0.3,0.4 -0.5,0.5 0,0.2 0,0.2 0.1,0.3 0,0 0,0 0.1,0 0,-0 0.1,-0.1 0.1,-0.1 0,-0 -0,-0.1 -0,-0.2 0.4,-0.4 0.6,-0.6 1.1,-0.8 0.1,-0.1 0.4,-0.2 0.6,-0.1l0.1,0c-0,0.4 -0.8,1.5 -1.1,1.6l0,0.1c0.7,-0.2 1.1,-1.5 1.6,-2 -0,-0.1 -0,-0.1 -0,-0.1l0,-0.1 0,0zM232,212.3c-0.2,0.2 -0.7,0.2 -1,0.4l-0,0c0.1,-0.1 0.3,-0.2 0.4,-0.3 0.1,-0.1 0.1,-0.2 0.2,-0.3 -0,-0.1 -0,-0.1 -0,-0.1l0,-0.1c-1.1,-0.2 -2.9,0.7 -3.4,1.2 -0.1,0.1 -0.2,0.3 -0.4,0.4 0,0.1 0,0.2 0,0.2 0.6,0 1.9,-0.4 2,-0.9 0,-0 0,-0 0,-0l0,-0.1c-0.4,-0 -1,0.1 -1.3,0.3l-0,0c0.2,-0.4 1.1,-0.7 1.6,-0.8 0.2,-0 0.5,-0.1 0.7,-0 0,0 0.1,0 0.1,0 -0.1,0.4 -0.6,0.8 -1,0.9l0,0.1c0.6,-0.1 1.1,-0.4 1.6,-0.6 0.3,-0.1 0.7,-0.2 1,-0.4 0.2,-0.1 0.9,-1.1 1,-1.4 -0.8,0.1 -0.9,1 -1.4,1.4l0,0zM229.1,213 L229.1,213.1c-0.1,0 -0.1,0.1 -0.2,0.2 -0.2,0.1 -0.4,0.1 -0.6,0.2 -0.1,-0 -0.1,-0 -0.1,-0l-0,0c0.1,-0.3 0.7,-0.5 1,-0.5l0,0zM213.8,216.4c0,-0 0,-0.1 0,-0.1 -0.9,-0 -1.8,-0.1 -2.7,-0.1 -0.1,0.1 -0.3,0 -0.4,0.1 -0.2,0.1 -0.4,0.1 -0.5,0.2 0,0.1 0,0 0,0.1 0.2,0.2 1.5,0.2 1.8,0l0.1,0 0,-0.1c-0.4,-0.1 -1.1,0.2 -1.4,0l-0,0 0,-0c1,-0.1 2.1,-0 3.1,-0 -0.1,0.1 -0.3,0 -0.4,0.1 -0,0 -0.1,0 -0.1,0l0,0.1c0.2,0 0.4,0.1 0.7,0.1 0,0 -0,0 0,0 -0.3,0.2 -1.2,0.1 -1.5,-0l0,-0.1c-0.2,-0.1 -0.9,0.1 -1.1,0.1 -0.1,0 -0.3,-0 -0.3,0 -0.2,0 -0.2,0 -0.3,0.1 0,0.1 0,0.1 0.1,0.2 0.2,0.1 0.6,0.1 0.9,0.1l0,-0 0,0 0,-0c-0.1,-0.1 -0.5,-0 -0.7,-0.1l-0.1,0c0.1,-0.1 1.3,-0.3 1.5,-0.1 0.1,0 0,0 0.1,0 -0.2,0 -0.4,0.1 -0.6,0.1 0,0.1 0,0 0,0.1 0.1,0 0.2,0 0.3,0 -0,0.1 -0.1,0.1 -0.1,0.1 0,0 0,0 0,0.1 0.5,-0 1,-0.1 1.4,-0.1 0.3,-0.1 0.6,0 0.8,-0.1l0.3,0 0,-0.1c-0.5,-0 -1.7,-0 -2.1,0.1l-0.1,0c0,-0 -0,-0 0,-0 0.1,-0.2 0.4,-0.1 0.7,-0.1 0.4,-0.1 1.1,-0.3 1.4,0 0.1,0.1 0,-0 0,0.1 0.1,-0 0.2,-0 0.2,-0l0.3,0 0,-0.1c-0.3,-0.1 -0.8,-0.2 -1.1,-0.4 -0.2,-0.1 -0.1,-0.2 -0.4,-0.3l0,0zM176.5,149c-0.1,0.3 -0.3,0.5 -0.4,0.8 -0.2,0.6 -0.5,1.1 -0.7,1.7 -0.2,0.5 -0.3,1.2 -0.6,1.6l0,0.1c0.4,-0.1 0.6,-0.5 0.9,-0.7 0.6,-0.6 1.8,-2.1 1.8,-3.1 -0.1,-0.1 -0.1,-0.1 -0.1,-0.2 -0.2,-0.1 -0.5,-0.1 -0.8,-0.1l0,0zM176.7,150.5c-0.2,0.3 -0.3,0.5 -0.4,0.8 -0.2,0.2 -0.4,0.4 -0.6,0.7l-0,0c0,-0.3 0.2,-0.5 0.3,-0.7 0.2,-0.5 0.4,-1 0.6,-1.5 0.1,0 0.2,0 0.3,0.1 0.1,0 0,-0 0.1,0.1 0.1,0.2 -0.2,0.5 -0.3,0.6l0,0zM241.7,139.3c-0.4,-0.4 -0.7,-0.9 -1.1,-1.2l0,-0c-0.2,0.1 -0.8,0.6 -1,0.8 -0.2,-0.1 -0.4,-0.3 -0.6,-0.5 -0.6,-0.5 -1.2,-1.1 -2.3,-1.1 -0.1,0.1 -0.3,0.1 -0.5,0.2 -0.5,0.2 -1,0.6 -1.2,1.1 -0.2,0.6 0,1.4 0.2,1.8 0.4,0.8 1,1.5 1.5,2.2 0.4,0.6 0.9,1.2 1.7,1.4 0.9,0.2 1.3,-0.8 1.6,-1.2 0.3,-0.4 1.1,-0.5 1.4,-1 0.1,-0.2 0,-0.6 -0,-0.7 -0.2,-0.4 -1,-1.5 -1.3,-1.7 0,-0.2 0.1,-0.2 0.2,-0.4 0.2,0.1 0.3,0.4 0.5,0.6 0.2,0.2 0.5,0.4 0.7,0.6 0.4,0 0.6,-0.1 0.7,-0.3l0,0c-0.1,-0.2 -0.4,-0.4 -0.6,-0.6zM239.7,143.2c-0.6,0.2 -1,-0.3 -1.3,-0.6 -0.9,-0.9 -1.5,-1.9 -2.1,-3 -0.2,-0.4 -0.8,-1 -0.5,-1.6l0.1,0c0.2,0.3 0.5,0.5 0.7,0.7 0.5,0.7 1.2,1.4 1.8,2.1 0.3,0.4 0.7,0.9 1,1.3 0.2,0.2 0.3,0.5 0.5,0.7 -0,0.2 -0.1,0.2 -0.2,0.4l0,0zM240.2,140.6c0.3,0.4 0.7,0.6 0.7,1.4 -0.1,0.1 -0.1,0.2 -0.3,0.3 -0,0 -0,0 -0.1,0 -0.5,-0.9 -1.3,-1.6 -1.9,-2.4 -0.2,-0.3 -0.5,-0.5 -0.7,-0.7 -0.3,-0.4 -0.7,-0.8 -1.1,-1.2 -0.1,-0.1 -0.2,-0.2 -0.3,-0.3 0,-0.1 0,-0.1 0.1,-0.1 0.6,0 0.9,0.4 1.3,0.7 0.9,0.7 1.6,1.5 2.3,2.4z" - android:strokeColor="#00000000" android:strokeWidth="1"/> -</vector> diff --git a/app/src/main/res/layout/view_card_announcement.xml b/app/src/main/res/layout/view_card_announcement.xml index 57d052c..a6367ee 100644 --- a/app/src/main/res/layout/view_card_announcement.xml +++ b/app/src/main/res/layout/view_card_announcement.xml @@ -7,12 +7,12 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <ImageView + <org.wikipedia.views.FaceAndColorDetectImageView + style="@style/SimpleDraweeViewPlaceholder" android:id="@+id/view_announcement_header_image" android:layout_width="match_parent" android:layout_height="160dp" - android:contentDescription="@null" - android:scaleType="centerCrop"/> + android:contentDescription="@null" /> <TextView android:id="@+id/view_announcement_text" diff --git a/app/src/test/java/org/wikipedia/feed/announcement/AnnouncementClientTest.java b/app/src/test/java/org/wikipedia/feed/announcement/AnnouncementClientTest.java index 00732e5..6d599e3 100644 --- a/app/src/test/java/org/wikipedia/feed/announcement/AnnouncementClientTest.java +++ b/app/src/test/java/org/wikipedia/feed/announcement/AnnouncementClientTest.java @@ -27,10 +27,11 @@ public class AnnouncementClientTest extends MockWebServerTest { private static final int ANNOUNCEMENT_IOS = 0; - private static final int ANNOUNCEMENT_ANDROID = 1; - private static final int ANNOUNCEMENT_INVALID_DATES = 2; - private static final int ANNOUNCEMENT_NO_DATES = 3; - private static final int ANNOUNCEMENT_NO_COUNTRIES = 4; + private static final int ANNOUNCEMENT_SURVEY_ANDROID = 1; + private static final int ANNOUNCEMENT_FUNDRAISING_ANDROID = 2; + private static final int ANNOUNCEMENT_INVALID_DATES = 3; + private static final int ANNOUNCEMENT_NO_DATES = 4; + private static final int ANNOUNCEMENT_NO_COUNTRIES = 5; @NonNull private AnnouncementClient client = new AnnouncementClient(); private AnnouncementList announcementList; private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT); @@ -71,8 +72,15 @@ verify(cb).error(any(Throwable.class)); } + @Test public void testFundraisingParams() throws Throwable { + Announcement announcement = announcementList.items().get(ANNOUNCEMENT_FUNDRAISING_ANDROID); + assertThat(announcement.hasAction(), is(true)); + assertThat(announcement.hasFooterCaption(), is(true)); + assertThat(announcement.hasImageUrl(), is(true)); + } + @Test public void testShouldShowByCountry() throws Throwable { - Announcement announcement = announcementList.items().get(ANNOUNCEMENT_ANDROID); + Announcement announcement = announcementList.items().get(ANNOUNCEMENT_SURVEY_ANDROID); Date dateDuring = dateFormat.parse("2016-11-20"); assertThat(AnnouncementClient.shouldShow(announcement, "US", dateDuring), is(true)); assertThat(AnnouncementClient.shouldShow(announcement, "FI", dateDuring), is(false)); @@ -80,7 +88,7 @@ } @Test public void testShouldShowByDate() throws Throwable { - Announcement announcement = announcementList.items().get(ANNOUNCEMENT_ANDROID); + Announcement announcement = announcementList.items().get(ANNOUNCEMENT_SURVEY_ANDROID); Date dateBefore = dateFormat.parse("2016-08-01"); Date dateAfter = dateFormat.parse("2017-01-05"); assertThat(AnnouncementClient.shouldShow(announcement, "US", dateBefore), is(false)); diff --git a/app/src/test/res/raw/announce_2016_11_21.json b/app/src/test/res/raw/announce_2016_11_21.json index 85eef97..3a73f1d 100644 --- a/app/src/test/res/raw/announce_2016_11_21.json +++ b/app/src/test/res/raw/announce_2016_11_21.json @@ -41,6 +41,27 @@ ] }, { + "id": "EN11116FUNDRAISINGANDROID", + "type": "fundraising", + "start_time": "2016-11-15T17:11:12Z", + "end_time": "2016-11-30T17:11:12Z", + "platforms": [ + "AndroidApp" + ], + "text": "Help Wikipedia by making a donation.", + "image" : "https://image.url", + "action": { + "title": "Donate", + "url": "https://donate.url?campaign_id=12345&source=android" + }, + "caption_HTML": "By donating, you are agreeing to our <a href=\"https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Donor_policy&country=%1$slanguage=%2$s&uselang=%2$s&utm_medium=androidapp\">donor privacy policy</a>.", + "countries": [ + "US", + "CA", + "GB" + ] + }, + { "id": "AnnouncementWithInvalidDates", "type": "fundraising", "start_time": null, -- To view, visit https://gerrit.wikimedia.org/r/325724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e77fc7bcbdd9ed020127f40c1996ff772fff097 Gerrit-PatchSet: 4 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits