Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/src/main/res/layout/fragment_admin.xml
This commit is contained in:
DKaverznev 2025-02-20 12:12:25 +03:00
commit 0e3fde6347
15 changed files with 67 additions and 283 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -1,265 +1,59 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp" android:width="108dp"
android:height="108dp" android:height="108dp"
android:viewportWidth="500" android:viewportWidth="230"
android:viewportHeight="500"> android:viewportHeight="162">
<group android:scaleX="1.6264286" <group android:scaleX="0.40944445"
android:scaleY="1.6264286" android:scaleY="0.2883913"
android:translateX="-96.36905" android:translateX="67.91389"
android:translateY="-36.13095"> android:translateY="57.640305">
<path <path
android:pathData="M182.03,262.73L243.12,262.73A1.56,1.56 0,0 1,244.68 264.29L244.68,289.77A1.56,1.56 0,0 1,243.12 291.33L182.03,291.33A1.56,1.56 0,0 1,180.47 289.77L180.47,264.29A1.56,1.56 0,0 1,182.03 262.73z" android:pathData="M219.6,63.04H10.27C7.32,63.04 4.93,65.44 4.93,68.39V155.69C4.93,158.64 7.32,161.04 10.27,161.04H219.6C222.56,161.04 224.95,158.64 224.95,155.69V68.39C224.95,65.44 222.56,63.04 219.6,63.04Z"
android:fillColor="#B29E8C"/> android:fillColor="#ffffff"/>
<path <path
android:pathData="M182.03,262.73L243.12,262.73A1.56,1.56 0,0 1,244.68 264.29L244.68,289.77A1.56,1.56 0,0 1,243.12 291.33L182.03,291.33A1.56,1.56 0,0 1,180.47 289.77L180.47,264.29A1.56,1.56 0,0 1,182.03 262.73z" android:pathData="M143.48,47.45H86.37C82.04,47.44 77.89,45.72 74.82,42.66C71.76,39.59 70.04,35.44 70.03,31.11V16.45C70.04,12.12 71.76,7.96 74.82,4.9C77.89,1.84 82.04,0.12 86.37,0.11H143.48C147.82,0.11 151.97,1.83 155.04,4.9C158.1,7.96 159.82,12.11 159.82,16.45V31.04C159.83,33.19 159.41,35.32 158.6,37.31C157.78,39.3 156.58,41.11 155.06,42.64C153.54,44.16 151.74,45.37 149.75,46.2C147.76,47.02 145.63,47.45 143.48,47.45ZM86.37,12.11C85.22,12.12 84.12,12.58 83.3,13.39C82.49,14.2 82.02,15.3 82,16.45V31.04C82,32.21 82.47,33.33 83.3,34.16C84.12,34.99 85.25,35.45 86.42,35.45H143.53C144.7,35.45 145.82,34.99 146.65,34.16C147.48,33.33 147.94,32.21 147.94,31.04V16.45C147.94,15.28 147.48,14.15 146.65,13.33C145.82,12.5 144.7,12.03 143.53,12.03L86.37,12.11Z"
android:strokeAlpha="0.6" android:fillColor="#2E2E2E"/>
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path <path
android:fillColor="#FF000000" android:pathData="M219.58,63.04H10.29C9.59,63.04 8.89,63.18 8.24,63.44C7.59,63.71 7,64.1 6.5,64.6C6,65.1 5.61,65.69 5.34,66.34C5.07,66.99 4.93,67.68 4.93,68.39V96.41L113.91,117.87C114.58,118.02 115.27,118.02 115.94,117.87L224.95,96.41V68.39C224.95,67.68 224.81,66.99 224.54,66.34C224.27,65.69 223.87,65.1 223.37,64.6C222.88,64.1 222.28,63.71 221.63,63.44C220.98,63.18 220.29,63.04 219.58,63.04Z"
android:pathData="M243.11,262.73H182a1.56,1.56 0,0 0,-1.56 1.56v8.17l31.8,6.26a1.47,1.47 0,0 0,0.59 0l31.81,-6.26v-8.17A1.56,1.56 0,0 0,243.11 262.73Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M244.45,252.27L225.79,252.27v-3.13a4.89,4.89 0,0 0,-4.88 -4.88L204.24,244.26a4.89,4.89 0,0 0,-4.88 4.88v3.13L180.71,252.27a1.54,1.54 0,0 0,-1.54 1.54v15.41a1.55,1.55 0,0 0,1.24 1.51L212.28,277a1.94,1.94 0,0 0,0.59 0l31.87,-6.27a1.56,1.56 0,0 0,1.25 -1.51L245.99,253.81A1.54,1.54 0,0 0,244.45 252.27ZM203.07,249.14a1.19,1.19 0,0 1,1.17 -1.18h16.67a1.19,1.19 0,0 1,1.17 1.18v3.13h-19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M244.45,252.27L225.79,252.27v-3.13a4.89,4.89 0,0 0,-4.88 -4.88L204.24,244.26a4.89,4.89 0,0 0,-4.88 4.88v3.13L180.71,252.27a1.54,1.54 0,0 0,-1.54 1.54v15.41a1.55,1.55 0,0 0,1.24 1.51L212.28,277a1.94,1.94 0,0 0,0.59 0l31.87,-6.27a1.56,1.56 0,0 0,1.25 -1.51L245.99,253.81A1.54,1.54 0,0 0,244.45 252.27ZM203.07,249.14a1.19,1.19 0,0 1,1.17 -1.18h16.67a1.19,1.19 0,0 1,1.17 1.18v3.13h-19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M209.29,272.79L215.87,272.79A1.48,1.48 0,0 1,217.35 274.27L217.35,278.43A1.48,1.48 0,0 1,215.87 279.91L209.29,279.91A1.48,1.48 0,0 1,207.81 278.43L207.81,274.27A1.48,1.48 0,0 1,209.29 272.79z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M209.29,272.79L215.87,272.79A1.48,1.48 0,0 1,217.35 274.27L217.35,278.43A1.48,1.48 0,0 1,215.87 279.91L209.29,279.91A1.48,1.48 0,0 1,207.81 278.43L207.81,274.27A1.48,1.48 0,0 1,209.29 272.79z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M182.03,78.77L243.12,78.77A1.56,1.56 0,0 1,244.68 80.33L244.68,105.81A1.56,1.56 0,0 1,243.12 107.37L182.03,107.37A1.56,1.56 0,0 1,180.47 105.81L180.47,80.33A1.56,1.56 0,0 1,182.03 78.77z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M182.03,78.77L243.12,78.77A1.56,1.56 0,0 1,244.68 80.33L244.68,105.81A1.56,1.56 0,0 1,243.12 107.37L182.03,107.37A1.56,1.56 0,0 1,180.47 105.81L180.47,80.33A1.56,1.56 0,0 1,182.03 78.77z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M243.11,78.77H182a1.56,1.56 0,0 0,-1.56 1.56V88.5l31.8,6.26a1.47,1.47 0,0 0,0.59 0l31.81,-6.26V80.33A1.56,1.56 0,0 0,243.11 78.77Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M244.45,68.31L225.79,68.31L225.79,65.18a4.89,4.89 0,0 0,-4.88 -4.88L204.24,60.3a4.89,4.89 0,0 0,-4.88 4.88v3.13L180.71,68.31a1.54,1.54 0,0 0,-1.54 1.54L179.17,85.26a1.54,1.54 0,0 0,1.24 1.51L212.28,93a1.47,1.47 0,0 0,0.59 0l31.87,-6.27A1.55,1.55 0,0 0,246 85.26L246,69.85A1.54,1.54 0,0 0,244.45 68.31ZM203.07,65.18A1.18,1.18 0,0 1,204.24 64h16.67a1.18,1.18 0,0 1,1.17 1.17v3.13h-19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M244.45,68.31L225.79,68.31L225.79,65.18a4.89,4.89 0,0 0,-4.88 -4.88L204.24,60.3a4.89,4.89 0,0 0,-4.88 4.88v3.13L180.71,68.31a1.54,1.54 0,0 0,-1.54 1.54L179.17,85.26a1.54,1.54 0,0 0,1.24 1.51L212.28,93a1.47,1.47 0,0 0,0.59 0l31.87,-6.27A1.55,1.55 0,0 0,246 85.26L246,69.85A1.54,1.54 0,0 0,244.45 68.31ZM203.07,65.18A1.18,1.18 0,0 1,204.24 64h16.67a1.18,1.18 0,0 1,1.17 1.17v3.13h-19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M209.29,88.84L215.87,88.84A1.48,1.48 0,0 1,217.35 90.32L217.35,94.48A1.48,1.48 0,0 1,215.87 95.96L209.29,95.96A1.48,1.48 0,0 1,207.81 94.48L207.81,90.32A1.48,1.48 0,0 1,209.29 88.84z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M209.29,88.84L215.87,88.84A1.48,1.48 0,0 1,217.35 90.32L217.35,94.48A1.48,1.48 0,0 1,215.87 95.96L209.29,95.96A1.48,1.48 0,0 1,207.81 94.48L207.81,90.32A1.48,1.48 0,0 1,209.29 88.84z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M86.87,262.73L147.96,262.73A1.56,1.56 0,0 1,149.52 264.29L149.52,289.77A1.56,1.56 0,0 1,147.96 291.33L86.87,291.33A1.56,1.56 0,0 1,85.31 289.77L85.31,264.29A1.56,1.56 0,0 1,86.87 262.73z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M86.87,262.73L147.96,262.73A1.56,1.56 0,0 1,149.52 264.29L149.52,289.77A1.56,1.56 0,0 1,147.96 291.33L86.87,291.33A1.56,1.56 0,0 1,85.31 289.77L85.31,264.29A1.56,1.56 0,0 1,86.87 262.73z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M148,262.73H86.87a1.56,1.56 0,0 0,-1.56 1.56v8.17l31.8,6.26a1.52,1.52 0,0 0,0.6 0l31.81,-6.26v-8.17A1.56,1.56 0,0 0,148 262.73Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M149.28,252.27L130.62,252.27v-3.13a4.89,4.89 0,0 0,-4.88 -4.88L109.08,244.26a4.89,4.89 0,0 0,-4.88 4.88v3.13L85.54,252.27A1.54,1.54 0,0 0,84 253.81v15.41a1.55,1.55 0,0 0,1.24 1.51L117.11,277a2,2 0,0 0,0.6 0l31.87,-6.27a1.55,1.55 0,0 0,1.24 -1.51L150.82,253.81A1.54,1.54 0,0 0,149.28 252.27ZM107.9,249.14a1.2,1.2 0,0 1,1.18 -1.18h16.66a1.2,1.2 0,0 1,1.18 1.18v3.13h-19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M149.28,252.27L130.62,252.27v-3.13a4.89,4.89 0,0 0,-4.88 -4.88L109.08,244.26a4.89,4.89 0,0 0,-4.88 4.88v3.13L85.54,252.27A1.54,1.54 0,0 0,84 253.81v15.41a1.55,1.55 0,0 0,1.24 1.51L117.11,277a2,2 0,0 0,0.6 0l31.87,-6.27a1.55,1.55 0,0 0,1.24 -1.51L150.82,253.81A1.54,1.54 0,0 0,149.28 252.27ZM107.9,249.14a1.2,1.2 0,0 1,1.18 -1.18h16.66a1.2,1.2 0,0 1,1.18 1.18v3.13h-19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M114.12,272.79L120.7,272.79A1.48,1.48 0,0 1,122.18 274.27L122.18,278.43A1.48,1.48 0,0 1,120.7 279.91L114.12,279.91A1.48,1.48 0,0 1,112.64 278.43L112.64,274.27A1.48,1.48 0,0 1,114.12 272.79z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M114.12,272.79L120.7,272.79A1.48,1.48 0,0 1,122.18 274.27L122.18,278.43A1.48,1.48 0,0 1,120.7 279.91L114.12,279.91A1.48,1.48 0,0 1,112.64 278.43L112.64,274.27A1.48,1.48 0,0 1,114.12 272.79z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M86.87,78.77L147.96,78.77A1.56,1.56 0,0 1,149.52 80.33L149.52,105.81A1.56,1.56 0,0 1,147.96 107.37L86.87,107.37A1.56,1.56 0,0 1,85.31 105.81L85.31,80.33A1.56,1.56 0,0 1,86.87 78.77z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M86.87,78.77L147.96,78.77A1.56,1.56 0,0 1,149.52 80.33L149.52,105.81A1.56,1.56 0,0 1,147.96 107.37L86.87,107.37A1.56,1.56 0,0 1,85.31 105.81L85.31,80.33A1.56,1.56 0,0 1,86.87 78.77z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M148,78.77H86.87a1.56,1.56 0,0 0,-1.56 1.56V88.5l31.8,6.26a1.51,1.51 0,0 0,0.6 0l31.81,-6.26V80.33A1.56,1.56 0,0 0,148 78.77Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M149.28,68.31H130.62V65.18a4.89,4.89 0,0 0,-4.88 -4.88H109.08a4.89,4.89 0,0 0,-4.88 4.88v3.13H85.54A1.54,1.54 0,0 0,84 69.85V85.26a1.54,1.54 0,0 0,1.24 1.51L117.11,93a1.51,1.51 0,0 0,0.6 0l31.87,-6.27a1.54,1.54 0,0 0,1.24 -1.51V69.85A1.54,1.54 0,0 0,149.28 68.31ZM107.9,65.18A1.19,1.19 0,0 1,109.08 64h16.66a1.19,1.19 0,0 1,1.18 1.17v3.13h-19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M149.28,68.31H130.62V65.18a4.89,4.89 0,0 0,-4.88 -4.88H109.08a4.89,4.89 0,0 0,-4.88 4.88v3.13H85.54A1.54,1.54 0,0 0,84 69.85V85.26a1.54,1.54 0,0 0,1.24 1.51L117.11,93a1.51,1.51 0,0 0,0.6 0l31.87,-6.27a1.54,1.54 0,0 0,1.24 -1.51V69.85A1.54,1.54 0,0 0,149.28 68.31ZM107.9,65.18A1.19,1.19 0,0 1,109.08 64h16.66a1.19,1.19 0,0 1,1.18 1.17v3.13h-19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M114.12,88.84L120.7,88.84A1.48,1.48 0,0 1,122.18 90.32L122.18,94.48A1.48,1.48 0,0 1,120.7 95.96L114.12,95.96A1.48,1.48 0,0 1,112.64 94.48L112.64,90.32A1.48,1.48 0,0 1,114.12 88.84z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M114.12,88.84L120.7,88.84A1.48,1.48 0,0 1,122.18 90.32L122.18,94.48A1.48,1.48 0,0 1,120.7 95.96L114.12,95.96A1.48,1.48 0,0 1,112.64 94.48L112.64,90.32A1.48,1.48 0,0 1,114.12 88.84z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M140,199.35H86.87a1.57,1.57 0,0 1,-1.57 -1.57V172.31a1.55,1.55 0,0 1,0.13 -0.61,2.15 2.15,0 0,1 0.14,-0.26 1.1,1.1 0,0 1,0.2 -0.23,1.56 1.56,0 0,1 1.1,-0.46h50.29a65.58,65.58 0,0 0,-0.41 10.52c0,0.57 0,1.14 0.09,1.7 0.07,1.05 0.15,2.11 0.27,3.16A67,67 0,0 0,140 199.35Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M140,199.35H86.87a1.57,1.57 0,0 1,-1.57 -1.57V172.31a1.55,1.55 0,0 1,0.13 -0.61,2.15 2.15,0 0,1 0.14,-0.26 1.1,1.1 0,0 1,0.2 -0.23,1.56 1.56,0 0,1 1.1,-0.46h50.29a65.58,65.58 0,0 0,-0.41 10.52c0,0.57 0,1.14 0.09,1.7 0.07,1.05 0.15,2.11 0.27,3.16A67,67 0,0 0,140 199.35Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M137.16,170.75a65.58,65.58 0,0 0,-0.41 10.52c0,0.57 0,1.14 0.09,1.7l-14.66,2.88 -4.48,0.88a1.18,1.18 0,0 1,-0.59 0l-4.47,-0.87 -27.33,-5.38V172.3a1.69,1.69 0,0 1,0.12 -0.6,2.15 2.15,0 0,1 0.14,-0.26 1.1,1.1 0,0 1,0.2 -0.23,1.56 1.56,0 0,1 1.1,-0.46Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M139.25,160.29h-8.62v-3.13a4.9,4.9 0,0 0,-4.89 -4.88L109.08,152.28a4.88,4.88 0,0 0,-4.88 4.88v3.13L85.54,160.29A1.54,1.54 0,0 0,84 161.83v15.4a1.55,1.55 0,0 0,1.25 1.52h0.06l27.33,5.39 4.47,0.87a1.47,1.47 0,0 0,0.59 0l4.48,-0.88 14.57,-2.87a65.58,65.58 0,0 1,0.41 -10.52A66.34,66.34 0,0 1,139.25 160.29ZM107.9,157.16a1.19,1.19 0,0 1,1.18 -1.17h16.66a1.18,1.18 0,0 1,1.17 1.17v3.13h-19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M139.25,160.29h-8.62v-3.13a4.9,4.9 0,0 0,-4.89 -4.88L109.08,152.28a4.88,4.88 0,0 0,-4.88 4.88v3.13L85.54,160.29A1.54,1.54 0,0 0,84 161.83v15.4a1.55,1.55 0,0 0,1.25 1.52h0.06l27.33,5.39 4.47,0.87a1.47,1.47 0,0 0,0.59 0l4.48,-0.88 14.57,-2.87a65.58,65.58 0,0 1,0.41 -10.52A66.34,66.34 0,0 1,139.25 160.29ZM107.9,157.16a1.19,1.19 0,0 1,1.18 -1.17h16.66a1.18,1.18 0,0 1,1.17 1.17v3.13h-19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M114.12,180.81L120.7,180.81A1.48,1.48 0,0 1,122.18 182.29L122.18,186.45A1.48,1.48 0,0 1,120.7 187.93L114.12,187.93A1.48,1.48 0,0 1,112.64 186.45L112.64,182.29A1.48,1.48 0,0 1,114.12 180.81z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M114.12,180.81L120.7,180.81A1.48,1.48 0,0 1,122.18 182.29L122.18,186.45A1.48,1.48 0,0 1,120.7 187.93L114.12,187.93A1.48,1.48 0,0 1,112.64 186.45L112.64,182.29A1.48,1.48 0,0 1,114.12 180.81z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M338.28,291.32L277.19,291.32A1.56,1.56 0,0 1,275.63 289.76L275.63,264.28A1.56,1.56 0,0 1,277.19 262.72L338.28,262.72A1.56,1.56 0,0 1,339.84 264.28L339.84,289.76A1.56,1.56 0,0 1,338.28 291.32z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M338.28,291.32L277.19,291.32A1.56,1.56 0,0 1,275.63 289.76L275.63,264.28A1.56,1.56 0,0 1,277.19 262.72L338.28,262.72A1.56,1.56 0,0 1,339.84 264.28L339.84,289.76A1.56,1.56 0,0 1,338.28 291.32z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M277.2,262.73h61.08a1.56,1.56 0,0 1,1.56 1.56v8.17L308,278.72a1.47,1.47 0,0 1,-0.59 0l-31.81,-6.26v-8.17A1.56,1.56 0,0 1,277.2 262.73Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M275.87,252.27h18.66v-3.13a4.89,4.89 0,0 1,4.88 -4.88h16.67a4.89,4.89 0,0 1,4.88 4.88v3.13h18.65a1.54,1.54 0,0 1,1.54 1.54v15.41a1.55,1.55 0,0 1,-1.24 1.51L308,277a2,2 0,0 1,-0.6 0l-31.87,-6.27a1.55,1.55 0,0 1,-1.24 -1.51L274.29,253.81A1.54,1.54 0,0 1,275.87 252.27ZM317.25,249.14a1.19,1.19 0,0 0,-1.17 -1.18L299.41,247.96a1.2,1.2 0,0 0,-1.18 1.18v3.13h19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M275.87,252.27h18.66v-3.13a4.89,4.89 0,0 1,4.88 -4.88h16.67a4.89,4.89 0,0 1,4.88 4.88v3.13h18.65a1.54,1.54 0,0 1,1.54 1.54v15.41a1.55,1.55 0,0 1,-1.24 1.51L308,277a2,2 0,0 1,-0.6 0l-31.87,-6.27a1.55,1.55 0,0 1,-1.24 -1.51L274.29,253.81A1.54,1.54 0,0 1,275.87 252.27ZM317.25,249.14a1.19,1.19 0,0 0,-1.17 -1.18L299.41,247.96a1.2,1.2 0,0 0,-1.18 1.18v3.13h19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M311.03,279.91L304.45,279.91A1.48,1.48 0,0 1,302.97 278.43L302.97,274.27A1.48,1.48 0,0 1,304.45 272.79L311.03,272.79A1.48,1.48 0,0 1,312.51 274.27L312.51,278.43A1.48,1.48 0,0 1,311.03 279.91z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M311.03,279.91L304.45,279.91A1.48,1.48 0,0 1,302.97 278.43L302.97,274.27A1.48,1.48 0,0 1,304.45 272.79L311.03,272.79A1.48,1.48 0,0 1,312.51 274.27L312.51,278.43A1.48,1.48 0,0 1,311.03 279.91z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M338.28,107.36L277.19,107.36A1.56,1.56 0,0 1,275.63 105.8L275.63,80.32A1.56,1.56 0,0 1,277.19 78.76L338.28,78.76A1.56,1.56 0,0 1,339.84 80.32L339.84,105.8A1.56,1.56 0,0 1,338.28 107.36z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M338.28,107.36L277.19,107.36A1.56,1.56 0,0 1,275.63 105.8L275.63,80.32A1.56,1.56 0,0 1,277.19 78.76L338.28,78.76A1.56,1.56 0,0 1,339.84 80.32L339.84,105.8A1.56,1.56 0,0 1,338.28 107.36z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M277.2,78.77h61.08a1.56,1.56 0,0 1,1.56 1.56V88.5L308,94.76a1.47,1.47 0,0 1,-0.59 0L275.64,88.5V80.33A1.56,1.56 0,0 1,277.2 78.77Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M275.87,68.31h18.66L294.53,65.18a4.89,4.89 0,0 1,4.88 -4.88h16.67A4.89,4.89 0,0 1,321 65.18v3.13h18.65a1.54,1.54 0,0 1,1.54 1.54L341.19,85.26a1.54,1.54 0,0 1,-1.24 1.51L308,93a1.51,1.51 0,0 1,-0.6 0l-31.87,-6.27a1.54,1.54 0,0 1,-1.24 -1.51L274.29,69.85A1.54,1.54 0,0 1,275.87 68.31ZM317.25,65.18A1.18,1.18 0,0 0,316.08 64L299.41,64a1.19,1.19 0,0 0,-1.18 1.17v3.13h19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M275.87,68.31h18.66L294.53,65.18a4.89,4.89 0,0 1,4.88 -4.88h16.67A4.89,4.89 0,0 1,321 65.18v3.13h18.65a1.54,1.54 0,0 1,1.54 1.54L341.19,85.26a1.54,1.54 0,0 1,-1.24 1.51L308,93a1.51,1.51 0,0 1,-0.6 0l-31.87,-6.27a1.54,1.54 0,0 1,-1.24 -1.51L274.29,69.85A1.54,1.54 0,0 1,275.87 68.31ZM317.25,65.18A1.18,1.18 0,0 0,316.08 64L299.41,64a1.19,1.19 0,0 0,-1.18 1.17v3.13h19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M311.03,95.95L304.45,95.95A1.48,1.48 0,0 1,302.97 94.47L302.97,90.31A1.48,1.48 0,0 1,304.45 88.83L311.03,88.83A1.48,1.48 0,0 1,312.51 90.31L312.51,94.47A1.48,1.48 0,0 1,311.03 95.95z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M311.03,95.95L304.45,95.95A1.48,1.48 0,0 1,302.97 94.47L302.97,90.31A1.48,1.48 0,0 1,304.45 88.83L311.03,88.83A1.48,1.48 0,0 1,312.51 90.31L312.51,94.47A1.48,1.48 0,0 1,311.03 95.95z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M285.19,199.35h53.1a1.57,1.57 0,0 0,1.56 -1.57V172.31a1.55,1.55 0,0 0,-0.13 -0.61,1.3 1.3,0 0,0 -0.14,-0.26 1.1,1.1 0,0 0,-0.2 -0.23,1.54 1.54,0 0,0 -1.1,-0.46H288a65.58,65.58 0,0 1,0.41 10.52c0,0.57 0,1.14 -0.09,1.7 -0.06,1.05 -0.15,2.11 -0.27,3.16A67,67 0,0 1,285.19 199.35Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M285.19,199.35h53.1a1.57,1.57 0,0 0,1.56 -1.57V172.31a1.55,1.55 0,0 0,-0.13 -0.61,1.3 1.3,0 0,0 -0.14,-0.26 1.1,1.1 0,0 0,-0.2 -0.23,1.54 1.54,0 0,0 -1.1,-0.46H288a65.58,65.58 0,0 1,0.41 10.52c0,0.57 0,1.14 -0.09,1.7 -0.06,1.05 -0.15,2.11 -0.27,3.16A67,67 0,0 1,285.19 199.35Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:fillColor="#FF000000"
android:pathData="M288,170.75a65.58,65.58 0,0 1,0.41 10.52c0,0.57 0,1.14 -0.09,1.7L303,185.85l4.48,0.88a1.18,1.18 0,0 0,0.59 0l4.47,-0.87 27.33,-5.38V172.3a1.69,1.69 0,0 0,-0.12 -0.6,1.3 1.3,0 0,0 -0.14,-0.26 1.1,1.1 0,0 0,-0.2 -0.23,1.54 1.54,0 0,0 -1.1,-0.46Z"
android:strokeAlpha="0.1"
android:fillAlpha="0.1"/>
<path
android:pathData="M285.9,160.29h8.63v-3.13a4.89,4.89 0,0 1,4.88 -4.88h16.66a4.89,4.89 0,0 1,4.89 4.88v3.13h18.65a1.54,1.54 0,0 1,1.54 1.54v15.4a1.55,1.55 0,0 1,-1.24 1.52h-0.07l-27.33,5.39L308,185a1.47,1.47 0,0 1,-0.59 0l-4.48,-0.88 -14.57,-2.87a67,67 0,0 0,-2.5 -21ZM317.25,157.16a1.19,1.19 0,0 0,-1.18 -1.17L299.41,155.99a1.18,1.18 0,0 0,-1.17 1.17v3.13h19Z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M285.9,160.29h8.63v-3.13a4.89,4.89 0,0 1,4.88 -4.88h16.66a4.89,4.89 0,0 1,4.89 4.88v3.13h18.65a1.54,1.54 0,0 1,1.54 1.54v15.4a1.55,1.55 0,0 1,-1.24 1.52h-0.07l-27.33,5.39L308,185a1.47,1.47 0,0 1,-0.59 0l-4.48,-0.88 -14.57,-2.87a67,67 0,0 0,-2.5 -21ZM317.25,157.16a1.19,1.19 0,0 0,-1.18 -1.17L299.41,155.99a1.18,1.18 0,0 0,-1.17 1.17v3.13h19Z"
android:strokeAlpha="0.6"
android:fillColor="#fff"
android:fillAlpha="0.6"/>
<path
android:pathData="M311.03,187.94L304.45,187.94A1.48,1.48 0,0 1,302.97 186.46L302.97,182.3A1.48,1.48 0,0 1,304.45 180.82L311.03,180.82A1.48,1.48 0,0 1,312.51 182.3L312.51,186.46A1.48,1.48 0,0 1,311.03 187.94z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M311.03,187.94L304.45,187.94A1.48,1.48 0,0 1,302.97 186.46L302.97,182.3A1.48,1.48 0,0 1,304.45 180.82L311.03,180.82A1.48,1.48 0,0 1,312.51 182.3L312.51,186.46A1.48,1.48 0,0 1,311.03 187.94z"
android:strokeAlpha="0.3"
android:fillColor="#fff"
android:fillAlpha="0.3"/>
<path
android:pathData="M171.92,164.54L259.7,164.54A2.24,2.24 0,0 1,261.94 166.78L261.94,203.39A2.24,2.24 0,0 1,259.7 205.63L171.92,205.63A2.24,2.24 0,0 1,169.68 203.39L169.68,166.78A2.24,2.24 0,0 1,171.92 164.54z"
android:fillColor="#B29E8C"/>
<path
android:pathData="M227.78,158L203.83,158a6.86,6.86 0,0 1,-6.85 -6.85L196.98,145a6.86,6.86 0,0 1,6.85 -6.85h23.95a6.85,6.85 0,0 1,6.85 6.85v6.12A6.85,6.85 0,0 1,227.78 158ZM203.83,143.18A1.85,1.85 0,0 0,202 145v6.12a1.85,1.85 0,0 0,1.85 1.85h23.95a1.85,1.85 0,0 0,1.85 -1.85L229.65,145a1.85,1.85 0,0 0,-1.85 -1.85Z"
android:fillColor="#B29E8C"/>
<path
android:fillColor="#FF000000"
android:pathData="M259.69,164.54H171.93a2.24,2.24 0,0 0,-2.25 2.24v11.75l45.7,9a2,2 0,0 0,0.85 0l45.71,-9V166.78A2.24,2.24 0,0 0,259.69 164.54Z"
android:strokeAlpha="0.2" android:strokeAlpha="0.2"
android:fillColor="#383838"
android:fillAlpha="0.2"/> android:fillAlpha="0.2"/>
<path <path
android:pathData="M262,176l-45.79,9a2.48,2.48 0,0 1,-0.86 0l-45.79,-9a2.22,2.22 0,0 1,-1.79 -2.17V151.73a2.21,2.21 0,0 1,2.21 -2.21H261.6a2.21,2.21 0,0 1,2.21 2.21v22.14A2.21,2.21 0,0 1,262 176Z" android:pathData="M225.09,90.37L115.89,111.84C115.21,111.96 114.52,111.96 113.84,111.84L4.64,90.37C3.44,90.14 2.36,89.49 1.58,88.55C0.81,87.61 0.38,86.42 0.37,85.2V32.5C0.37,31.8 0.51,31.12 0.77,30.48C1.04,29.84 1.43,29.26 1.92,28.77C2.41,28.28 2.99,27.89 3.63,27.63C4.27,27.36 4.95,27.23 5.64,27.23H224.14C224.83,27.23 225.51,27.36 226.15,27.63C226.79,27.89 227.37,28.28 227.86,28.77C228.35,29.26 228.74,29.84 229.01,30.48C229.27,31.12 229.41,31.8 229.41,32.5V85.29C229.38,86.51 228.94,87.68 228.15,88.6C227.37,89.53 226.29,90.15 225.09,90.37Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M126.24,97.55H103.66C100.87,97.55 98.6,99.82 98.6,102.61V116.89C98.6,119.68 100.87,121.95 103.66,121.95H126.24C129.03,121.95 131.3,119.68 131.3,116.89V102.61C131.3,99.82 129.03,97.55 126.24,97.55Z"
android:fillColor="#B29E8C"/> android:fillColor="#B29E8C"/>
<path <path
android:pathData="M211.08,179.01L220.55,179.01A2.12,2.12 0,0 1,222.67 181.13L222.67,187.12A2.12,2.12 0,0 1,220.55 189.24L211.08,189.24A2.12,2.12 0,0 1,208.96 187.12L208.96,181.13A2.12,2.12 0,0 1,211.08 179.01z" android:pathData="M126.24,97.55H103.66C100.87,97.55 98.6,99.82 98.6,102.61V116.89C98.6,119.68 100.87,121.95 103.66,121.95H126.24C129.03,121.95 131.3,119.68 131.3,116.89V102.61C131.3,99.82 129.03,97.55 126.24,97.55Z"
android:fillColor="#B29E8C"/> android:fillColor="#2E2E2E"/>
<path <path
android:fillColor="#FF000000" android:pathData="M167.68,38H212V63.91"
android:pathData="M211.08,179.01L220.55,179.01A2.12,2.12 0,0 1,222.67 181.13L222.67,187.12A2.12,2.12 0,0 1,220.55 189.24L211.08,189.24A2.12,2.12 0,0 1,208.96 187.12L208.96,181.13A2.12,2.12 0,0 1,211.08 179.01z" android:strokeLineJoin="round"
android:strokeAlpha="0.4" android:strokeWidth="8"
android:fillAlpha="0.4"/> android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
<path
android:pathData="M61.32,152H17V126.09"
android:strokeLineJoin="round"
android:strokeWidth="8"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
<path
android:pathData="M212,126.09V152H167.68"
android:strokeLineJoin="round"
android:strokeWidth="8"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
<path
android:pathData="M17,63.91V38H61.32"
android:strokeLineJoin="round"
android:strokeWidth="8"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
</group> </group>
</vector> </vector>

