Skip to content
Snippets Groups Projects
Commit 3567bce6 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch 'upstream' into 'master'

Upstream

See merge request benoit.harrault/ameixa!1
parents 9e1fee49 f765727f
No related branches found
No related tags found
No related merge requests found
Showing
with 207 additions and 20 deletions
app/src/main/res/drawable-hdpi/metronome.png

2.67 KiB

app/src/main/res/drawable-hdpi/papercraft.png

2 KiB

app/src/main/res/drawable-hdpi/peertube.png

1.97 KiB

app/src/main/res/drawable-mdpi/metronome.png

1.75 KiB

app/src/main/res/drawable-mdpi/papercraft.png

1.25 KiB

app/src/main/res/drawable-mdpi/peertube.png

1.34 KiB

app/src/main/res/drawable-xhdpi/metronome.png

3.55 KiB

app/src/main/res/drawable-xhdpi/papercraft.png

2.73 KiB

app/src/main/res/drawable-xhdpi/peertube.png

2.72 KiB

app/src/main/res/drawable-xxhdpi/metronome.png

5.57 KiB

app/src/main/res/drawable-xxhdpi/papercraft.png

4.52 KiB

app/src/main/res/drawable-xxhdpi/peertube.png

4.31 KiB

app/src/main/res/drawable-xxxhdpi/metronome.png

7.76 KiB

app/src/main/res/drawable-xxxhdpi/papercraft.png

6.2 KiB

app/src/main/res/drawable-xxxhdpi/peertube.png

5.89 KiB

