Merge remote-tracking branch 'refs/remotes/origin/develop' into fix/#279

-home-qa

README.md

@@ -17,6 +17,10 @@
 
 <br> 
 
+## DOWNLOAD
+<a href="https://play.google.com/store/apps/details?id=com.terning.point"><img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="100"></a>
+
+
 ## CONTRIBUTORS
 |                                  👑이유빈<br/>([@leeeyubin](https://github.com/leeeyubin))                                    |                                      이석준<br/>([@boiledEgg-s](https://github.com/boiledEgg-s))                                       |                                  김아린<br/>([@arinming](https://github.com/arinming))                                   |                                    박효빈<br/>([@Hyobeen-Park](https://github.com/Hyobeen-Park))                                     |
 |:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|
@@ -28,7 +32,12 @@
 
 <br>
 
+## DEPENDENCY GRAPH
+  <img width="300px" src="https://github.com/user-attachments/assets/9f730e35-2ecf-4d1f-a170-e08a4836fe8a"/>
+
+
 ## MODULE & PACKAGE CONVENTION
+
 ```
 
 🗃️app
@@ -41,6 +50,7 @@
  ┣ 📂extension
  ┣ 📂navigation
  ┣ 📂state
+ ┣ 📂type
  ┗ 📂util
 
 🗃️data
@@ -50,19 +60,19 @@
  ┃ ┣ 📂response
  ┃ ┣ 📂request
  ┣ 📂local
+ ┣ 📂mapper
  ┣ 📂repositoryImpl
  ┗ 📂service
 
 🗃️domain
  ┣ 📂entity
- ┃ ┣ 📂response
- ┃ ┣ 📂request
  ┗ 📂repository
 
 🗃️feature
  ┗ 📂기능 별 패키징
 
 ```
+
 <br>
 
 ## TECH STACK
@@ -78,6 +88,22 @@
 | Other Tools | Discode, Notion, Figma  |\
 </br>
 
+## SCREENSHOTS
+|       뷰       |                                                              1                                                              |                                                              2                                                              |                                                              3                                                                                        |
+|:-------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|
+| 온보딩 <br> 필터링 설정 | <img width="200px" src="https://github.com/user-attachments/assets/e3b39df0-78f3-4c7b-8049-f5133f18d419"/> | <img width="200px" src="https://github.com/user-attachments/assets/f3cd3efb-b0bc-4bf3-b3ee-0a8be316883a"/> | <img width="200px" src="https://github.com/user-attachments/assets/11d5283c-0537-484a-b822-bcb291e79203"/> |                                                                                                                                 |                                                                                                                             |
+| 홈 <br> 필터링 재설정 | <img width="200px" src="https://github.com/user-attachments/assets/4f558239-fde5-41d7-b7d8-6988b3091fe6"/> | <img width="200px" src="https://github.com/user-attachments/assets/5c7d77d3-3cdc-4f30-8b1d-4e1878266f04"/> | <img width="200px" src="https://github.com/user-attachments/assets/d3202b3b-d8fe-42cf-b7aa-3e54be928736"/> |
+| 캘린더 월간 <br> 캘린더 주간  | <img width="200px" src="https://github.com/user-attachments/assets/0af96542-a560-41f6-87e1-a063dbc49e7c"/> | <img width="200px" src="https://github.com/user-attachments/assets/5d50db13-40af-4f40-b395-235d1560a023"/> | <img width="200px" src="https://github.com/user-attachments/assets/cfdf0ef3-e299-43ba-8208-97d46b320acf"/> | 
+|   탐색 <br> 공고 상세 페이지   | <img width="200px" src="https://github.com/user-attachments/assets/0505ed7f-407a-46dd-a06d-22974da5097a"/> | <img width="200px" src="https://github.com/user-attachments/assets/c7c1ff76-2160-4a96-873e-edd069ddf824"/> | <img width="200px" src="https://github.com/user-attachments/assets/c78b5d07-fbbc-408d-b088-3b94ebc3350e"/> | 
+|   마이페이지 <br> 프로필 수정   | <img width="200px" src="https://github.com/user-attachments/assets/53b9fb41-9190-4f21-98fb-416d52703e55"/> | <img width="200px" src="https://github.com/user-attachments/assets/678c19cd-3aa5-4056-a807-82fbfc307dac"/> | <img width="200px" src="https://github.com/user-attachments/assets/1e7311d4-34b6-4a12-907a-5afbf68ef898"/> | 
+
+<br>
+
+
+## DESIGN SYSTEM
+🔗 [TERNING DESIGN SYSTEM](https://teamterning.github.io/Terning-Android/index.html)
+
+
 ## KANBAN BOARD
 🔗 [TERNING PROJECT](https://github.com/orgs/teamterning/projects/1)
 

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_terning_launcher_foreground"
+        android:icon="@mipmap/ic_terning_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_terning_launcher_round"
         android:supportsRtl="true"

core/src/main/res/values/strings.xml

@@ -64,9 +64,9 @@
 
     <!--NameTextField-->
     <string name="sign_up_helper">12자리 이내, 문자/숫자 가능, 특수문자/기호 입력불가</string>
-    <string name="sign_up_helper_error">이름에 특수문자는 입력할 수 없어요</string>
-    <string name="sign_up_helper_available">사용 가능한 이름이에요</string>
-    <string name="sign_up_helper_out">이름은 12자리 이내로 설정해 주세요</string>
+    <string name="sign_up_helper_error">닉네임에 특수문자는 입력할 수 없어요</string>
+    <string name="sign_up_helper_available">사용 가능한 닉네임이에요</string>
+    <string name="sign_up_helper_out">닉네임은 12자리 이내로 설정해 주세요</string>
 
     <!--ChangeFilter-->
     <string name="change_filter_top_bar_title">필터링 재설정</string>

feature/src/main/java/com/terning/feature/calendar/calendar/component/CalendarDay.kt

@@ -32,16 +32,19 @@ fun CalendarDay(
     onDateSelected: (LocalDate) -> Unit = {}
 ) {
     val backgroundColor =
-        if (isSelected) TerningMain else if (isToday) Grey200 else Color.Transparent
+        if (isSelected)
+            TerningMain
+        else if (isToday) Grey150
+        else Color.Transparent
+
     val textColor =
-        if (dayData.isOutDate) {
-            Grey150
-        } else {
-            if (isSelected)
-                White
-            else
-                Black
-        }
+        if (dayData.isOutDate)
+            Grey200
+        else if (isSelected)
+            White
+        else
+            Black
+
 
     Box(
         modifier = modifier,

feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt

@@ -89,6 +89,7 @@ fun ScrapDialog(
                     is ScrapDialogSideEffect.PatchedScrap -> {
                         onClickChangeColor()
                         onDismissRequest(false)
+                        context.toast(R.string.dialog_content_calendar_color_change_complete)
                     }
 
                     is ScrapDialogSideEffect.NavigateToDetail -> onClickNavigateButton(

feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt

@@ -61,7 +61,6 @@ fun InternCompanyInfo(
                 contentScale = ContentScale.Fit,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .clip(CircleShape),
             )
         }
         Column(

feature/src/main/java/com/terning/feature/intern/component/InternTitle.kt

@@ -17,6 +17,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.theme.Black
+import com.terning.core.designsystem.theme.Grey100
+import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey375
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningSub3
@@ -38,7 +40,11 @@ fun InternTitle(
         Row(
             modifier = Modifier
                 .background(
-                    color = TerningSub3,
+                    color = if (dDay != "지원마감") {
+                        TerningSub3
+                    } else {
+                        Grey100
+                    },
                     shape = RoundedCornerShape(size = 5.dp)
                 )
                 .width(70.dp)
@@ -49,7 +55,11 @@ fun InternTitle(
             Text(
                 text = dDay,
                 style = TerningTheme.typography.title3,
-                color = TerningMain,
+                color = if (dDay != "지원마감") {
+                    TerningMain
+                } else {
+                    Grey300
+                }
             )
         }
 

feature/src/main/java/com/terning/feature/mypage/mypage/component/MyPageItem.kt

@@ -1,5 +1,6 @@
 package com.terning.feature.mypage.mypage.component
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -9,6 +10,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.component.image.TerningImage
@@ -38,8 +40,9 @@ fun MyPageItem(
         Row(
             verticalAlignment = Alignment.CenterVertically
         ) {
-            TerningImage(
-                painter = icon,
+            Image(
+                painter = painterResource(id = icon),
+                contentDescription = "my page image",
                 modifier = modifier.size(28.dp)
             )
             Text(
@@ -51,7 +54,7 @@ fun MyPageItem(
         if (version.isNotEmpty())
             Text(
                 text = version,
-                modifier = modifier.padding(end = 16.dp),
+                modifier = modifier.padding(end = 7.dp),
                 style = TerningTheme.typography.button4,
                 color = Grey350
             )

feature/src/main/java/com/terning/feature/search/search/component/ImageSlider.kt

@@ -27,18 +27,16 @@ fun ImageSlider(
     images: List<Int>,
     onAdvertisementClick: () -> Unit,
 ) {
-    val infiniteImages = remember { images + images + images }
     val pagerState = rememberPagerState(
-        initialPage = images.size,
-        initialPageOffsetFraction = 0f,
-        pageCount = { infiniteImages.size }
+        initialPage = 0,
+        pageCount = { Int.MAX_VALUE }
     )
     val autoScroll = remember { mutableStateOf(true) }
 
     LaunchedEffect(autoScroll.value) {
         if (autoScroll.value) {
             while (true) {
-                delay(2000)
+                delay(3000)
                 if (!pagerState.isScrollInProgress) {
                     val nextPage = pagerState.currentPage + 1
                     pagerState.animateScrollToPage(nextPage)
@@ -47,14 +45,6 @@ fun ImageSlider(
         }
     }
 
-    LaunchedEffect(pagerState.currentPage) {
-        if (pagerState.currentPage < images.size) {
-            pagerState.scrollToPage(pagerState.currentPage + images.size)
-        } else if (pagerState.currentPage >= 2 * images.size) {
-            pagerState.scrollToPage(pagerState.currentPage - images.size)
-        }
-    }
-
     Column(
         modifier
             .fillMaxWidth()
@@ -68,10 +58,11 @@ fun ImageSlider(
             HorizontalPager(
                 state = pagerState,
                 modifier = modifier,
-                beyondViewportPageCount = infiniteImages.size
+                beyondViewportPageCount = 1
             ) { currentPage ->
+                val pageIndex = currentPage % images.size
                 Image(
-                    painter = painterResource(id = infiniteImages[currentPage % images.size]),
+                    painter = painterResource(id = images[pageIndex]),
                     contentDescription = null,
                     modifier = modifier
                         .fillMaxWidth()

feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt

@@ -254,7 +254,7 @@ fun SearchProcessScreen(
                         }
                     }
 
-                    if (state.existSearchResults) {
+                    if (internSearchResultData.isNotEmpty()) {
                         LazyColumn(
                             contentPadding = PaddingValues(
                                 top = 12.dp,
@@ -319,6 +319,7 @@ fun SearchProcessScreen(
                             color = Grey400,
                         )
                     }
+
                 }
             }
         }

feature/src/main/res/values/strings.xml

@@ -17,11 +17,11 @@
     <string name="sign_in_kakao_cancel">로그인을 취소하였습니다</string>
 
     <!--SignUp-->
-    <string name="sign_up_title">반가워요!\n이름을 알려주세요</string>
+    <string name="sign_up_title">반가워요!\n닉네임을 알려주세요</string>
     <string name="sign_up_profile_image">프로필 이미지</string>
     <string name="sign_up_profile_button">프로필 버튼</string>
-    <string name="sign_up_name">이름</string>
-    <string name="sign_up_hint">이름을 입력해 주세요</string>
+    <string name="sign_up_name">닉네임</string>
+    <string name="sign_up_hint">닉네임을 입력해 주세요</string>
     <string name="sign_up_next_button">다음으로</string>
 
     <!--Search-->
@@ -60,7 +60,7 @@
     <string name="dialog_content_scrap_sub_title">공고를 캘린더에 스크랩하시겠어요?</string>
     <string name="dialog_content_color_button">스크랩 색상</string>
     <string name="dialog_content_calendar_color_change">색상 변경하기</string>
-    <string name="dialog_content_calendar_color_change_complete">색상 변경완료</string>
+    <string name="dialog_content_calendar_color_change_complete">스크랩 색상이 변경되었어요!</string>
     <string name="dialog_scrap_button">내 캘린더에 스크랩하기</string>
     <string name="dialog_content_scrap_cancel_main_title">관심 공고가 캘린더에서 사라져요!</string>
     <string name="dialog_content_scrap_cancel_sub_title">스크랩을 취소하시겠어요?</string>

gradle/libs.versions.toml

@@ -2,13 +2,13 @@
 compileSdk = "34"
 minSdk = "28"
 targetSdk = "34"
-versionName = "1.1.0"
-versionCode = "10100"
+versionName = "1.1.2"
+versionCode = "10102"
 kotlinCompilerExtensionVersion = "1.5.0"
 jvmTarget = "1.8"
 
 ## Android gradle plugin
-androidGradlePlugin = "8.6.0"
+androidGradlePlugin = "8.5.0"
 androidDesugarJdkLibs = "2.0.4"
 
 ## AndroidX