[Mod/#137] sign up screen

app/src/main/AndroidManifest.xml

@@ -5,13 +5,11 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_HEALTH"/>
-
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <application
         android:name="com.paw.key.PawKeyApplication"

app/src/main/java/com/paw/key/PawKeyApplication.kt

@@ -2,6 +2,11 @@ package com.paw.key
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
+import coil.ImageLoader
+import coil.ImageLoaderFactory
+import coil.disk.DiskCache
+import coil.memory.MemoryCache
+import coil.util.DebugLogger
 import com.kakao.vectormap.KakaoMapSdk
 import com.naver.maps.map.NaverMapSdk
 import dagger.hilt.android.HiltAndroidApp
@@ -10,7 +15,7 @@ import javax.inject.Inject
 import javax.inject.Named
 
 @HiltAndroidApp
-class PawKeyApplication : Application() {
+class PawKeyApplication : Application(), ImageLoaderFactory {
     @Inject
     @Named("kakao.native.key")
     lateinit var kakaoNativeKey: String // BuildConfig는 컴파일 타임에 생성되는 정적 클래스이기 때문에 Mocking이 불가능 = 테스트 용이성
@@ -33,4 +38,22 @@ class PawKeyApplication : Application() {
     private fun setDarkMode() {
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
     }
+
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(this)
+            .memoryCache {
+                MemoryCache.Builder(this)
+                    .maxSizePercent(0.25)
+                    .build()
+            }
+            .diskCache {
+                DiskCache.Builder()
+                    .directory(cacheDir.resolve("image_cache"))
+                    .maxSizeBytes(50 * 1024 * 1024)
+                    .build()
+            }
+            .logger(DebugLogger())
+            .respectCacheHeaders(false)
+            .build()
+    }
 }

app/src/main/java/com/paw/key/core/designsystem/component/DataLoadingScreen.kt

@@ -0,0 +1,47 @@
+package com.paw.key.core.designsystem.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.paw.key.core.designsystem.theme.PawKeyTheme
+
+@Composable
+fun DataLoadingScreen() {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(
+                color = PawKeyTheme.colors.gray950.copy(alpha = 0.5f)
+            ),
+        contentAlignment = Alignment.Center
+    ) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            CircularProgressIndicator(
+                color = PawKeyTheme.colors.green500
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            //Text("현재 위치를 가져오는 중...")
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun LoadingScreenPreview() {
+    PawKeyTheme {
+        DataLoadingScreen()
+    }
+}

app/src/main/java/com/paw/key/core/designsystem/component/DogkyButton.kt

@@ -0,0 +1,62 @@
+package com.paw.key.core.designsystem.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.paw.key.core.designsystem.theme.PawKeyTheme
+import com.paw.key.core.extension.noRippleClickable
+
+@Composable
+fun DogkyButton(
+    text: String,
+    enabled: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val backgroundColor = when {
+        enabled -> PawKeyTheme.colors.primary
+        else -> PawKeyTheme.colors.background1
+    }
+
+    val textColor = when {
+        enabled -> PawKeyTheme.colors.background1
+        else -> PawKeyTheme.colors.default
+    }
+
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+            .background(backgroundColor, shape = RoundedCornerShape(8.dp))
+            .noRippleClickable {
+                if (enabled) onClick()
+            }
+            .padding(vertical = 14.dp),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = text,
+            style = PawKeyTheme.typography.mainButtonDefault,
+            color = textColor
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun DogkyButtonPreview() {
+    PawKeyTheme {
+        DogkyButton(
+            text = "",
+            enabled = true,
+            onClick = {}
+        )
+    }
+}

app/src/main/java/com/paw/key/core/designsystem/component/PawKeyBottomSheet.kt

@@ -0,0 +1,50 @@
+package com.paw.key.core.designsystem.component
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.paw.key.core.designsystem.theme.PawKeyTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PawKeyBottomSheet(
+    sheetState: SheetState,
+    onDismissRequest: () -> Unit,
+    modifier: Modifier = Modifier,
+    content: @Composable (sheetState: SheetState) -> Unit
+) {
+    ModalBottomSheet(
+        onDismissRequest = onDismissRequest,
+        sheetState = sheetState,
+        shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp),
+        containerColor = PawKeyTheme.colors.background2,
+        modifier = modifier
+            .fillMaxWidth(),
+        dragHandle = null,
+    ) {
+        content(sheetState)
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Preview
+@Composable
+private fun PawKeyBottomSheetPreview() {
+    PawKeyTheme {
+        val sheetState = rememberModalBottomSheetState(
+            skipPartiallyExpanded = true
+        )
+
+        PawKeyBottomSheet(
+            sheetState = sheetState,
+            onDismissRequest = {}
+        ) { }
+    }
+}

app/src/main/java/com/paw/key/core/designsystem/component/PawkeyButton.kt

@@ -85,6 +85,7 @@ private fun PreviewPawkeyButton() {
     }
 }
 
+// Todo : 이 더러운 분기의 버튼 제거예정
 @Composable
 fun PawkeyButton(
     text: String,
@@ -102,7 +103,7 @@ fun PawkeyButton(
     }
 
     val backgroundColor = when {
-        actualEnabled && !isBackGround -> PawKeyTheme.colors.green500
+        actualEnabled && !isBackGround -> PawKeyTheme.colors.primary
         actualEnabled && isBackGround -> PawKeyTheme.colors.white1
         !actualEnabled && isBackGround -> PawKeyTheme.colors.white1
         else -> PawKeyTheme.colors.gray200
@@ -139,7 +140,7 @@ fun PawkeyButton(
     ) {
         Text(
             text = text,
-            style = PawKeyTheme.typography.body16Sb,
+            style = PawKeyTheme.typography.mainButtonActive,
             color = contentColor
         )
     }

app/src/main/java/com/paw/key/core/util/DateVisualTransformation.kt

@@ -0,0 +1,44 @@
+package com.paw.key.core.util
+
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
+
+// 날짜 텍스트 입력받아서 변환 텍스트 만들기
+class DateVisualTransformation : VisualTransformation {
+    override fun filter(text: AnnotatedString): TransformedText {
+        val digitsOnly = text.text.filter { it.isDigit() }
+
+        val trimmed = if (digitsOnly.length > 8) digitsOnly.substring(0, 8) else digitsOnly
+
+        val formattedText = buildString {
+            trimmed.forEachIndexed { index, char ->
+                append(char)
+                if (index == 3 || index == 5) {
+                    append('/')
+                }
+            }
+        }
+
+        val offsetMapping = object : OffsetMapping {
+            override fun originalToTransformed(offset: Int): Int {
+                return when {
+                    offset >= 6 -> offset + 2
+                    offset >= 4 -> offset + 1
+                    else -> offset
+                }
+            }
+
+            override fun transformedToOriginal(offset: Int): Int {
+                return when {
+                    offset >= 8 -> offset - 2 // yyyy/MM/dd
+                    offset >= 5 -> offset - 1 // yyyy/MM
+                    else -> offset
+                }
+            }
+        }
+
+        return TransformedText(AnnotatedString(formattedText), offsetMapping)
+    }
+}

app/src/main/java/com/paw/key/presentation/ui/course/util/PermissionRequestEffect.kt → app/src/main/java/com/paw/key/core/util/PermissionRequestEffect.kt

@@ -1,4 +1,4 @@
-package com.paw.key.presentation.ui.course.util
+package com.paw.key.core.util
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts

app/src/main/java/com/paw/key/core/util/flattenCoordinatesToLatLng.kt

@@ -0,0 +1,15 @@
+package com.paw.key.core.util
+
+import com.naver.maps.geometry.LatLng
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toPersistentList
+
+fun flattenCoordinatesToLatLng(
+    coordinates: List<List<List<Pair<Double, Double>>>>
+): ImmutableList<ImmutableList<LatLng>> {
+    return coordinates.map { polygon ->  // 각 Polygon
+        polygon.firstOrNull()?.map { point ->
+            LatLng(point.first, point.second)
+        }.orEmpty().toPersistentList()
+    }.toPersistentList()
+}

app/src/main/java/com/paw/key/core/util/saveBitmapToCache.kt

@@ -0,0 +1,56 @@
+package com.paw.key.core.util
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import androidx.core.content.FileProvider
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+
+// 혹시나 비트맵 사용 시
+fun saveBitmapToCache(
+    context: Context,
+    bitmap: Bitmap,
+    maxFiles: Int = 5, // 캐시 최대 개수
+    maxCacheSizeBytes: Long = 50L * 1024 * 1024, // 50mb,
+    childName : String = "map_snapshot_" // 이미지 이름 변경용
+): Result<Uri> {
+    val cacheDir = context.cacheDir
+
+    // 기존 스냅샷 파일 목록 오래된 순 정렬
+    val existingFiles = cacheDir.listFiles { file ->
+        file.name.startsWith(childName) && file.extension == "png"
+    }?.sortedBy { it.lastModified() } ?: emptyList()
+
+    // 최대 개수 초과 시 오래된 파일 삭제 LRU 구현
+    if (existingFiles.size >= maxFiles) {
+        val filesToDelete = existingFiles.take(existingFiles.size - maxFiles + 1)
+        filesToDelete.forEach { it.delete() }
+    }
+
+    // 용량 기반 삭제
+    var totalSize = existingFiles.sumOf { it.length() }
+    val iterator = existingFiles.iterator()
+    while (totalSize > maxCacheSizeBytes && iterator.hasNext()) {
+        val file = iterator.next()
+        totalSize -= file.length()
+        file.delete()
+    }
+
+    val imageFile = File(cacheDir, "${childName}${System.currentTimeMillis()}.png")
+    return try {
+        FileOutputStream(imageFile).use { out ->
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
+        }
+        Result.success(
+            FileProvider.getUriForFile(
+                context,
+                "${context.packageName}.fileprovider",
+                imageFile
+            )
+        )
+    } catch (e: IOException) {
+        Result.failure(e)
+    }
+}