Skip to content

Commit

Permalink
ui/#192 : 구글 소셜 로그인 버튼
Browse files Browse the repository at this point in the history
  • Loading branch information
@shinythinking
shinythinking committed Dec 2, 2024
1 parent 734ab52 commit 425cb45
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 44 deletions.
32 changes: 32 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_google_login.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="179dp"
android:height="40dp"
android:viewportWidth="179"
android:viewportHeight="40">
<path
android:fillColor="#ffffff"
android:pathData="M4,0.5L175,0.5A3.5,3.5 0,0 1,178.5 4L178.5,36A3.5,3.5 0,0 1,175 39.5L4,39.5A3.5,3.5 0,0 1,0.5 36L0.5,4A3.5,3.5 0,0 1,4 0.5z" />
<group>
<clip-path android:pathData="M12,10h20v20h-20z" />
<path
android:fillColor="#4285F4"
android:pathData="M31.6,20.23C31.6,19.52 31.54,18.84 31.42,18.18H22V22.05H27.38C27.15,23.3 26.45,24.36 25.39,25.07V27.58H28.62C30.51,25.84 31.6,23.27 31.6,20.23V20.23Z" />
<path
android:fillColor="#34A853"
android:pathData="M22,30C24.7,30 26.96,29.1 28.62,27.58L25.39,25.07C24.49,25.67 23.35,26.02 22,26.02C19.4,26.02 17.19,24.26 16.4,21.9H13.06V24.49C14.71,27.76 18.09,30 22,30Z" />
<path
android:fillColor="#FBBC04"
android:pathData="M16.4,21.9C16.2,21.3 16.09,20.66 16.09,20C16.09,19.34 16.2,18.7 16.4,18.1V15.51H13.06C12.39,16.86 12,18.39 12,20C12,21.61 12.39,23.14 13.06,24.49L16.4,21.9V21.9Z" />
<path
android:fillColor="#E94235"
android:pathData="M22,13.98C23.47,13.98 24.79,14.48 25.82,15.47L28.69,12.6C26.96,10.99 24.7,10 22,10C18.09,10 14.71,12.24 13.06,15.51L16.4,18.1C17.19,15.74 19.4,13.98 22,13.98Z" />
</group>
<path
android:fillColor="#1F1F1F"
android:pathData="M48.25,22.44C48.25,22.23 48.22,22.05 48.15,21.89C48.09,21.73 47.99,21.58 47.83,21.45C47.68,21.32 47.46,21.19 47.17,21.07C46.9,20.94 46.54,20.81 46.11,20.68C45.63,20.53 45.2,20.37 44.8,20.19C44.4,20.01 44.05,19.8 43.76,19.57C43.46,19.32 43.23,19.05 43.07,18.74C42.9,18.42 42.82,18.06 42.82,17.65C42.82,17.25 42.9,16.88 43.07,16.54C43.25,16.21 43.49,15.92 43.8,15.68C44.12,15.44 44.5,15.25 44.93,15.12C45.37,14.98 45.84,14.91 46.37,14.91C47.11,14.91 47.74,15.05 48.28,15.32C48.81,15.59 49.23,15.96 49.51,16.42C49.8,16.88 49.95,17.39 49.95,17.95H48.25C48.25,17.62 48.18,17.33 48.04,17.08C47.9,16.82 47.69,16.62 47.41,16.48C47.13,16.33 46.78,16.26 46.35,16.26C45.94,16.26 45.6,16.32 45.34,16.44C45.07,16.56 44.87,16.73 44.73,16.94C44.6,17.15 44.54,17.39 44.54,17.65C44.54,17.84 44.58,18.01 44.67,18.16C44.75,18.31 44.88,18.46 45.06,18.59C45.24,18.72 45.46,18.84 45.73,18.95C46,19.06 46.32,19.17 46.68,19.28C47.23,19.44 47.71,19.62 48.13,19.83C48.54,20.02 48.88,20.24 49.15,20.5C49.42,20.75 49.63,21.03 49.77,21.35C49.9,21.66 49.97,22.02 49.97,22.42C49.97,22.84 49.89,23.22 49.72,23.56C49.55,23.89 49.31,24.18 48.99,24.41C48.68,24.64 48.31,24.82 47.87,24.95C47.44,25.08 46.96,25.14 46.42,25.14C45.94,25.14 45.47,25.07 45.01,24.95C44.55,24.82 44.13,24.62 43.75,24.36C43.37,24.1 43.07,23.77 42.85,23.38C42.62,22.98 42.51,22.52 42.51,21.99H44.23C44.23,22.32 44.28,22.59 44.39,22.82C44.51,23.05 44.66,23.23 44.86,23.38C45.06,23.52 45.3,23.63 45.56,23.69C45.83,23.76 46.12,23.8 46.42,23.8C46.82,23.8 47.16,23.74 47.43,23.63C47.7,23.51 47.91,23.35 48.04,23.15C48.18,22.94 48.25,22.71 48.25,22.44ZM53.09,17.6V25H51.43V17.6H53.09ZM51.32,15.66C51.32,15.41 51.41,15.2 51.57,15.04C51.74,14.87 51.97,14.79 52.27,14.79C52.56,14.79 52.79,14.87 52.96,15.04C53.13,15.2 53.21,15.41 53.21,15.66C53.21,15.91 53.13,16.11 52.96,16.28C52.79,16.44 52.56,16.52 52.27,16.52C51.97,16.52 51.74,16.44 51.57,16.28C51.41,16.11 51.32,15.91 51.32,15.66ZM59.63,17.6H61.13V24.79C61.13,25.46 60.99,26.03 60.7,26.49C60.42,26.96 60.03,27.31 59.52,27.55C59.01,27.8 58.43,27.92 57.76,27.92C57.48,27.92 57.17,27.88 56.82,27.8C56.48,27.71 56.15,27.58 55.82,27.4C55.5,27.22 55.24,26.99 55.02,26.7L55.79,25.72C56.06,26.04 56.35,26.27 56.67,26.42C56.99,26.56 57.32,26.63 57.67,26.63C58.05,26.63 58.37,26.56 58.64,26.42C58.91,26.29 59.11,26.08 59.26,25.81C59.41,25.54 59.48,25.22 59.48,24.83V19.28L59.63,17.6ZM54.61,21.38V21.24C54.61,20.68 54.67,20.17 54.81,19.71C54.95,19.24 55.14,18.85 55.4,18.51C55.65,18.18 55.96,17.92 56.33,17.74C56.69,17.56 57.11,17.47 57.57,17.47C58.04,17.47 58.45,17.55 58.79,17.73C59.13,17.9 59.42,18.15 59.64,18.47C59.87,18.79 60.05,19.17 60.18,19.62C60.31,20.06 60.41,20.55 60.47,21.1V21.55C60.41,22.08 60.31,22.57 60.17,23C60.03,23.44 59.84,23.82 59.61,24.14C59.38,24.46 59.09,24.7 58.75,24.88C58.41,25.05 58.01,25.14 57.55,25.14C57.1,25.14 56.69,25.04 56.33,24.86C55.97,24.67 55.66,24.41 55.4,24.07C55.14,23.73 54.95,23.34 54.81,22.88C54.67,22.42 54.61,21.92 54.61,21.38ZM56.25,21.24V21.38C56.25,21.72 56.28,22.04 56.35,22.33C56.42,22.62 56.52,22.88 56.66,23.1C56.8,23.32 56.98,23.49 57.19,23.62C57.41,23.74 57.67,23.8 57.96,23.8C58.35,23.8 58.67,23.72 58.91,23.56C59.16,23.39 59.35,23.17 59.49,22.89C59.62,22.61 59.72,22.3 59.77,21.95V20.71C59.75,20.44 59.69,20.19 59.6,19.96C59.52,19.73 59.41,19.53 59.27,19.35C59.13,19.18 58.95,19.04 58.73,18.94C58.52,18.84 58.27,18.79 57.98,18.79C57.68,18.79 57.42,18.86 57.2,18.98C56.98,19.11 56.8,19.29 56.66,19.51C56.53,19.73 56.42,19.99 56.36,20.29C56.29,20.59 56.25,20.9 56.25,21.24ZM64.47,19.18V25H62.82V17.6H64.37L64.47,19.18ZM64.18,21.03L63.64,21.02C63.65,20.5 63.72,20.02 63.86,19.58C64.01,19.14 64.21,18.77 64.46,18.45C64.72,18.14 65.03,17.9 65.39,17.73C65.75,17.55 66.15,17.47 66.6,17.47C66.95,17.47 67.27,17.52 67.56,17.62C67.85,17.71 68.1,17.87 68.3,18.09C68.51,18.31 68.67,18.59 68.78,18.94C68.89,19.29 68.95,19.72 68.95,20.22V25H67.29V20.21C67.29,19.86 67.24,19.58 67.14,19.37C67.04,19.16 66.89,19.02 66.69,18.93C66.5,18.84 66.26,18.79 65.97,18.79C65.69,18.79 65.44,18.85 65.21,18.97C64.99,19.09 64.8,19.25 64.65,19.46C64.5,19.66 64.38,19.9 64.3,20.17C64.22,20.44 64.18,20.72 64.18,21.03ZM78.57,23.26V17.6H80.22V25H78.66L78.57,23.26ZM78.8,21.72L79.35,21.71C79.35,22.2 79.3,22.66 79.19,23.08C79.08,23.49 78.91,23.86 78.68,24.17C78.45,24.47 78.16,24.71 77.81,24.88C77.45,25.05 77.03,25.14 76.53,25.14C76.17,25.14 75.84,25.08 75.54,24.98C75.24,24.87 74.98,24.71 74.76,24.49C74.54,24.28 74.38,23.99 74.26,23.64C74.14,23.29 74.08,22.87 74.08,22.38V17.6H75.73V22.4C75.73,22.66 75.76,22.89 75.82,23.07C75.89,23.25 75.97,23.39 76.08,23.5C76.19,23.61 76.32,23.69 76.47,23.74C76.61,23.78 76.77,23.8 76.93,23.8C77.4,23.8 77.77,23.71 78.04,23.53C78.31,23.34 78.51,23.09 78.62,22.78C78.74,22.46 78.8,22.11 78.8,21.72ZM83.56,19.03V27.84H81.92V17.6H83.43L83.56,19.03ZM88.38,21.23V21.38C88.38,21.91 88.32,22.41 88.19,22.87C88.07,23.33 87.88,23.73 87.64,24.07C87.4,24.41 87.1,24.67 86.74,24.86C86.39,25.04 85.98,25.14 85.51,25.14C85.05,25.14 84.65,25.05 84.3,24.88C83.96,24.71 83.67,24.47 83.43,24.15C83.2,23.84 83,23.47 82.86,23.04C82.72,22.62 82.62,22.15 82.56,21.64V21.08C82.62,20.54 82.72,20.05 82.86,19.61C83,19.16 83.2,18.78 83.43,18.46C83.67,18.15 83.96,17.9 84.3,17.73C84.64,17.55 85.04,17.47 85.5,17.47C85.96,17.47 86.37,17.56 86.73,17.74C87.09,17.92 87.4,18.17 87.64,18.51C87.89,18.83 88.07,19.23 88.2,19.7C88.32,20.16 88.38,20.67 88.38,21.23ZM86.73,21.38V21.23C86.73,20.89 86.7,20.57 86.64,20.28C86.57,19.99 86.47,19.73 86.34,19.5C86.2,19.28 86.03,19.11 85.81,18.98C85.6,18.86 85.35,18.79 85.05,18.79C84.76,18.79 84.51,18.84 84.3,18.94C84.09,19.04 83.92,19.17 83.77,19.35C83.63,19.52 83.52,19.72 83.45,19.96C83.37,20.18 83.31,20.43 83.28,20.7V22.03C83.34,22.35 83.43,22.66 83.56,22.93C83.69,23.2 83.88,23.42 84.12,23.58C84.37,23.74 84.68,23.82 85.07,23.82C85.36,23.82 85.62,23.76 85.83,23.63C86.03,23.51 86.21,23.33 86.34,23.11C86.47,22.88 86.57,22.62 86.64,22.32C86.7,22.02 86.73,21.71 86.73,21.38ZM95.28,23.36L96.99,17.6H98.04L97.75,19.33L96.03,25H95.09L95.28,23.36ZM94.27,17.6L95.61,23.39L95.72,25H94.66L92.66,17.6H94.27ZM99.64,23.32L100.93,17.6H102.54L100.54,25H99.49L99.64,23.32ZM98.22,17.6L99.91,23.29L100.12,25H99.18L97.43,19.32L97.15,17.6H98.22ZM105.42,17.6V25H103.77V17.6H105.42ZM103.66,15.66C103.66,15.41 103.74,15.2 103.91,15.04C104.07,14.87 104.31,14.79 104.6,14.79C104.89,14.79 105.13,14.87 105.29,15.04C105.46,15.2 105.55,15.41 105.55,15.66C105.55,15.91 105.46,16.11 105.29,16.28C105.13,16.44 104.89,16.52 104.6,16.52C104.31,16.52 104.07,16.44 103.91,16.28C103.74,16.11 103.66,15.91 103.66,15.66ZM110.62,17.6V18.81H106.45V17.6H110.62ZM107.65,15.79H109.3V22.96C109.3,23.18 109.33,23.36 109.4,23.48C109.46,23.6 109.56,23.68 109.68,23.72C109.79,23.76 109.93,23.78 110.09,23.78C110.21,23.78 110.32,23.78 110.42,23.76C110.53,23.75 110.61,23.74 110.67,23.72L110.68,24.98C110.54,25.02 110.38,25.06 110.2,25.09C110.02,25.12 109.82,25.14 109.59,25.14C109.21,25.14 108.87,25.07 108.58,24.94C108.29,24.8 108.06,24.58 107.9,24.28C107.73,23.97 107.65,23.56 107.65,23.06V15.79ZM113.52,14.5V25H111.88V14.5H113.52ZM113.23,21.03L112.7,21.02C112.7,20.51 112.77,20.04 112.91,19.61C113.05,19.17 113.25,18.8 113.5,18.48C113.75,18.15 114.06,17.91 114.41,17.73C114.77,17.56 115.16,17.47 115.6,17.47C115.96,17.47 116.29,17.52 116.58,17.62C116.88,17.72 117.13,17.88 117.35,18.1C117.56,18.32 117.72,18.61 117.83,18.96C117.94,19.31 118,19.74 118,20.25V25H116.35V20.24C116.35,19.88 116.29,19.6 116.19,19.39C116.09,19.18 115.94,19.03 115.75,18.94C115.55,18.84 115.31,18.79 115.03,18.79C114.73,18.79 114.47,18.85 114.24,18.97C114.02,19.09 113.83,19.25 113.68,19.46C113.53,19.66 113.42,19.9 113.34,20.17C113.27,20.44 113.23,20.72 113.23,21.03ZM130.96,19.91V23.71C130.82,23.9 130.6,24.11 130.3,24.33C130,24.55 129.61,24.74 129.12,24.9C128.63,25.06 128.01,25.14 127.28,25.14C126.65,25.14 126.08,25.03 125.56,24.82C125.04,24.61 124.59,24.3 124.22,23.89C123.84,23.48 123.55,22.98 123.35,22.39C123.14,21.8 123.04,21.12 123.04,20.37V19.67C123.04,18.92 123.13,18.25 123.32,17.67C123.51,17.07 123.79,16.57 124.14,16.16C124.5,15.75 124.92,15.44 125.43,15.23C125.93,15.02 126.5,14.91 127.14,14.91C127.96,14.91 128.63,15.05 129.16,15.32C129.7,15.59 130.12,15.96 130.41,16.44C130.7,16.92 130.88,17.47 130.96,18.08H129.28C129.23,17.74 129.12,17.43 128.96,17.15C128.8,16.88 128.58,16.66 128.29,16.51C128,16.35 127.63,16.27 127.17,16.27C126.77,16.27 126.42,16.35 126.12,16.5C125.82,16.65 125.57,16.87 125.37,17.16C125.18,17.45 125.03,17.81 124.93,18.23C124.83,18.64 124.78,19.12 124.78,19.66V20.37C124.78,20.91 124.83,21.4 124.95,21.82C125.07,22.25 125.23,22.6 125.45,22.89C125.68,23.19 125.95,23.41 126.27,23.56C126.59,23.7 126.95,23.78 127.35,23.78C127.74,23.78 128.06,23.74 128.31,23.68C128.56,23.61 128.76,23.53 128.9,23.44C129.06,23.35 129.17,23.25 129.25,23.17V21.19H127.18V19.91H130.96ZM132.38,21.38V21.23C132.38,20.69 132.46,20.2 132.62,19.74C132.77,19.28 132.99,18.88 133.29,18.55C133.58,18.21 133.94,17.94 134.37,17.75C134.8,17.56 135.28,17.47 135.82,17.47C136.36,17.47 136.84,17.56 137.27,17.75C137.69,17.94 138.06,18.21 138.35,18.55C138.65,18.88 138.87,19.28 139.03,19.74C139.18,20.2 139.26,20.69 139.26,21.23V21.38C139.26,21.92 139.18,22.41 139.03,22.87C138.87,23.32 138.65,23.72 138.35,24.06C138.06,24.4 137.7,24.67 137.27,24.86C136.85,25.04 136.37,25.14 135.83,25.14C135.29,25.14 134.8,25.04 134.37,24.86C133.95,24.67 133.59,24.4 133.29,24.06C133,23.72 132.77,23.32 132.62,22.87C132.46,22.41 132.38,21.92 132.38,21.38ZM134.03,21.23V21.38C134.03,21.72 134.07,22.03 134.13,22.33C134.2,22.62 134.31,22.88 134.46,23.11C134.6,23.33 134.79,23.51 135.02,23.63C135.24,23.76 135.52,23.82 135.83,23.82C136.13,23.82 136.4,23.76 136.62,23.63C136.85,23.51 137.04,23.33 137.18,23.11C137.33,22.88 137.44,22.62 137.51,22.33C137.58,22.03 137.61,21.72 137.61,21.38V21.23C137.61,20.9 137.58,20.59 137.51,20.3C137.44,20 137.33,19.74 137.18,19.51C137.03,19.28 136.84,19.11 136.62,18.98C136.39,18.85 136.13,18.78 135.82,18.78C135.51,18.78 135.24,18.85 135.01,18.98C134.79,19.11 134.6,19.28 134.46,19.51C134.31,19.74 134.2,20 134.13,20.3C134.07,20.59 134.03,20.9 134.03,21.23ZM140.33,21.38V21.23C140.33,20.69 140.41,20.2 140.56,19.74C140.71,19.28 140.94,18.88 141.23,18.55C141.53,18.21 141.89,17.94 142.31,17.75C142.74,17.56 143.22,17.47 143.76,17.47C144.3,17.47 144.79,17.56 145.21,17.75C145.64,17.94 146,18.21 146.3,18.55C146.59,18.88 146.82,19.28 146.97,19.74C147.13,20.2 147.21,20.69 147.21,21.23V21.38C147.21,21.92 147.13,22.41 146.97,22.87C146.82,23.32 146.59,23.72 146.3,24.06C146,24.4 145.64,24.67 145.22,24.86C144.79,25.04 144.31,25.14 143.77,25.14C143.23,25.14 142.75,25.04 142.32,24.86C141.89,24.67 141.53,24.4 141.24,24.06C140.94,23.72 140.71,23.32 140.56,22.87C140.41,22.41 140.33,21.92 140.33,21.38ZM141.98,21.23V21.38C141.98,21.72 142.01,22.03 142.08,22.33C142.15,22.62 142.25,22.88 142.4,23.11C142.54,23.33 142.73,23.51 142.96,23.63C143.19,23.76 143.46,23.82 143.77,23.82C144.08,23.82 144.34,23.76 144.57,23.63C144.79,23.51 144.98,23.33 145.13,23.11C145.27,22.88 145.38,22.62 145.45,22.33C145.52,22.03 145.56,21.72 145.56,21.38V21.23C145.56,20.9 145.52,20.59 145.45,20.3C145.38,20 145.27,19.74 145.12,19.51C144.97,19.28 144.79,19.11 144.56,18.98C144.34,18.85 144.07,18.78 143.76,18.78C143.45,18.78 143.18,18.85 142.95,18.98C142.73,19.11 142.54,19.28 142.4,19.51C142.25,19.74 142.15,20 142.08,20.3C142.01,20.59 141.98,20.9 141.98,21.23ZM153.32,17.6H154.82V24.79C154.82,25.46 154.68,26.03 154.4,26.49C154.11,26.96 153.72,27.31 153.21,27.55C152.71,27.8 152.12,27.92 151.46,27.92C151.17,27.92 150.86,27.88 150.51,27.8C150.17,27.71 149.84,27.58 149.52,27.4C149.2,27.22 148.93,26.99 148.72,26.7L149.49,25.72C149.75,26.04 150.04,26.27 150.36,26.42C150.68,26.56 151.02,26.63 151.37,26.63C151.75,26.63 152.07,26.56 152.33,26.42C152.6,26.29 152.81,26.08 152.95,25.81C153.1,25.54 153.17,25.22 153.17,24.83V19.28L153.32,17.6ZM148.3,21.38V21.24C148.3,20.68 148.37,20.17 148.5,19.71C148.64,19.24 148.84,18.85 149.09,18.51C149.35,18.18 149.66,17.92 150.02,17.74C150.39,17.56 150.8,17.47 151.26,17.47C151.74,17.47 152.15,17.55 152.48,17.73C152.82,17.9 153.11,18.15 153.34,18.47C153.57,18.79 153.74,19.17 153.87,19.62C154,20.06 154.1,20.55 154.16,21.1V21.55C154.1,22.08 154.01,22.57 153.86,23C153.72,23.44 153.54,23.82 153.3,24.14C153.07,24.46 152.78,24.7 152.44,24.88C152.1,25.05 151.71,25.14 151.24,25.14C150.79,25.14 150.39,25.04 150.02,24.86C149.66,24.67 149.35,24.41 149.09,24.07C148.84,23.73 148.64,23.34 148.5,22.88C148.37,22.42 148.3,21.92 148.3,21.38ZM149.95,21.24V21.38C149.95,21.72 149.98,22.04 150.04,22.33C150.11,22.62 150.21,22.88 150.35,23.1C150.49,23.32 150.67,23.49 150.88,23.62C151.1,23.74 151.36,23.8 151.65,23.8C152.04,23.8 152.36,23.72 152.6,23.56C152.86,23.39 153.05,23.17 153.18,22.89C153.32,22.61 153.41,22.3 153.47,21.95V20.71C153.44,20.44 153.38,20.19 153.3,19.96C153.21,19.73 153.1,19.53 152.96,19.35C152.82,19.18 152.64,19.04 152.43,18.94C152.21,18.84 151.96,18.79 151.67,18.79C151.37,18.79 151.12,18.86 150.9,18.98C150.68,19.11 150.5,19.29 150.36,19.51C150.22,19.73 150.12,19.99 150.05,20.29C149.98,20.59 149.95,20.9 149.95,21.24ZM158.29,14.5V25H156.64V14.5H158.29ZM163.36,25.14C162.81,25.14 162.32,25.05 161.88,24.87C161.44,24.69 161.06,24.43 160.75,24.11C160.45,23.79 160.21,23.41 160.05,22.97C159.89,22.53 159.8,22.06 159.8,21.55V21.28C159.8,20.7 159.89,20.18 160.06,19.71C160.23,19.24 160.46,18.84 160.76,18.51C161.06,18.17 161.42,17.91 161.83,17.73C162.24,17.56 162.68,17.47 163.16,17.47C163.69,17.47 164.15,17.56 164.55,17.73C164.94,17.91 165.27,18.16 165.53,18.49C165.8,18.8 165.99,19.18 166.12,19.63C166.25,20.07 166.32,20.56 166.32,21.09V21.79H160.6V20.61H164.69V20.48C164.68,20.19 164.62,19.91 164.51,19.65C164.41,19.39 164.25,19.18 164.03,19.02C163.81,18.86 163.52,18.78 163.15,18.78C162.88,18.78 162.64,18.84 162.42,18.96C162.21,19.07 162.04,19.24 161.9,19.46C161.75,19.67 161.65,19.94 161.57,20.25C161.49,20.55 161.46,20.9 161.46,21.28V21.55C161.46,21.88 161.5,22.18 161.59,22.46C161.68,22.73 161.81,22.97 161.98,23.17C162.16,23.38 162.37,23.54 162.61,23.66C162.86,23.77 163.14,23.83 163.45,23.83C163.85,23.83 164.2,23.75 164.51,23.59C164.82,23.43 165.09,23.21 165.32,22.92L166.19,23.76C166.03,23.99 165.82,24.21 165.57,24.43C165.31,24.64 165,24.81 164.63,24.94C164.26,25.07 163.84,25.14 163.36,25.14Z" />
<path
android:fillColor="#00000000"
android:pathData="M4,0.5L175,0.5A3.5,3.5 0,0 1,178.5 4L178.5,36A3.5,3.5 0,0 1,175 39.5L4,39.5A3.5,3.5 0,0 1,0.5 36L0.5,4A3.5,3.5 0,0 1,4 0.5z"
android:strokeWidth="1"
android:strokeColor="#747775" />
</vector>
62 changes: 19 additions & 43 deletions feature/login/src/main/java/com/boostcamp/mapisode/login/LoginScreen.kt
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
package com.boostcamp.mapisode.login

