Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

내용 작성 화면 Compose 전환 #170

Merged
merged 6 commits into from
Jul 24, 2023
Merged

내용 작성 화면 Compose 전환 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38a5869
issue #161 chore: LottieCompose 및 Text효과 import
TTC1018 Jul 2, 2023
f20bc8c
issue #161 feat: primaryVariant 색상 변경 (primary와 유사한 색으로)
TTC1018 Jul 2, 2023
7bbfc04
issue #161 chore: 음소거Lottie Raw폴더에 추가
TTC1018 Jul 2, 2023
73e76f2
issue #161 refactor: ViewModel 데이터 Flow로 리팩토링
TTC1018 Jul 2, 2023
c61ef45
issue #161 feat: 내용 작성 화면 Compose 구현
TTC1018 Jul 2, 2023
c05b627
issue #161 feat: Compose용 액티비티 생성
TTC1018 Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,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')
Expand All @@ -76,6 +77,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"
Expand Down Expand Up @@ -117,6 +120,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")
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/boostcamp/dailyfilm/presentation/trimvideo/TrimVideoActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/boostcamp/dailyfilm/presentation/ui/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading