Merge branch 'develop_back' into ARCH-114-feat/jwt

.github/ISSUE_TEMPLATE/feat_request.md → .github/ISSUE_TEMPLATE/기능-이슈.md

@@ -1,3 +1,12 @@
+---
+name: 기능 이슈
+about: 기능 관련 이슈
+title: feat
+labels: ''
+assignees: ''
+
+---
+
 ## 어떤 기능인가요?
 
 > 추가하려는 기능에 대해 간결하게 설명해주세요

.github/ISSUE_TEMPLATE/bug_request.md → .github/ISSUE_TEMPLATE/버그-이슈.md

@@ -1,3 +1,12 @@
+---
+name: 버그 이슈
+about: 버그 관련 이슈
+title: fix
+labels: ''
+assignees: ''
+
+---
+
 ## 어떤 버그인가요?
 
 > 어떤 버그인지 간결하게 설명해주세요

README.md

@@ -25,19 +25,13 @@ An<u>Droid</u> + <u>Blossom</u> </h2>
 ### ⛏️ 작업 중...
 
 ## 🛠 개발 시스템 구성도
-![image](https://github.com/tukcomCD2024/DroidBlossom/assets/68144059/c3116c5f-cc50-461b-8b3a-24a0566ed7e4)
-
-## 시스템 디자인
-![image](https://github.com/tukcomCD2024/DroidBlossom/assets/68144059/f7570e1d-c258-4f4e-adab-5b45d3acc901)
-
-## ⚙️ 운용 환경
-![image](https://github.com/tukcomCD2024/DroidBlossom/assets/68144059/0d43ae45-c953-46f0-aa44-1323713a1bb7)
+### ⛏️ 작업 중...
 
 ## 시스템 디자인
-![image](https://github.com/tukcomCD2024/DroidBlossom/assets/68144059/f7570e1d-c258-4f4e-adab-5b45d3acc901)
+### ⛏️ 작업 중...
 
 ## ⚙️ 운용 환경
-![image](https://github.com/tukcomCD2024/DroidBlossom/assets/68144059/0d43ae45-c953-46f0-aa44-1323713a1bb7)
+### ⛏️ 작업 중...
 
 ## 🦾 기술 스택
 ### ⛏️ 작업 중...

documents/개발 일정.txt

@@ -0,0 +1,14 @@
+백엔드
+- 매주 온라인, 오프라인으로 코딩 진행
+- 목요일 마다 오프라인 코드 리뷰
+- 스크럼 미팅 진행
+
+프론트엔드
+- 매주 오프라인, 온라인으로 코딩 진행
+- 스크럼 미팅 진행
+- 목요일 마다 오프라인 코드 리뷰
+- 디자이너와 상시 소통
+
+팀 회의
+- 특이사항 발생 시 일정 지정해 팀 회의 진행
+- 스프린트 종료 시 만나서 팀 회의 진행

frontend/ARchive/.gitignore

@@ -0,0 +1,33 @@
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

frontend/ARchive/app/.gitignore

@@ -0,0 +1 @@
+/build

frontend/ARchive/app/build.gradle

@@ -0,0 +1,108 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
+    id 'dagger.hilt.android.plugin'
+}
+
+android {
+    namespace 'com.droidblossom.archive'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "com.droidblossom.archive"
+        minSdk 24
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+    buildFeatures{
+        dataBinding = true
+        viewBinding = true
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    //gson
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation 'com.google.code.gson:gson:2.10.1'
+
+    //Glide
+    implementation 'com.github.bumptech.glide:glide:4.14.2'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
+
+    //coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+
+    // ViewModel
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-runtime:2.6.2"
+    implementation 'androidx.activity:activity-ktx:1.6.1'
+
+
+    //lifecycle
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+
+    //Retrofit
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+    implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.2"
+    implementation "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2"
+
+
+    // https://github.com/square/okhttp
+    implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.2"
+
+    // https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor
+    implementation "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2"
+
+    //CardView
+    implementation "androidx.cardview:cardview:1.0.0"
+
+    // photoview
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+
+    // hilt
+    implementation "com.google.dagger:hilt-android:2.47"
+    kapt "com.google.dagger:hilt-compiler:2.47"
+
+    // jetpack navigation
+    implementation "androidx.navigation:navigation-fragment-ktx:2.5.1"
+    implementation "androidx.navigation:navigation-ui-ktx:2.5.1"
+
+    //circleImageView : https://github.com/hdodenhof/CircleImageView
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+
+    //circleIndicator : https://github.com/ongakuer/CircleIndicator
+    implementation 'me.relex:circleindicator:2.1.6'
+}
+kapt {
+    correctErrorTypes true
+}

frontend/ARchive/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

frontend/ARchive/app/src/androidTest/java/com/droidblossom/archive/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.droidblossom.archive
+
+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.droidblossom.archive", appContext.packageName)
+    }
+}

frontend/ARchive/app/src/main/AndroidManifest.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".ARchiveApplication"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:screenOrientation="portrait"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.ARchive"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
+
+        <activity
+            android:name=".presentation.ui.capsule.CapsuleDetailActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".presentation.ui.home.createcapsule.CreateCapsuleActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".presentation.ui.skin.skinmake.SkinMakeActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".presentation.ui.MainActivity"
+            android:exported="true"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity"/>
+
+        <activity
+            android:name=".presentation.ui.auth.AuthActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity"/>
+
+        <activity
+            android:name=".presentation.ui.splash.SplashActivity"
+            android:exported="true"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+</manifest>

frontend/ARchive/app/src/main/java/com/droidblossom/archive/ARchiveApplication.kt

@@ -0,0 +1,7 @@
+package com.droidblossom.archive
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class ARchiveApplication : Application() {}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/presentation/base/BaseActivity.kt

@@ -0,0 +1,37 @@
+package com.droidblossom.archive.presentation.base
+
+import android.os.Bundle
+import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import kotlinx.coroutines.Job
+
+abstract class BaseActivity<VM: BaseViewModel?, V: ViewDataBinding>(@LayoutRes val layoutResource :Int): AppCompatActivity() {
+
+    abstract val viewModel: VM?
+    private var fetchJob: Job? = null
+
+    private var _binding: V? = null
+    protected val binding: V get() = _binding!!
+
+    abstract fun observeData()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _binding = DataBindingUtil.setContentView(this, layoutResource)
+        binding.lifecycleOwner = this
+        setContentView(binding.root)
+        fetchJob = viewModel?.fetchData()
+        observeData()
+    }
+
+    override fun onDestroy() {
+        fetchJob?.let {
+            if (it.isActive) {
+                it.cancel()
+            }
+        }
+        super.onDestroy()
+    }
+}