Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • justJanne/meteroid
1 result
Select Git revision
Show changes
Commits on Source (3)
Show whitespace changes
Inline Side-by-side
Showing
with 248 additions and 16 deletions
app/src/debug/res/drawable/ic_launcher.xml 0 → 100644
View file @ d5083dd5
<?xml version="1.0" encoding="utf-8"?><!--
~ The MIT License (MIT)
~
~ Copyright (c) 2013-2023 Chaosdorf e.V.
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in
~ all copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
~ THE SOFTWARE.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
xmlns:tools="http://schemas.android.com/tools"
android:width="72dp"
android:height="72dp"
android:viewportWidth="72"
android:viewportHeight="72">
<path
android:fillColor="@color/ic_launcher_background"
android:pathData="m11.5 0c-6.35 0-11.5 5.15-11.5 11.5v49c0 6.35 5.15 11.5 11.5 11.5h49c6.35 0 11.5-5.15 11.5-11.5v-49c0-6.35-5.15-11.5-11.5-11.5z"
tools:ignore="VectorRaster"/>
<path
android:fillAlpha="0.5"
android:fillColor="#000000"
android:pathData="m21.7 60.9v11.1h38.8c0 0 0.256-0 0-0l-10.6-11.1z"/>
<path
android:pathData="m53.5 23.5-4.46 37.2c-0.136 1.14-3.2 1.6-13.3 1.6s-13.2-0.465-13.3-1.6l-4.38-39c14.3 4.73 19.3-2.75 35.4 1.86z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="0"
android:endY="60"
android:startX="0"
android:startY="20"
android:type="linear">
<item
android:color="#ff9800"
android:offset="0.6"/>
<item
android:color="#f9c579"
android:offset="1.0"/>
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#bad9ff"
android:pathData="m36 15.4c-5.15 0-9.85 0.237-13.3 0.625-1.71 0.194-3.09 0.422-4.09 0.69-0.5 0.135-0.9 0.273-1.24 0.469-0.17 0.098-0.329 0.21-0.474 0.39-0.144 0.18-0.268 0.475-0.232 0.77l5 42.2c0.072 0.61 0.53 1.08 1.12 1.4 0.59 0.314 1.38 0.545 2.46 0.745 2.17 0.398 5.55 0.63 10.7 0.63s8.55-0.233 10.7-0.63c1.08-0.199 1.87-0.432 2.46-0.745 0.59-0.314 1.05-0.785 1.12-1.39l5-42.2c0.0353-0.298-0.088-0.59-0.232-0.77s-0.305-0.292-0.474-0.39c-0.339-0.196-0.74-0.334-1.24-0.469-1-0.27-2.38-0.499-4.09-0.69-3.42-0.387-8.1-0.625-13.3-0.625zm0 1.5c5.1 0 9.8 0.238 13.1 0.615 1.66 0.188 3 0.415 3.87 0.65 0.398 0.108 0.665 0.218 0.815 0.297l-4.98 42c0.0034-0.0282 0.021 0.0545-0.337 0.245-0.358 0.19-1.02 0.412-2.02 0.595-2 0.366-5.35 0.605-10.4 0.605s-8.45-0.24-10.4-0.605c-1-0.183-1.66-0.404-2.02-0.595-0.358-0.19-0.34-0.274-0.337-0.245l-4.98-42c0.15-0.0785 0.416-0.189 0.815-0.297 0.865-0.234 2.2-0.46 3.87-0.65 3.33-0.377 8-0.615 13.1-0.615z"
tools:ignore="VectorPath"/>
<path
android:fillColor="#ffe2b7"
android:pathData="m27 26.4a2.96 2.96 0 0 0-2.74 2.96 2.98 2.98 0 0 0 5.95 0 2.96 2.96 0 0 0-3.18-2.96zm18 4.49a2.96 2.96 0 0 0-2.74 2.96 2.98 2.98 0 0 0 5.95 0 2.96 2.96 0 0 0-3.18-2.96zm-19.4 6.2a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm3.92 3.85a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 0 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm12.2 0.725a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm-4.46 4.02a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm-6.35 1.4a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm11.6 1.92a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-5.15 1.54a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-7.75 0.48a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm10.4 3.06a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-7.75 0.132a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm3.72 1.64a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm2.63 2.34a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845z"
tools:ignore="VectorPath"/>
<path
android:fillColor="#d91616"
android:pathData="m38.2 37.5h-4.5v-2.22h4.5m0 6.67h-4.5v-2.22h4.5m6.75-6.67h-3.16c-0.506-0.867-1.2-1.61-2.05-2.18l1.83-1.81-1.59-1.57-2.44 2.41c-0.517-0.122-1.03-0.189-1.6-0.189s-1.08 0.0667-1.59 0.189l-2.45-2.41-1.59 1.57 1.82 1.81c-0.832 0.567-1.53 1.31-2.04 2.18h-3.16v2.22h2.35c-0.0562 0.367-0.101 0.733-0.101 1.11v1.11h-2.25v2.22h2.25v1.11c0 0.378 0.045 0.744 0.101 1.11h-2.35v2.22h3.16c1.17 1.99 3.34 3.33 5.84 3.33 2.5 0 4.67-1.34 5.84-3.33h3.16v-2.22h-2.35c0.0562-0.367 0.101-0.733 0.101-1.11v-1.11h2.25v-2.22h-2.25v-1.11c0-0.378-0.045-0.744-0.101-1.11h2.35z"/>
</vector>
app/src/debug/res/drawable/ic_launcher_foreground.xml 0 → 100644
View file @ d5083dd5
<?xml version="1.0" encoding="utf-8"?><!--
~ The MIT License (MIT)
~
~ Copyright (c) 2013-2023 Chaosdorf e.V.
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in
~ all copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
~ THE SOFTWARE.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
xmlns:tools="http://schemas.android.com/tools"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillAlpha="0.5"
android:fillColor="#000000"
android:pathData="m39.7 78.9h28.6l28 29.1h-56.5z"/>
<path
android:pathData="m71.5 41.5-4.46 37.2c-0.136 1.14-3.2 1.6-13.3 1.6s-13.2-0.465-13.3-1.6l-4.38-39c14.3 4.73 19.3-2.75 35.4 1.86z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="0"
android:endY="80"
android:startX="0"
android:startY="40"
android:type="linear">
<item
android:color="#ff9800"
android:offset="0.6"/>
<item
android:color="#f9c579"
android:offset="1.0"/>
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#bad9ff"
android:pathData="m54 33.4c-5.15 0-9.85 0.237-13.3 0.625-1.71 0.194-3.09 0.422-4.09 0.69-0.5 0.135-0.9 0.273-1.24 0.469-0.17 0.098-0.329 0.21-0.474 0.39-0.144 0.18-0.268 0.475-0.232 0.77l5 42.2c0.072 0.61 0.53 1.08 1.12 1.4 0.59 0.314 1.38 0.545 2.46 0.745 2.17 0.398 5.55 0.63 10.7 0.63s8.55-0.233 10.7-0.63c1.08-0.199 1.87-0.432 2.46-0.745 0.59-0.314 1.05-0.785 1.12-1.39l5-42.2c0.0353-0.298-0.088-0.59-0.232-0.77s-0.305-0.292-0.474-0.39c-0.339-0.196-0.74-0.334-1.24-0.469-1-0.27-2.38-0.499-4.09-0.69-3.42-0.387-8.1-0.625-13.3-0.625zm0 1.5c5.1 0 9.8 0.238 13.1 0.615 1.66 0.188 3 0.415 3.87 0.65 0.398 0.108 0.665 0.218 0.815 0.297l-4.98 42c0.0034-0.0282 0.021 0.0545-0.337 0.245-0.358 0.19-1.02 0.412-2.02 0.595-2 0.366-5.35 0.605-10.4 0.605s-8.45-0.24-10.4-0.605c-1-0.183-1.66-0.404-2.02-0.595-0.358-0.19-0.34-0.274-0.337-0.245l-4.98-42c0.15-0.0785 0.416-0.189 0.815-0.297 0.865-0.234 2.2-0.46 3.87-0.65 3.33-0.377 8-0.615 13.1-0.615z"
tools:ignore="VectorPath"/>
<path
android:fillColor="#ffe2b7"
android:pathData="m45 44.4a2.96 2.96 0 0 0-2.74 2.96 2.98 2.98 0 0 0 5.95 0 2.96 2.96 0 0 0-3.18-2.96zm18 4.49a2.96 2.96 0 0 0-2.74 2.96 2.98 2.98 0 0 0 5.95 0 2.96 2.96 0 0 0-3.18-2.96zm-19.4 6.2a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm3.92 3.85a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 0 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm12.2 0.725a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm-4.46 4.02a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm-6.35 1.4a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm11.6 1.92a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-5.15 1.54a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-7.75 0.48a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm10.4 3.06a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-7.75 0.132a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm3.72 1.64a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm2.63 2.34a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845z"
tools:ignore="VectorPath"/>
<path
android:fillColor="#d91616"
android:pathData="m56 54h-4v-2h4m0 6h-4v-2h4m6-6h-2.81c-0.45-0.78-1.07-1.45-1.82-1.96l1.63-1.63-1.41-1.41-2.17 2.17c-0.46-0.11-0.92-0.17-1.42-0.17s-0.96 0.06-1.41 0.17l-2.18-2.17-1.41 1.41 1.62 1.63c-0.74 0.51-1.36 1.18-1.81 1.96h-2.81v2h2.09c-0.05 0.33-0.09 0.66-0.09 1v1h-2v2h2v1c0 0.34 0.04 0.67 0.09 1h-2.09v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3h2.81v-2h-2.09c0.05-0.33 0.09-0.66 0.09-1v-1h2v-2h-2v-1c0-0.34-0.04-0.67-0.09-1h2.09z"/>
</vector>
app/src/debug/res/drawable/ic_splash.xml 0 → 100644
View file @ d5083dd5
<?xml version="1.0" encoding="utf-8"?><!--
~ The MIT License (MIT)
~
~ Copyright (c) 2013-2023 Chaosdorf e.V.
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in
~ all copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
~ THE SOFTWARE.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
xmlns:tools="http://schemas.android.com/tools"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="m71.5 41.5-4.46 37.2c-0.136 1.14-3.2 1.6-13.3 1.6s-13.2-0.465-13.3-1.6l-4.38-39c14.3 4.73 19.3-2.75 35.4 1.86z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="0"
android:endY="80"
android:startX="0"
android:startY="40"
android:type="linear">
<item
android:color="#ff9800"
android:offset="0.6"/>
<item
android:color="#f9c579"
android:offset="1.0"/>
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#bad9ff"
android:pathData="m54 33.4c-5.15 0-9.85 0.237-13.3 0.625-1.71 0.194-3.09 0.422-4.09 0.69-0.5 0.135-0.9 0.273-1.24 0.469-0.17 0.098-0.329 0.21-0.474 0.39-0.144 0.18-0.268 0.475-0.232 0.77l5 42.2c0.072 0.61 0.53 1.08 1.12 1.4 0.59 0.314 1.38 0.545 2.46 0.745 2.17 0.398 5.55 0.63 10.7 0.63s8.55-0.233 10.7-0.63c1.08-0.199 1.87-0.432 2.46-0.745 0.59-0.314 1.05-0.785 1.12-1.39l5-42.2c0.0353-0.298-0.088-0.59-0.232-0.77s-0.305-0.292-0.474-0.39c-0.339-0.196-0.74-0.334-1.24-0.469-1-0.27-2.38-0.499-4.09-0.69-3.42-0.387-8.1-0.625-13.3-0.625zm0 1.5c5.1 0 9.8 0.238 13.1 0.615 1.66 0.188 3 0.415 3.87 0.65 0.398 0.108 0.665 0.218 0.815 0.297l-4.98 42c0.0034-0.0282 0.021 0.0545-0.337 0.245-0.358 0.19-1.02 0.412-2.02 0.595-2 0.366-5.35 0.605-10.4 0.605s-8.45-0.24-10.4-0.605c-1-0.183-1.66-0.404-2.02-0.595-0.358-0.19-0.34-0.274-0.337-0.245l-4.98-42c0.15-0.0785 0.416-0.189 0.815-0.297 0.865-0.234 2.2-0.46 3.87-0.65 3.33-0.377 8-0.615 13.1-0.615z"
tools:ignore="VectorPath"/>
<path
android:fillColor="#ffe2b7"
android:pathData="m45 44.4a2.96 2.96 0 0 0-2.74 2.96 2.98 2.98 0 0 0 5.95 0 2.96 2.96 0 0 0-3.18-2.96zm18 4.49a2.96 2.96 0 0 0-2.74 2.96 2.98 2.98 0 0 0 5.95 0 2.96 2.96 0 0 0-3.18-2.96zm-19.4 6.2a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm3.92 3.85a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 0 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm12.2 0.725a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm-4.46 4.02a1.7 1.7 0 0 0-1.56 1.69 1.7 1.7 0 1 0 3.39 0 1.7 1.7 0 0 0-1.82-1.69zm-6.35 1.4a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm11.6 1.92a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-5.15 1.54a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-7.75 0.48a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm10.4 3.06a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm-7.75 0.132a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 1 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm3.72 1.64a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845zm2.63 2.34a0.845 0.845 0 0 0-0.785 0.845 0.848 0.848 0 0 0 1.7 0 0.845 0.845 0 0 0-0.91-0.845z"
tools:ignore="VectorPath"/>
<path
android:fillColor="#d91616"
android:pathData="m56 54h-4v-2h4m0 6h-4v-2h4m6-6h-2.81c-0.45-0.78-1.07-1.45-1.82-1.96l1.63-1.63-1.41-1.41-2.17 2.17c-0.46-0.11-0.92-0.17-1.42-0.17s-0.96 0.06-1.41 0.17l-2.18-2.17-1.41 1.41 1.62 1.63c-0.74 0.51-1.36 1.18-1.81 1.96h-2.81v2h2.09c-0.05 0.33-0.09 0.66-0.09 1v1h-2v2h2v1c0 0.34 0.04 0.67 0.09 1h-2.09v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3h2.81v-2h-2.09c0.05-0.33 0.09-0.66 0.09-1v-1h2v-2h-2v-1c0-0.34-0.04-0.67-0.09-1h2.09z"/>
</vector>
app/src/debug/res/values/strings.xml 0 → 100644
View file @ d5083dd5
<?xml version="1.0" encoding="utf-8"?><!--
~ The MIT License (MIT)
~
~ Copyright (c) 2013-2023 Chaosdorf e.V.
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in
~ all copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
~ THE SOFTWARE.
-->
<resources>
<string name="application_name">Meteroid Test</string>
</resources>
app/src/main/kotlin/de/chaosdorf/meteroid/ui/MeteroidRouter.kt
View file @ d5083dd5
......@@ -87,24 +87,26 @@ fun MeteroidRouter(
MeteroidScreen.Home.Purchase.route, arguments = listOf(
navArgument("server") {
type = NavType.LongType
initialAccount.server?.let { defaultValue = it.value }
defaultValue = initialAccount.server?.value ?: -1L
},
navArgument("user") {
type = NavType.LongType
initialAccount.user?.let { defaultValue = it.value }
defaultValue = initialAccount.user?.value ?: -1L
},
)
) { entry ->
val serverId = entry.arguments?.getLong("server")?.let(::ServerId)
?: ServerId(-1L)
val userId = entry.arguments?.getLong("user")?.let(::UserId)
?: UserId(-1L)
LaunchedEffect(serverId, userId) {
if (serverId == null || userId == null) {
if (!serverId.isValid() || !userId.isValid()) {
navigationViewModel.expanded.value = true
}
}
if (serverId != null && userId != null) {
if (serverId.isValid() && userId.isValid()) {
val viewModel: PurchaseViewModel = hiltViewModel(
key = MeteroidScreen.Home.Purchase.build(serverId, userId)
)
......
app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/MeteroidNavigation.kt
View file @ d5083dd5
......@@ -120,6 +120,7 @@ fun MeteroidNavigation(navController: NavController, viewModel: NavigationViewMo
saveState = false
}
}
viewModel.selectUser(entry.user.serverId, entry.user.userId)
}
}
......
app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/NavigationViewModel.kt
View file @ d5083dd5
......@@ -24,6 +24,7 @@
package de.chaosdorf.meteroid.ui.navigation
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
......@@ -44,7 +45,8 @@ class NavigationViewModel @Inject constructor(
userRepository: UserRepository,
pinnedUserRepository: PinnedUserRepository,
syncManager: SyncManager,
private val accountProvider: AccountProvider
private val accountProvider: AccountProvider,
private val preferences: AccountPreferences
) : ViewModel() {
val expanded = MutableStateFlow(false)
val account = MutableStateFlow<AccountPreferences.State?>(null)
......@@ -117,4 +119,11 @@ class NavigationViewModel @Inject constructor(
accountProvider.togglePin(serverId, userId)
}
}
fun selectUser(serverId: ServerId, userId: UserId) {
Log.i("UserListViewModel", "Updating AccountPreferences: $serverId $userId")
viewModelScope.launch {
preferences.setUser(serverId, userId)
}
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/ui/userlist/UserListViewModel.kt
View file @ d5083dd5
......@@ -64,7 +64,6 @@ class UserListViewModel @Inject constructor(
fun selectUser(serverId: ServerId, userId: UserId) {
Log.i("UserListViewModel", "Updating AccountPreferences: $serverId $userId")
viewModelScope.launch {
preferences.setUser(serverId, userId)
}
}
......
app/src/main/res/drawable/ic_launcher.xml
View file @ d5083dd5
......@@ -30,8 +30,9 @@
android:viewportWidth="72"
android:viewportHeight="72">
<path
android:fillColor="#003984"
android:pathData="m11.5 0c-6.35 0-11.5 5.15-11.5 11.5v49c0 6.35 5.15 11.5 11.5 11.5h49c6.35 0 11.5-5.15 11.5-11.5v-49c0-6.35-5.15-11.5-11.5-11.5z"/>
android:fillColor="@color/ic_launcher_background"
android:pathData="m11.5 0c-6.35 0-11.5 5.15-11.5 11.5v49c0 6.35 5.15 11.5 11.5 11.5h49c6.35 0 11.5-5.15 11.5-11.5v-49c0-6.35-5.15-11.5-11.5-11.5z"
tools:ignore="VectorRaster"/>
<path
android:fillAlpha="0.5"
android:fillColor="#000000"
......
app/src/main/res/values/themes.xml
View file @ d5083dd5
......@@ -17,7 +17,7 @@
</style>
<style name="Theme.Meteroid.SplashScreen" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">#003984</item>
<item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
<item name="postSplashScreenTheme">@style/Theme.Meteroid</item>
</style>
......
gradle.properties
View file @ d5083dd5
......@@ -22,7 +22,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m
org.gradle.jvmargs=-Xmx4096m
org.gradle.configuration-cache=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
......
gradle/convention/src/main/kotlin/util/ProjectExtensions.kt
View file @ d5083dd5
package util
import org.gradle.api.Project
import java.io.ByteArrayOutputStream
import java.util.*
@Suppress("UnstableApiUsage")
fun Project.cmd(vararg command: String) = try {
val stdOut = ByteArrayOutputStream()
exec {
providers.exec {
commandLine(*command)
standardOutput = stdOut
}
stdOut.toString(Charsets.UTF_8.name()).trim()
}.standardOutput.asText.get().trim()
} catch (e: Throwable) {
e.printStackTrace()
null
......