Merge pull request #170 from TTC1018/feature/#161

내용 작성 화면 Compose 전환
boostcampwm-2022 · Jul 24, 2023 · e94789f · e94789f
2 parents b1e79fb + c05b627
commit e94789f
Show file tree

Hide file tree

Showing 8 changed files with 4,204 additions and 37 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -69,6 +69,7 @@ dependencies {
     def pagingVersion = "3.1.1"
     def glide_version = "4.14.2"
     def glide_compose_version = "1.0.0-alpha.1"
+    def lottieComposeVersion = "6.0.0"
 
     // Compose
     def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
@@ -88,6 +89,8 @@ dependencies {
     implementation 'androidx.compose.runtime:runtime-livedata'
     // collectAsStateWithLifecycle()
     implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"
+    // Compose Text Effect
+    implementation "me.saket.extendedspans:extendedspans:1.3.0"
 
     // Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
@@ -129,6 +132,7 @@ dependencies {
     implementation 'com.arthenica:mobile-ffmpeg-min-gpl:4.4'
     // lottie
     implementation 'com.airbnb.android:lottie:5.0.2'
+    implementation "com.airbnb.android:lottie-compose:$lottieComposeVersion"
     // dataStore
     implementation("androidx.datastore:datastore-preferences:1.0.0")
     implementation("androidx.datastore:datastore-core:1.0.0")

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -42,6 +42,9 @@
         <activity
             android:name=".presentation.totalfilm.TotalFilmActivity"
             android:exported="false" />
+        <activity android:name=".presentation.uploadfilm.UploadFilmComposeActivity"
+            android:exported="false"
+            android:theme="@style/Theme.DailyFilm"/>
         <activity
             android:name=".presentation.uploadfilm.UploadFilmActivity"
             android:exported="false" />

diff --git a/app/src/main/java/com/boostcamp/dailyfilm/presentation/trimvideo/TrimVideoActivity.kt b/app/src/main/java/com/boostcamp/dailyfilm/presentation/trimvideo/TrimVideoActivity.kt
@@ -19,6 +19,7 @@ import com.boostcamp.dailyfilm.presentation.calendar.model.DateModel
 import com.boostcamp.dailyfilm.presentation.selectvideo.SelectVideoActivity
 import com.boostcamp.dailyfilm.presentation.selectvideo.SelectVideoActivity.Companion.DATE_VIDEO_ITEM
 import com.boostcamp.dailyfilm.presentation.uploadfilm.UploadFilmActivity
+import com.boostcamp.dailyfilm.presentation.uploadfilm.UploadFilmComposeActivity
 import com.boostcamp.dailyfilm.presentation.uploadfilm.model.DateAndVideoModel
 import com.gowtham.library.utils.CompressOption
 import com.gowtham.library.utils.TrimType
@@ -100,7 +101,7 @@ class TrimVideoActivity : BaseActivity<ActivityTrimViedoBinding>(R.layout.activi
 
     private fun moveToUpload(trimAndVideoModel: DateAndVideoModel, startTime: Long) {
         startActivity(
-            Intent(this, UploadFilmActivity::class.java).apply {
+            Intent(this, UploadFilmComposeActivity::class.java).apply {
                 putExtra(DATE_VIDEO_ITEM, trimAndVideoModel)
                 putExtra(KEY_CALENDAR_INDEX, viewModel.calendarIndex)
                 putExtra(KEY_INFO_ITEM, viewModel.infoItem)

diff --git a/app/src/main/java/com/boostcamp/dailyfilm/presentation/ui/theme/Color.kt b/app/src/main/java/com/boostcamp/dailyfilm/presentation/ui/theme/Color.kt
@@ -9,7 +9,7 @@ val lightBlack = Color(0xFF202022)
 val lightGray = Color(0xFFE1E1E1)
 
 val primary = lightBlack
-val primaryVariant = white
+val primaryVariant = blackBlur
 val background = white
 val surface = white
 val error = Color(0xFFB00020)