......@@ -203,6 +203,7 @@
<item>dimmer</item>
<item>dir</item>
<item>disablemanager</item>
<item>discord</item>
<item>diskusage</item>
<item>dns66</item>
<item>dnsman</item>
......@@ -427,6 +428,7 @@
<item>meditationassistant</item>
<item>memetastic</item>
<item>mercury</item>
<item>metronome</item>
<item>mgit</item>
<item>mibandnotifier</item>
<item>micopi</item>
......@@ -562,6 +564,7 @@
<item>paddletennis</item>
<item>pageturner</item>
<item>palemoon</item>
<item>papercraft</item>
<item>paperlaunch</item>
<item>passandroid</item>
<item>passwdsafe</item>
......@@ -569,6 +572,7 @@
<item>pdfreader</item>
<item>pedometer2</item>
<item>pedometer</item>
<item>peertube</item>
<item>penandpdf</item>
<item>performancecontrol</item>
<item>periodical</item>
......@@ -593,6 +597,7 @@
<item>pretendyourexyzzy</item>
<item>prevo</item>
<item>privacybrowser</item>
<item>protonmail</item>
<item>providersmedia</item>
<item>puff</item>
<item>puma</item>
......
......@@ -2742,6 +2742,9 @@
<item
component="ComponentInfo{org.palemoon.mobile/org.palemoon.mobile.App}"
drawable="palemoon" />
<item
component="ComponentInfo{pro.rudloff.papercraft/cordproject.lol.papercraft.MainActivity}"
drawable="papercraft" />
<item
component="ComponentInfo{de.devmil.paperlaunch/de.devmil.paperlaunch.MainActivity}"
drawable="paperlaunch" />
......@@ -2772,6 +2775,9 @@
<item
component="ComponentInfo{org.secuso.privacyfriendlyactivitytracker/org.secuso.privacyfriendlyactivitytracker.activities.SplashActivity}"
drawable="pedometer" />
<item
component="ComponentInfo{net.schueller.peertube/net.schueller.peertube.activity.VideoListActivity}"
drawable="peertube" />
<item
component="ComponentInfo{com.cgogolin.penandpdf/com.cgogolin.penandpdf/com.cgogolin.penandpdf.PenAndPDFActivity}"
drawable="penandpdf" />
......@@ -4149,6 +4155,9 @@
<item
component="ComponentInfo{com.github.axet.torrentclient/com.github.axet.torrentclient.activities.MainActivity}"
drawable="torrentclient" />
<item
component="ComponentInfo{org.pipoypipagames.towerjumper/org.godotengine.godot.Godot}"
drawable="towerjumper"/>
<item
component="ComponentInfo{org.traccar.client/org.traccar.client.TraccarActivity}"
drawable="traccar" />
......
......@@ -203,6 +203,7 @@
<item drawable="dimmer" />
<item drawable="dir" />
<item drawable="disablemanager" />
<item drawable="discord" />
<item drawable="diskusage" />
<item drawable="dns66" />
<item drawable="dnsman" />
......@@ -427,6 +428,7 @@
<item drawable="meditationassistant" />
<item drawable="memetastic" />
<item drawable="mercury" />
<item drawable="metronome" />
<item drawable="mgit" />
<item drawable="mibandnotifier" />
<item drawable="micopi" />
......@@ -562,6 +564,7 @@
<item drawable="paddletennis" />
<item drawable="pageturner" />
<item drawable="palemoon" />
<item drawable="papercraft" />
<item drawable="paperlaunch" />
<item drawable="passandroid" />
<item drawable="passwdsafe" />
......@@ -569,6 +572,7 @@
<item drawable="pdfreader" />
<item drawable="pedometer2" />
<item drawable="pedometer" />
<item drawable="peertube" />
<item drawable="penandpdf" />
<item drawable="performancecontrol" />
<item drawable="periodical" />
......@@ -593,6 +597,7 @@
<item drawable="pretendyourexyzzy" />
<item drawable="prevo" />
<item drawable="privacybrowser" />
<item drawable="protonmail" />
<item drawable="providersmedia" />
<item drawable="puff" />
<item drawable="puma" />
......
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 26.95 26.95" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<filter id="filter6206-7" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation="0.658125"/>
</filter>
</defs>
<g transform="translate(0 -1025.4)">
<path transform="matrix(1.0107 0 0 .99762 -.087875 2.579)" d="m4.4177 1028.2v1.6051h-1.6052v18.192h1.6052v2.1402h18.192v-2.1402h2.1402v-18.192h-2.1402v-1.6051h-18.192z" fill="#263238" filter="url(#filter6206-7)" opacity=".2"/>
<rect x="2.8113" y="1028.2" width="21.327" height="21.327" rx="1.1225" ry="1.1226" fill="#4caf50"/>
<g transform="translate(-20.925 990.46)">
<path d="m0 0h48v48h-48z" fill="none"/>
<g transform="matrix(.33601 0 0 .33601 1.434 68.477)">
<path d="m0 0h48v48h-48z" fill="none"/>
</g>
<g transform="matrix(.37187 0 0 .37187 36.377 59.287)">
<path d="m0 0h48v48h-48z" fill="none"/>
<g transform="matrix(2.6891 0 0 2.6891 -77.724 -45.422)">
<path d="m0 0h48v48h-48z" fill="none"/>
</g>
</g>
</g>
<path transform="translate(0 1025.4)" d="m3.9336 2.8105c-0.62186 0-1.123 0.50115-1.123 1.123v0.3125c0-0.6219 0.50118-1.123 1.123-1.123h19.082c0.62186 0 1.123 0.50115 1.123 1.123v-0.3125c0-0.6219-0.50118-1.123-1.123-1.123h-19.082z" fill="#fff" opacity=".2"/>
<rect x="120" y="512.36" width="40" height="40" fill="none"/>
<rect x="120" y="592.36" width="40" height="40" fill="none"/>
<rect x="120" y="632.36" width="40" height="40" fill="none"/>
<rect x="120" y="552.36" width="40" height="40" fill="none"/>
<rect x="120" y="672.36" width="40" height="40" fill="none"/>
<rect x="200" y="512.36" width="40" height="40" fill="none"/>
<rect x="200" y="592.36" width="40" height="40" fill="none"/>
<rect x="200" y="632.36" width="40" height="40" fill="none"/>
<rect x="200" y="552.36" width="40" height="40" fill="none"/>
<rect x="200" y="672.36" width="40" height="40" fill="none"/>
<rect x="280" y="512.36" width="40" height="40" fill="none"/>
<rect x="280" y="592.36" width="40" height="40" fill="none"/>
<rect x="280" y="632.36" width="40" height="40" fill="none"/>
<rect x="280" y="552.36" width="40" height="40" fill="none"/>
<rect x="280" y="672.36" width="40" height="40" fill="none"/>
<rect x="160" y="512.36" width="40" height="40" fill="none"/>
<rect x="160" y="592.36" width="40" height="40" fill="none"/>
<rect x="160" y="632.36" width="40" height="40" fill="none"/>
<rect x="160" y="552.36" width="40" height="40" fill="none"/>
<rect x="160" y="672.36" width="40" height="40" fill="none"/>
<rect x="240" y="512.36" width="40" height="40" fill="none"/>
<rect x="240" y="592.36" width="40" height="40" fill="none"/>
<rect x="240" y="632.36" width="40" height="40" fill="none"/>
<rect x="240" y="552.36" width="40" height="40" fill="none"/>
<rect x="240" y="672.36" width="40" height="40" fill="none"/>
<rect x="120" y="712.36" width="40" height="40" fill="none"/>
<rect x="200" y="712.36" width="40" height="40" fill="none"/>
<rect x="280" y="712.36" width="40" height="40" fill="none"/>
<rect x="160" y="712.36" width="40" height="40" fill="none"/>
<rect x="240" y="712.36" width="40" height="40" fill="none"/>
<rect x="320" y="552.36" width="40" height="40" fill="none"/>
<rect x="320" y="592.36" width="40" height="40" fill="none"/>
<rect x="320" y="672.36" width="40" height="40" fill="none"/>
<rect x="320" y="512.36" width="40" height="40" fill="none"/>
<rect x="320" y="632.36" width="40" height="40" fill="none"/>
<rect x="320" y="712.36" width="40" height="40" fill="none"/>
<rect x="150" y="542.36" width="180" height="180" fill="none"/>
<g transform="matrix(.37344 0 0 .37344 4.4375 1028.8)">
<path d="m0 0h48v48h-48z" fill="none"/>
</g>
<g transform="matrix(.36471 0 0 .36471 4.8146 1028.8)">
<path d="m0 0h48v48h-48z" fill="none"/>
</g>
<g transform="matrix(.41585 0 0 .41585 79.055 989.88)">
<g transform="matrix(.062269 0 0 .062269 -26.473 173.71)">
<g transform="matrix(38.618 0 0 38.618 13804 -12696)">
<g transform="matrix(.71436 0 0 .71436 -375.49 176.57)">
<path transform="matrix(1.3999 0 0 1.3999 525.63 -247.17)" d="m490.56 95.75c-121.72 0.18504-342.34 0.090577-468.16 0.09375-1.5548 6.9739-2.4062 14.232-2.4062 21.688v76.344c139.06 0.49354 331.32 0.2554 472.97 0.25v-76.594c0-7.4875-0.8386-14.78-2.4062-21.781zm-307.19 197.94c-52.495-3e-3 -106.38 0.11982-163.38 0.375v92.844c191.76-0.26331 282.43-0.0926 472.97-0.21875v-92.25c-109.29-0.35498-208.43-0.74426-309.59-0.75z" opacity="0"/>
</g>
</g>
</g>
</g>
<path d="m23.015 1049.6c0.6218 0 1.123-0.5012 1.123-1.123v-0.3125c0 0.6218-0.5012 1.123-1.123 1.123h-19.082c-0.6218 0-1.123-0.5012-1.123-1.123v0.3125c0 0.6218 0.5012 1.123 1.123 1.123h19.082z" fill="#263238" opacity=".2"/>
</g>
<g>
<flowRoot fill="#000000" font-family="Roboto" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0.01%" xml:space="preserve"><flowRegion><rect x="10.664" y="11.235" width="4.49" height="5.0512"/></flowRegion><flowPara font-size="3.75px" style="line-height:1.25">your</flowPara></flowRoot>
<path d="m8.5808 19.608h9.7883l-3.9153-12.292h-1.9577z" fill="none" stroke="#fff" stroke-linejoin="round" stroke-miterlimit="5.8" stroke-width="1.0926"/>
<path d="m18.303 6.6403-1.1225 1.9442-0.48606-0.28062-0.56125 0.97211 0.39918 0.4311-4.1225 7.1404 0.97211 0.56125 4.1225-7.1404 0.57293 0.13015 0.56125-0.97211-0.48606-0.28063 1.1225-1.9442z" fill="#fff"/>
</g>
<g display="none" fill="none">
<rect transform="rotate(90)" x="7.3342" y="-19.616" width="12.282" height="12.282" display="inline" stroke="#000" stroke-width=".065984"/>
<rect x="6.7726" y="8.112" width="13.405" height="10.726" stroke="#5261ff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".06524"/>
<rect transform="rotate(90)" x="6.7726" y="-18.838" width="13.405" height="10.726" display="inline" stroke="#0f0" stroke-linecap="round" stroke-linejoin="round" stroke-width=".06524"/>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" viewBox="0 0 28.747 28.747" xmlns="http://www.w3.org/2000/svg">
<defs>
<filter id="filter6206-7" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation="0.658125"/>
</filter>
</defs>
<g transform="translate(0 -1093.8)">
<path transform="matrix(1.0781 0 0 1.0641 -.093733 2.7509)" d="m4.4177 1028.2v1.6051h-1.6052v18.192h1.6052v2.1402h18.192v-2.1402h2.1402v-18.192h-2.1402v-1.6051z" fill="#3e2723" filter="url(#filter6206-7)" opacity=".2"/>
<rect x="2.9987" y="1096.8" width="22.749" height="22.749" rx="1.1973" ry="1.1974" fill="#ff5722"/>
<g transform="translate(-22.32 1056.5)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
<g transform="matrix(.33601 0 0 .33601 1.5296 73.043)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
<g transform="matrix(.37187 0 0 .37187 38.802 63.239)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
<g transform="matrix(2.6891 0 0 2.6891 -82.906 -48.45)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
</g>
</g>
<path d="m4.1958 1096.8c-0.66332 0-1.1979 0.5346-1.1979 1.1979v0.3334c0-0.6634 0.53459-1.1979 1.1979-1.1979h20.354c0.66332 0 1.1979 0.5345 1.1979 1.1979v-0.3334c0-0.6633-0.5346-1.1979-1.1979-1.1979z" fill="#fff" opacity=".2"/>
<rect x="128" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="128" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="213.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="298.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="170.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="256" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="341.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/>
<rect x="160" y="578.52" width="192" height="192" fill="none" stroke-width="1.0667"/>
<g transform="matrix(.37344 0 0 .37344 4.7333 1097.4)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
<g transform="matrix(.36471 0 0 .36471 5.1356 1097.4)">
<path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/>
</g>
<g transform="matrix(.41585 0 0 .41585 84.325 1055.9)">
<g transform="matrix(.062269 0 0 .062269 -28.238 185.29)">
<g transform="matrix(38.618 0 0 38.618 14724 -13542)">
<g transform="matrix(.71436 0 0 .71436 -400.52 188.34)">
<path d="m1293.2-120.67c-181.75 0.2763-511.18 0.13525-699.05 0.13998-2.3216 10.413-3.593 21.251-3.593 32.384v114c207.65 0.73695 494.72 0.38136 706.23 0.3733v-114.37c0-11.18-1.2522-22.07-3.593-32.523zm-458.69 295.56c-78.385-4e-3 -158.85 0.17892-243.95 0.55995v138.63c286.34-0.39317 421.73-0.13827 706.23-0.32664v-137.75c-163.2-0.53005-311.22-1.1113-462.28-1.1199z" opacity="0" stroke-width="1.4932"/>
</g>
</g>
</g>
</g>
<path d="m24.549 1119.5c0.66325 0 1.1979-0.5346 1.1979-1.1979v-0.3333c0 0.6632-0.53461 1.1978-1.1979 1.1978h-20.354c-0.66325 0-1.1979-0.5346-1.1979-1.1978v0.3333c0 0.6633 0.53461 1.1979 1.1979 1.1979z" fill="#3e2723" opacity=".2"/>
</g>
<flowRoot fill="#000000" font-family="Roboto" font-size="12.8px" letter-spacing="0px" stroke-width="1.0667px" word-spacing="0px" style="line-height:0.01%" xml:space="preserve"><flowRegion><rect x="11.375" y="11.984" width="4.7893" height="5.388" stroke-width="1.1378px"/></flowRegion><flowPara font-size="4px" style="line-height:1.25">your</flowPara></flowRoot>
<path d="m16.496 9.3482c-1.897 0.0018-3.6312 1.0722-4.4832 2.7672l3.9143 2.2615-3.9119 2.2591c0.85419 1.6906 2.5867 2.7569 4.4808 2.7578 2.7749 4.9e-4 5.0245-2.2491 5.024-5.024-8.03e-4 -2.7739-2.25-5.0221-5.024-5.0216zm-4.4808 7.2878-0.002385-4.5206-4.7852-2.7625v10.046z" fill="#fff"/>
</svg>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment