[deploy] 1.0.2 version

.github/workflows/android_cd.yml

@@ -28,7 +28,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: set up JDK 17
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: 17
@@ -43,7 +43,7 @@ jobs:
       - name: Decode google-services.json
         env:
           FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
-        run: echo $FIREBASE_SECRET > app/google-services.json
+        run: echo "$FIREBASE_SECRET" > app/google-services.json
 
       - name: Access local properties
         env:
@@ -52,24 +52,41 @@ jobs:
           KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }}
           AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
           GOOGLE_ADS_API_ID: ${{ secrets.GOOGLE_ADS_API_ID }}
-          GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID }}
+          GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID_MANIFEST }}
         run: |
-          echo "dev.base.url=\"$BASE_URL\"" >> local.properties
+          echo "dev.base.url=\"$HFM_BASE_URL\"" >> local.properties
           echo "kakao.native.app.key.manifest=\"$KAKAO_NATIVE_APP_KEY_MANIFEST\"" >> local.properties
           echo "kakao.native.app.key=\"$KAKAO_NATIVE_APP_KEY\"" >> local.properties
           echo "amplitude.dev.api.key=\"$AMPLITUDE_API_KEY\"" >> local.properties
-          echo "google.ads.api.id=\"GOOGLE_ADS_API_ID\"" >> local.properties
-          echo "google.ads.api.id.manifest=\"GOOGLE_ADS_API_ID_MANIFEST\"" >> local.properties
+          echo "google.ads.api.id=\"$GOOGLE_ADS_API_ID\"" >> local.properties
+          echo "google.ads.api.id.manifest=\"$GOOGLE_ADS_API_ID_MANIFEST\"" >> local.properties
 
-      - name: Build Release APK
+      - name: Decode Keystore
+        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > app/date_road.keystore
+
+      - name: Export signing environment
         run: |
-          ./gradlew :app:assembleRelease
+          echo "STORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> $GITHUB_ENV
+          echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> $GITHUB_ENV
+          echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> $GITHUB_ENV
+
+      - name: Build Signed Release APK
+        run: ./gradlew :app:assembleRelease
+
+      - name: Upload Signed APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-apk
+          path: ./app/build/outputs/apk/release/app-release.apk
+
+      - name: Build Signed Release AAB
+        run: ./gradlew :app:bundleRelease
 
-      - name: Upload Release APK
+      - name: Upload Signed AAB
         uses: actions/upload-artifact@v4
         with:
-          name: release
-          path: ./app/build/outputs/apk/release/app-release-unsigned.apk
+          name: release-aab
+          path: ./app/build/outputs/bundle/release/app-release.aab
 
       - name: Discord Notify - Success
         if: ${{ success() }}
@@ -81,7 +98,8 @@ jobs:
           username: DATEROAD-ANDROID 🍫
           content: |
             Release Test가 완료되었습니다!
