diff --git a/.DS_Store b/.DS_Store index 17fc5a9..beea1c2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/1 b/1 deleted file mode 100644 index 7e9e814..0000000 --- a/1 +++ /dev/null @@ -1,7 +0,0 @@ -Merge branch 'Front' of https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305 into Front - -# Please enter a commit message to explain why this merge is necessary, -# especially if it merges an updated upstream into a topic branch. -# -# Lines starting with '#' will be ignored, and an empty message aborts -# the commit. diff --git a/README.md b/README.md index c7648c8..df529c9 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,43 @@ # ๐Ÿ“– How Do Mo Do Project -![version](https://img.shields.io/badge/version-0.0.1-orange?)![spring](https://img.shields.io/badge/spring-4.0.0-yellow?logo=spring)![spring-boot](https://img.shields.io/badge/springboot-4.0.0-yellow?logo=spring)[![mysql](https://jaywcjlove.github.io/sb/ico/mysql.svg)](http://www.mysql.com/)![aws-ec2](https://img.shields.io/badge/aws-ec2-blue) +![version](https://img.shields.io/badge/version-1.0.0-orange?)![spring](https://img.shields.io/badge/spring-4.0.0-yellow?logo=spring)![spring-boot](https://img.shields.io/badge/springboot-4.0.0-yellow?logo=spring) [![mysql](https://jaywcjlove.github.io/sb/ico/mysql.svg)](http://www.mysql.com/)![aws-ec2](https://img.shields.io/badge/aws-ec2-blue) ### ๐Ÿ  [App Download Homepage](http://j3a305.p.ssafy.io:8080/home/index.html) - +### ๐ŸŽฅ [App ์‹œ์—ฐ์˜์ƒ](https://www.youtube.com/watch?v=thH3XNfE6p4) + +![image](/uploads/32ff25800eb4e553a9942b89841f1eea/image.png)
### ๐Ÿ“‚ Contents -- [Project ์†Œ๊ฐœ](#-์˜ํ™”-๊ด€๋ จ-์ถ”์ฒœ-์„œ๋น„์Šค) +- [Project ์†Œ๊ฐœ](#%EF%B8%8F-์˜ํ™”-๊ด€๋ จ-์ถ”์ฒœ-์„œ๋น„์Šค) - [๊ธฐ์ˆ  ์Šคํƒ](#-๊ธฐ์ˆ -์Šคํƒ) - [์‚ฌ์šฉ ๊ธฐ์ˆ ](#-์‚ฌ์šฉ-๊ธฐ์ˆ ) -- [Git Flow](#-Git-Flow) +- [Git Flow](#-git-flow) - [์—ญํ• ๋ถ„๋‹ด](#-์—ญํ• -๋ถ„๋‹ด) - [Jira](#-jira) -- [ํ™”๋ฉด ๊ตฌ์„ฑ Flow](#-ํ™”๋ฉด-๊ตฌ์„ฑ-Flow) +- [ํ™”๋ฉด ๊ตฌ์„ฑ Flow](#-ํ™”๋ฉด-๊ตฌ์„ฑ-flow) +- [ํ”„๋กœ์ ํŠธ ์‚ฐ์ถœ๋ฌผ](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc) + - [ํ”„๋กœ์ ํŠธ ๊ณ„ํš์„œ](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/blob/develop/doc/%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8%20%EA%B3%84%ED%9A%8D%EC%84%9C/%EC%84%9C%EC%9A%B83%EB%B0%98_A305_%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8_%EA%B3%84%ED%9A%8D%EC%84%9C.pdf) + - [๊ธฐ๋Šฅ ๋ช…์„ธ์„œ](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/%EA%B8%B0%EB%8A%A5%20%EB%AA%85%EC%84%B8) + - [์™€์ด์–ดํ”„๋ ˆ์ž„](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/%EC%99%80%EC%9D%B4%EC%96%B4%ED%94%84%EB%A0%88%EC%9E%84) + - [ERD](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/ERD) + - [API๋ฌธ์„œ](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/API%EB%AC%B8%EC%84%9C) + - [UCC Download](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/UCC%EC%98%81%EC%83%81) + - [๋ฐœํ‘œ์ž๋ฃŒ](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/%EB%B0%9C%ED%91%9C%EC%9E%90%EB%A3%8C) + - [ํšŒ์˜๋ก](https://lab.ssafy.com/s03-bigdata-sub3/s03p23a305/tree/develop/doc/%ED%9A%8C%EC%9D%98%EB%A1%9D)
### ๐Ÿ–ฅ๏ธ ์˜ํ™” ๊ด€๋ จ ์ถ”์ฒœ ์„œ๋น„์Šค -- ํ”„๋กœ์ ํŠธ ์†Œ๊ฐœ +- โ˜ **์˜ํ™”์‚ฌ ํ†ตํ•ฉ ํ”Œ๋žซํผ** + + - **3๊ฐœ์˜ ์˜ํ™”์‚ฌ(CGV, ๋กฏ๋ฐ์‹œ๋„ค๋งˆ, ๋ฉ”๊ฐ€๋ฐ•์Šค)** ์ƒ์˜์‹œ๊ฐ„ ํ†ตํ•ฉ์„ ํ†ตํ•œ **๋น ๋ฅธ ์ •๋ณด ๊ฒ€์ƒ‰๊ณผ ํ™œ๋™์„ ๊ณ ๋ คํ•œ ์˜ํ™”๊ด€ ์„ ํƒ** + +- โ˜ ์นด๋“œ์‚ฌ ๊ฒฐ์ œ์ •๋ณด ๋น…๋ฐ์ดํ„ฐ๋ฅผ ํ™œ์šฉํ•œ ์˜ํ™”๊ด€ **์ฃผ๋ณ€ ํ™œ๋™ ๋ถ„์„ ๋ฐ ์ถ”์ฒœ!** (๋ง›์ง‘, ์‡ผํ•‘ ๋“ฑ์˜ ์—ฌ๊ฐ€ํ™œ๋™) + +- โ˜ ์˜ํ™”์˜ ์ˆ˜๋งŽ์€ **๋ฆฌ๋ทฐ ๊ธ/๋ถ€์ • ๋ถ„์„์„ ํ†ตํ•ด ์˜ํ™”๋ฅผ ์ถ”์ฒœ**!
@@ -113,7 +130,7 @@ > - `์ข…์†๋œ ์ฝ”๋“œ`๋ฅผ ๊ฐ์ถ• > - `๊ฒฐํ•ฉ๋„`๋ฅผ ๋‚ฎ์ถ”๋ฉด์„œ `์œ ์—ฐ์„ฑ`๊ณผ `ํ™•์žฅ์„ฑ`์ด ํ–ฅ์ƒ > -> **KAKAO Map**: +> **KAKAO Map**: ์˜ํ™”๊ด€ ๋ฆฌ์ŠคํŠธ๋ฅผ ์ง€๋„์—์„œ ๋ณด์—ฌ์ฃผ๊ธฐ ์œ„ํ•ด์„œ ์นด์นด์˜ค๋งต API๋ฅผ ์ด์šฉ. @@ -177,120 +194,228 @@ - Front_doc - Front_epic Name -- Back - - - Back_doc - - Back_Setting - - - Back_Users - - - Back_Theaters - - - Back_Current_Movielist - - - Back_django - - - Back_api - - - Back_Crawling - - - Back_SelectTheaters - + - Back + - Back_doc + - Back_Setting + - Back_Users + - Back_Theaters + - Back_Current_Movielist + - Back_django + - Back_api + - Back_Crawling + - Back_SelectTheaters - bigdata_recommand - - pn_score_analysis - - - release - - + - release + +
### ๐Ÿ“ƒ ์—ญํ•  ๋ถ„๋‹ด -- PM +- - #### PM & BigData ๐Ÿ•ตโ€โ™‚ **์ด์„ ์ˆ˜** -- Frontend - - ๐Ÿ‘ฑ **๊น€์ฐฌ์˜** ๐Ÿ‘จ ๊น€๋Œ€์šฉ ๐Ÿ‘ฆ ๊น€ํ˜•ํƒ - - ```markdown - # [Role] - ## [๊น€ ์ฐฌ ์˜] - ### 1. ์ƒ์˜๊ด€ ์„ ํƒ ํŽ˜์ด์ง€ - - 1) ์ค‘์ฒฉ Recycler View๋ฅผ ํ†ตํ•œ ์ƒ์˜ ์˜ํ™” ์‹œ๊ฐ„ ์ •๋ณด ๊ตฌ์„ฑ - - ์˜ํ™”์‚ฌ ํŽ˜์ด์ง€ ํฌ๋กค๋ง ๋ฐ์ดํ„ฐ ํ™œ์šฉ - - 2) Recycler View๋ฅผ ํ†ตํ•œ ๋‚ ์งœ ๋ฐ์ดํ„ฐ ์ •๋ณด ๊ตฌ์„ฑ - - ํ˜„์žฌ ์‹œ๊ฐ„์œผ๋กœ๋ถ€ํ„ฐ 7์ผ๊ฐ„ ๋‚ ์งœ๋ฅผ ์ €์žฅํ•˜์—ฌ ์ถœ๋ ฅ - ### 2. ์žฅ์†Œ ์„ ํƒ ํŽ˜์ด์ง€ - - 1) ์‹œ/๋„, ๊ตฌ/๊ตฐ ์„ ํƒ ์„œ๋ฒ„ ์—ฐ๋™ํ•˜์—ฌ ๋ฐ์ดํ„ฐ ์ถœ๋ ฅ - - 2) ๊ตฌ/๊ตฐ ๋ฐ์ดํ„ฐ๋ฅผ ํ†ตํ•ด ์นด๋“œ๋ฐ์ดํ„ฐ ๋ถ„์„ ๊ฒฐ๊ณผ ์ถœ๋ ฅ - ## [๊น€ ๋Œ€ ์šฉ] - - ## [๊น€ ํ˜• ํƒ] - ### 1. Main Page - - 1) Recycler View๋ฅผ ํ†ตํ•œ ์‹ค์‹œ๊ฐ„ ์ƒ์˜ ์˜ํ™” ์ •๋ณด ๊ตฌ์„ฑ - - ์‹ค์‹œ๊ฐ„ ์ƒ์˜ ์˜ํ™” API ํ™œ์šฉ - - ์˜ˆ๋งคํ•˜๊ธฐ ๋ฒ„ํŠผ์„ ํด๋ฆญํ•˜์—ฌ ํ•ด๋‹น ์˜ํ™”์— ๋Œ€ํ•œ ๊ธ์ •/๋ถ€์ • ๋ถ„์„ ๊ฒฐ๊ณผ๋ฅผ Dialog๋กœ ์ถœ๋ ฅ - - BigData ๋ถ„์„ ๊ฒฐ๊ณผ๋ฅผ ํ†ตํ•œ ๊ธ์ •/ ๋ถ€์ • ์ ์ˆ˜๋ฅผ ํ†ต์‹ ํ•˜๊ณ  ๊ฒฐ๊ณผ๊ฐ’์„ ๋ฐ›์•„์™€ Dialog์— ์ ์šฉ - - ์˜ํ™”๊ด€ ์„ ํƒ ํ™”๋ฉด์œผ๋กœ ์—ฐ๊ฒฐ - - 2) Recycler View๋ฅผ ํ†ตํ•œ ์˜ํ™” ๋ธ”๋กœ๊ทธ ๋ฆฌ๋ทฐ ์ •๋ณด ๊ตฌ์„ฑ - - Spinner๋ฅผ ํ†ตํ•ด ์˜ํ™”๋ฅผ ์„ ํƒ - - ์„ ํƒ๋œ ์˜ํ™”๋ฅผ ๋„ค์ด๋ฒ„ ๋ธ”๋กœ๊ทธ ๊ฒ€์ƒ‰ API ํ™œ์šฉ - - Web View Activity๋ฅผ ํ™œ์šฉํ•˜์—ฌ ํ•ด๋‹น ๋ธ”๋กœ๊ทธ๋กœ ์—ฐ๊ฒฐ - ### 2. Login Page - - 1) Login Activity, View Model, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ - - 2) Backend ํŒŒํŠธ์™€ ๋กœ๊ทธ์ธ ๊ด€๋ จ ํ†ต์‹  - ### 3. MyPage - - 1) ํšŒ์›์ •๋ณด ์ˆ˜์ • Activity, View Model, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ - - 2) ํšŒ์› ํƒˆํ‡ด Activity, View Model, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ - - 3) Backend ํŒŒํŠธ์™€ ํšŒ์›์ •๋ณด ์ˆ˜์ •, ํƒˆํ‡ด ๊ธฐ๋Šฅ ํ†ต์‹  - ### 4. Dialog Activity - - 1) ํšŒ์› ํƒˆํ‡ด ๋ฐ ์˜ํ™” ๋ฆฌ๋ทฐ ๊ธ์ •/๋ถ€์ • ๋ถ„์„ ์ •๋ณด Dialog Activity๋ฅผ ๊ตฌํ˜„ - - 2) ์‚ฌ์šฉ์ž์—๊ฒŒ ํšจ๊ณผ์ ์œผ๋กœ ๋ณด์—ฌ์งˆ ์ˆ˜ ์žˆ๋„๋ก layout์„ ๊ตฌํ˜„ - ### 5. Splash Page - - 1) App ์ฒ˜์Œ ์‹คํ–‰ ํ™”๋ฉด Splash Activity, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ ``` + 1. bigdata analysis of activitiy - + 1) spark ์„ธ์…˜ ์ƒ์„ฑ ๋ฐ ๋ถ„์„ ๋ฐ์ดํ„ฐ ๋กœ๋“œ + + 2) ์‹œ๊ตฌ๊ตฐ ๊ธฐ์ค€ ๊ทธ๋ฃนํ•‘ dataframe ์ƒ์„ฑ + + 3) param์— ๋”ฐ๋ฅธ dataframe ๋ถ„์„ + + 4) ๊ฒฐ๊ณผ๊ฐ’ response (json) + + 5) Django RESTful api ํ™œ์šฉ (GET) + + 6) python ๋ชจ๋“ˆํ™” ๋ฐ singleton pattern ์ ์šฉ (์—ฌ๋Ÿฌ ์„ธ์…˜์˜ ์ ‘๊ทผ์— ๋™์ผํ•œ ์‚ฌ์ „๋ถ„์„ ๋ฐ์ดํ„ฐ๋ฅผ ํ™œ์šฉํ•˜๊ธฐ ์œ„ํ•ด) + + 2. positive/negative score analysis -- Backend + 1) Bertforsequenceclassification 15๋งŒ๊ฐœ ๊ธ๋ถ€์ • ๋ฆฌ๋ทฐ ์‚ฌ์ „ ํ•™์Šต ๋ฐ, ํ•™์Šต ๋ชจ๋ธ ์ถ”์ถœ (Colab ํ™˜๊ฒฝ์—์„œ ํ•™์Šต ํ›„ ์ถ”์ถœ) - ๐Ÿ‘จ **๊ถŒ์˜ค์ •** ๐Ÿ‘ฉ ์ „์ˆ˜ํ˜„ + 2) Crawling์„ ํ†ตํ•ด '๋„ค์ด๋ฒ„ ์˜ํ™”' ํ™ˆํŽ˜์ด์ง€์˜ ๋ฆฌ๋ทฐ 2ํŽ˜์ด์ง€ ๋ถ„๋Ÿ‰ ์ถ”์ถœ - ```markdown - # [Role] - ## [์ „์ˆ˜ํ˜„] - ### 1. Spring Server - - 1) ํšŒ์›์ •๋ณด CRUD - - 2) ์‹œ๊ตฌ๊ตฐ ๋ฐ ์ฆ๊ฒจ์ฐพ๊ธฐ CRUD + 3) ํ‰๊ฐ€ ๋ฐ์ดํ„ฐ ํ† ํฐํ™” ๋ฐ ์–ดํ…์…˜ ๋งˆ์Šคํ‚น, ํŒŒ์ดํ† ์น˜์˜ ํ…์„œํ˜•์œผ๋กœ ๋ณ€ํ™˜ + + 4) Django RESTful api ํ™œ์šฉ (GET) + + 5) python ๋ชจ๋“ˆํ™” ๋ฐ singleton pattern ์ ์šฉ (์—ฌ๋Ÿฌ ์„ธ์…˜์˜ ์ ‘๊ทผ์— ๋™์ผํ•œ ์‚ฌ์ „๋ถ„์„ ๋ฐ์ดํ„ฐ๋ฅผ ํ™œ์šฉํ•˜๊ธฐ ์œ„ํ•ด) + + 6) AWS ํ™˜๊ฒฝ์„ค์ • ๋ฐ ๋ฐฐํฌ ๊ด€๋ฆฌ ``` +
+
- +- #### Frontend + + ๐Ÿ‘ฑ **๊น€์ฐฌ์˜** + ``` + 1. ์ƒ์˜๊ด€ ์„ ํƒ ํŽ˜์ด์ง€ + + 1) ์ค‘์ฒฉ Recycler View๋ฅผ ํ†ตํ•œ ์ƒ์˜ ์˜ํ™” ์‹œ๊ฐ„ ์ •๋ณด ๊ตฌ์„ฑ + + - ์˜ํ™”์‚ฌ ํŽ˜์ด์ง€ ํฌ๋กค๋ง ๋ฐ์ดํ„ฐ ํ™œ์šฉ + + 2) Recycler View๋ฅผ ํ†ตํ•œ ๋‚ ์งœ ๋ฐ์ดํ„ฐ ์ •๋ณด ๊ตฌ์„ฑ + + - ํ˜„์žฌ ์‹œ๊ฐ„์œผ๋กœ๋ถ€ํ„ฐ 7์ผ๊ฐ„ ๋‚ ์งœ๋ฅผ ์ €์žฅํ•˜์—ฌ ์ถœ๋ ฅ + + 2. ์žฅ์†Œ ์„ ํƒ ํŽ˜์ด์ง€ + + 1) ์‹œ/๋„, ๊ตฌ/๊ตฐ ์„ ํƒ ์„œ๋ฒ„ ์—ฐ๋™ํ•˜์—ฌ ๋ฐ์ดํ„ฐ ์ถœ๋ ฅ -- Big Data - - ๐Ÿ‘จ **์ด์„ ์ˆ˜** - - ```markdown - # [Role] - ## [์ด์„ ์ˆ˜] - ### 1. bigdata analysis of activitiy - - 1) spark ์„ธ์…˜ ์ƒ์„ฑ ๋ฐ ๋ถ„์„ ๋ฐ์ดํ„ฐ ๋กœ๋“œ - - 2) ์‹œ๊ตฌ๊ตฐ ๊ธฐ์ค€ ๊ทธ๋ฃนํ•‘ dataframe ์ƒ์„ฑ - - 3) param์— ๋”ฐ๋ฅธ dataframe ๋ถ„์„ - - 4) ๊ฒฐ๊ณผ๊ฐ’ response (json) - - 5) Django RESTful api ํ™œ์šฉ (GET) - - 6) python ๋ชจ๋“ˆํ™” ๋ฐ singleton pattern ์ ์šฉ (์—ฌ๋Ÿฌ ์„ธ์…˜์˜ ์ ‘๊ทผ์— ๋™์ผํ•œ ์‚ฌ์ „๋ถ„์„ ๋ฐ์ดํ„ฐ๋ฅผ ํ™œ์šฉํ•˜๊ธฐ ์œ„ํ•ด) - ### 2. positive/negative score analysis - - 1) Bertforsequenceclassification 15๋งŒ๊ฐœ ๊ธ๋ถ€์ • ๋ฆฌ๋ทฐ ์‚ฌ์ „ ํ•™์Šต ๋ฐ, ํ•™์Šต ๋ชจ๋ธ ์ถ”์ถœ (Colab ํ™˜๊ฒฝ์—์„œ ํ•™์Šต ํ›„ ์ถ”์ถœ) - - 2) Crawling์„ ํ†ตํ•ด '๋„ค์ด๋ฒ„ ์˜ํ™”' ํ™ˆํŽ˜์ด์ง€์˜ ๋ฆฌ๋ทฐ 2ํŽ˜์ด์ง€ ๋ถ„๋Ÿ‰ ์ถ”์ถœ - - 3) ํ‰๊ฐ€ ๋ฐ์ดํ„ฐ ํ† ํฐํ™” ๋ฐ ์–ดํ…์…˜ ๋งˆ์Šคํ‚น, ํŒŒ์ดํ† ์น˜์˜ ํ…์„œํ˜•์œผ๋กœ ๋ณ€ํ™˜ - - 4) Django RESTful api ํ™œ์šฉ (GET) - - 5) python ๋ชจ๋“ˆํ™” ๋ฐ singleton pattern ์ ์šฉ (์—ฌ๋Ÿฌ ์„ธ์…˜์˜ ์ ‘๊ทผ์— ๋™์ผํ•œ ์‚ฌ์ „๋ถ„์„ ๋ฐ์ดํ„ฐ๋ฅผ ํ™œ์šฉํ•˜๊ธฐ ์œ„ํ•ด) - - 6) AWS ํ™˜๊ฒฝ์„ค์ • ๋ฐ ๋ฐฐํฌ ๊ด€๋ฆฌ + 2) ๊ตฌ/๊ตฐ ๋ฐ์ดํ„ฐ๋ฅผ ํ†ตํ•ด ์นด๋“œ๋ฐ์ดํ„ฐ ๋ถ„์„ ๊ฒฐ๊ณผ ์ถœ๋ ฅ ``` + + ๐Ÿ‘จ **๊น€๋Œ€์šฉ** + ``` + 1. Signup Page + + 1) Signup Activity, Signup ViewModel๋กœ ๋ทฐ ๊ตฌ์„ฑ ๋ฐ Backend์™€ ํ†ต์‹  + + 2) ๋ฐ์ดํ„ฐ ์œ ํšจ๊ฐ’ ํ™•์ธ + + - ์ด๋ฉ”์ผ, ๋‹‰๋„ค์ž„ ์ค‘๋ณต์ฒดํฌ ๊ธฐ๋Šฅ ๊ตฌํ˜„ - ๋‘˜ ์ค‘์— ํ•˜๋‚˜๋ผ๋„ ์ค‘๋ณต ์ฒดํฌ๊ฐ€ ๋˜์ง€์•Š์•˜์œผ๋ฉด ํšŒ์›๊ฐ€์ž… ๋ถˆ๊ฐ€ + + - ์ƒ๋…„์›”์ผ ๋ฐ ์ด๋ฉ”์ผ, ๋‹‰๋„ค์ž„ Validate Check + + 2. Theater Page + + 1) Recycler View, Bottom Sheet, Kakao Map์„ ์ด์šฉํ•œ View ๊ตฌ์„ฑ + + - ํ•˜๋‹จ Bottom Sheet ์•ˆ์— Recycler View๋ฅผ ์ด์šฉํ•ด ์˜ํ™”๊ด€ ๋ฆฌ์ŠคํŠธ ๊ตฌ์„ฑ + + - ๋ฆฌ์ŠคํŠธ ํด๋ฆญ์‹œ ๋งต์—์„œ ํ•ด๋‹น ์œ„์น˜ Marker๋กœ ์ด๋™ ๋ฐ ํ•˜๋‹จ ๋ฒ„ํŠผ ํ™œ์„ฑํ™” + + - ํ•ด๋‹น ์•„์ดํ…œ ์˜ค๋ฅธ์ชฝ ์ฆ๊ฒจ์ฐพ๊ธฐ ๋ฒ„ํŠผ ๋ˆ„๋ฅผ์‹œ ์ฆ๊ฒจ์ฐพ๊ธฐ ์ถ”๊ฐ€/์‚ญ์ œ + + - ์˜ํ™”๊ด€๋ณ„๋กœ ๋งˆ์ปค์ด๋ฏธ์ง€ ์ƒ์ด, ๋งˆ์ปค ํด๋ฆญ์‹œ ํ•ด๋‹น ์˜ํ™”๊ด€ ์ •๋ณด๋ฅผ ๋‹ด์€ InfoWindow ์ถœ๋ ฅ + + - InfoWindow ํด๋ฆญ์‹œ ํ˜„์žฌ ์œ„์น˜๋กœ๋ถ€ํ„ฐ ํ•ด๋‹น ์œ„์น˜๊นŒ์ง€ ๊ธธ์ฐพ๊ธฐ ๊ธฐ๋Šฅ(KakaoMap) + + 3. Favorite Page + + 1) View ๊ตฌ์„ฑ + + - Bottom Tab์—์„œ ์ฆ๊ฒจ์ฐพ๊ธฐ ํด๋ฆญ์‹œ RecyclerView๋ฅผ ์ด์šฉํ•œ ์ฆ๊ฒจ์ฐพ๊ธฐ ๋ฆฌ์ŠคํŠธ ๊ตฌํ˜„ + + - ์˜ค๋ฅธ์ชฝ์— ๋ณ„๋ชจ์–‘์„ ๋ˆŒ๋Ÿฌ ์ฆ๊ฒจ์ฐพ๊ธฐ ์‚ญ์ œ ๊ธฐ๋Šฅ + + - ์ƒ์˜๊ด€ ํด๋ฆญ์‹œ ์˜ํ™”์„ ํƒ -> ์‹œ๊ฐ„๋Œ€ ์„ ํƒ ํŽ˜์ด์ง€๋กœ ๋ฐ”๋กœ ์ด๋™. + + 4. ์‹œ์—ฐ UCC ์ œ์ž‘ + ``` + + ๐Ÿ‘ฆ **๊น€ํ˜•ํƒ** + + ``` + 1. Main Page + + 1) Recycler View๋ฅผ ํ†ตํ•œ ์‹ค์‹œ๊ฐ„ ์ƒ์˜ ์˜ํ™” ์ •๋ณด ๊ตฌ์„ฑ + + - ์‹ค์‹œ๊ฐ„ ์ƒ์˜ ์˜ํ™” API ํ™œ์šฉ + + - ์˜ˆ๋งคํ•˜๊ธฐ ๋ฒ„ํŠผ์„ ํด๋ฆญํ•˜์—ฌ ํ•ด๋‹น ์˜ํ™”์— ๋Œ€ํ•œ ๊ธ์ •/๋ถ€์ • ๋ถ„์„ ๊ฒฐ๊ณผ๋ฅผ Dialog๋กœ ์ถœ๋ ฅ + + - BigData ๋ถ„์„ ๊ฒฐ๊ณผ๋ฅผ ํ†ตํ•œ ๊ธ์ •/ ๋ถ€์ • ์ ์ˆ˜๋ฅผ ํ†ต์‹ ํ•˜๊ณ  ๊ฒฐ๊ณผ๊ฐ’์„ ๋ฐ›์•„์™€ Dialog์— ์ ์šฉ + + - ์˜ํ™”๊ด€ ์„ ํƒ ํ™”๋ฉด์œผ๋กœ ์—ฐ๊ฒฐ + + 2) Recycler View๋ฅผ ํ†ตํ•œ ์˜ํ™” ๋ธ”๋กœ๊ทธ ๋ฆฌ๋ทฐ ์ •๋ณด ๊ตฌ์„ฑ + + - Spinner๋ฅผ ํ†ตํ•ด ์˜ํ™”๋ฅผ ์„ ํƒ + + - ์„ ํƒ๋œ ์˜ํ™”๋ฅผ ๋„ค์ด๋ฒ„ ๋ธ”๋กœ๊ทธ ๊ฒ€์ƒ‰ API ํ™œ์šฉ + + - Web View Activity๋ฅผ ํ™œ์šฉํ•˜์—ฌ ํ•ด๋‹น ๋ธ”๋กœ๊ทธ๋กœ ์—ฐ๊ฒฐ + + 2. Login Page + + 1) Login Activity, View Model, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ + + 2) Backend ํŒŒํŠธ์™€ ๋กœ๊ทธ์ธ ๊ด€๋ จ ํ†ต์‹  + + 3. MyPage + + 1) ํšŒ์›์ •๋ณด ์ˆ˜์ • Activity, View Model, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ + + 2) ํšŒ์› ํƒˆํ‡ด Activity, View Model, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ + + 3) Backend ํŒŒํŠธ์™€ ํšŒ์›์ •๋ณด ์ˆ˜์ •, ํƒˆํ‡ด ๊ธฐ๋Šฅ ํ†ต์‹  + + 4. Dialog Activity + + 1) ํšŒ์› ํƒˆํ‡ด ๋ฐ ์˜ํ™” ๋ฆฌ๋ทฐ ๊ธ์ •/๋ถ€์ • ๋ถ„์„ ์ •๋ณด Dialog Activity๋ฅผ ๊ตฌํ˜„ + + 2) ์‚ฌ์šฉ์ž์—๊ฒŒ ํšจ๊ณผ์ ์œผ๋กœ ๋ณด์—ฌ์งˆ ์ˆ˜ ์žˆ๋„๋ก layout์„ ๊ตฌํ˜„ + + 5. Splash Page + + 1) App ์ฒ˜์Œ ์‹คํ–‰ ํ™”๋ฉด Splash Activity, layout์„ ํ†ตํ•ด view๋ฅผ ๊ตฌ์„ฑ + ``` +
+
+ +- #### Backend + + ๐Ÿ‘จ **๊ถŒ์˜ค์ •** + + ``` + 1. ์šด์˜์„œ๋ฒ„ ํ™˜๊ฒฝ ๊ตฌ์ถ• + + 1) Database ์„œ๋ฒ„ + + - Docker ์„ค์น˜ + + - Docker MariaDB ์ด๋ฏธ์ง€ Database ์„œ๋ฒ„ ์„ค์น˜ + + 2) Django ์„œ๋ฒ„ + + - Anacoda ์„ค์น˜ + + - Django ์„œ๋ฒ„ ๊ตฌ์ถ• + + 2. Crwaling + + 1) ์˜ํ™”๊ด€ ์ •๋ณด + + - ๊ฐ ์˜ํ™”์‚ฌ ๊ทน์žฅ๋ช…, ์ฃผ์†Œ ์ˆ˜์ง‘ + + - ๋„ค์ด๋ฒ„ ์˜คํ”ˆ API (map-geocode)๋กœ ๊ทน์žฅ ์œ„๋„, ๊ฒฝ๋„ ์ˆ˜์ง‘ + + 2) ํ˜„์žฌ ์ƒ์˜ ์˜ํ™” ์ •๋ณด + + - ๋„ค์ด๋ฒ„ ์˜ํ™” > ํ˜„์žฌ ์ƒ์˜์˜ํ™” > ์ƒ์˜์˜ํ™” ์ •๋ณด ์ˆ˜์ง‘ + + 3) ํ˜„์žฌ ์‚ฌ์˜์ค‘์ธ ์˜ํ™”๊ด€ ์ •๋ณด + + - ์˜ํ™”์‚ฌ > ๊ทน์žฅ > ์‚ฌ์˜์˜ํ™” ์˜ˆ๋งค ์ •๋ณด ์ˆ˜์ง‘ + + 3. ์†Œ๊ฐœ UCC ์ œ์ž‘ + ``` + + ๐Ÿ‘ฉ **์ „์ˆ˜ํ˜„** + + ``` + 1. Spring Server + + 1) ํšŒ์›์ •๋ณด CRUD + + 2) ์‹œ๊ตฌ๊ตฐ ๋ฐ ์ฆ๊ฒจ์ฐพ๊ธฐ CRUD + + 2. Database + + 1) movie_project ๋ฐ์ดํ„ฐ๋ฒ ์ด์Šค ์ƒ์„ฑ + + 2) ํšŒ์›, ๊ถŒํ•œ, ์ง€์—ญ, ์˜ํ™”๊ด€ ํ…Œ์ด๋ธ” ์ƒ์„ฑ + ``` + +
+
+
### ๐Ÿ“ƒ Jira @@ -337,6 +462,7 @@ #### ์žฅ์†Œ ์„ ํƒ ๋ฐ ์นด๋“œ๋ฐ์ดํ„ฐ ๋ถ„์„ ๊ฒฐ๊ณผ ์ถœ๋ ฅ ํ™”๋ฉด ![Screenshot_20201007-204712_HowDoMoDo](https://user-images.githubusercontent.com/45157374/95328101-01c02c00-08e0-11eb-9af3-b4a79e82b713.jpg) +![image](/uploads/7a7fa42e9680f979616332ad64d1867b/image.png) - ์‹œ/๋„, ๊ตฌ/๊ตฐ์„ ์„ ํƒํ•˜์—ฌ ์‚ฌ์šฉ์ž๊ฐ€ ์˜ํ™” ๊ด€๋žŒ์„ ์›ํ•˜๋Š” ์žฅ์†Œ๋ฅผ ์„ ํƒํ•ฉ๋‹ˆ๋‹ค. @@ -350,8 +476,9 @@ #### ์˜ํ™”๊ด€ ์„ ํƒ ํ™”๋ฉด -![Screenshot_20201007-204743_HowDoMoDo](https://user-images.githubusercontent.com/45157374/95328325-611e3c00-08e0-11eb-923d-cc16f5b40d6d.jpg) +![image](/uploads/38361594fbeb06829f27eda3ab6937fd/image.png) ![Screenshot_20201007-204805_HowDoMoDo](https://user-images.githubusercontent.com/45157374/95328339-65e2f000-08e0-11eb-8a9a-0d26e605ec66.jpg) +![image](/uploads/bc675b09c061f1d9ae333f8a68abb007/image.png) - ํ•ด๋‹น ์žฅ์†Œ์— ์žˆ๋Š” 3๊ฐœ ํšŒ์‚ฌ(๋ฉ”๊ฐ€๋ฐ•์Šค, CGV, ๋กฏ๋ฐ์‹œ๋„ค๋งˆ)๋ฅผ ๋ชจ๋‘ ์ถœ๋ ฅํ•ด์ค๋‹ˆ๋‹ค. diff --git "a/doc/API\353\254\270\354\204\234/.gitkeep" "b/doc/API\353\254\270\354\204\234/.gitkeep" new file mode 100644 index 0000000..e69de29 diff --git "a/doc/API\353\254\270\354\204\234/API_\353\254\270\354\204\234.xlsx" "b/doc/API\353\254\270\354\204\234/API_\353\254\270\354\204\234.xlsx" new file mode 100644 index 0000000..33f1172 Binary files /dev/null and "b/doc/API\353\254\270\354\204\234/API_\353\254\270\354\204\234.xlsx" differ diff --git "a/doc/UCC\354\230\201\354\203\201/HDMD.html" "b/doc/UCC\354\230\201\354\203\201/HDMD.html" new file mode 100644 index 0000000..abc8fc4 --- /dev/null +++ "b/doc/UCC\354\230\201\354\203\201/HDMD.html" @@ -0,0 +1,14 @@ + + + + +Insert title here + + + +
+ +
+ + \ No newline at end of file diff --git "a/doc/UCC\354\230\201\354\203\201/HOWDOMOD.mp4" "b/doc/UCC\354\230\201\354\203\201/HOWDOMOD.mp4" new file mode 100644 index 0000000..57738ab Binary files /dev/null and "b/doc/UCC\354\230\201\354\203\201/HOWDOMOD.mp4" differ diff --git a/doc/test.txt b/doc/test.txt deleted file mode 100644 index 9233c1a..0000000 --- a/doc/test.txt +++ /dev/null @@ -1 +0,0 @@ -dd \ No newline at end of file diff --git "a/doc/\353\260\234\355\221\234\354\236\220\353\243\214/\354\265\234\354\242\205 \353\260\234\355\221\234.pptx" "b/doc/\353\260\234\355\221\234\354\236\220\353\243\214/\354\265\234\354\242\205 \353\260\234\355\221\234.pptx" index 9393ff7..a0ab873 100644 Binary files "a/doc/\353\260\234\355\221\234\354\236\220\353\243\214/\354\265\234\354\242\205 \353\260\234\355\221\234.pptx" and "b/doc/\353\260\234\355\221\234\354\236\220\353\243\214/\354\265\234\354\242\205 \353\260\234\355\221\234.pptx" differ diff --git "a/doc/\355\224\204\353\241\234\354\240\235\355\212\270 \352\263\204\355\232\215\354\204\234/test.md" "b/doc/\355\224\204\353\241\234\354\240\235\355\212\270 \352\263\204\355\232\215\354\204\234/test.md" deleted file mode 100644 index 30d74d2..0000000 --- "a/doc/\355\224\204\353\241\234\354\240\235\355\212\270 \352\263\204\355\232\215\354\204\234/test.md" +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git "a/doc/\355\232\214\354\235\230\353\241\235/.gitkeep" "b/doc/\355\232\214\354\235\230\353\241\235/.gitkeep" new file mode 100644 index 0000000..e69de29 diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0901 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0901 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..d4b5dd1 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0901 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0902 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0902 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..fd767bc Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0902 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0903 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0903 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..284a42f Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0903 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0904 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0904 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..2f4aa4c Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0904 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0907 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0907 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..27b9d79 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0907 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0908 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0908 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..c15b4c5 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0908 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0909 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0909 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..d9fadb1 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0909 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0910 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0910 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..5db21ed Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0910 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0910 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0910 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..3e4c844 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0910 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0911 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0911 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..99ade16 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0911 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0911 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0911 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..125f3ba Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0911 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0914 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0914 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..40e993d Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0914 \354\230\244\355\233\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0915 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0915 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..a9db80e Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0915 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0917 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0917 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..cc76e57 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0917 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0918 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0918 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..bc0960d Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0918 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0922 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0922 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..8033c38 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0922 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git "a/doc/\355\232\214\354\235\230\353\241\235/0928 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" "b/doc/\355\232\214\354\235\230\353\241\235/0928 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" new file mode 100644 index 0000000..726fe11 Binary files /dev/null and "b/doc/\355\232\214\354\235\230\353\241\235/0928 \354\230\244\354\240\204 \355\232\214\354\235\230\353\241\235.docx" differ diff --git a/frontend/HowDoMoDo/app/src/main/AndroidManifest.xml b/frontend/HowDoMoDo/app/src/main/AndroidManifest.xml index 9746660..d905d55 100644 --- a/frontend/HowDoMoDo/app/src/main/AndroidManifest.xml +++ b/frontend/HowDoMoDo/app/src/main/AndroidManifest.xml @@ -54,7 +54,7 @@ + android:value="" /> \ No newline at end of file diff --git a/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/object/ObjectCollection.kt b/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/object/ObjectCollection.kt index 2d0358c..da1ca90 100644 --- a/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/object/ObjectCollection.kt +++ b/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/object/ObjectCollection.kt @@ -2,7 +2,7 @@ package com.ssafy.howdomodo.`object` object ObjectCollection { const val URL = "url" - const val API_ID = "WNMOA7SCA1KgsgKqdpiW" - const val API_SECRET = "G9ZfV1Ou1u" - const val MOVIE_API_KEY = "c9e7b475248df927289763b0de2d5bae" + const val API_ID = "" + const val API_SECRET = "" + const val MOVIE_API_KEY = "" } \ No newline at end of file diff --git a/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/ui/favorite/MovieSelectDialogFragment.kt b/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/ui/favorite/MovieSelectDialogFragment.kt index e54f458..20674a6 100644 --- a/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/ui/favorite/MovieSelectDialogFragment.kt +++ b/frontend/HowDoMoDo/app/src/main/java/com/ssafy/howdomodo/ui/favorite/MovieSelectDialogFragment.kt @@ -9,11 +9,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter -import android.widget.TextView import android.widget.Toast -import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager @@ -23,10 +19,7 @@ import com.ssafy.howdomodo.`object`.TheaterCollection import com.ssafy.howdomodo.ui.Loading import com.ssafy.howdomodo.ui.gwanSelect.GwanSelectActivity import com.ssafy.howdomodo.ui.main.* -import com.ssafy.howdomodo.ui.selectArea.SelectAreaActivity import kotlinx.android.synthetic.main.dialog_movie_select.view.* -import kotlinx.android.synthetic.main.fragment_main.* -import kotlinx.android.synthetic.main.item_ticketing_dialog.view.* import org.koin.androidx.viewmodel.ext.android.viewModel class MovieSelectDialogFragment : DialogFragment() { @@ -144,7 +137,7 @@ class MovieSelectDialogFragment : DialogFragment() { // item_psns_content.text = PsNs dialog.setOnOKClickedListener { content-> if(content == "ํ™•์ธ"){ - val intent = Intent(activity, SelectAreaActivity::class.java) + val intent = Intent(activity, GwanSelectActivity::class.java) ObjectMovie.movieTitle = movieTitle startActivity(intent) dismiss() diff --git a/frontend/HowDoMoDo/app/src/main/res/layout/activity_gwan_select.xml b/frontend/HowDoMoDo/app/src/main/res/layout/activity_gwan_select.xml index ba4f48d..6b1a0c6 100644 --- a/frontend/HowDoMoDo/app/src/main/res/layout/activity_gwan_select.xml +++ b/frontend/HowDoMoDo/app/src/main/res/layout/activity_gwan_select.xml @@ -50,12 +50,15 @@ + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingHorizontal="12dp"> - + android:layout_marginEnd="4dp" + android:src="@drawable/movie_twelve" /> - + tools:text="๊ณต์žฅ๊ฐ€๊ฐ€๊ฐ€๊ฐ€๊ฐ€sdfsdfsdf๊ฐ๊ฐ€ใ…ใ„ฑ" /> + @@ -101,7 +96,6 @@ android:id="@+id/act_gwan_tv_theater_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:maxLength="10" android:maxLines="1" android:ellipsize="end" app:layout_constraintEnd_toEndOf="parent" diff --git a/frontend/HowDoMoDo/app/src/main/res/layout/activity_last.xml b/frontend/HowDoMoDo/app/src/main/res/layout/activity_last.xml index 70111f9..e042a96 100644 --- a/frontend/HowDoMoDo/app/src/main/res/layout/activity_last.xml +++ b/frontend/HowDoMoDo/app/src/main/res/layout/activity_last.xml @@ -11,7 +11,7 @@ android:id="@+id/act_last_tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="์˜ˆ๋งค ์ž˜ํ•˜์…ง๋‚˜์š”?" + android:text="์˜ˆ๋งค ์ž˜ํ•˜์…จ๋‚˜์š”?" android:textSize="30dp" android:fontFamily="@font/noto_sans_kr_regular" app:layout_constraintBottom_toTopOf="@id/act_last_cl_next" diff --git a/frontend/HowDoMoDo/app/src/main/res/layout/item_main_posting.xml b/frontend/HowDoMoDo/app/src/main/res/layout/item_main_posting.xml index 31f0dd2..553bbde 100644 --- a/frontend/HowDoMoDo/app/src/main/res/layout/item_main_posting.xml +++ b/frontend/HowDoMoDo/app/src/main/res/layout/item_main_posting.xml @@ -3,18 +3,19 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="150dp" - android:layout_height="188dp" + android:layout_height="wrap_content" + android:padding="10dp" android:background="#1e2329" android:layout_marginLeft="22dp"> + android:lines="3" /> + android:textColor="#DDDDDD" />