import androidx.compose.foundation.Image
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.boostcamp.mapisode.designsystem.R.drawable
import com.boostcamp.mapisode.designsystem.compose.MapisodeIcon
import com.boostcamp.mapisode.designsystem.compose.MapisodeIconButton
import com.boostcamp.mapisode.designsystem.compose.MapisodeText
import com.boostcamp.mapisode.designsystem.theme.MapisodeTheme

Expand Down Expand Up @@ -64,50 +58,32 @@ fun LoginScreen(
style = MapisodeTheme.typography.headlineSmall,
)

Spacer(modifier = Modifier.height(15.dp))
Spacer(modifier = Modifier.height(16.dp))

MapisodeText(
text = stringResource(R.string.login_app_long_description),
text = stringResource(R.string.login_app_long_description1),
modifier = Modifier.align(Alignment.CenterHorizontally),
style = MapisodeTheme.typography.bodyLarge.copy(
textAlign = TextAlign.Center,
),
style = MapisodeTheme.typography.bodyLarge,
)

Spacer(modifier = Modifier.weight(1f))
Spacer(modifier = Modifier.height(4.dp))

MapisodeIconButton(
onClick = googleSignInClicked,
modifier = Modifier
.fillMaxWidth(0.8f)
.weight(1f)
.border(
width = 1.dp,
color = MapisodeTheme.colorScheme.outlineButtonStroke,
),
) {
Row(
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center,
) {
Image(
painter = painterResource(id = drawable.ic_google),
contentDescription = "구글 로그인",
modifier = Modifier
.fillMaxHeight(0.5f)
.aspectRatio(1f),
contentScale = ContentScale.Fit,
)
MapisodeText(
text = stringResource(R.string.login_app_long_description2),
modifier = Modifier.align(Alignment.CenterHorizontally),
style = MapisodeTheme.typography.bodyLarge,
)

Spacer(modifier = Modifier.width(24.dp))
Spacer(modifier = Modifier.weight(1f))

MapisodeText(
text = "구글 계정으로 로그인",
style = MapisodeTheme.typography.bodyLarge,
)
}
}
Image(
painter = painterResource(drawable.ic_google_login),
contentDescription = stringResource(R.string.login_google_login),
modifier = Modifier
.fillMaxWidth(0.5f)
.clickable { googleSignInClicked() },
contentScale = ContentScale.FillWidth,
)

Spacer(modifier = Modifier.weight(2f))
}
Expand Down
3 changes: 2 additions & 1 deletion feature/login/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="login_app_long_description">당신의 순간을 지도에 담아 공유해보세요.\n소중한 사람들과 함께 해보세요!.</string>
<string name="login_app_long_description1">당신의 순간을 지도에 담아 공유해보세요.</string>
<string name="login_app_long_description2">소중한 사람들과 함께 해보세요!</string>
<string name="login_app_short_description">우리의 순간이 모인 지도, 메피소드</string>
<string name="login_mapisode_subicon">Mapisode subIcon</string>
<string name="login_nickname">닉네임</string>
Expand Down

0 comments on commit 425cb45

Please sign in to comment.