Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ dependencies {
//koin
implementation(libs.insert.koin.koin.android)
implementation(libs.koin.androidx.compose)
implementation(libs.koin.androidx.navigation)

implementation (libs.accompanist.systemuicontroller) // 최신 버전 확인

Expand Down
11 changes: 11 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@
android:name=".presentation.service.TimerService"
android:foregroundServiceType="mediaPlayback"
android:exported="false" />

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>

</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
package com.ggaebiz.ggaebiz.data.repository

import android.content.ContentValues
import android.content.Context
import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.Matrix
import android.net.Uri
import android.os.Environment
import android.provider.MediaStore
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asAndroidBitmap
import androidx.compose.ui.unit.IntSize
import androidx.core.content.FileProvider
import com.ggaebiz.ggaebiz.domain.repository.ImageRepository
import com.ggaebiz.ggaebiz.presentation.model.Sticker
import com.ggaebiz.ggaebiz.presentation.model.StickerSource
import com.ggaebiz.ggaebiz.presentation.ui.proof.loadBitmapFromUri
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import java.io.File

class ImageRepositoryImpl(
private val appContext: Context
) : ImageRepository {

override suspend fun createCachedImage(
background: ImageBitmap,
canvasSize: IntSize,
stickers: List<Sticker>
): Uri {

val backgroundBitmap = background.asAndroidBitmap()

val mergedBitmap = withContext(Dispatchers.Default) {
createShareBitmap(
background = backgroundBitmap,
canvasSize = canvasSize,
stickers = stickers
)
}

return withContext(Dispatchers.IO) {
saveBitmapToCache(mergedBitmap)
}
}

override suspend fun saveImageToGallery(uri: Uri): Result<Unit> =
withContext(Dispatchers.IO) {
runCatching {
saveBitmapToGallery(uri)
}
}


private fun createShareBitmap(
background: Bitmap,
canvasSize: IntSize,
stickers: List<Sticker>
): Bitmap {

val result = Bitmap.createBitmap(
background.width,
background.height,
Bitmap.Config.ARGB_8888
)

val canvas = Canvas(result)
canvas.drawBitmap(background, 0f, 0f, null)

val scaleFactor =
background.width.toFloat() / canvasSize.width.toFloat()

stickers
.sortedBy { it.zIndex }
.forEach { sticker ->
when(sticker.source){
is StickerSource.Bitmap -> {
val stickerBitmap = (sticker.source as StickerSource.Bitmap).image.asAndroidBitmap()
val cx = sticker.x * scaleFactor
val cy = sticker.y * scaleFactor

val matrix = Matrix().apply {
postTranslate(
-stickerBitmap.width / 2f,
-stickerBitmap.height / 2f
)
postScale(
sticker.scale * scaleFactor,
sticker.scale * scaleFactor
)
postRotate(sticker.rotation)
postTranslate(cx, cy)
}
canvas.drawBitmap(stickerBitmap, matrix, null)
}
else-> {}
}
}

return result
}

/**
* cacheDir 에 파일 저장
*/
private fun saveBitmapToCache(bitmap: Bitmap): Uri {
val file = File(
appContext.cacheDir,
"editor_${System.currentTimeMillis()}.png"
)

file.outputStream().use {
bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
}

return FileProvider.getUriForFile(
appContext,
"${appContext.packageName}.provider",
file
)
}

/**
* 갤러리에 저장 (Android Q+ 기준)
*/
private fun saveBitmapToGallery(uri: Uri) {
val resolver = appContext.contentResolver

val fileName = "ggaebiz_${System.currentTimeMillis()}.jpg"

val values = ContentValues().apply {
put(MediaStore.Images.Media.DISPLAY_NAME, fileName)
put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
put(
MediaStore.Images.Media.RELATIVE_PATH,
Environment.DIRECTORY_PICTURES + "/GaeBiz"
)
put(MediaStore.Images.Media.IS_PENDING, 1)
}

val collection =
MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)

val galleryUri =
resolver.insert(collection, values)
?: error("MediaStore insert failed")

resolver.openInputStream(uri).use { input ->
resolver.openOutputStream(galleryUri).use { output ->
requireNotNull(input)
requireNotNull(output)
input.copyTo(output)
}
}

values.clear()
values.put(MediaStore.Images.Media.IS_PENDING, 0)
resolver.update(galleryUri, values, null, null)
}
}
13 changes: 12 additions & 1 deletion app/src/main/java/com/ggaebiz/ggaebiz/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,21 @@ import com.ggaebiz.ggaebiz.data.datastore.OnboardingDataStore
import com.ggaebiz.ggaebiz.data.datastore.TimerDataStore
import com.ggaebiz.ggaebiz.data.repository.AudioRepositoryImpl
import com.ggaebiz.ggaebiz.data.repository.ConfigRepositoryImpl
import com.ggaebiz.ggaebiz.data.repository.ImageRepositoryImpl
import com.ggaebiz.ggaebiz.data.repository.OnboardingRepositoryImpl
import com.ggaebiz.ggaebiz.data.repository.TimerRepositoryImpl
import com.ggaebiz.ggaebiz.domain.repository.AudioRepository
import com.ggaebiz.ggaebiz.domain.repository.ConfigRepository
import com.ggaebiz.ggaebiz.domain.repository.ImageRepository
import com.ggaebiz.ggaebiz.domain.repository.OnboardingRepository
import com.ggaebiz.ggaebiz.domain.repository.TimerRepository
import com.ggaebiz.ggaebiz.domain.usecase.CreateCachedImageUseCase
import com.ggaebiz.ggaebiz.domain.usecase.EndTimerUseCase
import com.ggaebiz.ggaebiz.domain.usecase.GetAudioResIdUseCase
import com.ggaebiz.ggaebiz.domain.usecase.GetCharacterIdxUseCase
import com.ggaebiz.ggaebiz.domain.usecase.GetSnoozeCountUseCase
import com.ggaebiz.ggaebiz.domain.usecase.GetTimerSettingUseCase
import com.ggaebiz.ggaebiz.domain.usecase.SaveImageToGalleryUseCase
import com.ggaebiz.ggaebiz.domain.usecase.SelectCharacterIdxUseCase
import com.ggaebiz.ggaebiz.domain.usecase.SetSnoozeCountUseCase
import com.ggaebiz.ggaebiz.domain.usecase.SetTimerSettingUseCase
Expand All @@ -30,6 +34,8 @@ import com.ggaebiz.ggaebiz.presentation.ui.alarm.AlarmViewModel
import com.ggaebiz.ggaebiz.presentation.ui.config.ConfigViewModel
import com.ggaebiz.ggaebiz.presentation.ui.home.HomeViewModel
import com.ggaebiz.ggaebiz.presentation.ui.onboarding.OnboardingViewModel
import com.ggaebiz.ggaebiz.presentation.ui.proof.editor.EditorViewModel
import com.ggaebiz.ggaebiz.presentation.ui.proof.finish.EditorResultViewModel
import com.ggaebiz.ggaebiz.presentation.ui.setting.SettingViewModel
import com.ggaebiz.ggaebiz.presentation.ui.splash.SplashViewModel
import com.ggaebiz.ggaebiz.presentation.ui.timer.TimerViewModel
Expand All @@ -52,6 +58,7 @@ val appModule = module {
single<TimerRepository> { TimerRepositoryImpl(get()) }
single<ConfigRepository> { ConfigRepositoryImpl(get()) }
single<OnboardingRepository> { OnboardingRepositoryImpl(get()) }
single<ImageRepository> { ImageRepositoryImpl(appContext = androidContext()) }

single { TimerServiceManager(androidContext()) }

Expand All @@ -63,13 +70,17 @@ val appModule = module {
factory { GetTimerSettingUseCase(get()) }
factory { SetSnoozeCountUseCase(get()) }
factory { GetSnoozeCountUseCase(get()) }
factory { CreateCachedImageUseCase(get()) }
factory { SaveImageToGalleryUseCase(imageRepository = get()) }

viewModel { HomeViewModel(get(), get(), get()) }
viewModel { HomeViewModel(get(), get(), get(), get()) }
viewModel { SettingViewModel(get(), get(), get()) }
viewModel { SplashViewModel(get()) }
viewModel { OnboardingViewModel(get()) }
viewModel { TimerViewModel(get(), get(), get(), get(), get(), get()) }
viewModel { AlarmViewModel(get(), get(), get(), get(), get()) }
viewModel { ConfigViewModel(get()) }
viewModel { EditorViewModel(get(), get()) }
viewModel { EditorResultViewModel(get(), get()) }

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.ggaebiz.ggaebiz.domain.repository

import android.net.Uri
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.unit.IntSize
import com.ggaebiz.ggaebiz.presentation.model.Sticker

interface ImageRepository {

suspend fun createCachedImage(
background: ImageBitmap,
canvasSize: IntSize,
stickers: List<Sticker>
): Uri

suspend fun saveImageToGallery(uri: Uri): Result<Unit>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.ggaebiz.ggaebiz.domain.usecase

import android.net.Uri
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.unit.IntSize
import com.ggaebiz.ggaebiz.domain.repository.ImageRepository
import com.ggaebiz.ggaebiz.presentation.model.BitmapSticker
import com.ggaebiz.ggaebiz.presentation.model.Sticker

class CreateCachedImageUseCase(
private val imageRepository: ImageRepository
) {
suspend operator fun invoke(
background: ImageBitmap,
canvasSize: IntSize,
stickers: List<Sticker>
): Uri {
return imageRepository.createCachedImage(
background,
canvasSize,
stickers
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.ggaebiz.ggaebiz.domain.usecase

import android.net.Uri
import com.ggaebiz.ggaebiz.domain.repository.ImageRepository

class SaveImageToGalleryUseCase(
private val imageRepository: ImageRepository
) {
suspend operator fun invoke(uri: Uri) : Result<Unit>{
return imageRepository.saveImageToGallery(uri)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.ggaebiz.ggaebiz.R
import com.ggaebiz.ggaebiz.presentation.designsystem.component.button.GaeBizButton
import com.ggaebiz.ggaebiz.presentation.designsystem.component.button.GaeBizIconButton
import com.ggaebiz.ggaebiz.presentation.designsystem.component.icon.GaeBizIcon
import com.ggaebiz.ggaebiz.presentation.designsystem.theme.GaeBizTheme
Expand All @@ -25,38 +28,41 @@ fun GaeBizTextAppBar(
@StringRes titleRes: Int,
iconImageVector: ImageVector = GaeBizIcon.icBack,
iconOnClick: () -> Unit = { },
rightContent: (@Composable () -> Unit)? = null,
) {
Box(modifier = modifier.wrapContentSize()) {
Box(
modifier = modifier.wrapContentSize().padding(
horizontal = 16.dp,
vertical = 12.dp,
),
) {
GaeBizIconButton(
onClick = iconOnClick,
iconImageVector = iconImageVector,
)
}

Box(
modifier = modifier.fillMaxWidth().height(72.dp),
contentAlignment = Alignment.Center,
) {
Text(
text = stringResource(id = titleRes),
style = GaeBizTheme.typography.titleSemiBold,
color = GaeBizTheme.colors.gray800,
)
Box(
modifier = modifier
.fillMaxWidth()
.height(64.dp)
.padding(horizontal = 16.dp),
) {
GaeBizIconButton(
onClick = iconOnClick,
iconImageVector = iconImageVector,
modifier = Modifier.align(Alignment.CenterStart)
)
Text(
modifier = Modifier.align(Alignment.Center),
text = stringResource(id = titleRes),
style = GaeBizTheme.typography.titleSemiBold,
color = GaeBizTheme.colors.gray800,
)
if (rightContent != null) {
Box(
modifier = Modifier.align(Alignment.CenterEnd)
) {
rightContent()
}
}
}
}

@Preview("Text App Bar")
@Preview("Text App Bar", showBackground = true, apiLevel = 34)
@Composable
private fun GaeBizTextAppBarPreview() {
GaeBizTextAppBar(
titleRes = R.string.setting_title_text,
iconOnClick = {},
rightContent = {}
)
}
Loading