Merge branch 'main' of https://github.com/pknu-wap/2023_1_WAP_APP_TEA…

…M_MEDI into #203/feature/juno/user_profile_image
pknu-wap · Aug 22, 2023 · 033cfa0 · 033cfa0
2 parents 872c911 + 91535fa
commit 033cfa0
Show file tree

Hide file tree

Showing 700 changed files with 28,420 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,4 +81,4 @@ lint/intermediates/
 lint/generated/
 lint/outputs/
 lint/tmp/
-# lint/reports/
+# lint/reports/
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ Medilenz는 사용자가 필요로 하는 의약품 정보를 검색하고, 사
 
 ## App Design Templates (Figma)
 
-![image](https://github.com/pknu-wap/2023_1_WAP_APP_TEAM_MEDI/assets/116813010/6020601b-a74b-421f-af46-3b9b8d31e0d0)
+![image](https://github.com/pknu-wap/2023_1_WAP_APP_TEAM_MEDI/assets/116813010/466463b2-b69e-40fe-bcb2-30685a4cf7c0)
 
 
 <https://www.figma.com/file/wgaIpwcuWfSpy1SA52wiUt/%ED%99%94%EB%A9%B4?node-id=0%3A1&t=VEl3ZiT2Q5Cyp4ps-1>
diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
diff --git a/android/.idea/.name b/android/.idea/.name
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
diff --git a/android/.idea/inspectionProfiles/Project_Default.xml b/android/.idea/inspectionProfiles/Project_Default.xml
diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml
diff --git a/android/.idea/kotlinc.xml b/android/.idea/kotlinc.xml
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
diff --git a/android/.idea/navEditor.xml b/android/.idea/navEditor.xml
diff --git a/android/apikey.properties b/android/apikey.properties
@@ -0,0 +1,9 @@
+# 이 파일은 .gitignore에 추가되어 있어서 git에 올라가지 않는다.
+dataGoKrServiceKey=T2nJm9zlOA0Z7Dut%2BThT6Jp0Itn0zZw80AUP3uMdOWlZJR1gVPkx9p1t8etuSW1kWsSNrGGHKdxbwr1IUlt%2Baw%3D%3D
+dataGoKrBaseUrl=https://apis.data.go.kr/1471000/
+awsUrl=http://winocreative.synology.me:33000/
+vertexEndpointUrl=https://us-central1-aiplatform.googleapis.com/v1/projects/balmy-nuance-380605/locations/us-central1/endpoints/1063583985826791424:predict
+SIGNED_STORE_FILE=secretkey/medikey.jks
+SIGNED_STORE_PASSWORD=pamspams1
+SIGNED_KEY_ALIAS=medikey
+SIGNED_KEY_PASSWORD=pamspams1
diff --git a/android/app/.gitignore b/android/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/app/README.md b/android/app/README.md
@@ -0,0 +1,5 @@
+## App module
+
+* ### 구성
+    * MainActivty
+    * Application class