-            [❇️ APK를 다운로드해 보세요! ❇️](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+            [❇️ APK 다운로드](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+            [📦 AAB 다운로드](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
       - name: Discord Notify - Failure
         if: ${{ failure() }}

.github/workflows/android_ci.yml

@@ -55,7 +55,7 @@ jobs:
           KAKAO_REST_API_KEY: ${{ secrets.KAKAO_REST_API_KEY }}
           AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
           GOOGLE_ADS_API_ID: ${{ secrets.GOOGLE_ADS_API_ID }}
-          GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID }}
+          GOOGLE_ADS_API_ID_MANIFEST: ${{ secrets.GOOGLE_ADS_API_ID_MANIFEST }}
         run: |
           echo "dev.base.url=\"$BASE_URL\"" >> local.properties
           echo "kakao.base.url=\"$KAKAO_BASE_URL\"" >> local.properties

app/build.gradle.kts

@@ -16,6 +16,8 @@ val properties = Properties().apply {
 }
 
 android {
+    val keystoreFile = file("date_road.keystore")
+
     namespace = "org.sopt.teamdateroad"
     compileSdk = libs.versions.compileSdk.get().toInt()
 
@@ -37,6 +39,16 @@ android {
         manifestPlaceholders["KAKAO_NATIVE_APP_KEY_MANIFEST"] = properties["kakao.native.app.key.manifest"] as String
         manifestPlaceholders["GOOGLE_ADS_API_ID_MANIFEST"] = properties["google.ads.api.id.manifest"] as String
     }
+    signingConfigs {
+        if (keystoreFile.exists()) {
+            create("release") {
+                storeFile = keystoreFile
+                storePassword = System.getenv("STORE_PASSWORD")
+                keyAlias = System.getenv("KEY_ALIAS")
+                keyPassword = System.getenv("KEY_PASSWORD")
+            }
+        }
+    }
 
     buildTypes {
         debug {
@@ -47,6 +59,9 @@ android {
         }
 
         release {
+            if (keystoreFile.exists()) {
+                signingConfig = signingConfigs.getByName("release")
+            }
             isMinifyEnabled = true
             isShrinkResources = true
             buildConfigField("String", "BASE_URL", properties["prod.base.url"].toString())
@@ -58,6 +73,7 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8

app/src/main/java/org/sopt/teamdateroad/presentation/type/DateChipGroupType.kt

@@ -19,5 +19,10 @@ enum class DateChipGroupType(
         titleRes = R.string.date_chip_group_enroll_course,
         titleTextStyle = defaultDateRoadTypography.bodySemi15,
         maxSize = 3
+    ),
+    TIMELINE(
+        titleRes = R.string.date_chip_group_enroll_timeline,
+        titleTextStyle = defaultDateRoadTypography.bodySemi15,
+        maxSize = 3
     )
 }

app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt

@@ -104,7 +104,7 @@ enum class TagType(
     PLACE_CARD_TIME(
         backgroundColor = defaultDateRoadColors.gray200,
         contentColor = defaultDateRoadColors.black,
-        paddingHorizontal = 14,
+        paddingHorizontal = 0,
         paddingVertical = 5,
         textStyle = defaultDateRoadTypography.bodyMed13,
         roundedCornerShape = 10

app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadDatePickerBottomSheet.kt

@@ -0,0 +1,155 @@
+package org.sopt.teamdateroad.presentation.ui.component.bottomsheet
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.model.Picker
+import org.sopt.teamdateroad.presentation.ui.component.numberpicker.DateRoadNumberPicker
+import org.sopt.teamdateroad.presentation.ui.component.numberpicker.state.PickerState
+import org.sopt.teamdateroad.presentation.util.DatePicker
+import org.sopt.teamdateroad.ui.theme.DateRoadTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DateRoadDatePickerBottomSheet(
+    isBottomSheetOpen: Boolean,
+    isButtonEnabled: Boolean,
+    buttonText: String,
+    onDatePickerBottomSheetButtonClick: (String) -> Unit,
+    onDismissRequest: () -> Unit = {}
+) {
+    val yearItems = (DatePicker.YEAR_START..DatePicker.YEAR_END).map { it.toString() }
+    val monthItems = (DatePicker.MONTH_START..DatePicker.MONTH_END).map { it.toString().padStart(2, '0') }
+
+    val yearState = remember { PickerState() }
+    val monthState = remember { PickerState() }
+    val dayState = remember { PickerState() }
+    val dayItemsState = remember { mutableStateOf((1..31).map { it.toString().padStart(2, '0') }) }
+
+    LaunchedEffect(yearState.selectedItem, monthState.selectedItem) {
+        val year = yearState.selectedItem.toIntOrNull() ?: DatePicker.YEAR_START
+        val month = monthState.selectedItem.toIntOrNull() ?: DatePicker.MONTH_START
+        val lastDay = getLastDayOfMonth(year, month)
+        val newDays = (DatePicker.DAY_START..lastDay).map { it.toString().padStart(2, '0') }
+
+        dayItemsState.value = newDays
+        if (dayState.selectedItem !in newDays) {
+            dayState.selectedItem = newDays.first()
+        }
+    }
+
+    val yearPicker = Picker(
+        items = yearItems,
+        startIndex = yearItems.indexOf(yearState.selectedItem),
+        pickerState = yearState
+    )
+    val monthPicker = Picker(
+        items = monthItems,
+        startIndex = monthItems.indexOf(monthState.selectedItem),
+        pickerState = monthState
+    )
+    val dayPicker = Picker(
+        items = dayItemsState.value,
+        startIndex = dayItemsState.value.indexOf(dayState.selectedItem),
+        pickerState = dayState
+    )
+
+    val pickers = listOf(yearPicker, monthPicker, dayPicker)
+
+    LaunchedEffect(Unit) {
+        yearState.selectedItem = yearItems[DatePicker.YEAR_START_INDEX]
+        monthState.selectedItem = monthItems.first()
+        dayState.selectedItem = dayItemsState.value.first()
+    }
+
+    DateRoadBottomSheet(
+        modifier = Modifier.padding(top = 20.dp, bottom = 16.dp, start = 16.dp, end = 16.dp),
+        isBottomSheetOpen = isBottomSheetOpen,
+        isButtonEnabled = isButtonEnabled,
+        buttonText = buttonText,
+        onButtonClick = {
+            val selectedDate = pickers.joinToString(separator = DatePicker.SEPARATOR) {
+                it.pickerState.selectedItem.padStart(2, '0')
+            }
+            onDatePickerBottomSheetButtonClick(selectedDate)
+            // 상태 초기화
+            yearState.selectedItem = yearItems[DatePicker.YEAR_START_INDEX]
+            monthState.selectedItem = monthItems.first()
+            dayState.selectedItem = dayItemsState.value.first()
+        },
+        onDismissRequest = {
+            yearState.selectedItem = yearItems[DatePicker.YEAR_START_INDEX]
+            monthState.selectedItem = monthItems.first()
+            dayState.selectedItem = dayItemsState.value.first()
+            onDismissRequest()
+        }
+    ) {
+        Column {
+            Row(modifier = Modifier.fillMaxWidth()) {
+                pickers.forEachIndexed { index, item ->
+                    DateRoadNumberPicker(
+                        modifier = Modifier.weight(1f),
+                        items = item.items,
+                        startIndex = if (index == 0)item.items.indexOf(item.pickerState.selectedItem) else 0,
+                        pickerState = item.pickerState
+                    )
+                    if (index != pickers.size - 1) {
+                        Spacer(modifier = Modifier.width(17.dp))
+                    }
+                }
+            }
+            Spacer(modifier = Modifier.height(19.dp))
+        }
+    }
+}
+
+fun getLastDayOfMonth(year: Int, month: Int): Int {
+    return when (month) {
+        1, 3, 5, 7, 8, 10, 12 -> 31
+        4, 6, 9, 11 -> 30
+        2 -> if (isLeapYear(year)) 29 else 28
+        else -> 31
+    }
+}
+
+fun isLeapYear(year: Int): Boolean {
+    return (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)
+}
+
+@Preview
+@Composable
+fun DateRoadDatePickerBottomSheetPreview() {
+    var isBottomSheetOpen by rememberSaveable { mutableStateOf(false) }
+
+    Button(onClick = { isBottomSheetOpen = true }) {
+        Text(
+            text = "DateRoadPickerBottomSheet",
+            color = DateRoadTheme.colors.black,
+            style = DateRoadTheme.typography.titleExtra24
+        )
+    }
+
+    DateRoadDatePickerBottomSheet(
+        isBottomSheetOpen = isBottomSheetOpen,
+        isButtonEnabled = true,
+        buttonText = "취소",
+        onDatePickerBottomSheetButtonClick = {}
+    )
+}

app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt

@@ -1,10 +1,8 @@
 package org.sopt.teamdateroad.presentation.ui.component.button
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -39,16 +37,16 @@ fun DateRoadKakaoLoginButton(
         paddingHorizontal = 14.dp,
         onClick = onClick
     ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically
+        Box(
+            modifier.fillMaxWidth()
         ) {
             Image(
                 painter = painterResource(id = R.drawable.ic_kakao_logo),
                 contentDescription = null,
                 modifier = Modifier
                     .clip(CircleShape)
+                    .align(Alignment.CenterStart)
             )
-            Spacer(modifier = Modifier.size(5.dp))
             Text(
                 text = stringResource(id = R.string.kakao_login),
                 fontSize = 15.sp,
@@ -57,7 +55,7 @@ fun DateRoadKakaoLoginButton(
                 color = contentColor,
                 textAlign = TextAlign.Center,
                 modifier = Modifier
-                    .align(Alignment.CenterVertically)
+                    .align(Alignment.Center)
                     .fillMaxWidth()
             )
         }

app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadCourseCard.kt

@@ -40,6 +40,7 @@ fun DateRoadCourseCard(
     Row(
         modifier = modifier
             .fillMaxWidth()
+            .padding(end = 16.dp)
             .height(130.dp)
             .background(DateRoadTheme.colors.white)
             .noRippleClickable(onClick = { onClick(course.courseId) })

app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt

@@ -37,7 +37,7 @@ fun DateRoadPlaceCard(
     place: Place,
     onIconClick: (() -> Unit)? = null
 ) {
-    val paddingValues = Modifier.padding(start = placeCardType.startPadding, end = 17.dp)
+    val paddingValues = Modifier.padding(start = placeCardType.startPadding, end = 13.dp)
 
     Row(
         modifier = modifier
@@ -75,6 +75,7 @@ fun DateRoadPlaceCard(
                 Spacer(modifier = Modifier.width(10.dp))
 
                 DateRoadTextTag(
+                    modifier = Modifier.width(61.dp),
                     textContent = place.duration,
                     tagContentType = TagType.PLACE_CARD_TIME
                 )
@@ -130,7 +131,7 @@ fun DateRoadPlaceCardPreview() {
         DateRoadPlaceCard(
             placeCardType = PlaceCardType.COURSE_NORMAL,
             sequence = 0,
-            place = Place(title = "성수미술관 성수점성수미술관 성수점성수미술관 성수점성수미술관 성수점성수미술관 성수점", address = "서울 광진구 자양동 704-1", duration = "2.5시간")
+            place = Place(title = "성수미술관 성수점성수미술관 성수점성수미술관 성수점성수미술관 성수점성수미술관 성수점", address = "서울 광진구 자양동 704-1", duration = "4.0시간")
         )
         Spacer(modifier = Modifier.height(8.dp))
         DateRoadPlaceCard(