Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AN] 앱 디자인 수정 #512

Merged
merged 5 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ChatActivity :
viewModel.chats.collect {
adapter.submitList(it)
binding.rcvChatDetail.post {
binding.rcvChatDetail.scrollToPosition(adapter.currentList.size - 1)
binding.rcvChatDetail.smoothScrollToPosition(it.size)
}
}
}
Expand Down
78 changes: 78 additions & 0 deletions android/app/src/main/res/drawable/ic_login_dog_logo.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="172dp"
android:height="65dp"
android:viewportWidth="172"
android:viewportHeight="65">
<path
android:pathData="M21.83,4.02C21.79,3.13 22.28,2.46 23.3,1.99C24.38,1.48 25.52,1.22 26.73,1.22C27.81,1.22 28.76,1.43 29.6,1.85C30.44,2.22 30.93,2.85 31.07,3.74C31.73,8.27 32.15,12.7 32.33,17.04C32.57,21.38 32.68,25.81 32.68,30.34C32.68,31.41 32.19,32.35 31.21,33.14C30.23,33.93 28.95,34.61 27.36,35.17C25.82,35.68 24.05,36.08 22.04,36.36C20.08,36.59 18.12,36.71 16.16,36.71C14.2,36.71 12.29,36.59 10.42,36.36C8.6,36.08 6.97,35.68 5.52,35.17C4.08,34.66 2.91,34 2.02,33.21C1.14,32.42 0.69,31.48 0.69,30.41V27.47C0.69,23.46 0.79,19.49 0.97,15.57C1.16,11.65 1.51,7.68 2.02,3.67C2.12,2.83 2.56,2.22 3.35,1.85C4.19,1.48 5.13,1.29 6.15,1.29C6.81,1.29 7.46,1.36 8.11,1.5C8.81,1.64 9.42,1.83 9.93,2.06C10.45,2.29 10.87,2.57 11.19,2.9C11.52,3.23 11.68,3.55 11.68,3.88L11.4,12.21H14.48C15.74,12.21 17,12.21 18.26,12.21C19.57,12.21 20.9,12.23 22.25,12.28C22.16,10.93 22.07,9.57 21.97,8.22C21.93,6.87 21.88,5.47 21.83,4.02ZM37.44,3.32C37.4,2.85 37.51,2.43 37.79,2.06C38.07,1.69 38.42,1.38 38.84,1.15C39.31,0.87 39.85,0.66 40.45,0.52C41.06,0.38 41.67,0.31 42.27,0.31C43.3,0.31 44.23,0.52 45.07,0.94C45.96,1.36 46.47,2.04 46.61,2.97C46.94,5.07 47.2,7.17 47.38,9.27C47.62,11.37 47.83,13.52 48.01,15.71C48.99,15.66 49.95,15.66 50.88,15.71C51.86,15.71 52.82,15.73 53.75,15.78C54.59,15.83 55.22,16.29 55.64,17.18C56.06,18.02 56.27,18.98 56.27,20.05C56.27,20.66 56.2,21.26 56.06,21.87C55.92,22.48 55.71,23.04 55.43,23.55C55.15,24.02 54.8,24.41 54.38,24.74C53.96,25.02 53.47,25.16 52.91,25.16C52.12,25.16 51.37,25.16 50.67,25.16C49.97,25.16 49.25,25.18 48.5,25.23C48.55,26.3 48.57,27.4 48.57,28.52C48.62,29.64 48.64,30.74 48.64,31.81C48.64,34.94 48.57,37.92 48.43,40.77C48.39,41.66 47.83,42.33 46.75,42.8C45.68,43.22 44.47,43.43 43.11,43.43C42.41,43.43 41.71,43.36 41.01,43.22C40.31,43.08 39.68,42.89 39.12,42.66C38.61,42.38 38.19,42.05 37.86,41.68C37.54,41.26 37.4,40.77 37.44,40.21C37.63,37.22 37.75,34.17 37.79,31.04C37.89,27.87 37.93,24.67 37.93,21.45C37.93,18.37 37.89,15.34 37.79,12.35C37.75,9.32 37.63,6.31 37.44,3.32ZM25.12,53.23C25.22,54.02 25.61,54.58 26.31,54.91C27.01,55.28 27.76,55.52 28.55,55.61C29.25,55.66 29.95,55.68 30.65,55.68C31.4,55.73 32.17,55.75 32.96,55.75C35.06,55.75 37.14,55.66 39.19,55.47C41.29,55.33 43.32,55.14 45.28,54.91C45.61,54.86 45.91,54.96 46.19,55.19C46.52,55.47 46.8,55.8 47.03,56.17C47.27,56.59 47.43,57.06 47.52,57.57C47.66,58.13 47.73,58.67 47.73,59.18C47.73,59.83 47.62,60.42 47.38,60.93C47.15,61.49 46.78,61.86 46.26,62.05C43.51,62.89 40.66,63.54 37.72,64.01C34.78,64.48 31.84,64.71 28.9,64.71C27.64,64.71 26.22,64.64 24.63,64.5C23.05,64.41 21.51,64.15 20.01,63.73C18.57,63.36 17.31,62.77 16.23,61.98C15.21,61.19 14.6,60.11 14.41,58.76C14.32,57.83 14.23,56.92 14.13,56.03C14.09,55.19 14.06,54.33 14.06,53.44C14.06,51.67 14.16,49.89 14.34,48.12C14.53,46.3 14.76,44.5 15.04,42.73C15.18,41.8 15.67,41.14 16.51,40.77C17.4,40.4 18.38,40.21 19.45,40.21C20.15,40.21 20.85,40.28 21.55,40.42C22.3,40.56 22.95,40.77 23.51,41.05C24.07,41.28 24.52,41.59 24.84,41.96C25.22,42.29 25.38,42.64 25.33,43.01C25.24,44.22 25.17,45.39 25.12,46.51C25.08,47.58 25.05,48.68 25.05,49.8C25.05,50.36 25.05,50.92 25.05,51.48C25.05,52.04 25.08,52.62 25.12,53.23ZM11.19,25.65C11.19,26.49 11.8,27.12 13.01,27.54C14.23,27.91 15.53,28.1 16.93,28.1C17.63,28.1 18.33,28.05 19.03,27.96C19.73,27.87 20.34,27.73 20.85,27.54C21.41,27.31 21.86,27.03 22.18,26.7C22.56,26.37 22.74,25.98 22.74,25.51C22.74,24.67 22.74,23.83 22.74,22.99C22.74,22.15 22.72,21.31 22.67,20.47C20.71,20.47 18.8,20.47 16.93,20.47C15.07,20.47 13.15,20.49 11.19,20.54V25.65ZM105.88,57.92C105.83,59.09 105.29,60.09 104.27,60.93C103.24,61.82 101.91,62.54 100.28,63.1C98.64,63.71 96.8,64.15 94.75,64.43C92.74,64.71 90.73,64.85 88.73,64.85C86.72,64.85 84.74,64.71 82.78,64.43C80.86,64.2 79.14,63.8 77.6,63.24C76.1,62.73 74.89,62.05 73.96,61.21C73.02,60.37 72.56,59.39 72.56,58.27C72.56,55.24 72.67,52.18 72.91,49.1C73.19,46.02 73.58,42.87 74.1,39.65C74.24,38.72 74.7,38.06 75.5,37.69C76.34,37.27 77.27,37.06 78.3,37.06C78.95,37.06 79.6,37.13 80.26,37.27C80.96,37.41 81.56,37.62 82.08,37.9C82.59,38.13 83.01,38.44 83.34,38.81C83.66,39.14 83.8,39.51 83.76,39.93L83.27,44.55H86.77C88.21,44.55 89.68,44.55 91.18,44.55C92.67,44.55 94.21,44.57 95.8,44.62C95.7,43.83 95.61,43.08 95.52,42.38C95.42,41.63 95.33,40.86 95.24,40.07C95.14,39.6 95.21,39.18 95.45,38.81C95.73,38.44 96.1,38.13 96.57,37.9C97.03,37.62 97.55,37.41 98.11,37.27C98.71,37.13 99.32,37.06 99.93,37.06C101,37.06 101.98,37.27 102.87,37.69C103.75,38.11 104.29,38.79 104.48,39.72C105.46,44.76 105.95,49.73 105.95,54.63C105.95,55.19 105.95,55.73 105.95,56.24C105.95,56.8 105.92,57.36 105.88,57.92ZM60.38,9.48C59.58,9.53 58.98,9.11 58.56,8.22C58.14,7.33 57.93,6.38 57.93,5.35C57.93,4.42 58.09,3.58 58.42,2.83C58.79,2.08 59.33,1.66 60.03,1.57C62.08,1.43 64.23,1.34 66.47,1.29C68.71,1.2 70.97,1.15 73.26,1.15C75.22,1.15 77.15,1.17 79.07,1.22C81.03,1.27 82.92,1.34 84.74,1.43C85.81,1.48 86.65,1.71 87.26,2.13C87.86,2.5 88.31,3.04 88.59,3.74C88.87,4.39 89.03,5.19 89.08,6.12C89.12,7.01 89.15,7.99 89.15,9.06C89.19,13.31 89.01,17.41 88.59,21.38C88.17,25.3 87.4,29.2 86.28,33.07C86.14,33.58 85.67,33.98 84.88,34.26C84.08,34.49 83.15,34.61 82.08,34.61C81.24,34.61 80.37,34.54 79.49,34.4C78.6,34.21 77.81,33.98 77.11,33.7C76.45,33.37 75.94,33 75.57,32.58C75.19,32.11 75.08,31.6 75.22,31.04C76.15,28.01 76.97,24.86 77.67,21.59C78.37,18.28 78.83,14.99 79.07,11.72C79.16,10.97 79.14,10.44 79,10.11C78.86,9.78 78.41,9.6 77.67,9.55C75.05,9.41 72.18,9.34 69.06,9.34C67.56,9.34 66.07,9.36 64.58,9.41C63.13,9.41 61.73,9.43 60.38,9.48ZM96.22,31.95C96.4,29.99 96.54,28.03 96.64,26.07C96.73,24.06 96.78,21.99 96.78,19.84C96.78,17.23 96.71,14.57 96.57,11.86C96.47,9.11 96.36,6.26 96.22,3.32C96.17,2.85 96.29,2.43 96.57,2.06C96.85,1.69 97.2,1.38 97.62,1.15C98.08,0.87 98.62,0.66 99.23,0.52C99.83,0.38 100.44,0.31 101.05,0.31C102.07,0.31 103.01,0.52 103.85,0.94C104.73,1.36 105.27,2.04 105.46,2.97C105.78,4.74 106.04,6.49 106.23,8.22C106.46,9.9 106.67,11.6 106.86,13.33C107.93,13.28 109,13.28 110.08,13.33C111.2,13.33 112.25,13.35 113.23,13.4C114.07,13.45 114.7,13.91 115.12,14.8C115.54,15.64 115.75,16.6 115.75,17.67C115.75,18.28 115.68,18.88 115.54,19.49C115.4,20.1 115.19,20.66 114.91,21.17C114.63,21.64 114.28,22.03 113.86,22.36C113.44,22.64 112.95,22.78 112.39,22.78C111.5,22.78 110.66,22.78 109.87,22.78C109.07,22.78 108.26,22.8 107.42,22.85V25.51C107.42,26.72 107.39,27.91 107.35,29.08C107.35,30.25 107.32,31.39 107.28,32.51C107.23,33.4 106.65,34.07 105.53,34.54C104.41,34.96 103.17,35.17 101.82,35.17C100.32,35.17 98.99,34.91 97.83,34.4C96.66,33.84 96.12,33.02 96.22,31.95ZM82.57,54.35C82.57,54.77 82.78,55.14 83.2,55.47C83.62,55.8 84.15,56.05 84.81,56.24C85.46,56.47 86.21,56.64 87.05,56.73C87.89,56.87 88.7,56.94 89.5,56.94C90.29,56.94 91.11,56.87 91.95,56.73C92.79,56.64 93.53,56.47 94.19,56.24C94.89,56.05 95.45,55.77 95.87,55.4C96.29,55.07 96.5,54.68 96.5,54.21C96.5,53.84 96.5,53.46 96.5,53.09C96.5,52.72 96.47,52.34 96.43,51.97C94.23,51.97 91.95,51.97 89.57,51.97C87.19,51.97 84.88,51.99 82.64,52.04C82.64,52.41 82.61,52.81 82.57,53.23C82.57,53.6 82.57,53.98 82.57,54.35ZM145.75,51.76C146.12,48.54 146.35,44.9 146.45,40.84C146.59,36.73 146.66,32.51 146.66,28.17C146.66,24.95 146.63,21.75 146.59,18.58C146.54,15.41 146.47,12.35 146.38,9.41C146.33,8.48 146.77,7.75 147.71,7.24C148.69,6.68 149.71,6.4 150.79,6.4C151.72,6.4 152.56,6.61 153.31,7.03C154.1,7.45 154.57,8.13 154.71,9.06C155.08,11.58 155.38,14.24 155.62,17.04C155.85,19.79 156.04,22.64 156.18,25.58C156.97,25.58 157.79,25.58 158.63,25.58C159.51,25.53 160.4,25.53 161.29,25.58C161.24,22.73 161.2,19.96 161.15,17.25C161.15,14.54 161.1,11.93 161.01,9.41C160.96,8.48 161.4,7.75 162.34,7.24C163.32,6.68 164.37,6.4 165.49,6.4C166.42,6.4 167.29,6.61 168.08,7.03C168.87,7.45 169.36,8.13 169.55,9.06C169.88,11.21 170.15,13.52 170.39,15.99C170.62,18.42 170.81,20.91 170.95,23.48C171.13,26.05 171.25,28.66 171.3,31.32C171.39,33.93 171.44,36.5 171.44,39.02C171.44,41.59 171.39,44.06 171.3,46.44C171.21,48.77 171.09,50.94 170.95,52.95C170.85,53.79 170.32,54.4 169.34,54.77C168.4,55.14 167.33,55.33 166.12,55.33C165.42,55.33 164.7,55.26 163.95,55.12C163.25,55.03 162.62,54.84 162.06,54.56C161.54,54.33 161.13,54.05 160.8,53.72C160.47,53.35 160.33,52.93 160.38,52.46C160.61,49.99 160.8,47.26 160.94,44.27C161.08,41.28 161.17,38.13 161.22,34.82C160.43,34.77 159.63,34.75 158.84,34.75C158.09,34.75 157.32,34.75 156.53,34.75C156.53,35.4 156.53,36.08 156.53,36.78C156.57,37.48 156.6,38.16 156.6,38.81C156.6,41.28 156.55,43.66 156.46,45.95C156.37,48.19 156.25,50.29 156.11,52.25C156.01,53.09 155.5,53.7 154.57,54.07C153.68,54.44 152.63,54.63 151.42,54.63C150.72,54.63 150.02,54.56 149.32,54.42C148.62,54.33 147.99,54.16 147.43,53.93C146.91,53.65 146.49,53.35 146.17,53.02C145.84,52.65 145.7,52.23 145.75,51.76ZM119.29,18.3C118.5,18.3 117.91,17.83 117.54,16.9C117.17,15.97 116.98,14.96 116.98,13.89C116.98,12.96 117.14,12.09 117.47,11.3C117.79,10.51 118.29,10.09 118.94,10.04C120.9,9.9 122.74,9.81 124.47,9.76C126.19,9.67 127.92,9.62 129.65,9.62C131,9.62 132.35,9.64 133.71,9.69C135.11,9.69 136.6,9.74 138.19,9.83C139.21,9.88 140.01,10.13 140.57,10.6C141.13,11.02 141.52,11.6 141.76,12.35C142.04,13.1 142.2,13.98 142.25,15.01C142.29,15.99 142.32,17.09 142.32,18.3C142.32,20.68 142.27,23.13 142.18,25.65C142.09,28.17 141.92,30.69 141.69,33.21C141.5,35.68 141.22,38.13 140.85,40.56C140.48,42.94 140.01,45.2 139.45,47.35C139.31,47.96 138.84,48.4 138.05,48.68C137.26,48.96 136.37,49.1 135.39,49.1C134.6,49.1 133.78,49.01 132.94,48.82C132.1,48.63 131.35,48.38 130.7,48.05C130.09,47.72 129.63,47.33 129.3,46.86C128.97,46.35 128.88,45.76 129.02,45.11C129.44,43.43 129.84,41.56 130.21,39.51C130.58,37.46 130.91,35.36 131.19,33.21C131.51,31.02 131.77,28.87 131.96,26.77C132.19,24.62 132.38,22.64 132.52,20.82C132.61,20.03 132.59,19.44 132.45,19.07C132.31,18.7 131.89,18.49 131.19,18.44C129.98,18.35 128.9,18.3 127.97,18.3C127.04,18.3 126.1,18.3 125.17,18.3H119.29Z"
android:fillColor="#FF7C6B"/>
</vector>
31 changes: 31 additions & 0 deletions android/app/src/main/res/drawable/login_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="360dp"
android:height="800dp"
android:viewportWidth="360"
android:viewportHeight="800">
<group>
<clip-path
android:pathData="M0,0h360v800h-360z"/>
<path
android:pathData="M0,0h360v800h-360z"
android:fillColor="#FFF8F8"/>
<path
android:pathData="M392,241.5C392,273.26 366.26,299 334.5,299C302.74,299 277,273.26 277,241.5C277,209.74 302.74,184 334.5,184C366.26,184 392,209.74 392,241.5Z"
android:fillColor="#FDEBEE"/>
<path
android:pathData="M-12.5,146.5m-82.5,0a82.5,82.5 0,1 1,165 0a82.5,82.5 0,1 1,-165 0"
android:fillColor="#FCF4DE"/>
<path
android:pathData="M245.15,635.32C267.52,586.34 363.55,597.75 386.11,607.07C404.64,614.71 386,614.95 412.97,607.07C415.92,606.25 419.08,606.61 421.78,608.08C424.48,609.55 426.51,612 427.43,614.91C428.35,617.83 428.09,620.98 426.71,623.69C425.33,626.4 422.93,628.47 420.03,629.44C406.79,633.67 416.39,668.36 401.19,701.62C385.99,734.89 395.71,762.76 401.19,775.53C402.44,778.38 402.51,781.59 401.38,784.48C400.25,787.36 398.02,789.67 395.17,790.9C392.31,792.14 389.02,792.04 386.11,790.9C383.2,789.77 380.92,787.69 379.65,784.85C367.93,759.31 303.08,724.64 285.15,715.63C263.36,704.68 222.77,684.31 245.15,635.32ZM376,638.65C358.35,641.59 340.21,640.19 323.17,634.57C289,620.46 276.84,622.72 266.62,645.09C256.4,667.46 262.66,678.12 295.69,694.72C311.1,703.92 338.28,706.01 347.61,721.28C355.85,687.77 356.06,666.82 376,638.65Z"
android:fillColor="#FED5BE"/>
<path
android:pathData="M376,638.65C358.35,641.59 340.21,640.19 323.17,634.57C289,620.46 276.84,622.72 266.62,645.09C256.4,667.46 262.66,678.12 295.69,694.72C311.1,703.92 338.28,706.01 347.61,721.28C355.85,687.77 356.06,666.82 376,638.65Z"
android:fillColor="#FED5BE"/>
<path
android:pathData="M63.49,480.25C89.12,500.82 55.88,555.49 46.99,567.44C39.69,577.26 -25.14,648.3 -24.51,665.44C-24.47,667.3 -21.36,610.87 -22.63,612.24C-23.9,613.62 -25.66,614.46 -27.52,614.56C-29.38,614.67 -31.21,614.05 -32.61,612.82C-34.01,611.6 -35.01,608.01 -35.01,608.01C-35.01,608.01 -27.73,591.54 -45.14,577.56C-62.56,563.59 -34.48,550.27 -42.85,551.6C-44.73,551.92 -46.64,551.47 -48.18,550.38C-49.71,549.28 -50.74,547.61 -51.05,545.73C-51.35,543.86 -50.8,541.92 -49.69,540.37C-48.58,538.82 -72.89,528.34 -71.02,528.01C-54.15,524.91 -32.52,460.7 -24.51,451.44C-14.77,440.18 37.85,459.67 63.49,480.25ZM17.73,557.19C18.63,546.3 22.18,535.78 28.06,526.54C41.52,508.43 42,500.89 30.3,491.49C18.59,482.1 11.34,484.2 -3.43,501.27C-11.18,509.01 -16.49,524.78 -26.92,528.01C-8.32,537.91 4.04,541.17 17.73,557.19Z"
android:fillColor="#D9EEEB"/>
<path
android:pathData="M17.73,557.19C18.63,546.3 22.18,535.78 28.06,526.54C41.52,508.43 42,500.89 30.3,491.49C18.59,482.1 11.34,484.2 -3.43,501.27C-11.18,509.01 -16.49,524.78 -26.92,528.01C-8.32,537.91 4.04,541.17 17.73,557.19Z"
android:fillColor="#D9EEEB"/>
</group>
</vector>
10 changes: 5 additions & 5 deletions android/app/src/main/res/font/font.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<font
android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/noto_sans_kr_bold"/>
android:font="@font/pretendard_bold"/>

