Skip to content

Commit

Permalink
feat: 카페 세부정보 Activity Layout 구현
Browse files Browse the repository at this point in the history
- res/drawable 경로에 아이콘 벡터 파일 추가
-
  • Loading branch information
ddiyooong committed Apr 3, 2023
1 parent 79b10ea commit c4b120e
Show file tree
Hide file tree
Showing 22 changed files with 518 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
android:theme="@style/Theme.Mocacong"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".activities.CafeDetailActivity"
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<meta-data
android:name="com.naver.maps.map.CLIENT_ID"
Expand All @@ -30,11 +39,7 @@
<activity
android:name=".activities.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example.mocacong.activities

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import com.example.mocacong.R

class CafeDetailActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_cafe_detail)
}
}
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_call.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20.01,15.38c-1.23,0 -2.42,-0.2 -3.53,-0.56 -0.35,-0.12 -0.74,-0.03 -1.01,0.24l-1.57,1.97c-2.83,-1.35 -5.48,-3.9 -6.89,-6.83l1.95,-1.66c0.27,-0.28 0.35,-0.67 0.24,-1.02 -0.37,-1.11 -0.56,-2.3 -0.56,-3.53 0,-0.54 -0.45,-0.99 -0.99,-0.99H4.19C3.65,3 3,3.24 3,3.99 3,13.28 10.73,21 20.01,21c0.71,0 0.99,-0.63 0.99,-1.18v-3.45c0,-0.54 -0.45,-0.99 -0.99,-0.99z"/>
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/detail_desk.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="122.88dp"
android:height="73.12dp"
android:viewportWidth="122.88"
android:viewportHeight="73.12">
<path
android:fillColor="#FF000000"
android:pathData="M97.13,61.06c3.25,0 5.88,0.56 5.88,1.25s-2.63,1.25 -5.88,1.25c-3.25,0 -5.88,-0.56 -5.88,-1.25S93.88,61.06 97.13,61.06L97.13,61.06zM25.08,14.73v56.31c0,0.58 -0.24,1.1 -0.61,1.48c-0.38,0.38 -0.9,0.61 -1.48,0.61h-9.92c-0.57,0 -1.09,-0.23 -1.47,-0.61l0,0l0,0l0,0c-0.38,-0.38 -0.61,-0.9 -0.61,-1.47V14.73H2.96c-0.82,0 -1.56,-0.33 -2.09,-0.87C0.33,13.32 0,12.58 0,11.77V2.96C0,2.14 0.33,1.4 0.87,0.87S2.14,0 2.96,0h116.96c0.82,0 1.56,0.33 2.09,0.87s0.87,1.28 0.87,2.09v8.81c0,0.82 -0.33,1.56 -0.87,2.09c-0.54,0.54 -1.28,0.87 -2.09,0.87h-0.19v56.31c0,0.57 -0.24,1.09 -0.61,1.47l-0.01,0.01c-0.38,0.38 -0.9,0.61 -1.47,0.61H77.18c-0.58,0 -1.1,-0.23 -1.48,-0.61c-0.07,-0.07 -0.13,-0.14 -0.19,-0.22c-0.27,-0.35 -0.43,-0.79 -0.43,-1.26V14.73H25.08L25.08,14.73zM78.54,30.64h37.74V14.73H78.54V30.64L78.54,30.64zM116.28,34.09H78.54V50.3h37.74V34.09L116.28,34.09zM116.28,53.75H78.54v15.93h37.74V53.75L116.28,53.75zM119.43,3.45H3.45v7.83h115.98V3.45L119.43,3.45zM21.63,14.73h-7.21v54.94h7.21V14.73L21.63,14.73zM97.13,21.27c3.25,0 5.88,0.53 5.88,1.19s-2.63,1.19 -5.88,1.19c-3.25,0 -5.88,-0.53 -5.88,-1.19S93.88,21.27 97.13,21.27L97.13,21.27zM97.13,41.13c3.25,0 5.88,0.56 5.88,1.25s-2.63,1.25 -5.88,1.25c-3.25,0 -5.88,-0.56 -5.88,-1.25S93.88,41.13 97.13,41.13L97.13,41.13z"
android:fillType="evenOdd"/>
</vector>
Binary file added app/src/main/res/drawable/detail_edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/detail_fav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_location.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_parking.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M13,3L6,3v18h4v-6h3c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6zM13.2,11L10,11L10,7h3.2c1.1,0 2,0.9 2,2s-0.9,2 -2,2z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_power.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M16.01,7L16,3h-2v4h-4V3H8v4h-0.01C7,6.99 6,7.99 6,8.99v5.49L9.5,18v3h5v-3l3.5,-3.51v-5.5c0,-1 -1,-2 -1.99,-1.99z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_sound.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
</vector>
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/detail_time.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
<path android:fillColor="@android:color/white" android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_toilet.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M16,4c0,-1.11 0.89,-2 2,-2s2,0.89 2,2s-0.89,2 -2,2S16,5.11 16,4zM20,22v-6h2.5l-2.54,-7.63C19.68,7.55 18.92,7 18.06,7h-0.12c-0.86,0 -1.63,0.55 -1.9,1.37l-0.86,2.58C16.26,11.55 17,12.68 17,14v8H20zM12.5,11.5c0.83,0 1.5,-0.67 1.5,-1.5s-0.67,-1.5 -1.5,-1.5S11,9.17 11,10S11.67,11.5 12.5,11.5zM5.5,6c1.11,0 2,-0.89 2,-2s-0.89,-2 -2,-2s-2,0.89 -2,2S4.39,6 5.5,6zM7.5,22v-7H9V9c0,-1.1 -0.9,-2 -2,-2H4C2.9,7 2,7.9 2,9v6h1.5v7H7.5zM14,22v-4h1v-4c0,-0.82 -0.68,-1.5 -1.5,-1.5h-2c-0.82,0 -1.5,0.68 -1.5,1.5v4h1v4H14z"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/detail_wifi.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
</vector>
Binary file added app/src/main/res/drawable/false_cong.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions app/src/main/res/drawable/filtering_btn_img.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="76dp"
android:viewportWidth="20"
android:viewportHeight="38">
<path
android:pathData="M10,0L10,0A10,10 0,0 1,20 10L20,28A10,10 0,0 1,10 38L10,38A10,10 0,0 1,0 28L0,10A10,10 0,0 1,10 0z"
android:fillColor="#ffffff"/>
<path
android:strokeWidth="1"
android:pathData="M2,19.333H17.333"
android:fillColor="#00000000"
android:strokeColor="#DEDEDE"/>
<path
android:pathData="M10,7.333m-2.667,0a2.667,2.667 0,1 1,5.333 0a2.667,2.667 0,1 1,-5.333 0"
android:fillColor="#B0A491"/>
<path
android:pathData="M6,12.333a4,3.667 0,1 0,8 0a4,3.667 0,1 0,-8 0z"
android:fillColor="#B0A491"/>
<path
android:pathData="M3.333,24.333a3.333,3 0,1 0,6.667 0a3.333,3 0,1 0,-6.667 0z"
android:fillColor="#7A5215"/>
<path
android:pathData="M2,30a4.667,4 0,1 0,9.333 0a4.667,4 0,1 0,-9.333 0z"
android:fillColor="#7A5215"/>
<path
android:pathData="M13,24.333m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:fillColor="#EBCDB0"/>
<path
android:pathData="M8,30a4.667,4 0,1 0,9.333 0a4.667,4 0,1 0,-9.333 0z"
android:fillColor="#EBCDB0"/>
<path
android:pathData="M9.667,25.667m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:fillColor="#B0A491"/>
<path
android:pathData="M5.333,31a4.667,4.333 0,1 0,9.333 0a4.667,4.333 0,1 0,-9.333 0z"
android:fillColor="#B0A491"/>
</vector>
8 changes: 4 additions & 4 deletions app/src/main/res/drawable/round_rectangle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<solid
android:color="@color/jinBrown"
/>
<stroke
android:width="1.5dp"
android:color="@color/white"
/>
<!-- <stroke-->
<!-- android:width="1.5dp"-->
<!-- android:color="@color/white"-->
<!-- />-->
</shape>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/round_white_rectangle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="20dp"
/>
<solid
android:color="#FFFFFF"
/>

</shape>
Loading

0 comments on commit c4b120e

Please sign in to comment.