Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Add News Media Scan flavor #549

Merged
merged 54 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
36cc6f8
Initial protorype for DW Media Probe
aanorbel Dec 12, 2022
bd06bc6
added sample logo
aanorbel Dec 13, 2022
87191eb
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Dec 14, 2022
2c1887b
updated with actual project information
aanorbel Dec 20, 2022
2097475
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Dec 21, 2022
0b17422
modified preferences
aanorbel Dec 21, 2022
383a55f
modified default preferrences
aanorbel Dec 26, 2022
9dfe80d
updated logo scaling for info page
aanorbel Jan 11, 2023
28885eb
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Feb 20, 2023
39b485f
updated version system
aanorbel Feb 20, 2023
50bc494
updated enabled categories
aanorbel Feb 23, 2023
013c5fd
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Feb 24, 2023
f02efb7
changed provider authorities
aanorbel Feb 28, 2023
4da10f3
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Mar 20, 2023
d49ed61
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Mar 30, 2023
1d14339
fix: webconectivity progress error and updated default database for d…
aanorbel Apr 3, 2023
f8fe1c5
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Jun 29, 2023
47175e5
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Jul 28, 2023
50b4fa6
changed overides based on new properties in app
aanorbel Jul 28, 2023
dfc2753
Updated logo
aanorbel Aug 1, 2023
f006382
Merge branch 'issue/1989-update' of github.com:ooni/probe-android int…
aanorbel Aug 1, 2023
6b7b0a9
updated preference intents
aanorbel Aug 1, 2023
1e9e3dc
updated onboarding page
aanorbel Aug 1, 2023
981699c
updated info activity
aanorbel Aug 1, 2023
d4390cf
updated theme with night mode colors
aanorbel Aug 1, 2023
9c34754
updated dialog and strings
aanorbel Aug 2, 2023
782e5f9
Updated dashboard logo to use xml file and update dashboard layout
aanorbel Aug 7, 2023
254322a
Updated string overides for onboarding pages
aanorbel Aug 11, 2023
bf75c4b
Updated the theme for `WebConnectivity` to use the base color theme f…
aanorbel Sep 6, 2023
d3a51bf
Updated dashboard to remove disabled cards based on build config
aanorbel Sep 7, 2023
69b7170
Updated about activity
aanorbel Sep 8, 2023
90d1326
Updated copy to use latest from DW Team
aanorbel Sep 11, 2023
8e7b12e
Updated copy
aanorbel Sep 11, 2023
dd58288
Updated copy and removed unnecesary text
aanorbel Sep 11, 2023
1a3751b
Updated asset animation and about page
aanorbel Sep 21, 2023
39cb657
Updated icon and resource file
aanorbel Sep 21, 2023
9e1cf64
Updated version code
aanorbel Sep 21, 2023
bb5f327
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Nov 17, 2023
4964560
Update app for release 3.8.5
aanorbel Nov 28, 2023
4650b5a
Merge branch 'releases/3.8.5' of github.com:ooni/probe-android into d…
aanorbel Nov 28, 2023
50f9d4b
Chore: Updated flavor definition to allow resource separation (#634)
aanorbel Dec 5, 2023
38d85b5
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Dec 5, 2023
a16dd05
Updated app to display disabled dashboard items based on build config
aanorbel Dec 5, 2023
b919961
Updated translations
aanorbel Feb 13, 2024
57a90cb
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Feb 13, 2024
b0d0f5d
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Mar 26, 2024
ca23927
chore: Updated translations for News Media Scan
aanorbel Mar 27, 2024
2f1406f
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Apr 10, 2024
7fbfd60
fix(NMS): update supported languages
aanorbel Apr 11, 2024
ca5ee3f
chore: remove bundle splitting for languages.
aanorbel Apr 29, 2024
f150e8d
chore: update language code
aanorbel Apr 29, 2024
6906084
fix: language decoding from string representation
aanorbel Apr 30, 2024
2a30bc4
chore: updated ci flow to include news media scan
aanorbel Apr 30, 2024
5700b4c
Merge branch 'master' of github.com:ooni/probe-android into dw-media-…
aanorbel Jul 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ android {
full {
dimension 'license'
}
dw {
dimension 'testing'
applicationId 'com.dw.ooniprobe'
resValue "string", "APP_NAME", "DW Media Probe"
buildConfigField 'String', 'BASE_SOFTWARE_NAME', '"dw-media-probe-android"'
versionName '0.0.1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In terms of maintainability, we should figure out before hand a way to map the dw-flavoured-app version to the actual ooniprobe-android version. The simplest scheme that comes to mind is that of using the same version number and the same version code we use for ooniprobe-android. Because using the same version number may be odd (would it be odd?), perhaps we can just share the version code? What do you think?

versionCode 1
}
}
variantFilter { variant ->
def names = variant.flavors*.name
Expand Down
43 changes: 43 additions & 0 deletions app/src/dw/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test whether it's possible to install the dw-flavoured-app and ooniprobe side by side? As far as I know, it is currently not possible to install OONI Probe stable and OONI Probe experimental side by side. While that may be acceptable because it's only us who install the experimental app, not allowing installation side by side will be a bit more confusing for people. That said, also allowing installing side-by-side is weird because we are going to have tow ~ooniprobe apps competing for collecting measurements. Did you spend time thinking about which would be the best way to handle this side by side scenario?

<application>
<activity
android:name=".activity.InfoActivity"
android:exported="false"
android:label="@string/Settings_About_Label"
android:parentActivityName=".activity.PreferenceActivity"
android:screenOrientation="userPortrait"
android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App.NoActionBar">
<intent-filter>
<action android:name=".activity.InfoActivity" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.ProxyActivity"
android:exported="false"
android:label="Proxy"
android:parentActivityName=".activity.PreferenceActivity"
android:screenOrientation="userPortrait"
android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar.App">
<intent-filter>
<action android:name=".activity.ProxyActivity" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.CustomWebsiteActivity"
android:exported="false"
android:label="@string/Settings_Websites_CustomURL_Title"
android:parentActivityName=".activity.PreferenceActivity"
android:screenOrientation="userPortrait">
<intent-filter>
<action android:name=".activity.CustomWebsiteActivity" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>
</manifest>
4 changes: 4 additions & 0 deletions app/src/dw/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Changes required.

- [] Translation updates
- [] Onboarding override
Binary file added app/src/dw/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/src/dw/res/drawable/home_toolbar_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:type="linear"
android:angle="0"
android:startColor="#0064B4"
android:endColor="#00A5FE" />
</shape>
30 changes: 30 additions & 0 deletions app/src/dw/res/drawable/ooni_logo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
Copy link
Contributor

@bassosimone bassosimone Jan 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this logo is there because we want to say something like "powered by", right?

android:width="302dp"
android:height="100dp"
android:viewportWidth="605"
android:viewportHeight="201">
<path
android:pathData="M285.04,136.07L265.46,136.07L251.48,103.11L237.74,136.07L218.16,136.07L196.41,67.98L219.51,67.98L229.88,103.29L242.81,67.98L260.38,67.98L273.32,103.29L283.68,67.98L306.78,67.98L285.04,136.07L285.04,136.07ZM100.63,178.93C57.43,178.93 22.41,143.9 22.41,100.7C22.41,57.5 57.43,22.48 100.63,22.48C143.83,22.48 178.85,57.5 178.85,100.7C178.85,143.9 143.83,178.93 100.63,178.93M248.65,0.56C219.06,0.56 192.49,13.44 174.22,33.89C155.94,13.44 129.36,0.56 99.78,0.56C44.67,0.56 0,45.23 0,100.34C0,155.45 44.67,200.12 99.78,200.12C129.36,200.12 155.94,187.24 174.22,166.79C192.49,187.24 219.06,200.12 248.65,200.12C303.76,200.12 348.43,155.45 348.43,100.34C348.43,45.23 303.76,0.56 248.65,0.56"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M103.2,117.27L81.67,117.27L81.67,84.98L103.2,84.98C118.8,84.98 124.37,91.47 124.37,101.13C124.37,110.77 118.84,117.27 103.2,117.27M106.17,62.48L57.35,62.48L57.35,139.76L106.17,139.76C127.94,139.76 150.26,128.81 150.26,101.12C150.26,73.43 127.94,62.48 106.17,62.48"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M405.05,90L405.05,47.62L419.15,90L430.48,90L444.27,47.47L444.27,90L454.85,90L454.85,33.9L438.95,33.9L424.77,77.92L410.38,33.9L394.7,33.9L394.7,90L405.05,90ZM481.48,90.97C485.17,90.97 488.27,90.47 490.77,89.47C493.27,88.47 495.65,87.1 497.9,85.35L497.9,85.35L493.85,78.67C492.25,79.72 490.59,80.63 488.86,81.38C487.14,82.13 485.23,82.5 483.13,82.5C477.52,82.5 474.35,79.38 473.6,73.13L473.6,73.13L498.95,73.13C499.4,69.47 499.35,66.17 498.8,63.22C498.25,60.27 497.23,57.75 495.73,55.65C494.23,53.55 492.3,51.92 489.95,50.77C487.6,49.62 484.85,49.05 481.7,49.05C478.8,49.05 476.2,49.55 473.9,50.55C471.6,51.55 469.65,52.96 468.05,54.79C466.45,56.61 465.21,58.81 464.34,61.39C463.46,63.96 463.02,66.82 463.02,69.97C463.02,73.32 463.46,76.31 464.34,78.94C465.21,81.56 466.45,83.76 468.05,85.54C469.65,87.31 471.59,88.66 473.86,89.59C476.14,90.51 478.67,90.97 481.48,90.97ZM488.9,65.7L473.6,65.7C474,62.7 474.83,60.49 476.08,59.06C477.33,57.64 479.02,56.92 481.17,56.92C483.67,56.92 485.55,57.67 486.8,59.17C488.05,60.67 488.75,62.85 488.9,65.7L488.9,65.7ZM520.4,90.82C524.5,90.82 527.92,89.3 530.67,86.25L530.67,86.25L531.65,90L540.28,90L540.28,31.87L530.15,31.87L530.15,51.97C527.45,50.12 524.45,49.2 521.15,49.2C518.6,49.2 516.3,49.69 514.25,50.66C512.2,51.64 510.46,53.04 509.04,54.86C507.61,56.69 506.51,58.9 505.74,61.5C504.96,64.1 504.58,67.03 504.58,70.28C504.58,73.57 504.96,76.5 505.74,79.05C506.51,81.6 507.59,83.75 508.96,85.5C510.34,87.25 512,88.57 513.95,89.47C515.9,90.38 518.05,90.82 520.4,90.82ZM522.42,81.97C519.88,81.97 518.04,81 516.91,79.05C515.79,77.1 515.22,74.17 515.22,70.28C515.22,66.07 515.85,62.99 517.1,61.01C518.35,59.04 520.28,58.05 522.88,58.05C524.22,58.05 525.53,58.29 526.78,58.76C528.03,59.24 529.15,59.85 530.15,60.6L530.15,60.6L530.15,78.82C529.1,79.82 527.9,80.6 526.55,81.15C525.2,81.7 523.83,81.97 522.42,81.97ZM554.22,44.7C556.03,44.7 557.55,44.09 558.8,42.86C560.05,41.64 560.67,40.12 560.67,38.32C560.67,36.52 560.05,35 558.8,33.75C557.55,32.5 556.03,31.87 554.22,31.87C552.42,31.87 550.91,32.5 549.69,33.75C548.46,35 547.85,36.52 547.85,38.32C547.85,40.12 548.46,41.64 549.69,42.86C550.91,44.09 552.42,44.7 554.22,44.7ZM559.33,90L559.33,50.02L549.2,50.02L549.2,90L559.33,90ZM579.8,90.97C581.55,90.97 583.4,90.69 585.35,90.11C587.3,89.54 589.22,88.38 591.13,86.63L591.13,86.63L591.88,90L600.95,90L600.95,65.03C600.95,60.12 599.58,56.24 596.83,53.36C594.08,50.49 590.2,49.05 585.2,49.05C582.5,49.05 579.75,49.46 576.95,50.29C574.15,51.11 571.47,52.25 568.92,53.7L568.92,53.7L572.22,61.12C574.13,60.22 576.03,59.51 577.92,58.99C579.83,58.46 581.58,58.2 583.17,58.2C585.38,58.2 587.19,58.81 588.61,60.04C590.04,61.26 590.78,63.35 590.83,66.3L590.83,66.3L585.05,66.3C579.25,66.3 574.67,67.32 571.33,69.38C567.97,71.42 566.3,74.57 566.3,78.82C566.3,80.57 566.6,82.2 567.2,83.7C567.8,85.2 568.67,86.49 569.83,87.56C570.97,88.64 572.39,89.47 574.06,90.07C575.74,90.68 577.65,90.97 579.8,90.97ZM582.28,82.88C580.42,82.88 579.04,82.5 578.11,81.75C577.19,81 576.72,79.95 576.72,78.6C576.72,76.85 577.44,75.57 578.86,74.78C580.29,73.97 582.6,73.57 585.8,73.57L585.8,73.57L590.83,73.57L590.83,79.95C589.58,80.85 588.21,81.56 586.74,82.09C585.26,82.61 583.78,82.88 582.28,82.88Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M405.58,168L405.58,148.65L412.48,148.65C418.63,148.65 423.42,147.02 426.88,143.77C430.33,140.52 432.05,136 432.05,130.2C432.05,124.45 430.36,119.96 426.99,116.74C423.61,113.51 418.92,111.9 412.92,111.9L412.92,111.9L394.7,111.9L394.7,168L405.58,168ZM411.88,139.05L405.58,139.05L405.58,121.65L411.5,121.65C414.5,121.65 416.8,122.39 418.4,123.86C420,125.34 420.8,127.5 420.8,130.35C420.8,133.2 420.02,135.36 418.48,136.84C416.92,138.31 414.73,139.05 411.88,139.05L411.88,139.05ZM449.98,168L449.98,139.5C451.63,137.8 453.7,136.95 456.2,136.95C457.65,136.95 459.08,137.13 460.48,137.47L460.48,137.47L463.17,128.02C461.67,127.43 460.17,127.13 458.67,127.13C456.92,127.13 455.29,127.54 453.76,128.36C452.24,129.19 450.88,130.32 449.67,131.77L449.67,131.77L448.63,128.02L439.85,128.02L439.85,168L449.98,168ZM486.05,168.98C488.9,168.98 491.5,168.48 493.85,167.48C496.2,166.48 498.2,165.06 499.85,163.24C501.5,161.41 502.77,159.21 503.67,156.64C504.58,154.06 505.02,151.18 505.02,147.98C505.02,144.82 504.58,141.96 503.67,139.39C502.77,136.81 501.5,134.61 499.85,132.79C498.2,130.96 496.21,129.55 493.89,128.55C491.56,127.55 488.98,127.05 486.13,127.05C483.23,127.05 480.6,127.55 478.25,128.55C475.9,129.55 473.9,130.96 472.25,132.79C470.6,134.61 469.33,136.81 468.42,139.39C467.52,141.96 467.08,144.82 467.08,147.98C467.08,151.18 467.52,154.06 468.42,156.64C469.33,159.21 470.6,161.41 472.25,163.24C473.9,165.06 475.9,166.48 478.25,167.48C480.6,168.48 483.2,168.98 486.05,168.98ZM486.13,160.2C483.38,160.2 481.29,159.16 479.86,157.09C478.44,155.01 477.73,151.98 477.73,147.98C477.73,144.02 478.44,141.01 479.86,138.94C481.29,136.86 483.38,135.82 486.13,135.82C488.83,135.82 490.89,136.86 492.31,138.94C493.74,141.01 494.45,144.02 494.45,147.98C494.45,151.98 493.74,155.01 492.31,157.09C490.89,159.16 488.83,160.2 486.13,160.2ZM531.35,168.82C533.9,168.82 536.2,168.34 538.25,167.36C540.3,166.39 542.04,164.99 543.46,163.16C544.89,161.34 545.99,159.11 546.76,156.49C547.54,153.86 547.92,150.93 547.92,147.68C547.92,144.38 547.55,141.46 546.8,138.94C546.05,136.41 544.97,134.27 543.58,132.52C542.17,130.77 540.5,129.45 538.55,128.55C536.6,127.65 534.45,127.2 532.1,127.2C528.2,127.2 524.92,128.57 522.28,131.32L522.28,131.32L522.28,109.88L512.15,109.88L512.15,168L520.7,168L521.38,164.4C524.17,167.35 527.5,168.82 531.35,168.82ZM529.63,159.98C528.22,159.98 526.9,159.73 525.65,159.23C524.4,158.73 523.28,158.1 522.28,157.35L522.28,157.35L522.28,139.27C523.38,138.27 524.6,137.49 525.95,136.91C527.3,136.34 528.67,136.05 530.08,136.05C532.63,136.05 534.46,137.01 535.59,138.94C536.71,140.86 537.28,143.77 537.28,147.68C537.28,151.93 536.65,155.04 535.4,157.01C534.15,158.99 532.22,159.98 529.63,159.98ZM571.33,168.98C575.03,168.98 578.13,168.48 580.63,167.48C583.13,166.48 585.5,165.1 587.75,163.35L587.75,163.35L583.7,156.68C582.1,157.73 580.44,158.63 578.71,159.38C576.99,160.13 575.08,160.5 572.97,160.5C567.38,160.5 564.2,157.38 563.45,151.13L563.45,151.13L588.8,151.13C589.25,147.48 589.2,144.18 588.65,141.22C588.1,138.27 587.08,135.75 585.58,133.65C584.08,131.55 582.15,129.93 579.8,128.77C577.45,127.63 574.7,127.05 571.55,127.05C568.65,127.05 566.05,127.55 563.75,128.55C561.45,129.55 559.5,130.96 557.9,132.79C556.3,134.61 555.06,136.81 554.19,139.39C553.31,141.96 552.88,144.82 552.88,147.98C552.88,151.32 553.31,154.31 554.19,156.94C555.06,159.56 556.3,161.76 557.9,163.54C559.5,165.31 561.44,166.66 563.71,167.59C565.99,168.51 568.53,168.98 571.33,168.98ZM578.75,143.7L563.45,143.7C563.85,140.7 564.67,138.49 565.92,137.06C567.17,135.64 568.88,134.93 571.03,134.93C573.53,134.93 575.4,135.68 576.65,137.18C577.9,138.68 578.6,140.85 578.75,143.7L578.75,143.7Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
30 changes: 30 additions & 0 deletions app/src/dw/res/drawable/ooniprobe_logo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="605dp"
android:height="201dp"
android:viewportWidth="605"
android:viewportHeight="201">
<path
android:pathData="M285.04,136.07L265.46,136.07L251.48,103.11L237.74,136.07L218.16,136.07L196.41,67.98L219.51,67.98L229.88,103.29L242.81,67.98L260.38,67.98L273.32,103.29L283.68,67.98L306.78,67.98L285.04,136.07L285.04,136.07ZM100.63,178.93C57.43,178.93 22.41,143.9 22.41,100.7C22.41,57.5 57.43,22.48 100.63,22.48C143.83,22.48 178.85,57.5 178.85,100.7C178.85,143.9 143.83,178.93 100.63,178.93M248.65,0.56C219.06,0.56 192.49,13.44 174.22,33.89C155.94,13.44 129.36,0.56 99.78,0.56C44.67,0.56 0,45.23 0,100.34C0,155.45 44.67,200.12 99.78,200.12C129.36,200.12 155.94,187.24 174.22,166.79C192.49,187.24 219.06,200.12 248.65,200.12C303.76,200.12 348.43,155.45 348.43,100.34C348.43,45.23 303.76,0.56 248.65,0.56"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M103.2,117.27L81.67,117.27L81.67,84.98L103.2,84.98C118.8,84.98 124.37,91.47 124.37,101.13C124.37,110.77 118.84,117.27 103.2,117.27M106.17,62.48L57.35,62.48L57.35,139.76L106.17,139.76C127.94,139.76 150.26,128.81 150.26,101.12C150.26,73.43 127.94,62.48 106.17,62.48"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M405.05,90L405.05,47.62L419.15,90L430.48,90L444.27,47.47L444.27,90L454.85,90L454.85,33.9L438.95,33.9L424.77,77.92L410.38,33.9L394.7,33.9L394.7,90L405.05,90ZM481.48,90.97C485.17,90.97 488.27,90.47 490.77,89.47C493.27,88.47 495.65,87.1 497.9,85.35L497.9,85.35L493.85,78.67C492.25,79.72 490.59,80.63 488.86,81.38C487.14,82.13 485.23,82.5 483.13,82.5C477.52,82.5 474.35,79.38 473.6,73.13L473.6,73.13L498.95,73.13C499.4,69.47 499.35,66.17 498.8,63.22C498.25,60.27 497.23,57.75 495.73,55.65C494.23,53.55 492.3,51.92 489.95,50.77C487.6,49.62 484.85,49.05 481.7,49.05C478.8,49.05 476.2,49.55 473.9,50.55C471.6,51.55 469.65,52.96 468.05,54.79C466.45,56.61 465.21,58.81 464.34,61.39C463.46,63.96 463.02,66.82 463.02,69.97C463.02,73.32 463.46,76.31 464.34,78.94C465.21,81.56 466.45,83.76 468.05,85.54C469.65,87.31 471.59,88.66 473.86,89.59C476.14,90.51 478.67,90.97 481.48,90.97ZM488.9,65.7L473.6,65.7C474,62.7 474.83,60.49 476.08,59.06C477.33,57.64 479.02,56.92 481.17,56.92C483.67,56.92 485.55,57.67 486.8,59.17C488.05,60.67 488.75,62.85 488.9,65.7L488.9,65.7ZM520.4,90.82C524.5,90.82 527.92,89.3 530.67,86.25L530.67,86.25L531.65,90L540.28,90L540.28,31.87L530.15,31.87L530.15,51.97C527.45,50.12 524.45,49.2 521.15,49.2C518.6,49.2 516.3,49.69 514.25,50.66C512.2,51.64 510.46,53.04 509.04,54.86C507.61,56.69 506.51,58.9 505.74,61.5C504.96,64.1 504.58,67.03 504.58,70.28C504.58,73.57 504.96,76.5 505.74,79.05C506.51,81.6 507.59,83.75 508.96,85.5C510.34,87.25 512,88.57 513.95,89.47C515.9,90.38 518.05,90.82 520.4,90.82ZM522.42,81.97C519.88,81.97 518.04,81 516.91,79.05C515.79,77.1 515.22,74.17 515.22,70.28C515.22,66.07 515.85,62.99 517.1,61.01C518.35,59.04 520.28,58.05 522.88,58.05C524.22,58.05 525.53,58.29 526.78,58.76C528.03,59.24 529.15,59.85 530.15,60.6L530.15,60.6L530.15,78.82C529.1,79.82 527.9,80.6 526.55,81.15C525.2,81.7 523.83,81.97 522.42,81.97ZM554.22,44.7C556.03,44.7 557.55,44.09 558.8,42.86C560.05,41.64 560.67,40.12 560.67,38.32C560.67,36.52 560.05,35 558.8,33.75C557.55,32.5 556.03,31.87 554.22,31.87C552.42,31.87 550.91,32.5 549.69,33.75C548.46,35 547.85,36.52 547.85,38.32C547.85,40.12 548.46,41.64 549.69,42.86C550.91,44.09 552.42,44.7 554.22,44.7ZM559.33,90L559.33,50.02L549.2,50.02L549.2,90L559.33,90ZM579.8,90.97C581.55,90.97 583.4,90.69 585.35,90.11C587.3,89.54 589.22,88.38 591.13,86.63L591.13,86.63L591.88,90L600.95,90L600.95,65.03C600.95,60.12 599.58,56.24 596.83,53.36C594.08,50.49 590.2,49.05 585.2,49.05C582.5,49.05 579.75,49.46 576.95,50.29C574.15,51.11 571.47,52.25 568.92,53.7L568.92,53.7L572.22,61.12C574.13,60.22 576.03,59.51 577.92,58.99C579.83,58.46 581.58,58.2 583.17,58.2C585.38,58.2 587.19,58.81 588.61,60.04C590.04,61.26 590.78,63.35 590.83,66.3L590.83,66.3L585.05,66.3C579.25,66.3 574.67,67.32 571.33,69.38C567.97,71.42 566.3,74.57 566.3,78.82C566.3,80.57 566.6,82.2 567.2,83.7C567.8,85.2 568.67,86.49 569.83,87.56C570.97,88.64 572.39,89.47 574.06,90.07C575.74,90.68 577.65,90.97 579.8,90.97ZM582.28,82.88C580.42,82.88 579.04,82.5 578.11,81.75C577.19,81 576.72,79.95 576.72,78.6C576.72,76.85 577.44,75.57 578.86,74.78C580.29,73.97 582.6,73.57 585.8,73.57L585.8,73.57L590.83,73.57L590.83,79.95C589.58,80.85 588.21,81.56 586.74,82.09C585.26,82.61 583.78,82.88 582.28,82.88Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M405.58,168L405.58,148.65L412.48,148.65C418.63,148.65 423.42,147.02 426.88,143.77C430.33,140.52 432.05,136 432.05,130.2C432.05,124.45 430.36,119.96 426.99,116.74C423.61,113.51 418.92,111.9 412.92,111.9L412.92,111.9L394.7,111.9L394.7,168L405.58,168ZM411.88,139.05L405.58,139.05L405.58,121.65L411.5,121.65C414.5,121.65 416.8,122.39 418.4,123.86C420,125.34 420.8,127.5 420.8,130.35C420.8,133.2 420.02,135.36 418.48,136.84C416.92,138.31 414.73,139.05 411.88,139.05L411.88,139.05ZM449.98,168L449.98,139.5C451.63,137.8 453.7,136.95 456.2,136.95C457.65,136.95 459.08,137.13 460.48,137.47L460.48,137.47L463.17,128.02C461.67,127.43 460.17,127.13 458.67,127.13C456.92,127.13 455.29,127.54 453.76,128.36C452.24,129.19 450.88,130.32 449.67,131.77L449.67,131.77L448.63,128.02L439.85,128.02L439.85,168L449.98,168ZM486.05,168.98C488.9,168.98 491.5,168.48 493.85,167.48C496.2,166.48 498.2,165.06 499.85,163.24C501.5,161.41 502.77,159.21 503.67,156.64C504.58,154.06 505.02,151.18 505.02,147.98C505.02,144.82 504.58,141.96 503.67,139.39C502.77,136.81 501.5,134.61 499.85,132.79C498.2,130.96 496.21,129.55 493.89,128.55C491.56,127.55 488.98,127.05 486.13,127.05C483.23,127.05 480.6,127.55 478.25,128.55C475.9,129.55 473.9,130.96 472.25,132.79C470.6,134.61 469.33,136.81 468.42,139.39C467.52,141.96 467.08,144.82 467.08,147.98C467.08,151.18 467.52,154.06 468.42,156.64C469.33,159.21 470.6,161.41 472.25,163.24C473.9,165.06 475.9,166.48 478.25,167.48C480.6,168.48 483.2,168.98 486.05,168.98ZM486.13,160.2C483.38,160.2 481.29,159.16 479.86,157.09C478.44,155.01 477.73,151.98 477.73,147.98C477.73,144.02 478.44,141.01 479.86,138.94C481.29,136.86 483.38,135.82 486.13,135.82C488.83,135.82 490.89,136.86 492.31,138.94C493.74,141.01 494.45,144.02 494.45,147.98C494.45,151.98 493.74,155.01 492.31,157.09C490.89,159.16 488.83,160.2 486.13,160.2ZM531.35,168.82C533.9,168.82 536.2,168.34 538.25,167.36C540.3,166.39 542.04,164.99 543.46,163.16C544.89,161.34 545.99,159.11 546.76,156.49C547.54,153.86 547.92,150.93 547.92,147.68C547.92,144.38 547.55,141.46 546.8,138.94C546.05,136.41 544.97,134.27 543.58,132.52C542.17,130.77 540.5,129.45 538.55,128.55C536.6,127.65 534.45,127.2 532.1,127.2C528.2,127.2 524.92,128.57 522.28,131.32L522.28,131.32L522.28,109.88L512.15,109.88L512.15,168L520.7,168L521.38,164.4C524.17,167.35 527.5,168.82 531.35,168.82ZM529.63,159.98C528.22,159.98 526.9,159.73 525.65,159.23C524.4,158.73 523.28,158.1 522.28,157.35L522.28,157.35L522.28,139.27C523.38,138.27 524.6,137.49 525.95,136.91C527.3,136.34 528.67,136.05 530.08,136.05C532.63,136.05 534.46,137.01 535.59,138.94C536.71,140.86 537.28,143.77 537.28,147.68C537.28,151.93 536.65,155.04 535.4,157.01C534.15,158.99 532.22,159.98 529.63,159.98ZM571.33,168.98C575.03,168.98 578.13,168.48 580.63,167.48C583.13,166.48 585.5,165.1 587.75,163.35L587.75,163.35L583.7,156.68C582.1,157.73 580.44,158.63 578.71,159.38C576.99,160.13 575.08,160.5 572.97,160.5C567.38,160.5 564.2,157.38 563.45,151.13L563.45,151.13L588.8,151.13C589.25,147.48 589.2,144.18 588.65,141.22C588.1,138.27 587.08,135.75 585.58,133.65C584.08,131.55 582.15,129.93 579.8,128.77C577.45,127.63 574.7,127.05 571.55,127.05C568.65,127.05 566.05,127.55 563.75,128.55C561.45,129.55 559.5,130.96 557.9,132.79C556.3,134.61 555.06,136.81 554.19,139.39C553.31,141.96 552.88,144.82 552.88,147.98C552.88,151.32 553.31,154.31 554.19,156.94C555.06,159.56 556.3,161.76 557.9,163.54C559.5,165.31 561.44,166.66 563.71,167.59C565.99,168.51 568.53,168.98 571.33,168.98ZM578.75,143.7L563.45,143.7C563.85,140.7 564.67,138.49 565.92,137.06C567.17,135.64 568.88,134.93 571.03,134.93C573.53,134.93 575.4,135.68 576.65,137.18C577.9,138.68 578.6,140.85 578.75,143.7L578.75,143.7Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
Loading