<font android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/noto_sans_kr_semi_bold"/>
android:font="@font/pretendard_semi_bold"/>

<font android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/noto_sans_kr_medium"/>
android:font="@font/pretendard_medium"/>

<font android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/noto_sans_kr_regular"/>
android:font="@font/pretendard_regular"/>

<font android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/noto_sans_kr_light"/>
android:font="@font/pretendard_light"/>
</font-family>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
36 changes: 30 additions & 6 deletions android/app/src/main/res/layout/activity_register.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,42 @@
android:id="@+id/register_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/coral30"
android:background="@drawable/login_background"
android:orientation="vertical"
tools:context=".presentation.ui.register.RegisterActivity">


<ImageView
android:layout_width="match_parent"
android:id="@+id/iv_register_friendogly_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_login_friendogly_logo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.26" />

<ImageView
android:id="@+id/iv_register_friendogly_dog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/img_login_main"
app:layout_constraintBottom_toTopOf="@+id/ib_kakao_register"
android:src="@drawable/ic_login_dog_logo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/iv_register_friendogly_logo" />


<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:gravity="center"
android:text="@string/register_friendogly_description"
android:textSize="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_register_friendogly_dog" />

<ImageButton
android:id="@+id/ib_kakao_register"
Expand Down Expand Up @@ -57,9 +81,9 @@
android:layout_marginBottom="24dp"
android:adjustViewBounds="true"
android:padding="0dp"
android:visibility="gone"
android:scaleType="fitCenter"
android:src="@drawable/img_google_register"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/layout/fragment_chat_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
style="@style/Theme.AppCompat.TextView.Medium.Gray08.Size18"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="현재 잠여한 모임이 없어요"
android:text="@string/chat_no_chat_description"
android:layout_marginTop="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
1 change: 0 additions & 1 deletion android/app/src/main/res/layout/layout_chat_drawer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
style="@style/Theme.AppCompat.TextView.Regular.Size12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="@drawable/rect_coral30_fill_8"
android:button="@null"
android:layout_marginTop="12dp"
Expand Down
5 changes: 4 additions & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@
<string name="chat_setting_alarm">채팅방 알림</string>
<string name="chat_setting_alarm_alert">알림을 거부하여 채팅 알림을 받을 수 없습니다.</string>
<string name="chat_mine">나</string>
<string name="chat_go_club_detail">모임 상세 바로가기</string>

<!--멍멍 짓기-->
<string name="woof_member_name">%s\'s 댕댕이</string>
Expand Down Expand Up @@ -304,5 +303,9 @@
<string name="file_size_exceed_message">1MB를 초과하는 이미지는 등록할 수 없어요</string>
<string name="default_error_message">알 수 없는 에러가 발생했어요</string>
<string name="kakao_login_error_message">카카오 로그인을 실패했어요</string>
<string name="chat_go_club_detail">모임 상세 바로가기</string>
<string name="no_internet_message">네트워크 상태가 좋지 않아요\n연결 상태를 확인하고 다시 시도해주세요</string>
<string name="chat_no_chat_description">현재 참여한 모임이 없어요</string>
<string name="register_friendogly_description">내 반려견의 행복을 위한\n친구 찾기 서비스</string>

</resources>
Loading
Loading