Skip to content

Commit

Permalink
Merge pull request #14 from DOSOPT-CDS-APP-TEAM5/feature/#12-모임가입하기-ui제작
Browse files Browse the repository at this point in the history
[UI/#12] 모임가입하기 / UI 구현
  • Loading branch information
lsakee authored Nov 29, 2023
2 parents 5af15e3 + 3d73bfa commit e042b88
Show file tree
Hide file tree
Showing 18 changed files with 829 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@ package org.sopt.carrot.presentation.joinmeeting

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import coil.load
import coil.transform.RoundedCornersTransformation
import org.sopt.carrot.R
import org.sopt.carrot.databinding.ActivityJoinMeetingBinding

class JoinMeetingActivity : AppCompatActivity() {
private lateinit var binding: ActivityJoinMeetingBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_join_meeting)
binding = ActivityJoinMeetingBinding.inflate(layoutInflater)
setContentView(binding.root)


binding.ivJoinMeetingProfile.load("https://github-production-user-asset-6210df.s3.amazonaws.com/98076050/275424965-975a57c1-1581-4283-9613-5486b67986de.jpeg") {
crossfade(true) //fade in 애니메이션
error(R.drawable.ic_launcher_foreground) //Load Error 시 보여줄 이미지
transformations(RoundedCornersTransformation(42F)) // 이미지를 원형으로 자르는 편집 기능 사용
}
}
}
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/chevron_down.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="17dp"
android:height="16dp"
android:viewportWidth="17"
android:viewportHeight="16">
<path
android:pathData="M6.029,2.862C5.768,3.123 5.768,3.545 6.029,3.805L10.224,8L6.029,12.196C5.768,12.456 5.768,12.878 6.029,13.138C6.289,13.399 6.711,13.399 6.972,13.138L11.638,8.472C11.899,8.211 11.899,7.789 11.638,7.529L6.972,2.862C6.711,2.602 6.289,2.602 6.029,2.862Z"
android:fillColor="#212529"
android:fillType="evenOdd"/>
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/chevron_down_orange.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="17dp"
android:height="16dp"
android:viewportWidth="17"
android:viewportHeight="16">
<path
android:pathData="M6.029,2.862C5.768,3.122 5.768,3.544 6.029,3.805L10.224,8L6.029,12.195C5.768,12.455 5.768,12.878 6.029,13.138C6.289,13.398 6.711,13.398 6.972,13.138L11.638,8.471C11.899,8.211 11.899,7.789 11.638,7.528L6.972,2.862C6.711,2.601 6.289,2.601 6.029,2.862Z"
android:fillColor="#FF6F0F"
android:fillType="evenOdd"/>
</vector>
23 changes: 23 additions & 0 deletions app/src/main/res/drawable/clock.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="14">
<group>
<clip-path
android:pathData="M0,0h14v14h-14z"/>
<path
android:pathData="M7,13.333C10.682,13.333 13.667,10.349 13.667,6.667C13.667,2.985 10.682,0 7,0C3.318,0 0.333,2.985 0.333,6.667C0.333,10.349 3.318,13.333 7,13.333Z"
android:fillColor="#ACB0B9"/>
<path
android:pathData="M7,2.667V6.667L9.667,8"
android:fillColor="#ACB0B9"/>
<path
android:pathData="M7,3.333V7.333L9.667,8.667"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</group>
</vector>
17 changes: 17 additions & 0 deletions app/src/main/res/drawable/ic_alert.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="17dp"
android:height="17dp"
android:viewportWidth="17"
android:viewportHeight="17">
<group>
<clip-path
android:pathData="M0,0h17v17h-17z"/>
<path
android:strokeWidth="1"
android:pathData="M8.5,5.667V8.5M8.5,11.333H8.507M15.583,8.5C15.583,12.412 12.412,15.583 8.5,15.583C4.588,15.583 1.417,12.412 1.417,8.5C1.417,4.588 4.588,1.416 8.5,1.416C12.412,1.416 15.583,4.588 15.583,8.5Z"
android:strokeLineJoin="round"
android:fillColor="#00000000"
android:strokeColor="#868E96"
android:strokeLineCap="round"/>
</group>
</vector>
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/ic_liked_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="17dp"
android:height="17dp"
android:viewportWidth="17"
android:viewportHeight="17">
<path
android:pathData="M8.5,0L8.5,0A8.5,8.5 0,0 1,17 8.5L17,8.5A8.5,8.5 0,0 1,8.5 17L8.5,17A8.5,8.5 0,0 1,0 8.5L0,8.5A8.5,8.5 0,0 1,8.5 0z"
android:fillColor="#FF6F0F"/>
<path
android:pathData="M6.583,7.269C7.629,7.269 8.674,4.454 9.72,4.454V7.269H12.857C12.857,7.269 12.509,12.546 10.417,12.546H6.583M6.583,7.269V12.546M6.583,7.269H4.143V12.546H6.583"
android:strokeLineJoin="round"
android:strokeWidth="0.622437"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</vector>
39 changes: 39 additions & 0 deletions app/src/main/res/drawable/ic_meatball_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<path
android:pathData="M20,0L20,0A20,20 0,0 1,40 20L40,20A20,20 0,0 1,20 40L20,40A20,20 0,0 1,0 20L0,20A20,20 0,0 1,20 0z"
android:fillColor="#F2F3F7"/>
<path
android:pathData="M20,20.667C20.368,20.667 20.667,20.368 20.667,20C20.667,19.632 20.368,19.333 20,19.333C19.632,19.333 19.333,19.632 19.333,20C19.333,20.368 19.632,20.667 20,20.667Z"
android:fillColor="#212529"/>
<path
android:pathData="M20,16C20.368,16 20.667,15.701 20.667,15.333C20.667,14.965 20.368,14.667 20,14.667C19.632,14.667 19.333,14.965 19.333,15.333C19.333,15.701 19.632,16 20,16Z"
android:fillColor="#212529"/>
<path
android:pathData="M20,25.333C20.368,25.333 20.667,25.035 20.667,24.667C20.667,24.298 20.368,24 20,24C19.632,24 19.333,24.298 19.333,24.667C19.333,25.035 19.632,25.333 20,25.333Z"
android:fillColor="#212529"/>
<path
android:pathData="M20,20.667C20.368,20.667 20.667,20.368 20.667,20C20.667,19.632 20.368,19.333 20,19.333C19.632,19.333 19.333,19.632 19.333,20C19.333,20.368 19.632,20.667 20,20.667Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#212529"
android:strokeLineCap="round"/>
<path
android:pathData="M20,16C20.368,16 20.667,15.701 20.667,15.333C20.667,14.965 20.368,14.667 20,14.667C19.632,14.667 19.333,14.965 19.333,15.333C19.333,15.701 19.632,16 20,16Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#212529"
android:strokeLineCap="round"/>
<path
android:pathData="M20,25.333C20.368,25.333 20.667,25.035 20.667,24.667C20.667,24.298 20.368,24 20,24C19.632,24 19.333,24.298 19.333,24.667C19.333,25.035 19.632,25.333 20,25.333Z"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#212529"
android:strokeLineCap="round"/>
</vector>
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/ic_personnel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="14">
<path
android:pathData="M7,8.75C5.151,8.75 3.506,9.643 2.459,11.028C2.234,11.327 2.121,11.476 2.125,11.677C2.128,11.833 2.226,12.029 2.348,12.126C2.507,12.25 2.726,12.25 3.166,12.25H10.834C11.274,12.25 11.493,12.25 11.652,12.126C11.774,12.029 11.872,11.833 11.875,11.677C11.879,11.476 11.766,11.327 11.541,11.028C10.494,9.643 8.849,8.75 7,8.75Z"
android:fillColor="#ACB0B9"/>
<path
android:pathData="M7,7C8.45,7 9.625,5.825 9.625,4.375C9.625,2.925 8.45,1.75 7,1.75C5.55,1.75 4.375,2.925 4.375,4.375C4.375,5.825 5.55,7 7,7Z"
android:fillColor="#ACB0B9"/>
</vector>
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/ic_share_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<path
android:pathData="M20,0L20,0A20,20 0,0 1,40 20L40,20A20,20 0,0 1,20 40L20,40A20,20 0,0 1,0 20L0,20A20,20 0,0 1,20 0z"
android:fillColor="#F2F3F7"/>
<path
android:pathData="M15.625,19.125C14.811,19.125 14.404,19.125 14.071,19.214C13.165,19.457 12.457,20.165 12.214,21.071C12.125,21.404 12.125,21.811 12.125,22.625V23.675C12.125,25.145 12.125,25.88 12.411,26.442C12.663,26.936 13.064,27.337 13.558,27.589C14.12,27.875 14.855,27.875 16.325,27.875H23.675C25.145,27.875 25.88,27.875 26.442,27.589C26.936,27.337 27.337,26.936 27.589,26.442C27.875,25.88 27.875,25.145 27.875,23.675V22.625C27.875,21.811 27.875,21.404 27.786,21.071C27.543,20.165 26.835,19.457 25.929,19.214C25.596,19.125 25.189,19.125 24.375,19.125M23.5,15.625L20,12.125M20,12.125L16.5,15.625M20,12.125V22.625"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#212529"
android:strokeLineCap="round"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/join_meeting_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="@color/carrot_primary_button"/>
<corners android:bottomRightRadius="6dp"
android:bottomLeftRadius="6dp"
android:topLeftRadius="6dp"
android:topRightRadius="6dp"/>
</shape>
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/join_meeting_grey_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/carrot_grey100" />
<corners android:radius="4dp" />
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="@color/carrot_grey100"/>
<corners android:bottomRightRadius="6dp"
android:bottomLeftRadius="6dp"
android:topLeftRadius="6dp"
android:topRightRadius="6dp"/>
</shape>
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/join_meeting_look_member.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/carrot_primary_background" />
<corners android:radius="6dp" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/shape_black_fill_rec.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="@color/carrot_grey500"/>
</shape>
Loading

0 comments on commit e042b88

Please sign in to comment.