diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index fd09d98..f1f3c2a 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -1,12 +1,12 @@ + android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" /> diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index fd09d98..f1f3c2a 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -1,12 +1,12 @@ + android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" /> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 48c55d4..9abb11a 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,14 +1,12 @@ + android:pathData="M950,431.4l-149.3,-256c-28.6,-49 -81.5,-79.4 -138.2,-79.4h-301c-56.7,0 -109.6,30.4 -138.2,79.4L74,431.4c-29,49.7 -29,111.5 0,161.2l149.3,256c28.6,49 81.5,79.4 138.2,79.4h301c56.7,0 109.6,-30.4 138.2,-79.4l149.3,-256c29,-49.7 29,-111.5 0,-161.2zM894.7,560.4l-149.3,256c-17.1,29.4 -48.9,47.6 -82.9,47.6h-301c-34,0 -65.8,-18.2 -82.9,-47.6l-149.3,-256c-17.4,-29.8 -17.4,-66.9 0,-96.7l149.3,-256c17.1,-29.4 48.9,-47.6 82.9,-47.6h301c34,0 65.8,18.2 82.9,47.6l149.3,256c17.4,29.8 17.4,66.8 0,96.7z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,320c-106,0 -192,86 -192,192s86,192 192,192 192,-86 192,-192 -86,-192 -192,-192zM602.5,602.5C578.3,626.7 546.2,640 512,640s-66.3,-13.3 -90.5,-37.5S384,546.2 384,512s13.3,-66.3 37.5,-90.5S477.8,384 512,384s66.3,13.3 90.5,37.5S640,477.8 640,512s-13.3,66.3 -37.5,90.5z" /> diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index fd09d98..f1f3c2a 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -1,12 +1,12 @@ + android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" /> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 48c55d4..9abb11a 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,14 +1,12 @@ + android:pathData="M950,431.4l-149.3,-256c-28.6,-49 -81.5,-79.4 -138.2,-79.4h-301c-56.7,0 -109.6,30.4 -138.2,79.4L74,431.4c-29,49.7 -29,111.5 0,161.2l149.3,256c28.6,49 81.5,79.4 138.2,79.4h301c56.7,0 109.6,-30.4 138.2,-79.4l149.3,-256c29,-49.7 29,-111.5 0,-161.2zM894.7,560.4l-149.3,256c-17.1,29.4 -48.9,47.6 -82.9,47.6h-301c-34,0 -65.8,-18.2 -82.9,-47.6l-149.3,-256c-17.4,-29.8 -17.4,-66.9 0,-96.7l149.3,-256c17.1,-29.4 48.9,-47.6 82.9,-47.6h301c34,0 65.8,18.2 82.9,47.6l149.3,256c17.4,29.8 17.4,66.8 0,96.7z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,320c-106,0 -192,86 -192,192s86,192 192,192 192,-86 192,-192 -86,-192 -192,-192zM602.5,602.5C578.3,626.7 546.2,640 512,640s-66.3,-13.3 -90.5,-37.5S384,546.2 384,512s13.3,-66.3 37.5,-90.5S477.8,384 512,384s66.3,13.3 90.5,37.5S640,477.8 640,512s-13.3,66.3 -37.5,90.5z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml index 7206fc3..9bbc578 100644 --- a/app/src/main/res/drawable/ic_user.xml +++ b/app/src/main/res/drawable/ic_user.xml @@ -1,15 +1,9 @@ - - + android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" /> diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index fd09d98..f1f3c2a 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -1,12 +1,12 @@ + android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" /> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 48c55d4..9abb11a 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,14 +1,12 @@ + android:pathData="M950,431.4l-149.3,-256c-28.6,-49 -81.5,-79.4 -138.2,-79.4h-301c-56.7,0 -109.6,30.4 -138.2,79.4L74,431.4c-29,49.7 -29,111.5 0,161.2l149.3,256c28.6,49 81.5,79.4 138.2,79.4h301c56.7,0 109.6,-30.4 138.2,-79.4l149.3,-256c29,-49.7 29,-111.5 0,-161.2zM894.7,560.4l-149.3,256c-17.1,29.4 -48.9,47.6 -82.9,47.6h-301c-34,0 -65.8,-18.2 -82.9,-47.6l-149.3,-256c-17.4,-29.8 -17.4,-66.9 0,-96.7l149.3,-256c17.1,-29.4 48.9,-47.6 82.9,-47.6h301c34,0 65.8,18.2 82.9,47.6l149.3,256c17.4,29.8 17.4,66.8 0,96.7z" /> + android:fillColor="@color/themeColor" + android:pathData="M512,320c-106,0 -192,86 -192,192s86,192 192,192 192,-86 192,-192 -86,-192 -192,-192zM602.5,602.5C578.3,626.7 546.2,640 512,640s-66.3,-13.3 -90.5,-37.5S384,546.2 384,512s13.3,-66.3 37.5,-90.5S477.8,384 512,384s66.3,13.3 90.5,37.5S640,477.8 640,512s-13.3,66.3 -37.5,90.5z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml index 7206fc3..9bbc578 100644 --- a/app/src/main/res/drawable/ic_user.xml +++ b/app/src/main/res/drawable/ic_user.xml @@ -1,15 +1,9 @@ - - + android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 5fb0844..5077a71 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -104,8 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - android:layout_marginEnd="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:backgroundTint="@color/white" android:contentDescription="修改服务器地址" android:src="@drawable/ic_settings"