View File

@ -17,7 +17,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.36" /> app:layout_constraintGuide_percent="0.37" />
<View <View
android:id="@+id/back" android:id="@+id/back"
@ -84,12 +84,11 @@
android:layout_height="10dp" android:layout_height="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/ic_line" android:background="@drawable/ic_line"
app:layout_constraintBottom_toTopOf="@+id/guideline2" app:layout_constraintTop_toBottomOf="@+id/guideline2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<View <View
android:id="@+id/username_field" android:id="@+id/username_field"
android:layout_width="320dp" android:layout_width="320dp"
@ -97,8 +96,9 @@
android:background="@drawable/button_grestroke_whiteback" android:background="@drawable/button_grestroke_whiteback"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.494" app:layout_constraintHorizontal_bias="0.494"
app:layout_constraintTop_toBottomOf="@+id/line"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline2" /> tools:layout_editor_absoluteY="278dp" />
<TextView <TextView
android:id="@+id/username_view" android:id="@+id/username_view"

View File

@ -10,17 +10,17 @@
android:id="@+id/loading" android:id="@+id/loading"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="parent" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_top" android:id="@+id/guideline_top"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.26" /> app:layout_constraintGuide_percent="0.19" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_bottom" android:id="@+id/guideline_bottom"
@ -34,19 +34,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.55" /> app:layout_constraintGuide_percent="0.45" />
<View
android:id="@+id/ic_building_top"
android:layout_width="match_parent"
android:layout_height="120dp"
android:rotation="180"
android:background="@drawable/ic_building"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -54,8 +44,8 @@
android:gravity="center" android:gravity="center"
android:text="@string/welcomeText" android:text="@string/welcomeText"
android:textColor="@color/black" android:textColor="@color/black"
android:textStyle="bold"
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline_top" /> app:layout_constraintTop_toTopOf="@+id/guideline_top" />
@ -64,27 +54,27 @@
android:id="@+id/textView2" android:id="@+id/textView2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center" android:gravity="center"
android:text="@string/inputLoginText" android:text="@string/inputLoginText"
android:textStyle="bold"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/textView3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/textView" />
<TextView <TextView
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:gravity="center" android:gravity="center"
android:text="@string/welcomeDescriptionLoginText" android:text="@string/welcomeDescriptionLoginText"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/username"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/textView2" />
<View <View
android:id="@+id/field_view" android:id="@+id/field_view"
@ -136,7 +126,7 @@
android:id="@+id/login" android:id="@+id/login"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="30dp" android:layout_marginTop="40dp"
android:enabled="false" android:enabled="false"
android:text="@string/continueText" android:text="@string/continueText"
android:textAllCaps="false" android:textAllCaps="false"
@ -144,13 +134,13 @@
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/field_view2" /> app:layout_constraintTop_toBottomOf="@+id/line" />
<View <View
android:id="@+id/ic_building_bottom" android:id="@+id/ic_building_bottom"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/ic_building"
android:layout_height="120dp" android:layout_height="120dp"
android:background="@drawable/ic_building"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -159,11 +149,11 @@
android:id="@+id/line" android:id="@+id/line"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="10dp" android:layout_height="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="15dp"
android:background="@drawable/ic_line" android:background="@drawable/ic_line"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login" /> app:layout_constraintTop_toBottomOf="@+id/field_view2" />
<TextView <TextView
android:id="@+id/error" android:id="@+id/error"
@ -172,8 +162,8 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:gravity="center" android:gravity="center"
android:text="@string/loginError" android:text="@string/loginError"
android:visibility="gone"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/field_view2" /> app:layout_constraintTop_toBottomOf="@+id/field_view2" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 754 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="ic_launcher_background">#FFFFFF</color> <color name="ic_launcher_background">#D0D0C3</color>
</resources> </resources>