Develop

.gitignore

@@ -4,10 +4,12 @@
 /local.properties
 /.idea/caches
 /.idea/libraries
+/.idea/.name
 /.idea/modules.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures
@@ -39,4 +41,3 @@ local.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
-

README.md

@@ -1 +1,70 @@
-# AppPicProj
+# AppPicProj
+<div align="center">
+<img width="477" alt="image" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/5b0c0d21-a39e-4e85-8628-19eeba83d7ee">
+</div>
+
+# AppPic
+> **덕성여대 소프트웨어공학 3팀** <br/> **개발기간: 2023.09 ~ 2023.11**
+
+## 깃헙 산출물
+<div align="center">
+<img width="176" alt="PicTogether" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/94cc6fa5-c6d8-412d-a74a-f9f1613cc39e">
+</div>
+
+> **개발 버전** : [https://github.com/BaileyChoi/AppPicProj.git](https://github.com/BaileyChoi/AppPicProj.git) <br>
+
+## 앱개발팀 소개
+
+|                                                            헤이                                                             |                                                            깡지                                                             |                                                            말이                                                             |                                                            도도                                                             |                                                            호요요                                                            |
+|:-------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------:|
+| <img width="160px" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/1830464d-0800-46cf-a232-aecbf4be0664" /> | <img width="160px" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/7cccdade-e414-4982-a225-751ebd632e80" /> | <img width="160px" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/fd8f0e00-c0ce-4548-b03b-931d82ed5604" /> | <img width="160px" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/e51e1bbb-2587-4efd-9891-033ea9bb394c" /> | <img width="160px" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/2ff57be7-d465-441e-a0af-53d5334a73e2" /> |
+|                                       [@BaileyChoi](https://github.com/BaileyChoi)                                        |                                    [@dontworrywony](https://github.com/dontworrywony)                                     |                                           [@nar0ng](https://github.com/nar0ng)                                            |                                        [@hyunn0121](https://github.com/hyunn0121)                                         |                                          [@19013na](https://github.com/19013na)                                           |
+|                                                            PM                                                             |                                                          Design                                                           |                                                           Infra                                                           |                                                         Developer                                                         |                                                         Developer                                                         |
+
+## 프로젝트 소개
+
+저희 AppPic에서 만든 PicTogether라는 어플은 기존의 모임어플에서의 불편함을 느껴 사용자들이 더 편리하게 모임을 관리하고 사진을 공유할 수 있도록 하기 위해 개발되었습니다.
+
+---
+
+## Stacks 🐈
+
+### Environment
+![Android Studio](https://img.shields.io/badge/AndroidStudio-3DDC84?style=for-the-badge&logo=AndroidStudio&logoColor=white)
+![Git](https://img.shields.io/badge/Git-F05032?style=for-the-badge&logo=Git&logoColor=white)
+![Github](https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=GitHub&logoColor=white)
+![Firebase](https://img.shields.io/badge/Firebase-FFCA28?style=for-the-badge&logo=firebase&logoColor=black)
+![OpenCV](https://img.shields.io/badge/opencv-5C3EE8?style=for-the-badge&logo=opencv&logoColor=black)
+![Figma](https://img.shields.io/badge/figma-F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white)
+
+### Development
+![Kotlin](https://img.shields.io/badge/Kotlin-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white)
+![Java](https://img.shields.io/badge/java-007396?style=for-the-badge&logo=OpenJDK&logoColor=white")
+
+### Communication
+![Notion](https://img.shields.io/badge/Notion-000000?style=for-the-badge&logo=Notion&logoColor=white)
+![GoogleMeet](https://img.shields.io/badge/GoogleMeet-00897B?style=for-the-badge&logo=Google%20Meet&logoColor=white)
+
+---
+## 화면 구성 📺
+|                                                             홈 페이지                                                              |                                                             친구 페이지                                                             |
+|:------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------:|
+|     <img width="330" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/d8161aff-e4f6-40fc-93ca-7eb6a9c4266e"/>     |     <img width="330" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/d014c1ff-7972-4d92-b69a-77e2432e075e"/>     |  
+|                                                             모임 페이지                                                             |                                                             네컷 페이지                                                             |  
+| <img width="330" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/e7a258de-256f-42b8-8813-dde98c1242f7"/> | <img width="330" src="https://github.com/BaileyChoi/AppPicProj/assets/71368635/29afafd3-9583-4ff4-ba0e-6bcf5df52252"/> |
+
+---
+## 주요 기능 📦
+
+### ⭐️ 약속 캘린더 기능
+- 캘린더에 약속을 추가하여 언제 어떤 약속이 있는지 한눈에 확인 가능
+
+### ⭐️ 친구 검색 및 추가 기능
+- PicTogether을 사용하는 회원 중 친구를 검색하여 친구 목록에 추가 가능
+
+### ⭐️ 모임 관리 및 모임 공유 사진첩 기능
+- 친구목록에서 원하는 친구를 골라 모임명과 함께 모임을 생성하고 목록에서 관리 가능
+- 공유하고 싶은 사진을 갤러리에서 골라 모임 공유 사진첩에 업로드 가능 
+
+### ⭐️ 사진 편집 기능
+- 네컷사진의 프레임 색상을 변경하거나 다양한 효과를 적용하여 저장 가능

app/build.gradle

@@ -4,6 +4,9 @@ plugins {
 
     id 'com.google.gms.google-services'
 
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+
 }
 
 android {
@@ -44,6 +47,7 @@ android {
     }
     buildFeatures {
         compose true
+        viewBinding = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion '1.4.3'
@@ -52,15 +56,26 @@ android {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi -v7a/libc++_shared.so'
     }
+
 }
 
 
 dependencies {
 
+    // OpenCV 4.5.1
+    implementation project(":opencv")
+
     implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+
+
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
     implementation 'androidx.activity:activity-compose:1.8.0'
@@ -81,9 +96,26 @@ dependencies {
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
+    // glide
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+
     implementation(platform("com.google.firebase:firebase-bom:32.6.0"))
     implementation 'com.google.firebase:firebase-auth-ktx:22.3.0'
+    implementation 'com.google.firebase:firebase-firestore:24.9.1'
 //    implementation 'com.google.android.gms:play-services-auth:20.7.0'      // 구글 인증
 
 
+    implementation("androidx.lifecycle:lifecycle-runtime:2.6.0")
+    implementation "androidx.room:room-runtime:2.6.0"
+    kapt("androidx.room:room-compiler:2.6.0")
+    implementation("androidx.room:room-ktx:2.6.0")
+
+    implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-livedata:2.3.1"
+    kapt "androidx.lifecycle:lifecycle-compiler:2.3.1"
+}
+
+kapt {
+    generateStubs = true
 }

app/src/androidTest/java/com/example/appapicprj/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.example.appapicprj
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.appapicprj", appContext.packageName)
+    }
+}

app/src/main/AndroidManifest.xml

@@ -2,6 +2,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.Apic.apic">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -15,7 +20,6 @@
         <activity
             android:name=".LoginActivity"
             android:exported="false" />
-
         <activity
             android:name=".GroupActivity"
             android:exported="false"
@@ -31,15 +35,10 @@
                 <!-- SplashActivity를 런처로 설정 -->
             </intent-filter>
         </activity>
-
         <activity
             android:name=".MainActivity"
             android:exported="false">
             <!-- MainActivity는 런처로 설정되지 않음 -->
         </activity>
-
-
-
     </application>
-
-</manifest>
+</manifest>